feat: Umami service

src/routes/applications/[id]/__layout.svelte

@@ -401,10 +401,10 @@
 			class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/logs`}
 		>
 			<button
-				title={$t('application.build_logs')}
+				title={$t('application.logs')}
 				disabled={$disabledButton}
 				class="icons bg-transparent tooltip-bottom text-sm"
-				data-tooltip={$t('application.build_logs')}
+				data-tooltip={$t('application.logs')}
 			>
 				<svg
 					xmlns="http://www.w3.org/2000/svg"

src/routes/services/[id]/_Services/_Services.svelte

@@ -16,6 +16,7 @@
 	import MeiliSearch from './_MeiliSearch.svelte';
 	import MinIo from './_MinIO.svelte';
 	import PlausibleAnalytics from './_PlausibleAnalytics.svelte';
+	import Umami from './_Umami.svelte';
 	import VsCodeServer from './_VSCodeServer.svelte';
 	import Wordpress from './_Wordpress.svelte';
 
@@ -169,6 +170,8 @@
 				<Ghost bind:service {readOnly} />
 			{:else if service.type === 'meilisearch'}
 				<MeiliSearch bind:service />
+			{:else if service.type === 'umami'}
+				<Umami bind:service />
 			{/if}
 		</div>
 	</form>

src/routes/services/[id]/_Services/_Umami.svelte

@@ -0,0 +1,29 @@
+<script lang="ts">
+	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import Explainer from '$lib/components/Explainer.svelte';
+
+	export let service;
+</script>
+
+<div class="flex space-x-1 py-5 font-bold">
+	<div class="title">Umami</div>
+</div>
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="adminUser">Admin User</label>
+	<input name="adminUser" id="adminUser" placeholder="admin" value="admin" disabled readonly />
+</div>
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="umamiAdminPassword">Initial Admin Password</label>
+	<CopyPasswordField
+		isPasswordField
+		name="umamiAdminPassword"
+		id="umamiAdminPassword"
+		placeholder="admin"
+		value={service.umami.umamiAdminPassword}
+		disabled
+		readonly
+	/>
+	<Explainer
+		text="It could be changed in Umami. <br>This is just the password set initially after the first start."
+	/>
+</div>

src/routes/services/[id]/configuration/type.svelte

@@ -43,6 +43,7 @@
 	import Ghost from '$lib/components/svg/services/Ghost.svelte';
 	import { t } from '$lib/translations';
 	import MeiliSearch from '$lib/components/svg/services/MeiliSearch.svelte';
+	import Umami from '$lib/components/svg/services/Umami.svelte';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -90,6 +91,8 @@
 						<Ghost isAbsolute />
 					{:else if type.name === 'meilisearch'}
 						<MeiliSearch isAbsolute />
+					{:else if type.name === 'umami'}
+						<Umami isAbsolute />
 					{/if}{type.fancyName}
 				</button>
 			</form>

src/routes/services/[id]/umami/start.json.ts

@@ -3,10 +3,11 @@ import * as db from '$lib/database';
 import { promises as fs } from 'fs';
 import yaml from 'js-yaml';
 import type { RequestHandler } from '@sveltejs/kit';
-import { ErrorHandler, getFreePort, getServiceImage } from '$lib/database';
+import { ErrorHandler, getServiceImage } from '$lib/database';
 import { makeLabelForServices } from '$lib/buildPacks/common';
 import type { ComposeFile } from '$lib/types/composeFile';
-import type { Service, DestinationDocker, ServiceSecret, Prisma } from '@prisma/client';
+import type { Service, DestinationDocker, Prisma } from '@prisma/client';
+import bcrypt from 'bcryptjs';
 
 export const post: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
@@ -61,7 +62,7 @@ export const post: RequestHandler = async (event) => {
 				config.umami.environmentVariables[secret.name] = secret.value;
 			});
 		}
-		console.log(umamiAdminPassword);
+
 		const initDbSQL = `
 		drop table if exists event;
 		drop table if exists pageview;
@@ -136,7 +137,10 @@ export const post: RequestHandler = async (event) => {
 		create index event_website_id_idx on event(website_id);
 		create index event_session_id_idx on event(session_id);
 		
-		insert into account (username, password, is_admin) values ('admin', '$2b$10$BUli0c.muyCW1ErNJc3jL.vFRFtFJWrT8/GcR4A.sUdCznaXiqFXa', true);`;
+		insert into account (username, password, is_admin) values ('admin', '${bcrypt.hashSync(
+			umamiAdminPassword,
+			10
+		)}', true);`;
 		await fs.writeFile(`${workdir}/schema.postgresql.sql`, initDbSQL);
 		const Dockerfile = `
 	  FROM ${config.postgresql.image}

src/routes/services/index.svelte

@@ -15,6 +15,7 @@
 	import MeiliSearch from '$lib/components/svg/services/MeiliSearch.svelte';
 	import { session } from '$app/stores';
 	import { getDomain } from '$lib/components/common';
+	import Umami from '$lib/components/svg/services/Umami.svelte';
 
 	export let services;
 	async function newService() {
@@ -86,6 +87,8 @@
 								<Ghost isAbsolute />
 							{:else if service.type === 'meilisearch'}
 								<MeiliSearch isAbsolute />
+							{:else if service.type === 'umami'}
+								<Umami isAbsolute />
 							{/if}
 							<div class="truncate text-center text-xl font-bold">
 								{service.name}
@@ -133,6 +136,8 @@
 									<Ghost isAbsolute />
 								{:else if service.type === 'meilisearch'}
 									<MeiliSearch isAbsolute />
+								{:else if service.type === 'umami'}
+									<Umami isAbsolute />
 								{/if}
 								<div class="truncate text-center text-xl font-bold">
 									{service.name}