From 606d071309c61a9db2a5231f1d96677c499fb124 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Fri, 3 Feb 2023 12:02:19 +0000
Subject: [PATCH 1/6] feat: add console

---
 src/lib/actions/analytics.ts      | 10 ++---
 src/lib/constants.ts              |  2 +
 src/lib/layout/footer.svelte      | 68 +++++++++++++++----------------
 src/lib/layout/shell.svelte       |  1 +
 src/routes/+layout.svelte         | 22 +++++-----
 src/routes/console/+layout.svelte |  3 +-
 6 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts
index a57000024..f54bc4922 100644
--- a/src/lib/actions/analytics.ts
+++ b/src/lib/actions/analytics.ts
@@ -1,9 +1,9 @@
-import Analytics from 'analytics';
-import googleAnalytics from '@analytics/google-analytics';
-import { get } from 'svelte/store';
 import { page } from '$app/stores';
+import { consoleMode, growthEndpoint } from '$lib/constants';
 import { user } from '$lib/stores/user';
-import { growthEndpoint, Mode } from '$lib/constants';
+import googleAnalytics from '@analytics/google-analytics';
+import Analytics from 'analytics';
+import { get } from 'svelte/store';
 
 const analytics = Analytics({
     app: 'appwrite',
@@ -49,7 +49,7 @@ function sendEventToGrowth(event: string, path: string, data: object = null): vo
             action: event,
             label: event,
             url: window.location.origin + path,
-            account: import.meta.env.VITE_CONSOLE_MODE?.toString() || Mode.SELF_HOSTED,
+            account: consoleMode,
             data: {
                 email,
                 name,
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 428ae6392..1f06721ac 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -7,6 +7,8 @@ export enum Mode {
     SELF_HOSTED = 'self-hosted'
 }
 
+export const consoleMode = import.meta.env.VITE_CONSOLE_MODE?.toString() || Mode.SELF_HOSTED;
+
 export const growthEndpoint = import.meta.env.VITE_APPWRITE_GROWTH_ENDPOINT;
 
 export enum Dependencies {
diff --git a/src/lib/layout/footer.svelte b/src/lib/layout/footer.svelte
index 23f83e399..4fe773bf9 100644
--- a/src/lib/layout/footer.svelte
+++ b/src/lib/layout/footer.svelte
@@ -1,46 +1,46 @@
-<footer class="main-footer">
-    <div class="container">
-        <ul class="inline-links is-center">
+<script>
+    import { consoleMode, Mode } from '$lib/constants';
+
+    const currentYear = new Date().getFullYear();
+</script>
+
+<footer class="main-footer u-cross-center">
+    <div class="main-footer-start">
+        <ul class="inline-links is-no-padding-first-and-last u-x-small">
             <li class="inline-links-item">
-                <a
-                    class="link"
-                    href="https://github.com/appwrite/appwrite"
-                    target="_blank"
-                    rel="noopener noreferrer">
-                    <span class="icon-github-circled" aria-hidden="true" />
-                    <span class="text">GitHub</span>
+                <div class="u-flex u-cross-center u-gap-8">
+                    {#if consoleMode === Mode.CLOUD}
+                        <span class="icon-cloud" />
+                    {/if}
+                </div>
+            </li>
+            <li class="inline-links-item">
+                <a href="https://appwrite.io/policy/terms" target="_blank" rel="noreferrer">
+                    <span class="text">Terms</span>
                 </a>
             </li>
             <li class="inline-links-item">
-                <a
-                    class="link"
-                    href="https://appwrite.io/discord"
-                    target="_blank"
-                    rel="noopener noreferrer">
-                    <span class="icon-discord" aria-hidden="true" />
-                    <span class="text">Discord</span>
+                <a href="https://appwrite.io/policy/privacy" target="_blank" rel="noreferrer">
+                    <span class="text">Privacy</span>
                 </a>
             </li>
+        </ul>
+    </div>
+    <div class="main-footer-end">
+        <ul class="inline-links is-no-padding-first-and-last u-x-small">
             <li class="inline-links-item">
-                <a
-                    class="link"
-                    href="https://github.com/appwrite/appwrite/issues/new"
-                    target="_blank"
-                    rel="noopener noreferrer">
-                    <span class="text">Open an Issue</span>
-                </a>
+                <span class="text">ⓒ {currentYear} Appwrite. All rights reserved.</span>
             </li>
-            <li class="inline-links-item">
-                <a
-                    class="link"
-                    href="https://appwrite.io/docs"
-                    target="_blank"
-                    rel="noopener noreferrer">
-                    <span class="text">Docs</span>
+            <li class="inline-links-item u-flex u-gap-8">
+                <a href="https://github.com/appwrite/console" target="_blank" rel="noreferrer">
+                    <span class="icon-github" aria-hidden="true" aria-label="Appwrite on Github" />
+                </a>
+                <a href="https://appwrite.io/discord" target="_blank" rel="noreferrer">
+                    <span
+                        class="icon-discord"
+                        aria-hidden="true"
+                        aria-label="Appwrite on Discord" />
                 </a>
-            </li>
-            <li class="inline-links-item">
-                <span class="text">API:0.13.2</span>
             </li>
         </ul>
     </div>
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index 70032a212..84f7d9e71 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -64,6 +64,7 @@
 
         <slot />
     </section>
+    <slot name="footer" />
 </main>
 
 <style>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index bdaa9a1ad..3a77fb2b0 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,19 +1,19 @@
 <script lang="ts">
-    import { afterNavigate, goto } from '$app/navigation';
-    import { page } from '$app/stores';
-    import { user } from '$lib/stores/user';
-    import { onCLS, onFID, onLCP, onFCP, onINP, onTTFB } from 'web-vitals';
-    import { reportWebVitals } from '$lib/helpers/vitals';
-    import { onMount } from 'svelte';
-    import { base } from '$app/paths';
     import { browser, dev } from '$app/environment';
-    import { app } from '$lib/stores/app';
-    import { Progress, Notifications } from '$lib/layout';
-    import { loading } from './store';
-    import Loading from './loading.svelte';
+    import { afterNavigate, goto } from '$app/navigation';
+    import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { trackPageView } from '$lib/actions/analytics';
+    import { reportWebVitals } from '$lib/helpers/vitals';
+    import { Notifications, Progress } from '$lib/layout';
+    import { app } from '$lib/stores/app';
+    import { user } from '$lib/stores/user';
     import * as Sentry from '@sentry/svelte';
     import { BrowserTracing } from '@sentry/tracing';
+    import { onMount } from 'svelte';
+    import { onCLS, onFCP, onFID, onINP, onLCP, onTTFB } from 'web-vitals';
+    import Loading from './loading.svelte';
+    import { loading } from './store';
 
     if (browser) {
         window.VERCEL_ANALYTICS_ID = import.meta.env.VERCEL_ANALYTICS_ID?.toString() ?? false;
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index 8ceaba15b..debe82b82 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -13,6 +13,7 @@
     import { loading } from '../store';
     import { feedback } from '$lib/stores/app';
     import { INTERVAL } from '$lib/constants';
+    import Footer from '$lib/layout/footer.svelte';
 
     onMount(() => {
         loading.set(false);
@@ -57,7 +58,7 @@
         <SideNavigation />
     </svelte:fragment>
     <slot />
-    <footer class="main-footer" />
+    <Footer slot="footer" />
 </Shell>
 
 {#if $wizard.show && $wizard.component}

From 70b7c2ae811476e7f01b8b902f7eda5add71ab10 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Tue, 7 Feb 2023 10:26:20 +0000
Subject: [PATCH 2/6] fix: footer positioning

---
 src/lib/layout/footer.svelte      |  6 ++++++
 src/lib/layout/shell.svelte       | 18 ++++++++++++------
 src/routes/console/+layout.svelte |  8 ++------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/lib/layout/footer.svelte b/src/lib/layout/footer.svelte
index 4fe773bf9..b5446237e 100644
--- a/src/lib/layout/footer.svelte
+++ b/src/lib/layout/footer.svelte
@@ -45,3 +45,9 @@
         </ul>
     </div>
 </footer>
+
+<style lang="scss">
+    .main-footer {
+        margin-block-start: auto;
+    }
+</style>
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index 84f7d9e71..aad0da6e0 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -41,7 +41,6 @@
 
 <main
     class:grid-with-side={showSideNavigation}
-    class:grid={!showSideNavigation}
     class:is-open={isOpen}
     class:u-hide={$wizard.show || $log.show}>
     <header class="main-header u-padding-inline-end-0">
@@ -54,9 +53,11 @@
         </button>
         <slot name="header" />
     </header>
-    <nav class="main-side">
-        <slot name="side" />
-    </nav>
+    {#if showSideNavigation}
+        <nav class="main-side">
+            <slot name="side" />
+        </nav>
+    {/if}
     <section class="main-content">
         {#if $page.data?.header}
             <svelte:component this={$page.data.header} />
@@ -67,9 +68,14 @@
     <slot name="footer" />
 </main>
 
-<style>
-    .grid-with-side {
+<style lang="scss">
+    main {
         min-height: 100vh;
+
+        &:not(.grid-with-side) {
+            display: flex;
+            flex-direction: column;
+        }
     }
 
     .main-side {
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index debe82b82..9639c019a 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -51,12 +51,8 @@
         !$page?.params.organization &&
         !$page.url.pathname.includes('/console/account') &&
         !$page.url.pathname.includes('/console/onboarding')}>
-    <svelte:fragment slot="header">
-        <Header />
-    </svelte:fragment>
-    <svelte:fragment slot="side">
-        <SideNavigation />
-    </svelte:fragment>
+    <Header slot="header" />
+    <SideNavigation slot="side" />
     <slot />
     <Footer slot="footer" />
 </Shell>

From 8346d94d63ac05996f4c278ffc2defa18e8fa318 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Wed, 15 Feb 2023 17:44:14 +0000
Subject: [PATCH 3/6] feat: show appwrite version

---
 src/lib/layout/footer.svelte      | 13 +++++++++++++
 src/lib/stores/sdk.ts             |  2 +-
 src/routes/console/+layout.svelte | 20 ++++++++++----------
 src/routes/console/+layout.ts     | 11 +++++++++++
 src/routes/console/store.ts       |  4 ++++
 svelte.config.js                  |  3 +++
 6 files changed, 42 insertions(+), 11 deletions(-)
 create mode 100644 src/routes/console/+layout.ts
 create mode 100644 src/routes/console/store.ts

diff --git a/src/lib/layout/footer.svelte b/src/lib/layout/footer.svelte
index b5446237e..cc2c697da 100644
--- a/src/lib/layout/footer.svelte
+++ b/src/lib/layout/footer.svelte
@@ -1,5 +1,6 @@
 <script>
     import { consoleMode, Mode } from '$lib/constants';
+    import { version } from '$routes/console/store';
 
     const currentYear = new Date().getFullYear();
 </script>
@@ -12,6 +13,14 @@
                     {#if consoleMode === Mode.CLOUD}
                         <span class="icon-cloud" />
                     {/if}
+                    {#if $version}
+                        <a
+                            class="text"
+                            href="https://github.com/appwrite/appwrite/blob/master/CHANGES.md"
+                            target="_blank">
+                            Version {$version}
+                        </a>
+                    {/if}
                 </div>
             </li>
             <li class="inline-links-item">
@@ -50,4 +59,8 @@
     .main-footer {
         margin-block-start: auto;
     }
+
+    [class^='icon-']:not(:hover) {
+        color: hsl(var(--color-neutral-50));
+    }
 </style>
diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index cffc23dec..f859fef2b 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -12,7 +12,7 @@ import {
     Users
 } from '@aw-labs/appwrite-console';
 
-const endpoint =
+export const endpoint =
     import.meta.env.VITE_APPWRITE_ENDPOINT?.toString() ?? `${window?.location?.origin}/v1`;
 const clientConsole = new Client();
 clientConsole.setEndpoint(endpoint).setProject('console');
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index 9639c019a..870794b40 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -1,19 +1,19 @@
 <script lang="ts">
-    import Shell from '$lib/layout/shell.svelte';
-    import SideNavigation from '$lib/layout/navigation.svelte';
-    import Header from '$lib/layout/header.svelte';
-    import { newOrgModal } from '$lib/stores/organization';
-    import Create from './createOrganization.svelte';
-    import { page } from '$app/stores';
     import { beforeNavigate } from '$app/navigation';
-    import { wizard } from '$lib/stores/wizard';
+    import { page } from '$app/stores';
+    import { INTERVAL } from '$lib/constants';
     import { Logs } from '$lib/layout';
+    import Footer from '$lib/layout/footer.svelte';
+    import Header from '$lib/layout/header.svelte';
+    import SideNavigation from '$lib/layout/navigation.svelte';
+    import Shell from '$lib/layout/shell.svelte';
+    import { feedback } from '$lib/stores/app';
     import { log } from '$lib/stores/logs';
+    import { newOrgModal } from '$lib/stores/organization';
+    import { wizard } from '$lib/stores/wizard';
     import { onMount } from 'svelte';
     import { loading } from '../store';
-    import { feedback } from '$lib/stores/app';
-    import { INTERVAL } from '$lib/constants';
-    import Footer from '$lib/layout/footer.svelte';
+    import Create from './createOrganization.svelte';
 
     onMount(() => {
         loading.set(false);
diff --git a/src/routes/console/+layout.ts b/src/routes/console/+layout.ts
new file mode 100644
index 000000000..65e09d55d
--- /dev/null
+++ b/src/routes/console/+layout.ts
@@ -0,0 +1,11 @@
+import { endpoint } from '$lib/stores/sdk';
+import type { LayoutLoad } from './$types';
+
+export const load: LayoutLoad = async () => {
+    const response = await fetch(`${endpoint}/health/version`);
+    const data = await response.json();
+
+    return {
+        version: data?.version ?? null
+    };
+};
diff --git a/src/routes/console/store.ts b/src/routes/console/store.ts
new file mode 100644
index 000000000..2e8023dda
--- /dev/null
+++ b/src/routes/console/store.ts
@@ -0,0 +1,4 @@
+import { page } from '$app/stores';
+import { derived } from 'svelte/store';
+
+export const version = derived(page, ($page) => $page.data.version as string | null);
diff --git a/svelte.config.js b/svelte.config.js
index b425b5de9..106dbd4a9 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -10,6 +10,9 @@ const config = {
         accessors: process.env.VITEST
     },
     kit: {
+        alias: {
+            $routes: './src/routes'
+        },
         adapter: adapter({
             fallback: 'index.html'
         }),

From 8f2abfa6e57f5c6ba455dc367f978139fbc1fa9a Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Wed, 15 Feb 2023 17:51:22 +0000
Subject: [PATCH 4/6] fix: footer mode check

---
 src/lib/layout/footer.svelte | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lib/layout/footer.svelte b/src/lib/layout/footer.svelte
index cc2c697da..fd8a77b59 100644
--- a/src/lib/layout/footer.svelte
+++ b/src/lib/layout/footer.svelte
@@ -1,5 +1,6 @@
 <script>
-    import { consoleMode, Mode } from '$lib/constants';
+    import { Mode, MODE } from '$lib/system';
+
     import { version } from '$routes/console/store';
 
     const currentYear = new Date().getFullYear();
@@ -10,14 +11,15 @@
         <ul class="inline-links is-no-padding-first-and-last u-x-small">
             <li class="inline-links-item">
                 <div class="u-flex u-cross-center u-gap-8">
-                    {#if consoleMode === Mode.CLOUD}
+                    {#if MODE === Mode.CLOUD}
                         <span class="icon-cloud" />
                     {/if}
                     {#if $version}
                         <a
                             class="text"
                             href="https://github.com/appwrite/appwrite/blob/master/CHANGES.md"
-                            target="_blank">
+                            target="_blank"
+                            rel="noreferrer">
                             Version {$version}
                         </a>
                     {/if}

From d3381b9cb67a16f3a394b28b4b548274d6c495c3 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Thu, 23 Feb 2023 17:38:41 +0000
Subject: [PATCH 5/6] refactor: endpoint constant on footer

---
 src/lib/stores/sdk.ts         | 2 +-
 src/routes/console/+layout.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index 240381c41..4c83cb15f 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -13,7 +13,7 @@ import {
     Users
 } from '@aw-labs/appwrite-console';
 
-export const endpoint = VARS.APPWRITE_ENDPOINT ?? `${globalThis?.location?.origin}/v1`;
+const endpoint = VARS.APPWRITE_ENDPOINT ?? `${globalThis?.location?.origin}/v1`;
 
 const clientConsole = new Client();
 clientConsole.setEndpoint(endpoint).setProject('console');
diff --git a/src/routes/console/+layout.ts b/src/routes/console/+layout.ts
index 65e09d55d..6e464728e 100644
--- a/src/routes/console/+layout.ts
+++ b/src/routes/console/+layout.ts
@@ -1,8 +1,8 @@
-import { endpoint } from '$lib/stores/sdk';
+import { sdkForConsole } from '$lib/stores/sdk';
 import type { LayoutLoad } from './$types';
 
 export const load: LayoutLoad = async () => {
-    const response = await fetch(`${endpoint}/health/version`);
+    const response = await fetch(`${sdkForConsole.client.config.endpoint}/health/version`);
     const data = await response.json();
 
     return {

From 5bac253fcbf14eeb6707cfe3db6bc0acf1592286 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Fri, 24 Feb 2023 16:24:41 +0530
Subject: [PATCH 6/6] fix: endpoint export from main

---
 src/lib/stores/sdk.ts                          | 2 +-
 src/routes/register/invite/[slug]/+page.svelte | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index 0eb424799..d3fb4455c 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -50,4 +50,4 @@ const sdkForProject = {
     users: new Users(clientProject)
 };
 
-export { sdkForConsole, sdkForProject, setProject, endpoint };
+export { sdkForConsole, sdkForProject, setProject };
diff --git a/src/routes/register/invite/[slug]/+page.svelte b/src/routes/register/invite/[slug]/+page.svelte
index ebf6353c9..023350aec 100644
--- a/src/routes/register/invite/[slug]/+page.svelte
+++ b/src/routes/register/invite/[slug]/+page.svelte
@@ -11,7 +11,7 @@
         InputText
     } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdkForConsole, endpoint } from '$lib/stores/sdk';
+    import { sdkForConsole } from '$lib/stores/sdk';
     import { Unauthenticated } from '$lib/layout';
     import FormList from '$lib/elements/forms/formList.svelte';
     import { Dependencies } from '$lib/constants';
@@ -51,7 +51,7 @@
     async function invite() {
         try {
             disabled = true;
-            const res = await fetch(`${endpoint}/account/invite`, {
+            const res = await fetch(`${sdkForConsole.client.config.endpoint}/account/invite`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json'