diff --git a/package.json b/package.json index 4eee4cf..90be871 100644 --- a/package.json +++ b/package.json @@ -60,5 +60,5 @@ "ct3aMetadata": { "initVersion": "7.39.3" }, - "packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977" + "packageManager": "pnpm@10.11.1+sha512.e519b9f7639869dc8d5c3c5dfef73b3f091094b0a006d7317353c72b124e80e1afd429732e28705ad6bfa1ee879c1fce46c128ccebd3192101f43dd67c667912" } diff --git a/public/favicon-96x96.png b/public/favicon.png similarity index 100% rename from public/favicon-96x96.png rename to public/favicon.png diff --git a/public/icons/apple.svg b/public/icons/apple.svg new file mode 100644 index 0000000..381f84a --- /dev/null +++ b/public/icons/apple.svg @@ -0,0 +1,19 @@ + + + + + apple [#173] + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/icons/microsoft.svg b/public/icons/microsoft.svg new file mode 100644 index 0000000..89ff5b9 --- /dev/null +++ b/public/icons/microsoft.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/app/(auth-pages)/profile/page.tsx b/src/app/(auth-pages)/profile/page.tsx index 39a6147..acd5341 100644 --- a/src/app/(auth-pages)/profile/page.tsx +++ b/src/app/(auth-pages)/profile/page.tsx @@ -81,7 +81,7 @@ const ProfilePage = () => { } return ( -
+
Your Profile diff --git a/src/app/(auth-pages)/sign-in/page.tsx b/src/app/(auth-pages)/sign-in/page.tsx index 79fb481..c554542 100644 --- a/src/app/(auth-pages)/sign-in/page.tsx +++ b/src/app/(auth-pages)/sign-in/page.tsx @@ -80,10 +80,10 @@ const Login = () => { return ( - + Sign In - + Don't have an account?{' '} Sign up @@ -101,7 +101,7 @@ const Login = () => { name='email' render={({ field }) => ( - Email + Email @@ -116,7 +116,7 @@ const Login = () => { render={({ field }) => (
- Password + Password { Sign in @@ -149,7 +150,6 @@ const Login = () => { - diff --git a/src/app/(auth-pages)/sign-up/page.tsx b/src/app/(auth-pages)/sign-up/page.tsx index 7719b57..0a280da 100644 --- a/src/app/(auth-pages)/sign-up/page.tsx +++ b/src/app/(auth-pages)/sign-up/page.tsx @@ -97,10 +97,10 @@ const SignUp = () => { return ( - + Sign Up - + Already have an account?{' '} Sign in @@ -115,7 +115,7 @@ const SignUp = () => { name='name' render={({ field }) => ( - Name + Name @@ -127,7 +127,7 @@ const SignUp = () => { name='email' render={({ field }) => ( - Email + Email @@ -140,7 +140,7 @@ const SignUp = () => { name='password' render={({ field }) => ( - Password + Password @@ -153,7 +153,7 @@ const SignUp = () => { name='confirmPassword' render={({ field }) => ( - Confirm Password + Confirm Password @@ -170,10 +170,11 @@ const SignUp = () => { : )} - Sign up + Sign Up diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 80d8fc0..0be671d 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -42,7 +42,7 @@ export const metadata: Metadata = { { url: '/favicon.ico', type: 'image/x-icon', sizes: 'any' }, { url: '/favicon-16x16.png', type: 'image/png', sizes: '16x16'}, { url: '/favicon-32x32.png', type: 'image/png', sizes: '32x32'}, - { url: '/favicon-96x96.png', type: 'image/png', sizes: '96x96'}, + { url: '/favicon.png', type: 'image/png', sizes: '96x96'}, { url: '/favicon.ico', type: 'image/x-icon', sizes: 'any', media: '(prefers-color-scheme: dark)' }, { url: '/favicon-16x16.png', type: 'image/png', sizes: '16x16', media: '(prefers-color-scheme: dark)' }, { url: '/favicon-32x32.png', type: 'image/png', sizes: '32x32', media: '(prefers-color-scheme: dark)' }, diff --git a/src/components/default/auth/SignInWithApple.tsx b/src/components/default/auth/SignInWithApple.tsx index b74395b..3bd0989 100644 --- a/src/components/default/auth/SignInWithApple.tsx +++ b/src/components/default/auth/SignInWithApple.tsx @@ -38,16 +38,23 @@ export const SignInWithApple = () => { }; return ( -
+ -
- Apple logo -

Sign in with Apple

+
+ Apple logo +

Sign in with Apple

{statusMessage && ( diff --git a/src/components/default/auth/SignInWithMicrosoft.tsx b/src/components/default/auth/SignInWithMicrosoft.tsx index e5911e6..ece1cd8 100644 --- a/src/components/default/auth/SignInWithMicrosoft.tsx +++ b/src/components/default/auth/SignInWithMicrosoft.tsx @@ -38,7 +38,10 @@ export const SignInWithMicrosoft = () => { }; return ( - + { type="submit" >
- Microsoft logo -

Sign in with Microsoft

+ Microsoft logo +

Sign in with Microsoft

 {statusMessage && ( diff --git a/src/components/default/navigation/index.tsx b/src/components/default/navigation/index.tsx index f5ce536..947c4df 100644 --- a/src/components/default/navigation/index.tsx +++ b/src/components/default/navigation/index.tsx @@ -18,7 +18,7 @@ const Navigation = () => { >
- T3 Logo + T3 Logo

T3 Supabase Template

diff --git a/src/lib/hooks/auth.ts b/src/lib/hooks/auth.ts index 335db86..5826515 100644 --- a/src/lib/hooks/auth.ts +++ b/src/lib/hooks/auth.ts @@ -60,6 +60,31 @@ export const signIn = async ( } }; + +export const signInWithMicrosoft = async (): Promise> => { + const supabase = createClient(); + const { data, error } = await supabase.auth.signInWithOAuth({ + provider: 'azure', + options: { + scopes: 'openid, profile email offline_access', + } + }); + if (error) return { success: false, error: error.message }; + return { success: true, data: data.url}; +}; + +export const signInWithApple = async (): Promise> => { + const supabase = createClient(); + const { data, error } = await supabase.auth.signInWithOAuth({ + provider: 'apple', + options: { + scopes: 'openid, profile email offline_access', + } + }); + if (error) return { success: false, error: error.message }; + return { success: true, data: data.url}; +}; + export const forgotPassword = async (formData: FormData): Promise> => { const email = formData.get('email') as string; const supabase = createClient();