diff --git a/package.json b/package.json index 4f4430be7..38ff3e61b 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@07edee17", "@appwrite.io/pink-legacy": "^1.0.0", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@07edee17", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@0781d67", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 84d3997b0..9c0de68da 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@07edee17 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@07edee17(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@0781d67 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@0781d67(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -218,14 +218,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9193} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@07edee17': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@07edee17} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@0781d67b6c017dc574bc09b1da45ab1c3d37ab8c': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@0781d67b6c017dc574bc09b1da45ab1c3d37ab8c} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@07edee1707e8eb0699c439e4c81f1bc2e4685244': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@07edee1707e8eb0699c439e4c81f1bc2e4685244} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@07edee17': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@07edee17} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -239,8 +239,8 @@ packages: '@appwrite.io/pink-legacy@1.0.0': resolution: {integrity: sha512-EZk/wX8oDhIsCXf2A0oQjdNOaHvh5MnWbLQI4pAiGrdy5qQGPoU19AK6iVX6z3QoOq7geoEu0zVwAowBy5hZbQ==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@07edee17': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@07edee17} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@0781d67': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@0781d67} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4089,11 +4089,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9193': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@07edee17(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@0781d67b6c017dc574bc09b1da45ab1c3d37ab8c(svelte@4.2.19)': dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@07edee1707e8eb0699c439e4c81f1bc2e4685244(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@07edee17(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4106,9 +4106,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@07edee17(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@0781d67(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@07edee1707e8eb0699c439e4c81f1bc2e4685244(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@0781d67b6c017dc574bc09b1da45ab1c3d37ab8c(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.2(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.2(svelte@4.2.19) diff --git a/src/lib/components/navbar.svelte b/src/lib/components/navbar.svelte index 23ef38d6d..8e8ecc8f0 100644 --- a/src/lib/components/navbar.svelte +++ b/src/lib/components/navbar.svelte @@ -46,6 +46,7 @@ }>; showAccountMenu: boolean; }; + function updateTheme(theme: 'light' | 'dark' | 'system') { const themeInUse = theme === 'system' @@ -82,7 +83,9 @@ class="sideNavToggle" on:click={() => { sideBarIsOpen = !sideBarIsOpen; - }}> + }}> + + {logo.alt} @@ -94,22 +97,25 @@ Feedback + >Feedback + + scrollable + width="28.25" + placement="bottom-end" + class="extended-width" + bind:show={showSupport}> (showSupport = !showSupport)}> - Support + Support + @@ -117,17 +123,21 @@
- + {isMac() ? '⌘ + K' : 'Ctrl + K'} + on:click={toggleCommandCenter}> + + + {isMac() ? '⌘ + K' : 'Ctrl + K'}
{ showAccountMenu = !showAccountMenu; - }}> + }}> + + {#if showAccountMenu} { showAccountMenu = !showAccountMenu; - }}> + }}> + +
@@ -105,7 +112,8 @@ Getting started {/if} - {#if project} + {#if project} + Overview -
+
+ +
Products @@ -168,13 +178,26 @@ Feedback + >Feedback + - Support + + + ($showSupportModal = true)}> + Support + + + + + +
{/if} @@ -202,13 +225,27 @@ Feedback + on:click={toggleFeedback} + >Feedback + - Support + + + ($showSupportModal = true)}> + Support + + + + + +
@@ -237,6 +274,7 @@ &:hover { background: var(--color-bgcolor-neutral-secondary, #f4f4f7); + .link-icon { color: var(--color-fgcolor-neutral-tertiary); } @@ -254,9 +292,11 @@ &:active { background: var(--color-bgcolor-neutral-secondary, #f4f4f7); + .link-text { color: var(--color-fgcolor-neutral-primary); } + .link-icon { color: var(--color-fgcolor-neutral-primary); } @@ -274,6 +314,7 @@ opacity: 1; visibility: visible; color: var(--color-fgcolor-neutral-secondary, #56565c); + &.no-text { visibility: hidden; opacity: 0; @@ -283,6 +324,7 @@ .action-buttons { margin-top: var(--gap-s); + span { width: 144px; text-align: center; @@ -293,6 +335,7 @@ width: 100%; } } + .top { display: flex; width: 199px; @@ -329,10 +372,12 @@ margin-block-start: var(--base-32, 32px); margin-block-end: var(--base-8, 8px); } + .products-label { font-size: var(--font-size-xs); color: var(--color-fgcolor-neutral-tertiary); } + .products-label-indicator { border-bottom: 1px solid var(--color-border-neutral); height: 1px; @@ -345,6 +390,7 @@ .only-desktop { display: none; } + .only-mobile { display: flex; } @@ -429,6 +475,7 @@ height: var(--base-32, 32px); } } + :global(button.collapse) { transform: translateX(-10px); } diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte index d28cce103..25ea6859c 100644 --- a/src/lib/components/support.svelte +++ b/src/lib/components/support.svelte @@ -156,13 +156,14 @@ diff --git a/src/lib/helpers/onboarding.ts b/src/lib/helpers/onboarding.ts index 3d542ac9c..9088d7534 100644 --- a/src/lib/helpers/onboarding.ts +++ b/src/lib/helpers/onboarding.ts @@ -1,6 +1,5 @@ export function hasOnboardingDismissed(projectId: string) { - const val = localStorage.getItem(`onboardingDismissed-${projectId}`) === 'true'; - return val; + return localStorage.getItem(`onboardingDismissed-${projectId}`) === 'true'; } export function setHasOnboardingDismissed(projectId: string) { diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte index 88524bd31..329359e49 100644 --- a/src/lib/layout/header.svelte +++ b/src/lib/layout/header.svelte @@ -126,11 +126,12 @@ + width="28.25" + placement="bottom-end" + on:blur={() => (showSupport = !showSupport)}> diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index ade3c3986..0b3f4d003 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -16,6 +16,8 @@ import { isCloud } from '$lib/system'; import SideNavigation from '$lib/layout/navigation.svelte'; import { isSmallViewport } from '$lib/stores/viewport'; + import { hasOnboardingDismissed } from '$lib/helpers/onboarding'; + import { isSidebarOpen } from '$lib/stores/sidebar'; export let showSideNavigation = false; export let showHeader = true; @@ -67,20 +69,19 @@ }) }; - let sideBarIsOpen = false; let showAccountMenu = false; let subNavigation: undefined | ComponentType = undefined; let state: undefined | 'open' | 'closed' | 'icons' = 'closed'; - $: state = sideBarIsOpen ? 'open' : 'closed'; - $: state = subNavigation && !$isSmallViewport ? 'icons' : sideBarIsOpen ? 'open' : 'closed'; + $: state = $isSidebarOpen ? 'open' : 'closed'; + $: state = subNavigation && !$isSmallViewport ? 'icons' : $isSidebarOpen ? 'open' : 'closed'; function handleResize() { - sideBarIsOpen = false; + $isSidebarOpen = false; showAccountMenu = false; } $: progressCard = function getProgressCard() { - if (selectedProject) { + if (selectedProject && !hasOnboardingDismissed(selectedProject.$id)) { const currentProject = projects.find((project) => project.$id === selectedProject.$id); return { @@ -101,14 +102,14 @@ class:is-fixed-layout={$activeHeaderAlert?.show} style:--p-side-size={sideSize}> {#if showHeader} - + {/if} @@ -134,9 +135,9 @@ diff --git a/src/lib/stores/sidebar.ts b/src/lib/stores/sidebar.ts new file mode 100644 index 000000000..b6e02bb65 --- /dev/null +++ b/src/lib/stores/sidebar.ts @@ -0,0 +1,3 @@ +import { writable } from 'svelte/store'; + +export const isSidebarOpen = writable(false); diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte index 19900ef3e..002807316 100644 --- a/src/routes/(console)/+layout.svelte +++ b/src/routes/(console)/+layout.svelte @@ -3,7 +3,6 @@ import { BillingPlan, INTERVAL } from '$lib/constants'; import { Logs } from '$lib/layout'; import Footer from '$lib/layout/footer.svelte'; - import SideNavigation from '$lib/layout/navigation.svelte'; import Shell from '$lib/layout/shell.svelte'; import { app } from '$lib/stores/app'; import { log } from '$lib/stores/logs'; diff --git a/src/routes/(console)/project-[project]/get-started/header.svelte b/src/routes/(console)/project-[project]/get-started/header.svelte deleted file mode 100644 index cb29eb3af..000000000 --- a/src/routes/(console)/project-[project]/get-started/header.svelte +++ /dev/null @@ -1,53 +0,0 @@ - - -{#if hasOnboardingDismissed($project.$id)} - - - - {$project?.name} - - {$project.$id} - - -{:else} - - - - - Welcome, hoi - Follow a few quick steps to get started with Appwrite - -
- {#if !hasOnboardingDismissed($project.$id)} - { - setHasOnboardingDismissed($project.$id); - if (location.href.endsWith('get-started')) { - goto(`${base}/project-${$project.$id}`); - } else { - location.reload(); - } - }}>Dismiss this page - {/if} -
-
-
-
-{/if} diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-android-dark.png b/src/routes/(console)/project-[project]/overview/assets/platform-android-dark.png deleted file mode 100644 index ed5e9e095..000000000 Binary files a/src/routes/(console)/project-[project]/overview/assets/platform-android-dark.png and /dev/null differ diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-android-dark.svg b/src/routes/(console)/project-[project]/overview/assets/platform-android-dark.svg new file mode 100644 index 000000000..df5eefca4 --- /dev/null +++ b/src/routes/(console)/project-[project]/overview/assets/platform-android-dark.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-android.png b/src/routes/(console)/project-[project]/overview/assets/platform-android.png deleted file mode 100644 index 28171723d..000000000 Binary files a/src/routes/(console)/project-[project]/overview/assets/platform-android.png and /dev/null differ diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-android.svg b/src/routes/(console)/project-[project]/overview/assets/platform-android.svg new file mode 100644 index 000000000..d11379ee9 --- /dev/null +++ b/src/routes/(console)/project-[project]/overview/assets/platform-android.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-flutter-dark.png b/src/routes/(console)/project-[project]/overview/assets/platform-flutter-dark.png deleted file mode 100644 index 4386eba87..000000000 Binary files a/src/routes/(console)/project-[project]/overview/assets/platform-flutter-dark.png and /dev/null differ diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-flutter-dark.svg b/src/routes/(console)/project-[project]/overview/assets/platform-flutter-dark.svg new file mode 100644 index 000000000..898f6cd30 --- /dev/null +++ b/src/routes/(console)/project-[project]/overview/assets/platform-flutter-dark.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-flutter.png b/src/routes/(console)/project-[project]/overview/assets/platform-flutter.png deleted file mode 100644 index 17e062b1c..000000000 Binary files a/src/routes/(console)/project-[project]/overview/assets/platform-flutter.png and /dev/null differ diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-flutter.svg b/src/routes/(console)/project-[project]/overview/assets/platform-flutter.svg new file mode 100644 index 000000000..a8562409a --- /dev/null +++ b/src/routes/(console)/project-[project]/overview/assets/platform-flutter.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-ios-dark.png b/src/routes/(console)/project-[project]/overview/assets/platform-ios-dark.png deleted file mode 100644 index 0830ebbb7..000000000 Binary files a/src/routes/(console)/project-[project]/overview/assets/platform-ios-dark.png and /dev/null differ diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-ios-dark.svg b/src/routes/(console)/project-[project]/overview/assets/platform-ios-dark.svg new file mode 100644 index 000000000..2ae552018 --- /dev/null +++ b/src/routes/(console)/project-[project]/overview/assets/platform-ios-dark.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-ios.png b/src/routes/(console)/project-[project]/overview/assets/platform-ios.png deleted file mode 100644 index 411467d2f..000000000 Binary files a/src/routes/(console)/project-[project]/overview/assets/platform-ios.png and /dev/null differ diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-ios.svg b/src/routes/(console)/project-[project]/overview/assets/platform-ios.svg new file mode 100644 index 000000000..f39255858 --- /dev/null +++ b/src/routes/(console)/project-[project]/overview/assets/platform-ios.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-web-dark.png b/src/routes/(console)/project-[project]/overview/assets/platform-web-dark.png index 74821735d..32089778c 100644 Binary files a/src/routes/(console)/project-[project]/overview/assets/platform-web-dark.png and b/src/routes/(console)/project-[project]/overview/assets/platform-web-dark.png differ diff --git a/src/routes/(console)/project-[project]/overview/assets/platform-web.png b/src/routes/(console)/project-[project]/overview/assets/platform-web.png index 2881e9dc1..addc7fe6e 100644 Binary files a/src/routes/(console)/project-[project]/overview/assets/platform-web.png and b/src/routes/(console)/project-[project]/overview/assets/platform-web.png differ diff --git a/src/routes/(console)/project-[project]/overview/assets/users-dark.png b/src/routes/(console)/project-[project]/overview/assets/users-dark.png deleted file mode 100644 index 1c437fdaf..000000000 Binary files a/src/routes/(console)/project-[project]/overview/assets/users-dark.png and /dev/null differ diff --git a/src/routes/(console)/project-[project]/overview/assets/users-dark.svg b/src/routes/(console)/project-[project]/overview/assets/users-dark.svg new file mode 100644 index 000000000..ccdbfafc6 --- /dev/null +++ b/src/routes/(console)/project-[project]/overview/assets/users-dark.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/routes/(console)/project-[project]/overview/assets/users.png b/src/routes/(console)/project-[project]/overview/assets/users.png deleted file mode 100644 index 5ee1fd02b..000000000 Binary files a/src/routes/(console)/project-[project]/overview/assets/users.png and /dev/null differ diff --git a/src/routes/(console)/project-[project]/overview/assets/users.svg b/src/routes/(console)/project-[project]/overview/assets/users.svg new file mode 100644 index 000000000..57274447d --- /dev/null +++ b/src/routes/(console)/project-[project]/overview/assets/users.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/routes/(console)/project-[project]/overview/header.svelte b/src/routes/(console)/project-[project]/overview/header.svelte index 8aafbe092..2b7ddefc7 100644 --- a/src/routes/(console)/project-[project]/overview/header.svelte +++ b/src/routes/(console)/project-[project]/overview/header.svelte @@ -1,4 +1,5 @@ -{#if hasOnboardingDismissed($project.$id)} +{#if hasOnboardingDismissed($project.$id) && !$page.url.pathname.includes('get-started')} diff --git a/src/routes/(console)/project-[project]/overview/onboard.svelte b/src/routes/(console)/project-[project]/overview/onboard.svelte index 9bb0cd599..566562b6f 100644 --- a/src/routes/(console)/project-[project]/overview/onboard.svelte +++ b/src/routes/(console)/project-[project]/overview/onboard.svelte @@ -1,24 +1,24 @@
- -
- -
+ +
@@ -22,7 +25,14 @@ background-color: #131315; } - .inner-modal-wrapper { - padding-block-start: 0.5rem; + /* pink2 modal doesn't allow removing the header divider yet, temporary fix*/ + :global(.mobile-support-dialog-modal dialog header) { + border-bottom: unset !important; + padding-bottom: unset !important; + } + + /* pink2 modal doesn't remove footer if not used, temporary fix*/ + :global(.mobile-support-dialog-modal dialog footer) { + display: none !important; }