Fixed the user loading
This commit is contained in:
parent
4cdeb5525a
commit
e93926fca3
@ -4,7 +4,7 @@ import { env } from "@utils/env";
|
|||||||
import { verifyJwt } from "@utils/verifyJwt";
|
import { verifyJwt } from "@utils/verifyJwt";
|
||||||
import { prisma } from "@utils/prisma";
|
import { prisma } from "@utils/prisma";
|
||||||
|
|
||||||
export async function POST(req: Request) {
|
export async function GET() {
|
||||||
let cookieStore;
|
let cookieStore;
|
||||||
try {
|
try {
|
||||||
cookieStore = await cookies();
|
cookieStore = await cookies();
|
||||||
@ -14,18 +14,19 @@ export async function POST(req: Request) {
|
|||||||
const payload = await verifyJwt({ token, secret: env.JWT_SECRET_KEY });
|
const payload = await verifyJwt({ token, secret: env.JWT_SECRET_KEY });
|
||||||
|
|
||||||
const user = await prisma.user.findUnique({
|
const user = await prisma.user.findUnique({
|
||||||
where: { id: payload.userId },
|
where: { id: payload.userId as number },
|
||||||
include: {
|
include: {
|
||||||
|
earthquakes: true,
|
||||||
|
observatories: true,
|
||||||
|
artefacts: true,
|
||||||
|
purchasedOrders: true,
|
||||||
|
requests: true,
|
||||||
scientist: {
|
scientist: {
|
||||||
include: {
|
include: {
|
||||||
earthquakes: true,
|
|
||||||
observatories: true,
|
|
||||||
artefacts: true,
|
|
||||||
superior: true,
|
superior: true,
|
||||||
subordinates: true,
|
subordinates: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
purchasedArtefacts: true,
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -1,4 +1,5 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
import useSWR from "swr";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
@ -10,6 +11,7 @@ import { Inter } from "next/font/google";
|
|||||||
|
|
||||||
import { StoreModel } from "@appTypes/StoreModel";
|
import { StoreModel } from "@appTypes/StoreModel";
|
||||||
import Navbar from "@components/Navbar";
|
import Navbar from "@components/Navbar";
|
||||||
|
import { fetcher } from "@utils/axiosHelpers";
|
||||||
|
|
||||||
const inter = Inter({
|
const inter = Inter({
|
||||||
subsets: ["latin"],
|
subsets: ["latin"],
|
||||||
@ -34,25 +36,17 @@ const store = createStore<StoreModel>({
|
|||||||
|
|
||||||
function UserFetcher() {
|
function UserFetcher() {
|
||||||
const setUser = useStoreActions((actions) => actions.setUser);
|
const setUser = useStoreActions((actions) => actions.setUser);
|
||||||
|
const { data, error } = useSWR("/api/user", fetcher);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
async function fetchUser() {
|
data && data.user && setUser(data.user);
|
||||||
try {
|
}, [setUser, data]);
|
||||||
const response = await axios.post("/api/get-user");
|
|
||||||
if (response.status === 200 && response.data.user) {
|
|
||||||
setUser(response.data.user);
|
|
||||||
} else {
|
|
||||||
setUser(null); // Clear user if no user found
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Error fetching user:", error);
|
|
||||||
setUser(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fetchUser();
|
|
||||||
}, [setUser]); // Run once on mount
|
|
||||||
|
|
||||||
return null; // No UI needed
|
useEffect(() => {
|
||||||
|
error && error.status === 401 && setUser(null);
|
||||||
|
}, [setUser, error]);
|
||||||
|
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
export default function RootLayout({
|
export default function RootLayout({
|
||||||
children,
|
children,
|
||||||
@ -66,7 +60,7 @@ export default function RootLayout({
|
|||||||
<UserFetcher></UserFetcher>
|
<UserFetcher></UserFetcher>
|
||||||
<Navbar></Navbar>
|
<Navbar></Navbar>
|
||||||
<div className="flex-1 overflow-y-auto">{children}</div>
|
<div className="flex-1 overflow-y-auto">{children}</div>
|
||||||
</body>
|
</body>
|
||||||
</StoreProvider>
|
</StoreProvider>
|
||||||
</html>
|
</html>
|
||||||
);
|
);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user