Merge remote-tracking branch 'upstream/next' into feature/glitchtip-service

# Conflicts:
#	apps/api/prisma/schema.prisma
#	apps/api/src/lib/common.ts
#	apps/api/src/lib/serviceFields.ts
#	apps/api/src/routes/api/v1/services/handlers.ts

apps/ui/src/lib/common.ts

@@ -148,6 +148,17 @@ export const supportedServiceTypesAndVersions = [
 			main: 3000
 		}
 	},
+	{
+		name: 'appwrite',
+		fancyName: 'Appwrite',
+		baseImage: 'appwrite/appwrite',
+		images: ['mariadb:10.7', 'redis:6.2-alpine', 'appwrite/telegraf:1.4.0'],
+		versions: ['latest', '0.15.3'],
+		recommendedVersion: '0.15.3',
+		ports: {
+			main: 80
+		}
+	}
 	// {
 	//     name: 'moodle',
 	//     fancyName: 'Moodle',

apps/ui/src/lib/components/svg/services/index.ts

@@ -13,5 +13,6 @@ export { default as MeiliSearch }  from './MeiliSearch.svelte';
 export { default as Umami }  from './Umami.svelte';
 export { default as Hasura }  from './Hasura.svelte';
 export { default as Fider }  from './Fider.svelte';
+export { default as Appwrite }  from './Moodle.svelte';
 export { default as Moodle }  from './Moodle.svelte';
 export { default as GlitchTip }  from './GlitchTip.svelte';

apps/ui/src/lib/templates.ts

@@ -292,8 +292,7 @@ export const buildPacks = [
 		fancyName: 'Deno',
 		hoverColor: 'hover:bg-green-700',
 		color: 'bg-green-700'
-	}
-	// },
+	},
     // {
     //     name: 'heroku',
 	// 	fancyName: 'Heroku Buildpack',

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

