Skip to content
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.

Sign up for GitHub

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

Fix https://github.com/CriticalMoments/CMSaasStarter/issues/13 #14

Merged
merged 1 commit into from
Feb 11, 2024
Merged

Fix https://github.com/CriticalMoments/CMSaasStarter/issues/13 #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 21 additions & 24 deletions src/routes/(admin)/account/(menu)/settings/change_password/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,16 @@
export let data
let { session, supabase } = data

// True if definitely has a password, but can be false if they
// logged in with oAuth or email link
let hasPassword = session?.user?.amr?.find((x) => x.method === "password")
? true
: false

let usingOAuth = session?.user?.amr?.find((x) => x.method === "oauth")
? true
: false

let sendBtn: HTMLButtonElement
let sentEmail = false
let sendForgotPassword = () => {
Expand All @@ -36,7 +42,7 @@
<title>Change Password</title>
</svelte:head>

<h1 class="text-2xl font-bold mb-6">Settings</h1>
<h1 class="text-2xl font-bold mb-6">Change Password</h1>

{#if hasPassword}
<SettingsModule
Expand Down Expand Up @@ -69,31 +75,22 @@
]}
/>
{:else}
<div class="alert max-w-md">
<svg
xmlns="http://www.w3.org/2000/svg"
class="stroke-current shrink-0 h-6 w-6"
fill="none"
viewBox="0 0 24 24"
><path
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
/></svg
>
<div
class="card p-6 pb-7 mt-8 max-w-xl flex flex-col md:flex-row shadow max-w-md"
>
<div class="flex flex-col gap-y-4">
<div class="font-bold">
You currently do not use a password to log in.
</div>
<div>
You use oAuth ("Sign in with Github" or similar). You can continue to
use your account using only oAuth if you like!
</div>
{#if usingOAuth}
<div class="font-bold">Set Password By Email</div>
<div>
You use oAuth to sign in ("Sign in with Github" or similar). You can
continue to access your account using only oAuth if you like!
</div>
{:else}
<div class="font-bold">Change Password By Email</div>
{/if}
<div>
If you'd like to set a password to compliment your oAuth login, click
the button below. It will send you an email at {session?.user?.email} which
will allow you to set a password.
The button below will send you an email at {session?.user?.email} which will
allow you to set your password.
</div>
<button
class="btn btn-outline btn-wide {sentEmail ? 'hidden' : ''}"
Expand Down
Loading