From 1cd5b838070175a5a78d847cc427600d54fcb9e3 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Fri, 28 Apr 2023 08:58:56 +0100
Subject: [PATCH] refactor(wip): card routes
---
src/lib/layout/header.svelte | 2 +-
src/routes/+layout.svelte | 10 +-
src/routes/+layout.ts | 2 +-
src/routes/cloud-beta-card/+page.svelte | 422 -----------------
src/routes/console/+layout.svelte | 2 +-
src/routes/console/card/+layout.svelte | 5 -
src/routes/console/card/+layout.ts | 10 -
src/routes/console/card/+page.svelte | 425 +++++++++++++++++-
.../card}/+page.ts | 0
.../card}/Card.svelte | 9 +-
src/routes/console/card/breadcrumbs.svelte | 12 -
src/routes/console/card/header.svelte | 43 --
12 files changed, 418 insertions(+), 524 deletions(-)
delete mode 100644 src/routes/cloud-beta-card/+page.svelte
delete mode 100644 src/routes/console/card/+layout.svelte
delete mode 100644 src/routes/console/card/+layout.ts
rename src/routes/{cloud-beta-card => console/card}/+page.ts (100%)
rename src/routes/{cloud-beta-card => console/card}/Card.svelte (98%)
delete mode 100644 src/routes/console/card/breadcrumbs.svelte
delete mode 100644 src/routes/console/card/header.svelte
diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte
index 456abf979..01c063faf 100644
--- a/src/lib/layout/header.svelte
+++ b/src/lib/layout/header.svelte
@@ -216,7 +216,7 @@
Claim your Cloud card
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 1c68b0541..6bf967226 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -60,18 +60,12 @@
* Handle initial load.
*/
if (!$page.url.pathname.startsWith('/auth')) {
- const acceptedRoutes = [
- '/login',
- '/register',
- '/recover',
- '/invite',
- '/cloud-beta-card'
- ];
+ const acceptedRoutes = ['/login', '/register', '/recover', '/invite', '/card'];
if ($user) {
if (
!$page.url.pathname.startsWith('/console') &&
!$page.url.pathname.startsWith('/invite') &&
- !$page.url.pathname.startsWith('/cloud-beta-card')
+ !$page.url.pathname.startsWith('/card')
) {
await goto(`${base}/console`, {
replaceState: true
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index c66b1684b..d16bd6216 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -32,7 +32,7 @@ export const load: LayoutLoad = async ({ depends, url }) => {
'/auth/magic-url',
'/auth/oauth2/success',
'/auth/oauth2/failure',
- '/cloud-beta-card'
+ '/card'
];
if (!acceptedRoutes.some((n) => url.pathname.startsWith(n))) {
diff --git a/src/routes/cloud-beta-card/+page.svelte b/src/routes/cloud-beta-card/+page.svelte
deleted file mode 100644
index cfeb6e26a..000000000
--- a/src/routes/cloud-beta-card/+page.svelte
+++ /dev/null
@@ -1,422 +0,0 @@
-
-
-
-
-
-
- Welcome to the Cloud
-
-
-
-
-
-
-
-
Cloud is live in public
- Beta
-
-
- Share your Cloud card and you may win an exclusive Cloud hoodie!
-
-
-
-

-
-
-
-
- {#if !cardActive}
-
-
-
- {/if}
-
-
- {#if cardActive}
-
(cardActive = false)}
- on:keydown={() => {
- /* no-op */
- }}
- transition:fade />
- {/if}
-
-
-
-
-
-
-
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index 9880acd0c..eb65d276e 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -50,7 +50,7 @@
showSideNavigation={$page.url.pathname !== '/console' &&
!$page?.params.organization &&
!$page.url.pathname.includes('/console/account') &&
- !$page.url.pathname.includes('/console/cloud-beta-card') &&
+ !$page.url.pathname.includes('/console/card') &&
!$page.url.pathname.includes('/console/onboarding')}>
diff --git a/src/routes/console/card/+layout.svelte b/src/routes/console/card/+layout.svelte
deleted file mode 100644
index d1389b13f..000000000
--- a/src/routes/console/card/+layout.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-
- Card - Appwrite
-
-
-
diff --git a/src/routes/console/card/+layout.ts b/src/routes/console/card/+layout.ts
deleted file mode 100644
index cd42223bd..000000000
--- a/src/routes/console/card/+layout.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import Header from './header.svelte';
-import Breadcrumbs from './breadcrumbs.svelte';
-import type { LayoutLoad } from './$types';
-
-export const load: LayoutLoad = async () => {
- return {
- header: Header,
- breadcrumbs: Breadcrumbs
- };
-};
diff --git a/src/routes/console/card/+page.svelte b/src/routes/console/card/+page.svelte
index 678666a5c..e4e843393 100644
--- a/src/routes/console/card/+page.svelte
+++ b/src/routes/console/card/+page.svelte
@@ -1,22 +1,415 @@
-
-
-
- Update Name
-
+
+
+
+ Welcome to the Cloud
+
+
+
+
+
+
+
+
Cloud is live in public
+ Beta
+
+
+ Share your Cloud card and you may win an exclusive Cloud hoodie!
+
+
+
+

+
+
-
+
+ {#if !cardActive}
+
+
+
+ {/if}
+
+
+ {#if cardActive}
+
(cardActive = false)}
+ on:keydown={() => {
+ /* no-op */
+ }}
+ transition:fade />
+ {/if}
+
+
+
+
+
+
diff --git a/src/routes/cloud-beta-card/+page.ts b/src/routes/console/card/+page.ts
similarity index 100%
rename from src/routes/cloud-beta-card/+page.ts
rename to src/routes/console/card/+page.ts
diff --git a/src/routes/cloud-beta-card/Card.svelte b/src/routes/console/card/Card.svelte
similarity index 98%
rename from src/routes/cloud-beta-card/Card.svelte
rename to src/routes/console/card/Card.svelte
index b9f13a7e5..8fadf44eb 100644
--- a/src/routes/cloud-beta-card/Card.svelte
+++ b/src/routes/console/card/Card.svelte
@@ -19,7 +19,6 @@
import { windowFocusStore } from '$lib/stores/windowFocus';
import { VARS } from '$lib/system';
- import { onMount } from 'svelte';
import { spring } from 'svelte/motion';
let cardEl: HTMLDivElement | undefined;
@@ -236,11 +235,11 @@
--center: ${$centerProximity};
`;
- // const frontImg = `${VARS.APPWRITE_ENDPOINT}/cards/cloud?userId=${userId}`;
- const frontImg = `${VARS.APPWRITE_ENDPOINT}/cards/cloud?mock=employee`;
+ const frontImg = `${VARS.APPWRITE_ENDPOINT}/cards/cloud?userId=${userId}`;
+ // const frontImg = `${VARS.APPWRITE_ENDPOINT}/cards/cloud?mock=employee`;
// const frontImg = `${VARS.APPWRITE_ENDPOINT}/cards/cloud?mock=normal`;
- // const backImg = `${VARS.APPWRITE_ENDPOINT}/cards/cloud-back?userId=${userId}`;
- const backImg = `${VARS.APPWRITE_ENDPOINT}/cards/cloud-back?mock=golden`;
+ const backImg = `${VARS.APPWRITE_ENDPOINT}/cards/cloud-back?userId=${userId}`;
+ // const backImg = `${VARS.APPWRITE_ENDPOINT}/cards/cloud-back?mock=golden`;
// const backImg = `${VARS.APPWRITE_ENDPOINT}/cards/cloud-back?mock=normal`;
diff --git a/src/routes/console/card/breadcrumbs.svelte b/src/routes/console/card/breadcrumbs.svelte
deleted file mode 100644
index edb898db1..000000000
--- a/src/routes/console/card/breadcrumbs.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
diff --git a/src/routes/console/card/header.svelte b/src/routes/console/card/header.svelte
deleted file mode 100644
index 1ea6a77f5..000000000
--- a/src/routes/console/card/header.svelte
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
- {$user.name}
-
-
-
-
-
-
- {#each tabs as tab}
-
- {tab.title}
-
- {/each}
-
-