gib/techtracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Never got Microsoft Sign in working, but we have my auth at least

Browse Source
This commit is contained in:
Gabriel Brown
2025-09-19 11:29:35 -05:00
parent 6249d51311
commit e7cdf7f754
11 changed files with 171 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/next/package.json
View File

@@ -30,7 +30,7 @@
"@t3-oss/env-nextjs": "^0.13.8",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"convex": "^1.27.0",
"convex": "^1.27.1",
"eslint-plugin-prettier": "^5.5.4",
"lucide-react": "^0.542.0",
"next": "^15.5.3",

BIN
apps/next/public/icons/misc/gibs-auth-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 845 KiB

BIN
apps/next/public/icons/misc/gibs-auth.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 425 KiB

63
apps/next/src/app/(auth)/signin/page.tsx
View File

@@ -3,6 +3,7 @@ import { z } from 'zod';
import { zodResolver } from '@hookform/resolvers/zod';
import { useForm } from 'react-hook-form';
import Link from 'next/link';
import Image from 'next/image';
import { useAuthActions } from '@convex-dev/auth/react';
import { useRouter } from 'next/navigation';
import { ConvexError } from 'convex/values';
@@ -213,7 +214,7 @@ const SignIn = () => {
<SubmitButton
disabled={loading}
pendingText='Signing in...'
className='text-lg font-semibold w-2/3 mx-auto'
className='text-xl font-semibold w-2/3 mx-auto'
>
Sign In
</SubmitButton>
@@ -228,25 +229,22 @@ const SignIn = () => {
</div>
<div className='flex my-auto justify-center'>
<Button
size='lg'
onClick={() => signIn('authentik')}
className='text-lg font-semibold w-2/3 mx-auto'
className='text-lg font-semibold w-5/6 mx-auto'
>
Sign In with Gib&apos;s Auth
</Button>
</div>
<div className='flex my-auto justify-center w-2/3'>
<div className='flex flex-row w-1/3 items-center my-2.5'>
<Separator className='py-0.5 mr-3' />
<span className='font-semibold text-lg'>or</span>
<Separator className='py-0.5 ml-3' />
</div>
</div>
<div className='flex my-auto justify-center'>
<Button
onClick={() => signIn('microsoft-entra-id')}
className='text-lg font-semibold w-2/3 mx-auto'
>
Sign In with Microsoft
<div className='flex flex-row space-x-2 my-auto'>
<Image
src={'/icons/misc/gibs-auth-logo.png'}
className=''
alt='Gib&apos;s Auth'
width={30}
height={30}
/>
<p className='my-auto'>
Sign In with Gib&apos;s Auth
</p>
</div>
</Button>
</div>
</CardContent>
@@ -341,12 +339,39 @@ const SignIn = () => {
<SubmitButton
disabled={loading}
pendingText='Signing Up...'
className='text-lg font-semibold w-2/3 mx-auto'
className='text-xl font-semibold w-2/3 mx-auto'
>
Sign Up
</SubmitButton>
</form>
</Form>
<div className='flex my-auto justify-center w-2/3'>
<div className='flex flex-row w-1/3 items-center my-2.5'>
<Separator className='py-0.5 mr-3' />
<span className='font-semibold text-lg'>or</span>
<Separator className='py-0.5 ml-3' />
</div>
</div>
<div className='flex my-auto justify-center'>
<Button
size='lg'
onClick={() => signIn('authentik')}
className='text-lg font-semibold w-5/6 mx-auto'
>
<div className='flex flex-row space-x-2 my-auto'>
<Image
src={'/icons/misc/gibs-auth-logo.png'}
className=''
alt='Gib&apos;s Auth'
width={30}
height={30}
/>
<p className='my-auto'>
Sign Up with Gib&apos;s Auth
</p>
</div>
</Button>
</div>
</CardContent>
</Card>
</TabsContent>