ershisan99/coolify
1
0
Fork 0
mirror of https://github.com/ershisan99/coolify.git synced 2025-12-31 05:09:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3' into patch-1

Browse Source
This commit is contained in:
Jenish J
2023-07-17 20:15:27 +05:30
committed by GitHub
parent 79c98657b1 3ba44a1e23
commit 1fbcfcaf74
21 changed files with 609 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/ui/src/hooks.ts
View File

@@ -1,13 +1,10 @@
import * as Sentry from '@sentry/svelte';
export async function handle({ event, resolve }) {
const response = await resolve(event, { ssr: false });
return response;
const response = await resolve(event, { ssr: false });
return response;
}
export const handleError = ({ error, event }) => {
Sentry.captureException(error, { event });
return {
message: 'Whoops!',
code: error?.code ?? 'UNKNOWN'
};
};
return {
message: 'Whoops!',
code: error?.code ?? 'UNKNOWN'
};
};

11
apps/ui/src/routes/__layout.svelte
View File

@@ -65,7 +65,6 @@
<script lang="ts">
export let settings: any;
export let sentryDSN: any;
export let baseSettings: any;
export let pendingInvitations: any = 0;
@@ -98,10 +97,6 @@
import Toasts from '$lib/components/Toasts.svelte';
import Tooltip from '$lib/components/Tooltip.svelte';
import { onMount } from 'svelte';
import LocalePicker from '$lib/components/LocalePicker.svelte';
import * as Sentry from '@sentry/svelte';
import { BrowserTracing } from '@sentry/tracing';
import { dev } from '$app/env';
if (userId) $appSession.userId = userId;
if (teamId) $appSession.teamId = teamId;
@@ -293,7 +288,7 @@
</a>
<a
id="documentation"
href="https://docs.coollabs.io/coolify/"
href="https://docs.coollabs.io/coolify-v3/"
target="_blank"
rel="noreferrer external"
class="icons hover:text-info"
@@ -384,7 +379,7 @@
</div>
<div class="drawer-side">
<label for="main-drawer" class="drawer-overlay w-full" />
<ul class="menu bg-coolgray-200 w-60 p-2 space-y-3 pt-4 ">
<ul class="menu bg-coolgray-200 w-60 p-2 space-y-3 pt-4">
<li>
<a
class="no-underline icons hover:text-white hover:bg-pink-500"
@@ -498,7 +493,7 @@
<li>
<a
class="no-underline icons hover:text-white hover:bg-info"
href="https://docs.coollabs.io/coolify/"
href="https://docs.coollabs.io/coolify-v3/"
target="_blank"
rel="noreferrer external"
>

4
apps/ui/src/routes/applications/[id]/configuration/source.svelte
View File

@@ -255,12 +255,12 @@
{/if}
<div class="flex flex-row items-center">
<div class="title py-4 pr-4">Public Repository from Git</div>
<DocLink url="https://docs.coollabs.io/coolify/applications/#public-repository-from-git" />
<DocLink url="https://docs.coollabs.io/coolify-v3/applications/#public-repository-from-git" />
</div>
<PublicRepository />
<div class="flex flex-row items-center pt-10">
<div class="title py-4 pr-4">Simple Dockerfile <Beta /></div>
<DocLink url="https://docs.coollabs.io/coolify/applications/#simple-dockerfile" />
<DocLink url="https://docs.coollabs.io/coolify-v3/applications/#simple-dockerfile" />
</div>
<div class="mx-auto max-w-screen-2xl">
<form class="flex flex-col" on:submit|preventDefault={handleDockerImage}>

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

@@ -34,14 +34,20 @@
customClass="max-w-[32rem]"
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-docker-engine' target='blank'>docs</a> for more details."
<br>See <a class='text-white' href='https://docs.coollabs.io-v3/coolify/destinations#remote-docker-engine' target='blank'>docs</a> for more details."
/>
</div>
<div class="flex justify-center px-6 pb-8">
<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4">
<div class="flex items-start lg:items-center space-x-0 lg:space-x-4 pb-5 flex-col lg:flex-row space-y-4 lg:space-y-0">
<div
class="flex items-start lg:items-center space-x-0 lg:space-x-4 pb-5 flex-col lg:flex-row space-y-4 lg:space-y-0"
>
<div class="title font-bold">{$t('forms.configuration')}</div>
<button type="submit" class="btn btn-sm bg-destinations w-full lg:w-fit" class:loading disabled={loading}
<button
type="submit"
class="btn btn-sm bg-destinations w-full lg:w-fit"
class:loading
disabled={loading}
>{loading
? payload.isCoolifyProxyUsed
? $t('destination.new.saving_and_configuring_proxy')

6
apps/ui/src/routes/sources/[id]/_Gitlab.svelte
View File

@@ -52,7 +52,7 @@
appSecret: source.gitlabApp.appSecret,
groupName: source.gitlabApp.groupName,
customPort: source.customPort,
customUser: source.customUser,
customUser: source.customUser
});
const from = $page.url.searchParams.get('from');
if (from) {
@@ -169,8 +169,8 @@
<div class="grid grid-flow-row gap-2 lg:px-10">
{#if !source.gitlabAppId}
<a
href="https://docs.coollabs.io/coolify/sources#how-to-integrate-with-gitlab"
class="font-bold "
href="https://docs.coollabs.io-v3/coolify/sources#how-to-integrate-with-gitlab"
class="font-bold"
target="_blank noreferrer"
rel="noopener noreferrer">Documentation and detailed instructions.</a
>