From b4892e0caf762bd5b8a438d852eb476f070e34b4 Mon Sep 17 00:00:00 2001
From: Kaname <56084970+kaname-png@users.noreply.github.com>
Date: Wed, 7 Sep 2022 00:16:57 +0000
Subject: [PATCH] fix(routes): ui from databases page

---
 .../src/routes/applications/[id]/index.svelte |   2 +-
 .../[id]/_Databases/_Databases.svelte         | 240 ++++++-------
 .../databases/[id]/_Databases/_MongoDB.svelte |   4 +-
 .../databases/[id]/_Databases/_MySQL.svelte   |   4 +-
 .../src/routes/databases/[id]/__layout.svelte | 330 +++++++++---------
 .../ui/src/routes/databases/[id]/index.svelte |   6 +-
 apps/ui/src/tailwind.css                      |   2 +-
 7 files changed, 292 insertions(+), 296 deletions(-)

diff --git a/apps/ui/src/routes/applications/[id]/index.svelte b/apps/ui/src/routes/applications/[id]/index.svelte
index 7ffe33cef..3dd4a6bae 100644
--- a/apps/ui/src/routes/applications/[id]/index.svelte
+++ b/apps/ui/src/routes/applications/[id]/index.svelte
@@ -294,7 +294,7 @@
 </script>
 
 <div class="flex items-center space-x-2 p-5 px-6 font-bold lg:hidden">
-	<div class="-mb-5 flex-col">
+	<div class="flex-col">
 		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
 			Configuration
 		</div>
diff --git a/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte b/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
index 5cfa6025e..79e3ff0ad 100644
--- a/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
+++ b/apps/ui/src/routes/databases/[id]/_Databases/_Databases.svelte
@@ -105,10 +105,10 @@
 	}
 </script>
 
-<div class="mx-auto max-w-4xl px-6">
+<div class="mx-auto max-w-4xl p-4">
 	<form on:submit|preventDefault={handleSubmit} class="py-4">