@@ -59,7 +59,7 @@
 
 	async function changeSettings(name: any) {
 		if (name !== 'appendOnly') {
-			if (publicLoading || !$status.database.isRunning || name !== 'appendOnly') return;
+			if (publicLoading || !$status.database.isRunning) return;
 		}
 		publicLoading = true;
 		let data = {
@@ -247,6 +247,7 @@
 		{#if database.type === 'redis'}
 			<div class="grid grid-cols-2 items-center">
 				<Setting
+					loading={publicLoading}
 					bind:setting={appendOnly}
 					on:click={() => changeSettings('appendOnly')}
 					title={$t('database.change_append_only_mode')}

apps/ui/src/routes/index.svelte

@@ -97,6 +97,7 @@
 <div class="mt-10 pb-12 tracking-tight sm:pb-16">
 	<div class="mx-auto px-10">
 		<div class="flex flex-col justify-center xl:flex-row">
+			{#if applications.length > 0}
 			<div>
 				<div class="title">Resources</div>
 				<div class="flex items-start justify-center p-8">
@@ -308,6 +309,7 @@
 					</table>
 				</div>
 			</div>
+			{/if}
 			{#if $appSession.teamId === '0'}
 				<Usage />
 			{/if}

apps/ui/src/routes/services/[id]/_ServiceLinks.svelte

@@ -55,6 +55,10 @@
 	<a href="https://fider.io" target="_blank">
 		<Icons.Fider />
 	</a>
+{:else if service.type === 'appwrote'}
+	<a href="https://appwrite.io" target="_blank">
+		<Icons.Appwrite/>
+	</a>
 {:else if service.type === 'moodle'}
 	<a href="https://moodle.org" target="_blank">
 		<Icons.Moodle />

apps/ui/src/routes/services/[id]/_Services/_Appwrite.svelte

@@ -0,0 +1,126 @@
+<script lang="ts">
+	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import { t } from '$lib/translations';
+	import Select from 'svelte-select';
+	export let service: any;
+	export let readOnly: any;
+</script>
+
+<div class="flex space-x-1 py-5 font-bold">
+	<div class="title">Appwrite</div>
+</div>
+
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="opensslKeyV1">Encryption Key</label>
+	<CopyPasswordField
+		name="opensslKeyV1"
+		id="opensslKeyV1"
+		isPasswordField
+		value={service.appwrite.opensslKeyV1}
+		readonly
+		disabled
+	/>
+</div>
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="executorSecret">Executor Secret</label>
+	<CopyPasswordField
+		name="executorSecret"
+		id="executorSecret"
+		isPasswordField
+		value={service.appwrite.executorSecret}
+		readonly
+		disabled
+	/>
+</div>
+
+<!-- <div class="flex space-x-1 py-5 font-bold">
+	<div class="title">Redis</div>
+</div>
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="redisPassword">Password</label>
+	<CopyPasswordField
+		name="redisPassword"
+		id="redisPassword"
+		isPasswordField
+		value={service.appwrite.redisPassword}
+		readonly
+		disabled
+	/>
+</div> -->
+
+<div class="flex space-x-1 py-5 font-bold">
+	<div class="title">MariaDB</div>
+</div>
+
+<!-- <div class="grid grid-cols-2 items-center px-10">
+	<label for="mariadbHost">MariaDB Host</label>
+	<CopyPasswordField
+		name="mariadbHost"
+		id="mariadbHost"
+		value={service.appwrite.mariadbHost}
+		readonly
+		disabled
+	/>
+</div>
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="mariadbPort">MariaDB Port</label>
+	<CopyPasswordField
+		name="mariadbPort"
+		id="mariadbPort"
+		value={service.appwrite.mariadbPort}
+		readonly
+		disabled
+	/>
+</div> -->
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="mariadbUser">{$t('forms.username')}</label>
+	<CopyPasswordField
+		name="mariadbUser"
+		id="mariadbUser"
+		value={service.appwrite.mariadbUser}
+		readonly
+		disabled
+	/>
+</div>
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="mariadbPassword">{$t('forms.password')}</label>
+	<CopyPasswordField
+		id="mariadbPassword"
+		isPasswordField
+		readonly
+		disabled
+		name="mariadbPassword"
+		value={service.appwrite.mariadbPassword}
+	/>
+</div>
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="mariadbRootUser">Root User</label>
+	<CopyPasswordField
+		name="mariadbRootUser"
+		id="mariadbRootUser"
+		value={service.appwrite.mariadbRootUser}
+		readonly
+		disabled
+	/>
+</div>
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="mariadbRootUserPassword">Root Password</label>
+	<CopyPasswordField
+		id="mariadbRootUserPassword"
+		isPasswordField
+		readonly
+		disabled
+		name="mariadbRootUserPassword"
+		value={service.appwrite.mariadbRootUserPassword}
+	/>
+</div>
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="mariadbDatabase">{$t('index.database')}</label>
+	<CopyPasswordField
+		name="mariadbDatabase"
+		id="mariadbDatabase"
+		value={service.appwrite.mariadbDatabase}
+		readonly
+		disabled
+	/>
+</div>

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

@@ -27,6 +27,7 @@
 	import Umami from './_Umami.svelte';
 	import VsCodeServer from './_VSCodeServer.svelte';
 	import Wordpress from './_Wordpress.svelte';
+	import Appwrite from './_Appwrite.svelte';
 	import Moodle from './_Moodle.svelte';
 
 	const { id } = $page.params;
@@ -395,6 +396,8 @@
 				<Hasura bind:service />
 			{:else if service.type === 'fider'}
 				<Fider bind:service {readOnly} />
+			{:else if service.type === 'appwrite'}
+				<Appwrite bind:service {readOnly} />
 			{:else if service.type === 'moodle'}
 				<Moodle bind:service {readOnly} />
 			{:else if service.type === 'glitchTip'}

apps/ui/src/routes/services/[id]/configuration/version.svelte

@@ -35,7 +35,6 @@
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
-
 	let recommendedVersion = supportedServiceTypesAndVersions.find(
 		({ name }) => name === type
 	)?.recommendedVersion;