Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: github conflicts

Browse Source
This commit is contained in:
Kaname 2022-09-10 00:05:19 +00:00
parent 02a336a25d
commit 9f813b7385
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
View File

@ -177,7 +177,7 @@
readonly readonly
disabled disabled
name="publicPort" name="publicPort"
value={publicLoading ? 'Loading...' : isPublic ? database.publicPort : privatePort} value={publicLoading ? 'Loading...' : $status.database.isPublic ? database.publicPort : privatePort}
/> />
</div> </div>
{#if database.type === 'mysql'} {#if database.type === 'mysql'}
@ -199,7 +199,7 @@
<div> <div>
<label for="url" class="text-base font-bold text-stone-100" <label for="url" class="text-base font-bold text-stone-100"
>{$t('database.connection_string')} >{$t('database.connection_string')}
{#if !isPublic && database.destinationDocker.remoteEngine} {#if !$status.database.isPublic && database.destinationDocker.remoteEngine}
<Explainer <Explainer
explanation="You can only access the database with this URL if your application is deployed to the same Destination." explanation="You can only access the database with this URL if your application is deployed to the same Destination."
/> />

6
apps/ui/src/routes/databases/[id]/__layout.svelte
View File

@ -62,7 +62,7 @@
import DeleteIcon from '$lib/components/DeleteIcon.svelte'; import DeleteIcon from '$lib/components/DeleteIcon.svelte';
import { onDestroy, onMount } from 'svelte'; import { onDestroy, onMount } from 'svelte';
import Tooltip from '$lib/components/Tooltip.svelte'; import Tooltip from '$lib/components/Tooltip.svelte';
import DatabaseLinks from './_DatabaseLinks.svelte'; import DatabaseLinks from './_DatabaseLinks.svelte';
const { id } = $page.params; const { id } = $page.params;
$status.database.isPublic = database.settings.isPublic || false; $status.database.isPublic = database.settings.isPublic || false;
@ -165,11 +165,11 @@ import DatabaseLinks from './_DatabaseLinks.svelte';
<div <div
class="flex flex-row flex-wrap space-x-4 space-y-3 justify-center lg:justify-start py-2 lg:py-0" class="flex flex-row flex-wrap space-x-4 space-y-3 justify-center lg:justify-start py-2 lg:py-0"
> >
{#if database.type && database.destinationDockerId && database.version && database.defaultDatabase} {#if database.type && database.destinationDockerId && database.version}
{#if $status.database.isExited} {#if $status.database.isExited}
<a <a
id="exited" id="exited"
href={!$disabledButton ? `/databases/${id}/logs` : null} href={!$status.database.isRunning ? `/databases/${id}/logs` : null}
class="icons bg-transparent text-sm flex items-center text-red-500 tooltip-error" class="icons bg-transparent text-sm flex items-center text-red-500 tooltip-error"
sveltekit:prefetch sveltekit:prefetch
> >