-		<div class="flex space-x-1 pb-5">
-			<div class="title">{$t('general')}</div>
+		<div class="flex flex-col lg:flex-row justify-between lg:space-x-1 space-y-3 pb-5 items-center">
+			<h1 class="title">{$t('general')}</h1>
 			{#if $appSession.isAdmin}
 				<button
 					type="submit"
@@ -119,143 +119,123 @@
 				>
 			{/if}
 		</div>
-
-		<div class="grid grid-flow-row gap-2 px-10">
-			<div class="grid grid-cols-2 items-center">
-				<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
-				<input
-					readonly={!$appSession.isAdmin}
-					name="name"
-					id="name"
-					bind:value={database.name}
-					required
-				/>
-			</div>
-			<div class="grid grid-cols-2 items-center">
-				<label for="destination" class="text-base font-bold text-stone-100"
-					>{$t('application.destination')}</label
-				>
-				{#if database.destinationDockerId}
-					<div class="no-underline">
-						<input
-							value={database.destinationDocker.name}
-							id="destination"
-							disabled
-							readonly
-							class="bg-transparent "
-						/>
-					</div>
-				{/if}
-			</div>
-
-			<div class="grid grid-cols-2 items-center">
-				<label for="version" class="text-base font-bold text-stone-100">Version / Tag</label>
-				<a
-					href={$appSession.isAdmin && !$status.database.isRunning
-						? `/databases/${id}/configuration/version?from=/databases/${id}`
-						: ''}
-					class="no-underline"
-				>
+		<div class="grid gap-4 grid-cols-2 auto-rows-max">
+			<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
+			<input
+				class="w-full"
+				readonly={!$appSession.isAdmin}
+				name="name"
+				id="name"
+				bind:value={database.name}
+				required
+			/>
+			<label for="destination" class="text-base font-bold text-stone-100"
+				>{$t('application.destination')}</label
+			>
+			{#if database.destinationDockerId}
+				<div class="no-underline">
 					<input
-						value={database.version}
+						value={database.destinationDocker.name}
+						id="destination"
+						disabled
 						readonly
-						disabled={$status.database.isRunning || $status.database.initialLoading}
-						class:cursor-pointer={!$status.database.isRunning}
-					/></a
-				>
-			</div>
-		</div>
-
-		<div class="grid grid-flow-row gap-2 px-10 pt-2">
-			<div class="grid grid-cols-2 items-center">
-				<label for="host" class="text-base font-bold text-stone-100">{$t('forms.host')}</label>
-				<CopyPasswordField
-					placeholder={$t('forms.generated_automatically_after_start')}
-					isPasswordField={false}
-					readonly
-					disabled
-					id="host"
-					name="host"
-					value={database.id}
-				/>
-			</div>
-			<div class="grid grid-cols-2 items-center">
-				<label for="publicPort" class="text-base font-bold text-stone-100">{$t('forms.port')}</label
-				>
-				<CopyPasswordField
-					placeholder={$t('database.generated_automatically_after_set_to_public')}
-					id="publicPort"
-					readonly
-					disabled
-					name="publicPort"
-					value={publicLoading ? 'Loading...' : isPublic ? database.publicPort : privatePort}
-				/>
-			</div>
-		</div>
-		<div class="grid grid-flow-row gap-2">
-			{#if database.type === 'mysql'}
-				<MySql bind:database />
-			{:else if database.type === 'postgresql'}
-				<PostgreSql bind:database />
-			{:else if database.type === 'mongodb'}
-				<MongoDb bind:database />
-			{:else if database.type === 'mariadb'}
-				<MariaDb bind:database />
-			{:else if database.type === 'redis'}
-				<Redis bind:database />
-			{:else if database.type === 'couchdb'}
-				<CouchDb {database} />
-			{/if}
-			<div class="grid grid-cols-2 items-center px-10 pb-8">
-				<div>
-					<label for="url" class="text-base font-bold text-stone-100"
-						>{$t('database.connection_string')}
-						{#if !isPublic && database.destinationDocker.remoteEngine}
-							<Explainer
-								explanation="You can only access the database with this URL if your application is deployed to the same Destination."
-							/>
-						{/if}</label
-					>
+						class="bg-transparent w-full"
+					/>
 				</div>
-				<CopyPasswordField
-					textarea={true}
-					placeholder={$t('forms.generated_automatically_after_start')}
-					isPasswordField={false}
-					id="url"
-					name="url"
+			{/if}
+			<label for="version" class="text-base font-bold text-stone-100">Version / Tag</label>
+			<a
+				href={$appSession.isAdmin && !$status.database.isRunning
+					? `/databases/${id}/configuration/version?from=/databases/${id}`
+					: ''}
+				class="no-underline"
+			>
+				<input
+					class="w-full"
+					value={database.version}
 					readonly
-					disabled
-					value={publicLoading || loading ? 'Loading...' : generateUrl()}
-				/>
+					disabled={$status.database.isRunning || $status.database.initialLoading}
+					class:cursor-pointer={!$status.database.isRunning}
+				/></a
+			>
+			<label for="host" class="text-base font-bold text-stone-100">{$t('forms.host')}</label>
+			<CopyPasswordField
+				placeholder={$t('forms.generated_automatically_after_start')}
+				isPasswordField={false}
+				readonly
+				disabled
+				id="host"
+				name="host"
+				value={database.id}
+			/>
+			<label for="publicPort" class="text-base font-bold text-stone-100">{$t('forms.port')}</label>
+			<CopyPasswordField
+				placeholder={$t('database.generated_automatically_after_set_to_public')}
+				id="publicPort"
+				readonly
+				disabled
+				name="publicPort"
+				value={publicLoading ? 'Loading...' : isPublic ? database.publicPort : privatePort}
+			/>
+		</div>
+		{#if database.type === 'mysql'}
+			<MySql bind:database />
+		{:else if database.type === 'postgresql'}
+			<PostgreSql bind:database />
+		{:else if database.type === 'mongodb'}
+			<MongoDb bind:database />
+		{:else if database.type === 'mariadb'}
+			<MariaDb bind:database />
+		{:else if database.type === 'redis'}
+			<Redis bind:database />
+		{:else if database.type === 'couchdb'}
+			<CouchDb {database} />
+		{/if}
+		<div class="flex flex-col space-y-3 mt-5">
+			<div>
+				<label for="url" class="text-base font-bold text-stone-100"
+					>{$t('database.connection_string')}
+					{#if !isPublic && database.destinationDocker.remoteEngine}
+						<Explainer
+							explanation="You can only access the database with this URL if your application is deployed to the same Destination."
+						/>
+					{/if}</label
+				>
 			</div>
+			<CopyPasswordField
+				textarea={true}
+				placeholder={$t('forms.generated_automatically_after_start')}
+				isPasswordField={false}
+				id="url"
+				name="url"
+				readonly
+				disabled
+				value={publicLoading || loading ? 'Loading...' : generateUrl()}
+			/>
 		</div>
 	</form>
 	<div class="flex space-x-1 pb-5 font-bold">
-		<div class="title">{$t('application.features')}</div>
+		<h1 class="title">{$t('application.features')}</h1>
 	</div>
-	<div class="px-10 pb-10">
-		<div class="grid grid-cols-2 items-center">
-			<Setting
-				id="isPublic"
-				loading={publicLoading}
-				bind:setting={isPublic}
-				on:click={() => changeSettings('isPublic')}
-				title={$t('database.set_public')}
-				description={$t('database.warning_database_public')}
-				disabled={!$status.database.isRunning}
-			/>
-		</div>
+	<div class="grid gap-4 grid-cols-2 auto-rows-max">
+		<Setting
+			id="isPublic"
+			loading={publicLoading}
+			bind:setting={isPublic}
+			on:click={() => changeSettings('isPublic')}
+			title={$t('database.set_public')}
+			description={$t('database.warning_database_public')}
+			disabled={!$status.database.isRunning}
+		/>
 		{#if database.type === 'redis'}
-			<div class="grid grid-cols-2 items-center">
-				<Setting
-					id="appendOnly"
-					loading={publicLoading}
-					bind:setting={appendOnly}
-					on:click={() => changeSettings('appendOnly')}
-					title={$t('database.change_append_only_mode')}
-					description={$t('database.warning_append_only')}
-				/>
-			</div>
+			<Setting
+				id="appendOnly"
+				loading={publicLoading}
+				bind:setting={appendOnly}
+				on:click={() => changeSettings('appendOnly')}
+				title={$t('database.change_append_only_mode')}
+				description={$t('database.warning_append_only')}
+			/>
 		{/if}
 	</div>
 </div>
diff --git a/apps/ui/src/routes/databases/[id]/_Databases/_MongoDB.svelte b/apps/ui/src/routes/databases/[id]/_Databases/_MongoDB.svelte
index b93c10bf5..23da287e1 100644
--- a/apps/ui/src/routes/databases/[id]/_Databases/_MongoDB.svelte
+++ b/apps/ui/src/routes/databases/[id]/_Databases/_MongoDB.svelte
@@ -7,9 +7,9 @@
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
-	<div class="title">MongoDB</div>
+	<h1 class="title">MongoDB</h1>
 </div>
-<div class="space-y-2 px-10">
+<div class="space-y-2">
 	<div class="grid grid-cols-2 items-center">
 		<label for="rootUser" class="text-base font-bold text-stone-100">{$t('forms.root_user')}</label>
 		<CopyPasswordField
diff --git a/apps/ui/src/routes/databases/[id]/_Databases/_MySQL.svelte b/apps/ui/src/routes/databases/[id]/_Databases/_MySQL.svelte
index 3405bd125..d91fda895 100644
--- a/apps/ui/src/routes/databases/[id]/_Databases/_MySQL.svelte
+++ b/apps/ui/src/routes/databases/[id]/_Databases/_MySQL.svelte
@@ -7,9 +7,9 @@
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
-	<div class="title">MySQL</div>
+	<h1 class="title">MySQL</h1>
 </div>
-<div class="space-y-2 px-10">
+<div class="space-y-2">
 	<div class="grid grid-cols-2 items-center">
 		<label for="defaultDatabase" class="text-base font-bold text-stone-100"
 			>{$t('database.default_database')}</label
diff --git a/apps/ui/src/routes/databases/[id]/__layout.svelte b/apps/ui/src/routes/databases/[id]/__layout.svelte
index bf33f39d1..d170a993c 100644
--- a/apps/ui/src/routes/databases/[id]/__layout.svelte
+++ b/apps/ui/src/routes/databases/[id]/__layout.svelte
@@ -62,6 +62,7 @@
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
 	import { onDestroy, onMount } from 'svelte';
 	import Tooltip from '$lib/components/Tooltip.svelte';
+import DatabaseLinks from './_DatabaseLinks.svelte';
 	const { id } = $page.params;
 
 	let statusInterval: any = false;
@@ -144,39 +145,130 @@
 </script>
 
 {#if id !== 'new'}
-	<nav class="nav-side">
-		{#if database.type && database.destinationDockerId && database.version && database.defaultDatabase}
-			{#if $status.database.isExited}
-				<a
-					id="exited"
-					href={!$disabledButton ? `/databases/${id}/logs` : null}
-					class="icons bg-transparent text-sm flex items-center text-red-500 tooltip-error"
-					sveltekit:prefetch
-				>
-					<svg
-						xmlns="http://www.w3.org/2000/svg"
-						class="w-6 h-6"
-						viewBox="0 0 24 24"
-						stroke-width="1.5"
-						stroke="currentcolor"
-						fill="none"
-						stroke-linecap="round"
-						stroke-linejoin="round"
+	<nav
+		class="flex flex-row px-3 justify-center lg:justify-between items-center bg-neutral-focus lg:fixed w-full z-10 lg:-ml-16 lg:pl-16"
+	>
+		<div class="hidden items-center space-x-2 p-5 px-6 font-bold lg:flex">
+			<div class="flex flex-col">
+				<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
+					Configuration
+				</div>
+				<span class="text-xs">{database.name}</span>
+			</div>
+			<DatabaseLinks {database} />
+		</div>
+		<div
+			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 $status.database.isExited}
+					<a
+						id="exited"
+						href={!$disabledButton ? `/databases/${id}/logs` : null}
+						class="icons bg-transparent text-sm flex items-center text-red-500 tooltip-error"
+						sveltekit:prefetch
 					>
-						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-						<path
-							d="M8.7 3h6.6c.3 0 .5 .1 .7 .3l4.7 4.7c.2 .2 .3 .4 .3 .7v6.6c0 .3 -.1 .5 -.3 .7l-4.7 4.7c-.2 .2 -.4 .3 -.7 .3h-6.6c-.3 0 -.5 -.1 -.7 -.3l-4.7 -4.7c-.2 -.2 -.3 -.4 -.3 -.7v-6.6c0 -.3 .1 -.5 .3 -.7l4.7 -4.7c.2 -.2 .4 -.3 .7 -.3z"
-						/>
-						<line x1="12" y1="8" x2="12" y2="12" />
-						<line x1="12" y1="16" x2="12.01" y2="16" />
-					</svg>
-				</a>
-				<Tooltip triggeredBy="#exited">{'Service exited with an error!'}</Tooltip>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							class="w-6 h-6"
+							viewBox="0 0 24 24"
+							stroke-width="1.5"
+							stroke="currentcolor"
+							fill="none"
+							stroke-linecap="round"
+							stroke-linejoin="round"
+						>
+							<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+							<path
+								d="M8.7 3h6.6c.3 0 .5 .1 .7 .3l4.7 4.7c.2 .2 .3 .4 .3 .7v6.6c0 .3 -.1 .5 -.3 .7l-4.7 4.7c-.2 .2 -.4 .3 -.7 .3h-6.6c-.3 0 -.5 -.1 -.7 -.3l-4.7 -4.7c-.2 -.2 -.3 -.4 -.3 -.7v-6.6c0 -.3 .1 -.5 .3 -.7l4.7 -4.7c.2 -.2 .4 -.3 .7 -.3z"
+							/>
+							<line x1="12" y1="8" x2="12" y2="12" />
+							<line x1="12" y1="16" x2="12.01" y2="16" />
+						</svg>
+					</a>
+					<Tooltip triggeredBy="#exited">{'Service exited with an error!'}</Tooltip>
+				{/if}
+				{#if $status.database.initialLoading}
+					<button
+						class="icons flex animate-spin items-center space-x-2 bg-transparent text-sm duration-500 ease-in-out"
+					>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							class="h-6 w-6"
+							viewBox="0 0 24 24"
+							stroke-width="1.5"
+							stroke="currentColor"
+							fill="none"
+							stroke-linecap="round"
+							stroke-linejoin="round"
+						>
+							<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+							<path d="M9 4.55a8 8 0 0 1 6 14.9m0 -4.45v5h5" />
+							<line x1="5.63" y1="7.16" x2="5.63" y2="7.17" />
+							<line x1="4.06" y1="11" x2="4.06" y2="11.01" />
+							<line x1="4.63" y1="15.1" x2="4.63" y2="15.11" />
+							<line x1="7.16" y1="18.37" x2="7.16" y2="18.38" />
+							<line x1="11" y1="19.94" x2="11" y2="19.95" />
+						</svg>
+					</button>
+				{:else if $status.database.isRunning}
+					<button
+						id="stop"
+						on:click={stopDatabase}
+						type="submit"
+						disabled={!$appSession.isAdmin}
+						class="icons bg-transparent text-sm flex items-center space-x-2 text-red-500 mt-3"
+					>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							class="w-6 h-6"
+							viewBox="0 0 24 24"
+							stroke-width="1.5"
+							stroke="currentColor"
+							fill="none"
+							stroke-linecap="round"
+							stroke-linejoin="round"
+						>
+							<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+							<rect x="6" y="5" width="4" height="14" rx="1" />
+							<rect x="14" y="5" width="4" height="14" rx="1" />
+						</svg>
+					</button>
+					<Tooltip triggeredBy="#stop">{'Stop'}</Tooltip>
+				{:else}
+					<button
+						id="start"
+						on:click={startDatabase}
+						type="submit"
+						disabled={!$appSession.isAdmin}
+						class="icons bg-transparent text-sm flex items-center space-x-2 text-green-500"
+						><svg
+							xmlns="http://www.w3.org/2000/svg"
+							class="w-6 h-6"
+							viewBox="0 0 24 24"
+							stroke-width="1.5"
+							stroke="currentColor"
+							fill="none"
+							stroke-linecap="round"
+							stroke-linejoin="round"
+						>
+							<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+							<path d="M7 4v16l13 -8z" />
+						</svg>
+					</button>
+					<Tooltip triggeredBy="#start">{'Start'}</Tooltip>
+				{/if}
 			{/if}
-			{#if $status.database.initialLoading}
-				<button
-					class="icons flex animate-spin items-center space-x-2 bg-transparent text-sm duration-500 ease-in-out"
-				>
+			<div class="border border-stone-700 h-8" />
+			<a
+				id="configuration"
+				href="/databases/{id}"
+				sveltekit:prefetch
+				class="hover:text-yellow-500 rounded"
+				class:text-yellow-500={$page.url.pathname === `/databases/${id}`}
+				class:bg-coolgray-500={$page.url.pathname === `/databases/${id}`}
+			>
+				<button class="icons bg-transparent m text-sm disabled:text-red-500">
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
 						class="h-6 w-6"
@@ -188,25 +280,32 @@
 						stroke-linejoin="round"
 					>
 						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-						<path d="M9 4.55a8 8 0 0 1 6 14.9m0 -4.45v5h5" />
-						<line x1="5.63" y1="7.16" x2="5.63" y2="7.17" />
-						<line x1="4.06" y1="11" x2="4.06" y2="11.01" />
-						<line x1="4.63" y1="15.1" x2="4.63" y2="15.11" />
-						<line x1="7.16" y1="18.37" x2="7.16" y2="18.38" />
-						<line x1="11" y1="19.94" x2="11" y2="19.95" />
-					</svg>
-				</button>
-			{:else if $status.database.isRunning}
-				<button
-					id="stop"
-					on:click={stopDatabase}
-					type="submit"
-					disabled={!$appSession.isAdmin}
-					class="icons bg-transparent text-sm flex items-center space-x-2 text-red-500"
-				>
+						<rect x="4" y="8" width="4" height="4" />
+						<line x1="6" y1="4" x2="6" y2="8" />
+						<line x1="6" y1="12" x2="6" y2="20" />
+						<rect x="10" y="14" width="4" height="4" />
+						<line x1="12" y1="4" x2="12" y2="14" />
+						<line x1="12" y1="18" x2="12" y2="20" />
+						<rect x="16" y="5" width="4" height="4" />
+						<line x1="18" y1="4" x2="18" y2="5" />
+						<line x1="18" y1="9" x2="18" y2="20" />
+					</svg></button
+				></a
+			>
+			<Tooltip triggeredBy="#configuration">{'Configuration'}</Tooltip>
+			<div class="border border-stone-700 h-8" />
+			<a
+				id="databaselogs"
+				href={$status.database.isRunning ? `/databases/${id}/logs` : null}
+				sveltekit:prefetch
+				class="hover:text-pink-500 rounded"
+				class:text-pink-500={$page.url.pathname === `/databases/${id}/logs`}
+				class:bg-coolgray-500={$page.url.pathname === `/databases/${id}/logs`}
+			>
+				<button disabled={!$status.database.isRunning} class="icons bg-transparent text-sm">
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
-						class="w-6 h-6"
+						class="h-6 w-6"
 						viewBox="0 0 24 24"
 						stroke-width="1.5"
 						stroke="currentColor"
@@ -215,120 +314,37 @@
 						stroke-linejoin="round"
 					>
 						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-						<rect x="6" y="5" width="4" height="14" rx="1" />
-						<rect x="14" y="5" width="4" height="14" rx="1" />
-					</svg>
-				</button>
-				<Tooltip triggeredBy="#stop">{'Stop'}</Tooltip>
-			{:else}
+						<path d="M3 19a9 9 0 0 1 9 0a9 9 0 0 1 9 0" />
+						<path d="M3 6a9 9 0 0 1 9 0a9 9 0 0 1 9 0" />
+						<line x1="3" y1="6" x2="3" y2="19" />
+						<line x1="12" y1="6" x2="12" y2="19" />
+						<line x1="21" y1="6" x2="21" y2="19" />
+					</svg></button
+				></a
+			>
+			<Tooltip triggeredBy="#databaselogs">{'Logs'}</Tooltip>
+			{#if forceDelete}
 				<button
-					id="start"
-					on:click={startDatabase}
+					on:click={() => deleteDatabase(true)}
 					type="submit"
 					disabled={!$appSession.isAdmin}
-					class="icons bg-transparent text-sm flex items-center space-x-2 text-green-500"
-					><svg
-						xmlns="http://www.w3.org/2000/svg"
-						class="w-6 h-6"
-						viewBox="0 0 24 24"
-						stroke-width="1.5"
-						stroke="currentColor"
-						fill="none"
-						stroke-linecap="round"
-						stroke-linejoin="round"
-					>
-						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-						<path d="M7 4v16l13 -8z" />
-					</svg>
-				</button>
-				<Tooltip triggeredBy="#start">{'Start'}</Tooltip>
+					class:hover:text-red-500={$appSession.isAdmin}
+					class="icons bg-transparent text-sm"
+				>
+					Force Delete</button
+				>{:else}
+				<button
+					id="delete"
+					on:click={() => deleteDatabase(false)}
+					type="submit"
+					disabled={!$appSession.isAdmin}
+					class:hover:text-red-500={$appSession.isAdmin}
+					class="icons bg-transparent text-sm"><DeleteIcon /></button
+				>
 			{/if}
-		{/if}
-		<div class="border border-stone-700 h-8" />
-		<a
-			id="configuration"
-			href="/databases/{id}"
-			sveltekit:prefetch
-			class="hover:text-yellow-500 rounded"
-			class:text-yellow-500={$page.url.pathname === `/databases/${id}`}
-			class:bg-coolgray-500={$page.url.pathname === `/databases/${id}`}
-		>
-			<button class="icons bg-transparent m text-sm disabled:text-red-500">
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					class="h-6 w-6"
-					viewBox="0 0 24 24"
-					stroke-width="1.5"
-					stroke="currentColor"
-					fill="none"
-					stroke-linecap="round"
-					stroke-linejoin="round"
-				>
-					<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-					<rect x="4" y="8" width="4" height="4" />
-					<line x1="6" y1="4" x2="6" y2="8" />
-					<line x1="6" y1="12" x2="6" y2="20" />
-					<rect x="10" y="14" width="4" height="4" />
-					<line x1="12" y1="4" x2="12" y2="14" />
-					<line x1="12" y1="18" x2="12" y2="20" />
-					<rect x="16" y="5" width="4" height="4" />
-					<line x1="18" y1="4" x2="18" y2="5" />
-					<line x1="18" y1="9" x2="18" y2="20" />
-				</svg></button
-			></a
-		>
-		<Tooltip triggeredBy="#configuration">{'Configuration'}</Tooltip>
-		<div class="border border-stone-700 h-8" />
-		<a
-			id="databaselogs"
-			href={$status.database.isRunning ? `/databases/${id}/logs` : null}
-			sveltekit:prefetch
-			class="hover:text-pink-500 rounded"
-			class:text-pink-500={$page.url.pathname === `/databases/${id}/logs`}
-			class:bg-coolgray-500={$page.url.pathname === `/databases/${id}/logs`}
-		>
-			<button disabled={!$status.database.isRunning} class="icons bg-transparent text-sm">
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					class="h-6 w-6"
-					viewBox="0 0 24 24"
-					stroke-width="1.5"
-					stroke="currentColor"
-					fill="none"
-					stroke-linecap="round"
-					stroke-linejoin="round"
-				>
-					<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-					<path d="M3 19a9 9 0 0 1 9 0a9 9 0 0 1 9 0" />
-					<path d="M3 6a9 9 0 0 1 9 0a9 9 0 0 1 9 0" />
-					<line x1="3" y1="6" x2="3" y2="19" />
-					<line x1="12" y1="6" x2="12" y2="19" />
-					<line x1="21" y1="6" x2="21" y2="19" />
-				</svg></button
-			></a
-		>
-		<Tooltip triggeredBy="#databaselogs">{'Logs'}</Tooltip>
-		{#if forceDelete}
-			<button
-				on:click={() => deleteDatabase(true)}
-				type="submit"
-				disabled={!$appSession.isAdmin}
-				class:hover:text-red-500={$appSession.isAdmin}
-				class="icons bg-transparent text-sm"
-			>
-				Force Delete</button
-			>{:else}
-			<button
-				id="delete"
-				on:click={() => deleteDatabase(false)}
-				type="submit"
-				disabled={!$appSession.isAdmin}
-				class:hover:text-red-500={$appSession.isAdmin}
-				class="icons bg-transparent text-sm"><DeleteIcon /></button
-			>
-		{/if}
 
-		<Tooltip triggeredBy="#delete">{'Delete'}</Tooltip>
+			<Tooltip triggeredBy="#delete">{'Delete'}</Tooltip>
+		</div>
 	</nav>
 {/if}
 <slot />
diff --git a/apps/ui/src/routes/databases/[id]/index.svelte b/apps/ui/src/routes/databases/[id]/index.svelte
index cb70d1eb9..9717b6241 100644
--- a/apps/ui/src/routes/databases/[id]/index.svelte
+++ b/apps/ui/src/routes/databases/[id]/index.svelte
@@ -48,8 +48,8 @@
 	});
 </script>
 
-<div class="flex h-20 items-center space-x-2 p-5 px-6 font-bold">
-	<div class="-mb-5 flex-col">
+<div class="flex items-center space-x-2 p-5 font-bold lg:hidden">
+	<div class="flex-col">
 		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
 			Configuration
 		</div>
@@ -58,7 +58,7 @@
 	<DatabaseLinks {database} />
 </div>
 
-<div class="mx-auto max-w-4xl px-6 py-4">
+<div class="mx-auto max-w-4xl  p-5 lg:pt-32">
 	<div class="text-2xl font-bold">Database Usage</div>
 	<div class="text-center">
 		<div class="stat w-64">
diff --git a/apps/ui/src/tailwind.css b/apps/ui/src/tailwind.css
index f4233cf8d..50f75c8ec 100644
--- a/apps/ui/src/tailwind.css
+++ b/apps/ui/src/tailwind.css
@@ -97,7 +97,7 @@ a {
 }
 
 .title {
-	@apply mr-4 text-base tracking-tight md:text-2xl font-bold;
+	@apply mr-4 tracking-tight text-2xl font-bold;
 }
 .nav-main {
 	@apply fixed top-0 left-0 min-h-screen w-16 min-w-[4rem] overflow-hidden border-r border-stone-800 bg-coolgray-200 scrollbar-w-1  scrollbar-thumb-coollabs scrollbar-track-coolgray-200 xl:overflow-visible;