From 7a5c326adaa4c5f231fd654d3b93a5ef6e171bbe Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 8 Mar 2023 10:39:32 +0000 Subject: [PATCH 01/19] feat: new sidebar draft --- package-lock.json | 8 +- package.json | 2 +- src/lib/layout/navigation.svelte | 178 +++++++++++++++++++++---------- 3 files changed, 127 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21a276c80..7f06084ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/pink": "^0.0.4", + "@appwrite.io/pink": "0.0.6-rc.2", "@aw-labs/appwrite-console": "^13.1.0", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.36.0", @@ -146,9 +146,9 @@ "integrity": "sha512-1Yw7u/COtxx06BfwlI+kVhsa/upKYzmCNrT4c8QDeCY2KMYlnijkUjtHiPU08HxyTIVB5j6d75O0YWVIHwQS8g==" }, "node_modules/@appwrite.io/pink": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.4.tgz", - "integrity": "sha512-pCXxBqSikG5PpBb2y84tTRH6cAMUYbROlQN8LuGoY2J+vTWMT+HQ7+RAAwRWU1Dlle4FgOFFCKmqU95g6X2a6g==", + "version": "0.0.6-rc.2", + "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.6-rc.2.tgz", + "integrity": "sha512-PR2TVhLgRwXfdrB+0w9pZv7X2n6WOawArSJXq8jsRF58EzWcl4nf8XkjTsJ9BSU+in9fkmhxNIBywM707jqUcg==", "dependencies": { "@appwrite.io/pink-icons": "*", "normalize.css": "^8.0.1", diff --git a/package.json b/package.json index c468dff23..374ad0c21 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@appwrite.io/pink": "^0.0.4", + "@appwrite.io/pink": "0.0.6-rc.2", "@aw-labs/appwrite-console": "^13.1.0", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.36.0", diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte index f7deb321f..27934cf2d 100644 --- a/src/lib/layout/navigation.svelte +++ b/src/lib/layout/navigation.svelte @@ -5,80 +5,146 @@ $: project = $page.params.project; $: path = `${base}/console/project-${project}`; + + let narrow = true;
- {#if project} +
+ {#if project} +
+
+ +
+
+ +
+
+ trackEvent('click_menu_settings')} + class:is-selected={$page.url.pathname.startsWith(`${path}/settings`)}> + +
+
+ {/if} + +
+ +
-
+
+ +
Header
+
- -
-
- trackEvent('click_menu_settings')} - class:is-selected={$page.url.pathname.startsWith(`${path}/settings`)}> - -
-
- {/if} +
From 605c5bae60fd82518210d089a6b1c72ca54a4b2d Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 14 Mar 2023 10:04:41 +0000 Subject: [PATCH 12/19] refactor: new sidebar anim --- src/lib/layout/navigation.svelte | 7 +++++-- src/lib/layout/shell.svelte | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte index 161300059..68e39d4fd 100644 --- a/src/lib/layout/navigation.svelte +++ b/src/lib/layout/navigation.svelte @@ -30,7 +30,7 @@ -
+
{#if project}
@@ -157,7 +157,10 @@
{#if subNavigation} -
+
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index aad0da6e0..612bec616 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -81,9 +81,15 @@ .main-side { z-index: 25; } + @media (max-width: 550.99px), (min-width: 551px) and (max-width: 1198.99px) { .main-side { top: 4.5rem; } } + @media (min-width: 1199px) { + .grid-with-side { + grid-template-columns: auto 1fr !important; + } + } From b201fc8aa9b9652e7b0d71cc95b646ad8dadaa2f Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 14 Mar 2023 10:11:05 +0000 Subject: [PATCH 13/19] refactor: revert back animation --- src/lib/layout/navigation.svelte | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte index cd2ae9c7d..a87b575ec 100644 --- a/src/lib/layout/navigation.svelte +++ b/src/lib/layout/navigation.svelte @@ -140,7 +140,7 @@
{/if} - {#if !subNavigation} + {#if subNavigation}