dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'next' into feature/glitchtip-service

Browse Source
This commit is contained in:
Andras Bacsai
2022-08-18 21:47:06 +02:00
committed by GitHub
parent 2962aa6166 11131ebe06
commit 8c30472472
39 changed files with 1031 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ui/src/lib/components/UpdateAvailable.svelte
View File

@@ -83,7 +83,7 @@
disabled={updateStatus.success === false}
on:click={update}
class="icons tooltip tooltip-right tooltip-primary bg-gradient-to-r from-purple-500 via-pink-500 to-red-500 text-white duration-75 hover:scale-105"
data-tip="Update available!"
data-tip="Update Available!"
>
{#if updateStatus.loading}
<svg

8
apps/ui/src/lib/locales/en.json
View File

@@ -4,7 +4,7 @@
"wait_new_version_startup": "Waiting for the new version to start...",
"new_version": "New version reachable. Reloading...",
"switch_to_a_different_team": "Switch to a different team...",
"update_available": "Update available"
"update_available": "Update Available"
},
"error": {
"you_can_find_your_way_back": "You can find your way back",
@@ -159,13 +159,13 @@
"storage_saved": "Storage saved.",
"storage_updated": "Storage updated.",
"storage_deleted": "Storage deleted.",
"persistent_storage_explainer": "You can specify any folder that you want to be persistent across deployments. <br>This is useful for storing data such as a database (SQLite) or a cache."
"persistent_storage_explainer": "You can specify any folder that you want to be persistent across deployments.<br><span class='text-green-500 font-bold'>/example</span> means it will preserve <span class='text-green-500 font-bold'>/app/example</span> in the container as <span class='text-green-500 font-bold'>/app</span> is <span class='text-green-500 font-bold'>the root directory</span> for your application.<br><br>This is useful for storing data such as a <span class='text-green-500 font-bold'>database (SQLite)</span> or a <span class='text-green-500 font-bold'>cache</span>."
},
"deployment_queued": "Deployment queued.",
"confirm_to_delete": "Are you sure you would like to delete '{{name}}'?",
"stop_application": "Stop application",
"stop_application": "Stop Application",
"permission_denied_stop_application": "You do not have permission to stop the application.",
"rebuild_application": "Rebuild application",
"rebuild_application": "Rebuild Application",
"permission_denied_rebuild_application": "You do not have permission to rebuild application.",
"build_and_start_application": "Deploy",
"permission_denied_build_and_start_application": "You do not have permission to deploy application.",

13
apps/ui/src/lib/store.ts
View File

@@ -1,3 +1,4 @@
import { dev } from '$app/env';
import cuid from 'cuid';
import { writable, readable, type Writable } from 'svelte/store';
@@ -71,8 +72,9 @@ export const features = readable({
export const location: Writable<null | string> = writable(null)
export const setLocation = (resource: any, settings?: any) => {
if (resource.settings.isBot) {
return location.set(`http://${settings.ipv4}:${resource.exposePort}`)
if (resource.settings.isBot && resource.exposePort) {
disabledButton.set(false);
return location.set(`http://${dev ? 'localhost' : settings.ipv4}:${resource.exposePort}`)
}
if (GITPOD_WORKSPACE_URL && resource.exposePort) {
const { href } = new URL(GITPOD_WORKSPACE_URL);
@@ -84,7 +86,12 @@ export const setLocation = (resource: any, settings?: any) => {
const newURL = `https://${CODESANDBOX_HOST.replace(/\$PORT/, resource.exposePort)}`
return location.set(newURL)
}
return location.set(resource.fqdn)
if (resource.fqdn) {
return location.set(resource.fqdn)
} else {
location.set(null);
disabledButton.set(false);
}
}
export const toasts: any = writable([])