From d9dd83b8c13e6f398774f1d764a5fad8bca25ed3 Mon Sep 17 00:00:00 2001 From: Gib Date: Thu, 26 Jun 2025 16:58:03 -0500 Subject: [PATCH] cleaning shit up --- bun.lockb | Bin 367652 -> 367692 bytes package.json | 6 +- public/icons/auth/apple.svg | 19 +++ public/icons/auth/microsoft.svg | 2 + .../default/auth/buttons/client/index.tsx | 3 + ...InWithApple.tsx => sign-in-with-apple.tsx} | 4 +- .../buttons/client/sign-in-with-microsoft.tsx | 94 +++++++++++++ .../client/{SignIn.tsx => sign-in.tsx} | 0 .../auth/cards/client/forgot-password.tsx | 0 .../default/auth/cards/client/profile.tsx | 0 .../default/auth/cards/client/sign-in.tsx | 126 ++++++++++++++++++ src/components/default/forms/index.tsx | 4 +- .../{StatusMessage.tsx => status-message.tsx} | 0 .../{SubmitButton.tsx => submit-button.tsx} | 0 14 files changed, 251 insertions(+), 7 deletions(-) create mode 100644 public/icons/auth/apple.svg create mode 100644 public/icons/auth/microsoft.svg create mode 100644 src/components/default/auth/buttons/client/index.tsx rename src/components/default/auth/buttons/client/{SignInWithApple.tsx => sign-in-with-apple.tsx} (94%) create mode 100644 src/components/default/auth/buttons/client/sign-in-with-microsoft.tsx rename src/components/default/auth/buttons/client/{SignIn.tsx => sign-in.tsx} (100%) create mode 100644 src/components/default/auth/cards/client/forgot-password.tsx create mode 100644 src/components/default/auth/cards/client/profile.tsx create mode 100755 src/components/default/auth/cards/client/sign-in.tsx rename src/components/default/forms/{StatusMessage.tsx => status-message.tsx} (100%) rename src/components/default/forms/{SubmitButton.tsx => submit-button.tsx} (100%) diff --git a/bun.lockb b/bun.lockb index d2920a4c535107eb622632490036ec1d2a0b4be2..7a3b3f5b46dba89744081a9e01a0376bad5b9fe6 100755 GIT binary patch delta 3280 zcmYk630REVAIImNdEYV7rbP{*Y0;FVX;COOMfk^+A|vFcZR*nUSK4%^o25m|Or;my zs|6`HN@yZmD*m}`+;S`QpfD|#x_`2i?(fZ+%XyyjobUOZ?|I+v`Mt}@>KRSdGsI>b z!_kkmho-NMl*AiY_-fgY*So>(F)}+tv?6 zgPS8I$PxlmofI;;;4%>r%0-D>$mD`MMedP{61kAc1(zlF$VCYfQW*;qW7J)xB~!7- z%N^HccQp@OkhB}u{w2B@`m{yn#l<|VGh5FOb>wRO_#~i7JtaTeq|ed~QYLmS;E z6Tj>r{d87UH*o#8i&i^|1idi@^K(L*-bgIQT;`8G+l5OB7ClTL`hA$Do4TSu*mZxQ z8K0xc%U;9DoO&Rb78?*BXS|lqjn7nPV*6SJ>{0#pX%oV(kFQ(Q9bN^j_&AqYyYd&= zevC%LXkS#mz-Z5){o8Qo@=Yx@jt7VG=VV?U+pSx^*)jR=iCO8&=59u}T86{cYnL{a z1_XMtho6$d=d9@d$SBK3d|1hw*;_GGxG$*h9I50(*A|s?+U5sVDjih3IVa5T`jRVY zyC2%s1=R9uKMYmU;!fM0#hxVoRAN}E=aQjOAK885$sjA^RuKFg$JJn&#L$F=R_kX~=)?B<`(&SO9Q>`~M%xERzG6_wc1IcwEO zypz_gQ31oB+_eMZ`3%bv72ah!-F<`a?Xo-<9=O=lyr4Qp=Groza<3;VsAy%i{cP7Y zb$_zj?sZ>UaJA;$bIFHmbvdiO6yGavzw9&_kH(_nIe#B7F6_n%ZI>&NN30ffuk!A> zU2hP%w{5KT*p3$~P4?P)REldYgjJDcZ0%>7sk2SHPg)*X)1r|W^?6oY>baWvpJMvS z*}hb~kg^c>rMLUlRQw+Asyfbh8>vXS;Wn~s@%cubGUw?HRdK2dd^37q29Bj4?kidA zceblj0@7A|AMa68Lp9#9!kHa#tX_Za58Af39}P;=LU_)W z9@oufCjRz@T_sbK-PlIWO+JsA%OY4ct%8DM<>t-Io`FNlw|G~P%~ZVUT(yhN`!8_q zjB<5&*TTt$1B;`2n88mOSecd%ztdFkZg6B!lu(shXR0U>A01w}Ah*IkSZiDTXpQ)P zw#wAaTLp7xGA+)5N> zu&)F+D#Xc7=C_6B+!?ww;igy-a;Ei}=lT0&ydT7C=uW+KW#xq{Zu=99OTEJX)7AN) z(QMHi`X#A_Z4}v&u>8L2{LEn4v09hVvYfodCKD$XJ&WNfpR!}8-Ys{?3Hut4g~P*L z{e3(&g}Womw;og|XbL%@zD>jNLDK)5^twfrb%F=SlEyc27v*N9Zx@!Z<0?`jC)PZl z(0us(KL*Mq?iPjTE|p652K-q$ZZ97yjP!uq748yFHy z2>(*SKoZGcAo0w|v*^fB;J%@MH~pqa== zeT#IMYeCPYE=Hq?Ccgk`vo`b~*sKWSaQtt#+ zd>!b=fhoi2ihQ#{=OeZT7ynp{iUn;wGR_5!gQl80V!EK!5c5Ec156#U4T$Lh zV}n+KaU){-pdV4`p?M-^0J=+r;3fnO0kWX{)MF3;qsliAx;ZLg2=W;LQv^n>ha$!W zt%O(@V#dIZ!ilL$h64jhGl3ojf~uNm4>Hb&Ni>2{h?ycIRkmov79bzRVh}R}{R&ku z7O{oEWNE#2mKZuc<)yxqVWI*qs{REDQN+HCt@PB*%DYNVhPA+1YF#1;elfKn$Rwggxq@+Bj-6j&Z& zDTvttO8`b4C>1e#&=J6>109l|ZW&DWpv`H>=m2aBV(ExE0^5pM24Z|*TEM9AnTR=o zK7o8<#8kaNK-(bvI!?8Vv?TjBGjyc57o%y4w9kj}2*WJMYrYIuY(Pr*G4e6yAe8MD zK^FNlQt599(jio5)|gAM0vswO-QthaF^nhm4#0~rg=iu5zoXHrNd+OE zq##4n2&5zbqo(r43&|H86v2Jr?vj1e5tTuksM zg=!X|O`Z`G#@}X&62eGs(k6FG2t)ar4%s3hIP%$2xk-&I&mfe@Ls^8*Hzdv=6v-D^ z#4I^dC#|yy1NlsiOv^?WhAe6%*r$+#*@O<2URP?ALu63rt~yK<6Vod4;N66FHIE=4 NZf0=ERVt;$-(}m*NhFS8IQC`Q7nm&=*uOzk^Q*dA9-N$Z=#$*_qa6=#ciZh=pqcNN@g@K57vZio zE*>SyPqfMt*vAbmODa}B9b1|C`+(ntPcpsao0bP3KGwXYclps+ze%wfo}K9%E)Au+b=f%IR1xG!-08II>Nhc3u3gBu#DhDS>}i{Z&#_ZzsmEQ z^Abf9_6RHnj9Gna@3@nGY}@oe#uif@owFQe7Kd}E;f|Yz-+rT+z2VLEkpsKmEO@la zgRPkNr{1YHpQ6Fs+LtGPrjHE)W)TITe|f84EIHzB8L_mm-xg2YjgVP#yk89QQA`R{d(Z|`{y zM79Vb4trkCXz}xO7wR;EHs}RQ9nc(Z*7PlEWUO#^!sod>QdZmrQBaP2?jc)kO zFhR|0PUvj^z`dQBn&+K+m>dh%;2v?nRrxI?S|^=~OegGNEZUy+xAycp{@z~yI4(Ek zI-V4HEwiDy$Tc(iW0s>Avr4tcGT7WA`BY$Pf;+p~K_Miiep-*o>tlaEc@o$kULXw4 zDNRsnqUH#|-stX*{Lw6zCxjw4E5gS3?XzP8Q;qn6i*G%S3K7Wpw$AcWjuX7S{IDw} z{mgS7?{DL^!nAmmyZQB;3~ju4MkwkYJb>8hZ|!Z~(b2SUy7iAk6?%_Fc}APm-;9O2 zx@deJU7Z)8J#x)ed&Z!fG{s|IY(Tcx#r)p?(SUkronTNLh(Z`TZ+#&uoDxe#M4quy!b?JFzm z8n*EYaR9qBZ|;q+-NWctW9_&0_FX)`GIN2F6hG*2;d`UOT+b3RlY=>5~4;%FiJScIxn9XxbJU%4dswfaWsc2VxmwGeM6+9UW$fDS>99y5+#6 z;942RDS9&q`b$RNV-}16SSyQR(U>KIvjO^lg%jTtx{wV+h!`K$sQ}vxOb%xH<)$00 z3gav=d6?-(mR_p{;~ZjZfPuv3z!;%jLD){zMPt}pxFFzyjtyw>JkW}WZA45R*bKz% z5Yqt020aaCd&D$BKcgK$I3PA3bUR{>h-m?1MML|igKz>!w@Mp^K5C&573u(!1xB|w z05M(Aa)|9jj05a69Fy+kE@1SD7r@vDg6>)ns#^#;0v`rvf*$-@xif&LSnI2RamW5a>V$11$fYAp!f|xnzP+;_dM2J~{4o7Q`dLd{D&;!9^h*<&iL@W+5KCoH9 zX!r4mtpJ^m>Jkvc+(AI-QA2JFU9o~Y5V@V#1%{fXlejPa%X*yj93B)Rg&wz5^ZN(+P~!He8?56A*?lc?k$M zOpyX&qY?bkhqQ6}&5CL1Z!Ht$eMltmrCbB90c6ghjPQbUWr{;VkR(Hm!VaoX@C*vn zVQI>Zw42Q#Yo-4!(DxzO^xkSZIHmywty{7ig&PMNBn9w=L7CHX&g@#7_llAXbr3C$ zfr9z4w0{HXFof@{krY4&QKn&el$Ua=xUoi~6 zfia2WFZFt?yq8E(-o6A|Mhf4i&s_rN6vz4!QaG+JKI%v0;W7?F`a6YT$&`VRI3`nr zE;op4g+$+UC@YR6{!>Z4DzwGO4pCNd+o0nVdH{!A&7$skUTt{{KiUp3IU`$VHPGY`~-(Qb~gPm_lm&zwD&# zd6VnFv@}(nM3R(z8mT%t>zPJsPi6;_$f;Cy8mTfl0b5O>l+#J}L_%zzPA1U}?#dtw RNSU}Sc;_L~sl+U@`X7lDr + + + + apple [#173] + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/icons/auth/microsoft.svg b/public/icons/auth/microsoft.svg new file mode 100644 index 0000000..89ff5b9 --- /dev/null +++ b/public/icons/auth/microsoft.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/components/default/auth/buttons/client/index.tsx b/src/components/default/auth/buttons/client/index.tsx new file mode 100644 index 0000000..d13fac5 --- /dev/null +++ b/src/components/default/auth/buttons/client/index.tsx @@ -0,0 +1,3 @@ +export { SignInWithApple } from './sign-in-with-apple'; +export { SignInWithMicrosoft } from './sign-in-with-microsoft'; +export { SignInButton } from './sign-in'; diff --git a/src/components/default/auth/buttons/client/SignInWithApple.tsx b/src/components/default/auth/buttons/client/sign-in-with-apple.tsx similarity index 94% rename from src/components/default/auth/buttons/client/SignInWithApple.tsx rename to src/components/default/auth/buttons/client/sign-in-with-apple.tsx index 3cff053..afea7c1 100644 --- a/src/components/default/auth/buttons/client/SignInWithApple.tsx +++ b/src/components/default/auth/buttons/client/sign-in-with-apple.tsx @@ -1,5 +1,5 @@ 'use client'; -import { signInWithApple, getProfile, updateProfile } from '@/lib/queries'; +import { signInWithApple } from '@/lib/queries'; import { StatusMessage, SubmitButton } from '@/components/default/forms'; import { useAuth } from '@/lib/hooks/context'; import { useRouter } from 'next/navigation'; @@ -85,7 +85,7 @@ export const SignInWithApple = ({ width={imageProps.width} height={imageProps.height} /> -

Sign In with Apple

+

Sign In with Apple

{statusMessage && } diff --git a/src/components/default/auth/buttons/client/sign-in-with-microsoft.tsx b/src/components/default/auth/buttons/client/sign-in-with-microsoft.tsx new file mode 100644 index 0000000..b109238 --- /dev/null +++ b/src/components/default/auth/buttons/client/sign-in-with-microsoft.tsx @@ -0,0 +1,94 @@ +'use client'; +import { signInWithMicrosoft } from '@/lib/queries'; +import { StatusMessage, SubmitButton } from '@/components/default/forms'; +import { useAuth } from '@/lib/hooks/context'; +import { useRouter } from 'next/navigation'; +import { useState } from 'react'; +import Image from 'next/image'; +import { type buttonVariants } from '@/components/ui'; +import { type ComponentProps } from 'react'; +import { type VariantProps } from 'class-variance-authority'; +import { useSupabaseClient } from '@/utils/supabase'; + +type ButtonProps = ComponentProps<'button'> & VariantProps; +type ImageProps = { + src: string; + alt: string; + className?: string; + width?: number; + height?: number; +} +type FormProps = ComponentProps<'form'>; +type TextProps = ComponentProps<'p'>; +type SignInWithMicrosoftProps = { + buttonProps?: ButtonProps; + imageProps?: ImageProps; + formProps?: FormProps; + textProps?: TextProps; +}; + +export const SignInWithMicrosoft = ({ + buttonProps = { + className: 'w-full cursor-pointer', + type: 'submit', + }, + imageProps = { + src: '/icons/auth/microsoft.svg', + alt: 'Apple', + className: '', + width: 24, + height: 24, + }, + formProps = { + className: 'my-4', + }, + textProps = { + className: 'text-[1.0rem]', + }, +} : SignInWithMicrosoftProps) => { + const router = useRouter(); + const { loading, refreshUser } = useAuth(); + const [statusMessage, setStatusMessage] = useState(''); + const [ isLoading, setIsLoading ] = useState(false); + const supabase = useSupabaseClient(); + + const handleSignInWithMicrosoft = async (e: React.FormEvent) => { + e.preventDefault(); + try { + if (!supabase) throw new Error('Supabase client not found'); + setStatusMessage(''); + setIsLoading(true); + const result = await signInWithMicrosoft(supabase); + if (result.data.url) window.location.href = result.data.url; + else setStatusMessage(`There was a problem signing in with Apple!`); + } catch (error) { + setStatusMessage(`Error signing in: ${error as string}`); + } finally { + setIsLoading(false); + await refreshUser(); + router.push(''); + } + }; + + return ( +
+ +
+ {imageProps.alt} +

Sign In with Apple

+
+ + {statusMessage && } + + ); +}; diff --git a/src/components/default/auth/buttons/client/SignIn.tsx b/src/components/default/auth/buttons/client/sign-in.tsx similarity index 100% rename from src/components/default/auth/buttons/client/SignIn.tsx rename to src/components/default/auth/buttons/client/sign-in.tsx diff --git a/src/components/default/auth/cards/client/forgot-password.tsx b/src/components/default/auth/cards/client/forgot-password.tsx new file mode 100644 index 0000000..e69de29 diff --git a/src/components/default/auth/cards/client/profile.tsx b/src/components/default/auth/cards/client/profile.tsx new file mode 100644 index 0000000..e69de29 diff --git a/src/components/default/auth/cards/client/sign-in.tsx b/src/components/default/auth/cards/client/sign-in.tsx new file mode 100755 index 0000000..83fb989 --- /dev/null +++ b/src/components/default/auth/cards/client/sign-in.tsx @@ -0,0 +1,126 @@ +'use client'; + +import { z } from 'zod'; +import { zodResolver } from '@hookform/resolvers/zod'; +import { useForm } from 'react-hook-form'; +import Link from 'next/link'; +import { signIn, signUp } from '@/lib/queries'; +import { useRouter } from 'next/navigation'; +import { useEffect, useState } from 'react'; +import { useAuth } from '@/lib/hooks/context'; +import { useSupabaseClient } from '@/utils/supabase'; +import { StatusMessage, SubmitButton } from '@/components/default/forms'; +import { + Card, + CardContent, + CardDescription, + CardHeader, + CardTitle, + Form, + FormControl, + FormField, + FormItem, + FormLabel, + FormMessage, + Input, + Separator, + Tabs, + TabsContent, + TabsList, + TabsTrigger, +} from '@/components/ui'; +import { + SignInWithApple, + SignInWithMicrosoft +} from '@/components/default/auth/buttons/client'; + +const signInFormSchema = z.object({ + email: z.string().email({ + message: 'Please enter a valid email address.' + }), + password: z.string().min(8, { + message: 'Password must be at least 8 characters.' + }), +}); + +const signUpformSchema = z + .object({ + name: z.string().min(2, { + message: 'Name must be at least 2 characters.', + }), + email: z.string().email({ + message: 'Please enter a valid email address.', + }), + password: z.string().min(8, { + message: 'Password must be at least 8 characters.', + }), + confirmPassword: z.string().min(8, { + message: 'Password must be at least 8 characters.', + }), + }) + .refine((data) => data.password === data.confirmPassword, { + message: 'Passwords do not match!', + path: ['confirmPassword'], + }); + +export const SignInCard = () => { + const router = useRouter(); + const { isAuthenticated, loading, refreshUser } = useAuth(); + const [statusMessage, setStatusMessage] = useState(''); + const supabase = useSupabaseClient(); + + const signInForm = useForm>({ + resolver: zodResolver(signInFormSchema), + defaultValues: { + email: '', + password: '', + }, + }); + + const signUpForm = useForm>({ + resolver: zodResolver(signUpformSchema), + defaultValues: { + name: '', + email: '', + password: '', + confirmPassword: '', + }, + }); + + useEffect(() => { + if (isAuthenticated) router.push('/'); + }, [isAuthenticated, router]); + + const handleSignIn = async (values: z.infer) => { + try { + setStatusMessage(''); + const formData = new FormData(); + formData.append('email', values.email); + formData.append('password', values.password); + if (!supabase) throw new Error('Supabase client not found'); + const result = await signIn(supabase, formData); + if (result.error) throw new Error(result.error.message); + else if (result.data) { + await refreshUser(); + signInForm.reset(); + router.push(''); + } + } catch (error) { + setStatusMessage(`Error signing in: ${error as string}`); + } + }; + + const handleSignUp = async (values: z.infer) => { + try { + + } catch { + + } + }; + + return ( + + ); + +}; + diff --git a/src/components/default/forms/index.tsx b/src/components/default/forms/index.tsx index e1e1b64..1fc702a 100644 --- a/src/components/default/forms/index.tsx +++ b/src/components/default/forms/index.tsx @@ -1,2 +1,2 @@ -export { StatusMessage } from './StatusMessage'; -export { SubmitButton } from './SubmitButton'; +export { StatusMessage } from './status-message'; +export { SubmitButton } from './submit-button'; diff --git a/src/components/default/forms/StatusMessage.tsx b/src/components/default/forms/status-message.tsx similarity index 100% rename from src/components/default/forms/StatusMessage.tsx rename to src/components/default/forms/status-message.tsx diff --git a/src/components/default/forms/SubmitButton.tsx b/src/components/default/forms/submit-button.tsx similarity index 100% rename from src/components/default/forms/SubmitButton.tsx rename to src/components/default/forms/submit-button.tsx