-
Notifications
You must be signed in to change notification settings - Fork 237
feat: added dismissible prop to header alert and email verification b… #2237
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
e0b9819
feat: added dismissible prop to header alert and email verification b…
HarshMN2345 d4a27d4
added not onboarding check
HarshMN2345 845399e
added seperate alert component from headeralert
HarshMN2345 dd05362
chnaged notification coolOfPeriod to never again and svlet5
HarshMN2345 827dd1b
replaced dervied.by with derived where needeed
HarshMN2345 97a9d13
Refactor needsEmailVerification derived variable
HarshMN2345 f59277d
Update src/lib/components/alerts/emailVerificationBanner.svelte
HarshMN2345 bedcc1a
Update src/lib/components/alerts/emailVerificationBanner.svelte
HarshMN2345 3b4c1ba
Update emailVerificationBanner.svelte
HarshMN2345 176e46e
Update emailVerificationBanner.svelte
HarshMN2345 3024ae7
Merge branch 'main' into feat-SER-165-Show-Banner-if-Unverified
HarshMN2345 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| <script lang="ts"> | ||
| import { base } from '$app/paths'; | ||
| import { goto } from '$app/navigation'; | ||
| import { Button } from '$lib/elements/forms'; | ||
| import { HeaderAlert } from '$lib/layout'; | ||
| import { Typography } from '@appwrite.io/pink-svelte'; | ||
| import { hideNotification, shouldShowNotification } from '$lib/helpers/notifications'; | ||
| import { user } from '$lib/stores/user'; | ||
| import { wizard } from '$lib/stores/wizard'; | ||
| import { page } from '$app/state'; | ||
|
|
||
| const { emailBannerClosed, onEmailBannerClose } = $props<{ | ||
| emailBannerClosed: boolean; | ||
| onEmailBannerClose: (closed: boolean) => void; | ||
| }>(); | ||
|
|
||
| const isOnOnboarding = $derived(() => page.route?.id?.includes('/(console)/onboarding')); | ||
|
|
||
| const hasUser = $derived(!!$user); | ||
| const needsEmailVerification = $derived(hasUser && !$user.emailVerification); | ||
| const shouldShowNotificationBanner = $derived.by(() => | ||
| shouldShowNotification('email-verification-banner') | ||
| ); | ||
| const wizardNotActive = $derived(!$wizard.show && !$wizard.cover); | ||
| const bannerNotClosed = $derived(!emailBannerClosed); | ||
| const notOnOnboarding = $derived(!isOnOnboarding); | ||
|
|
||
| const shouldShowEmailBanner = $derived( | ||
| hasUser && | ||
| needsEmailVerification && | ||
| shouldShowNotificationBanner && | ||
| wizardNotActive && | ||
| bannerNotClosed && | ||
| notOnOnboarding | ||
| ); | ||
|
|
||
| function navigateToAccount() { | ||
| goto(`${base}/account`); | ||
| } | ||
|
|
||
| function handleDismiss() { | ||
| onEmailBannerClose(true); | ||
| hideNotification('email-verification-banner', { coolOffPeriod: 24 * 365 * 100 }); | ||
| } | ||
| </script> | ||
|
|
||
| {#if shouldShowEmailBanner} | ||
| <HeaderAlert | ||
| type="warning" | ||
| title="Your email address needs to be verified" | ||
|
Meldiron marked this conversation as resolved.
HarshMN2345 marked this conversation as resolved.
|
||
| dismissible | ||
| on:dismiss={handleDismiss}> | ||
| <svelte:fragment> | ||
| To avoid losing access to your projects, make sure <Typography.Text | ||
|
HarshMN2345 marked this conversation as resolved.
|
||
| variant="m-500" | ||
| style="display:inline">{$user.email}</Typography.Text> is valid and up to date. Email | ||
| verification will be required soon. | ||
| </svelte:fragment> | ||
| <svelte:fragment slot="buttons"> | ||
| <Button secondary size="s" on:click={navigateToAccount}>Update email address</Button> | ||
| </svelte:fragment> | ||
| </HeaderAlert> | ||
| {/if} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.