wire profile components, login/register routes, spec-driven auth
- src/main.jsx: add /login, /register, /profile/* routes; wire profileComponents from react-auth; pass basePath to Admin - src/Header.tsx: profile button nav to /profile/me; Login to /login - src/openapi-config.ts: wire getToken and profileComponents - react-auth local: sync ProfileCreate, ProfileEdit, ProfileView - react-openapi local: sync all auth + x-profile changes (AppProvider, Admin, ProfileRoutes, SideMenu, types, hooks, etc.)
This commit is contained in:
@@ -134,7 +134,7 @@ export default function Header({
|
||||
</Button>
|
||||
<Button
|
||||
color="inherit"
|
||||
onClick={() => navigate("/admin/profile")}
|
||||
onClick={() => navigate("/profile/me")}
|
||||
sx={{ textTransform: "none", fontWeight: 500 }}
|
||||
>
|
||||
{currentUser.username}
|
||||
@@ -151,7 +151,7 @@ export default function Header({
|
||||
<Button
|
||||
color="inherit"
|
||||
variant="outlined"
|
||||
onClick={() => navigate("/admin")}
|
||||
onClick={() => navigate("/login")}
|
||||
sx={{ textTransform: "none" }}
|
||||
>
|
||||
Login
|
||||
|
||||
65
src/main.jsx
65
src/main.jsx
@@ -4,7 +4,8 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
||||
import {
|
||||
BrowserRouter,
|
||||
Routes,
|
||||
Route
|
||||
Route,
|
||||
useNavigate
|
||||
} from "react-router-dom";
|
||||
import {
|
||||
Box,
|
||||
@@ -14,11 +15,8 @@ import {
|
||||
import Home from './Home';
|
||||
import FetchRequests from './FetchRequest/FetchRequestCreate';
|
||||
import FetchRequestDetail from './FetchRequest/FetchRequestDetail';
|
||||
import { RequireAuth } from './RequireAuth';
|
||||
import { AppProvider, Admin } from '../react-openapi';
|
||||
import { Buffer } from 'buffer';
|
||||
import process from 'process';
|
||||
import { AuthProvider } from "../react-auth";
|
||||
import { AppProvider, Admin, ProfileRoutes } from '../react-openapi';
|
||||
import { AuthProvider, AuthPage, useAuth, ProfileCreate, ProfileEdit, ProfileView } from "../react-auth";
|
||||
import Header from './Header';
|
||||
import Footer from './Footer';
|
||||
import AppTheme from './shared-theme/AppTheme';
|
||||
@@ -26,20 +24,61 @@ import { specConfiguration } from './openapi-config';
|
||||
|
||||
const queryClient = new QueryClient();
|
||||
|
||||
window.Buffer = Buffer;
|
||||
window.process = process;
|
||||
|
||||
const rootElement = document.getElementById('root');
|
||||
const root = createRoot(rootElement);
|
||||
|
||||
const AUTH_BASE = import.meta.env.VITE_AUTH_BASE_URL;
|
||||
|
||||
// Wire profile components from react-auth into the spec-driven admin
|
||||
specConfiguration.profileComponents = {
|
||||
create: ProfileCreate,
|
||||
edit: ProfileEdit,
|
||||
view: ProfileView,
|
||||
};
|
||||
|
||||
function LoginPage() {
|
||||
const { login, register, loading, error, currentUser } = useAuth();
|
||||
const navigate = useNavigate();
|
||||
return (
|
||||
<AuthPage
|
||||
mode="login"
|
||||
onBack={() => navigate("/")}
|
||||
onSwitchMode={() => navigate("/register")}
|
||||
login={login}
|
||||
register={register}
|
||||
loading={loading}
|
||||
error={error}
|
||||
currentUser={currentUser}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function RegisterPage() {
|
||||
const { login, register, loading, error, currentUser } = useAuth();
|
||||
const navigate = useNavigate();
|
||||
return (
|
||||
<AuthPage
|
||||
mode="register"
|
||||
onBack={() => navigate("/")}
|
||||
onSwitchMode={() => navigate("/login")}
|
||||
login={login}
|
||||
register={register}
|
||||
loading={loading}
|
||||
error={error}
|
||||
currentUser={currentUser}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
const routerMapping = [
|
||||
{ path: "/", component: Home, headerTitle: "Home" },
|
||||
{ path: "/home", component: Home, headerTitle: "Home" },
|
||||
{ path: "/login", component: LoginPage, headerTitle: "Login" },
|
||||
{ path: "/register", component: RegisterPage, headerTitle: "Register" },
|
||||
{ path: "/fetch-requests", component: FetchRequests, headerTitle: "Fetch Requests" },
|
||||
{ path: "/fetch-requests/:id", component: FetchRequestDetail, headerTitle: "Fetch Request" },
|
||||
{ path: "/admin/*", component: Admin, headerTitle: "Admin" },
|
||||
{ path: "/profile/*", component: ProfileRoutes, headerTitle: "Profile" },
|
||||
];
|
||||
|
||||
root.render(
|
||||
@@ -59,13 +98,7 @@ root.render(
|
||||
<Route
|
||||
key={path}
|
||||
path={path}
|
||||
element={
|
||||
path.startsWith("/admin") ? (
|
||||
<RequireAuth><Component basePath="/admin" /></RequireAuth>
|
||||
) : (
|
||||
<Component />
|
||||
)
|
||||
}
|
||||
element={<Component basePath={path.replace(/\/\*$/, "")} />}
|
||||
/>
|
||||
))}
|
||||
</Routes>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type { SpecConfiguration } from "../react-openapi";
|
||||
// import { tokenStore } from "../react-auth";
|
||||
import { tokenStore } from "../react-auth";
|
||||
|
||||
const apiBase = import.meta.env.VITE_API_BASE_URL;
|
||||
|
||||
@@ -7,10 +7,10 @@ export const specConfiguration: SpecConfiguration = {
|
||||
specUrl: `${apiBase}/openapi.json`,
|
||||
baseApiUrl: apiBase,
|
||||
title: "Khata",
|
||||
getToken: () => tokenStore.get(),
|
||||
resourceConfig: {
|
||||
expenses: {
|
||||
filterOptions: { mode: "client" },
|
||||
},
|
||||
},
|
||||
// getToken: () => tokenStore.get(),
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user