fix: qa issues

Author: ArmanNik

src/routes/(console)/project-[project]/sites/(components)/openOnMobileModal.svelte

@@ -25,7 +25,7 @@
     <Layout.Stack gap="l">
         <Card padding="l" radius="l">
             <Layout.Stack justifyContent="center" alignItems="center">
-                <Image src={image} height={176} width={176} alt="QR code" />
+                <Image src={image} height={176} width={176} alt="QR code" radius="xxs" />
             </Layout.Stack>
         </Card>
         <InputText id="copy" value={url} readonly>

src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte

@@ -9,31 +9,23 @@
     import { getFrameworkIcon } from '../../store';
     import { Copy, SvgIcon } from '$lib/components';
     import { sdk } from '$lib/stores/sdk';
-    import { goto, invalidate } from '$app/navigation';
+    import { invalidate } from '$app/navigation';
     import { onMount } from 'svelte';
     import { Dependencies } from '$lib/constants';
 
     export let data;
 
-    onMount(() => {
-        const unsubscribe = sdk.forConsole.client.subscribe('console', (response) => {
+    onMount(async () => {
+        sdk.forConsole.client.subscribe('console', async (response) => {
             if (
                 response.events.includes(
                     `sites.${data.deployment.resourceId}.deployments.${data.deployment.$id}.update`
                 )
             ) {
                 invalidate(Dependencies.DEPLOYMENT);
-                if (data.deployment.status === 'ready') {
-                    goto(
-                        `${base}/project-${$page.params.project}/sites/create-site/finish?site=${data.site.$id}`
-                    );
-                }
             }
         });
-        return () => unsubscribe();
     });
-
-    $: console.log(data.deployment);
 </script>
 
 <Wizard
@@ -69,8 +61,7 @@
             framework={data.frameworks.frameworks.find((f) => f.key === data.site.framework)}
             repositoryName={data?.repository?.name}
             branch={data.repository?.id ? data.site.providerBranch : ''}
-            rootDir={data.repository?.id ? data.site.providerRootDirectory : ''}
-            domain={data.proxyRuleList.rules[0]?.domain} />
+            rootDir={data.repository?.id ? data.site.providerRootDirectory : ''} />
     </svelte:fragment>
     <svelte:fragment slot="footer">
         <Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">

src/routes/(console)/project-[project]/sites/create-site/deploying/+page.ts

@@ -1,10 +1,11 @@
 import { DeploymentResourceType, RuleTrigger, RuleType, sdk } from '$lib/stores/sdk';
-import { error } from '@sveltejs/kit';
+import { error, redirect } from '@sveltejs/kit';
 import type { PageLoad } from './$types';
 import { Query } from '@appwrite.io/console';
 import { Dependencies } from '$lib/constants';
+import { base } from '$app/paths';
 
-export const load: PageLoad = async ({ url, depends }) => {
+export const load: PageLoad = async ({ url, depends, params }) => {
     depends(Dependencies.DEPLOYMENT);
     depends(Dependencies.SITE);
     if (!url.searchParams.has('site')) error(404, 'Site is not optional');
@@ -23,6 +24,13 @@ export const load: PageLoad = async ({ url, depends }) => {
         ])
     ]);
 
+    if (deployment?.status === 'ready' && site?.deploymentId === deploymentId) {
+        redirect(
+            303,
+            `${base}/project-${params.project}/sites/create-site/finish?site=${site.$id}`
+        );
+    }
+
     return {
         site,
         deployment,

src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte

@@ -135,7 +135,7 @@
         <Layout.Stack gap="xl">
             <Layout.Stack gap="s">
                 <Typography.Text color="--fgcolor-neutral-primary">
-                    Upload a tar.gz containing your function source code
+                    Upload a tar.gz containing your site source code
                 </Typography.Text>
                 <Upload.Dropzone extensions={['gz', 'tar']} bind:files maxSize={10000000} required>
                     <Layout.Stack alignItems="center" gap="s">

src/routes/(console)/project-[project]/sites/createSiteModal.svelte

@@ -20,7 +20,7 @@
                 variant="secondary"
                 padding="xs"
                 radius="s"
-                href={`${base}/project-${$page.params.project}/sites/create-site/templates?framework=React&framework=Vue.js&framework=Next.js&framework=SvelteKit&framework=Nuxt`}>
+                href={`${base}/project-${$page.params.project}/sites/create-site/templates`}>
                 <Image
                     alt="repositories"
                     radius="xxs"

src/routes/(console)/project-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte

@@ -46,7 +46,7 @@
     <span slot="description"> Manually deploy a site by uploading any file(s) or folder. </span>
     <Layout.Stack gap="s">
         <Typography.Text color="--fgcolor-neutral-primary">
-            Upload a tar.gz file containing your function source code
+            Upload a tar.gz file containing your site source code
         </Typography.Text>
         <Upload.Dropzone extensions={['gz', 'tar']} bind:files maxSize={10000000} required>
             <Layout.Stack alignItems="center" gap="s">

src/routes/(public)/template-[template]/+page.svelte

@@ -0,0 +1,61 @@
+<script lang="ts">
+    import { app } from '$lib/stores/app';
+    import { loading } from '$routes/store';
+    import { Typography } from '@appwrite.io/pink-svelte';
+
+    loading.set(false);
+</script>
+
+<div class="auth-bg">
+    <section>
+        <div class="console-container">
+            <slot />
+        </div>
+    </section>
+    <footer>
+        <Typography.Eyebrow color="--fgcolor-neutral-secondary">POWERED BY</Typography.Eyebrow>
+        {#if $app.themeInUse === 'dark'}
+            <img
+                src="/console/images/appwrite-logo-dark.svg"
+                width="120"
+                height="22"
+                alt="Appwrite Logo" />
+        {:else}
+            <img
+                src="/console/images/appwrite-logo-light.svg"
+                width="120"
+                height="22"
+                alt="Appwrite Logo" />
+        {/if}
+    </footer>
+</div>
+
+<style lang="scss">
+    .auth-bg {
+        position: fixed;
+        background: var(--bgcolor-neutral-primary, #fff);
+        background-size: cover;
+        top: 0;
+        left: 0;
+        height: 100%;
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        justify-content: space-between;
+        section {
+            flex: 1;
+            display: flex;
+            align-items: center;
+        }
+        footer {
+            padding: 2rem 1rem;
+            display: flex;
+            gap: 0.5rem;
+            justify-content: center;
+            align-items: center;
+            flex-wrap: wrap;
+        }
+    }
+</style>

src/routes/(public)/template-[template]/+page.ts

@@ -0,0 +1,14 @@
+import { base } from '$app/paths';
+import { redirect } from '@sveltejs/kit';
+
+export const load = async ({ parent, url }) => {
+    const { account } = await parent();
+
+    // const params = new URLSearchParams(window.location.search);
+
+    if (account) {
+        redirect(303, `${base}/templates-[template]?type=${url.searchParams.get('type')}`);
+    } else {
+        return {};
+    }
+};