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

fixes here and there

Browse Source
This commit is contained in:
Andras Bacsai
2022-08-11 08:18:17 +00:00
parent 0c4203a351
commit 34ad5bc86b
7 changed files with 122 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/ui/src/lib/api.ts
View File

@@ -1,4 +1,5 @@
import { dev } from '$app/env';
import { CODESANDBOX_HOST } from '$env/static/private';
import Cookies from 'js-cookie';
export function getAPIUrl() {
@@ -7,10 +8,12 @@ export function getAPIUrl() {
const newURL = href.replace('https://', 'https://3001-').replace(/\/$/, '')
return newURL
}
if (CODESANDBOX_HOST) {
return `https://${CODESANDBOX_HOST.replace(/\$PORT/,'3001')}`
}
return dev ? 'http://localhost:3001' : 'http://localhost:3000';
}
export function getWebhookUrl(type: string) {
console.log(GITPOD_WORKSPACE_URL)
if (GITPOD_WORKSPACE_URL) {
const { href } = new URL(GITPOD_WORKSPACE_URL)
const newURL = href.replace('https://', 'https://3001-').replace(/\/$/, '')
@@ -21,6 +24,15 @@ export function getWebhookUrl(type: string) {
return `${newURL}/webhooks/gitlab/events`
}
}
if (CODESANDBOX_HOST) {
const newURL = CODESANDBOX_HOST.replace(/\$PORT/,'3001')
if (type === 'github') {
return `${newURL}/webhooks/github/events`
}
if (type === 'gitlab') {
return `${newURL}/webhooks/gitlab/events`
}
}
return `https://webhook.site/0e5beb2c-4e9b-40e2-a89e-32295e570c21/events`;
}
async function send({

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

@@ -1,3 +1,4 @@
import { CODESANDBOX_HOST } from '$env/static/private';
import { writable, readable, type Writable, type Readable } from 'svelte/store';
interface AppSession {
@@ -75,10 +76,12 @@ export const setLocation = (resource: any) => {
const newURL = href
.replace('https://', `https://${resource.exposePort}-`)
.replace(/\/$/, '');
location.set(newURL)
} else {
location.set(resource.fqdn)
return location.set(newURL)
} else if (CODESANDBOX_HOST){
const newURL = `https://${CODESANDBOX_HOST.replace(/\$PORT/,resource.exposePort)}`
return location.set(newURL)
}
return location.set(resource.fqdn)
}
export const toasts: any = writable([])

4
apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte
View File

@@ -31,7 +31,9 @@
<div class="text-center flex justify-center">
<Explainer
customClass="max-w-[32rem]"
text="Remote Docker Engines are using <span class='text-white font-bold'>SSH connection</span> to initiate connection. You need to setup an <span class='text-white font-bold'>SSH key</span> in advance on the server and install Docker. <br>See <a class='text-white' href='https://docs.coollabs.io'>docs</a> for more details."
text="Remote Docker Engines are using <span class='text-white font-bold'>SSH</span> to communicate with the remote docker engine.
You need to setup an <span class='text-white font-bold'>SSH key</span> in advance on the server and install Docker.
<br>See <a class='text-white' href='https://docs.coollabs.io/coolify/destinations/remote.html'>docs</a> for more details."
/>
</div>
<div class="flex justify-center px-6 pb-8">