From b15566ef495a653f64969ed40dc2ad95b7017d0b Mon Sep 17 00:00:00 2001 From: JManion32 Date: Fri, 6 Mar 2026 15:16:44 -0500 Subject: [PATCH 1/2] Cleanup login --- src/contexts/AuthContext.tsx | 17 ++++++++--------- src/pages/Home.tsx | 2 +- vite.config.ts | 3 +++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/contexts/AuthContext.tsx b/src/contexts/AuthContext.tsx index 3d2c507..75489e9 100644 --- a/src/contexts/AuthContext.tsx +++ b/src/contexts/AuthContext.tsx @@ -2,9 +2,11 @@ import React, { createContext, useContext, useState, type ReactNode } from 'react'; type User = { - id?: string; - name?: string; + uid?: string; email?: string; + first_name?: string; + last_name?: string; + role?: string; }; type AuthContextType = { @@ -32,10 +34,8 @@ export const AuthProvider: React.FC = ({ children }) => { setLoading(true); const response = await fetch('https://api.capyrpi.org/v1/auth/me', { - headers: { - Accept: 'application/json', - }, - credentials: 'include', + headers: { Accept: 'application/json' }, + credentials: 'include' }); if (response.ok) { @@ -70,9 +70,8 @@ export const AuthProvider: React.FC = ({ children }) => { const pollInterval = setInterval(async () => { try { const response = await fetch('https://api.capyrpi.org/v1/auth/me', { - headers: { - Accept: 'application/json', - }, + headers: { Accept: 'application/json' }, + credentials: 'include' }); if (response.ok) { diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index f90ebae..dfedd36 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -16,7 +16,7 @@ export default function Home() { setShowLogin(false)} />

- UserId: {user?.id ?? 'Not logged in'} + UserId: {user?.uid ?? 'Not logged in'}

diff --git a/vite.config.ts b/vite.config.ts index 8b0f57b..7182207 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -4,4 +4,7 @@ import react from '@vitejs/plugin-react' // https://vite.dev/config/ export default defineConfig({ plugins: [react()], + server: { + port: 5173 + } }) From 4e1774d546e2934f154fa254e0d360d5bef1eb97 Mon Sep 17 00:00:00 2001 From: JManion32 Date: Fri, 6 Mar 2026 15:18:13 -0500 Subject: [PATCH 2/2] Lint --- src/contexts/AuthContext.tsx | 4 ++-- src/pages/Home.tsx | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/contexts/AuthContext.tsx b/src/contexts/AuthContext.tsx index 75489e9..e709f31 100644 --- a/src/contexts/AuthContext.tsx +++ b/src/contexts/AuthContext.tsx @@ -35,7 +35,7 @@ export const AuthProvider: React.FC = ({ children }) => { const response = await fetch('https://api.capyrpi.org/v1/auth/me', { headers: { Accept: 'application/json' }, - credentials: 'include' + credentials: 'include', }); if (response.ok) { @@ -71,7 +71,7 @@ export const AuthProvider: React.FC = ({ children }) => { try { const response = await fetch('https://api.capyrpi.org/v1/auth/me', { headers: { Accept: 'application/json' }, - credentials: 'include' + credentials: 'include', }); if (response.ok) { diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index dfedd36..c68fbe9 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -16,7 +16,8 @@ export default function Home() { setShowLogin(false)} />

- UserId: {user?.uid ?? 'Not logged in'} + UserId:{' '} + {user?.uid ?? 'Not logged in'}