From a1576dd16fabf6a135970773bd4da6977cd7cf63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B8=D1=82=D0=B0=D0=BB=D0=B8=D0=B9=20=D0=9B=D0=B0?=
=?UTF-8?q?=D0=B2=D1=88=D0=BE=D0=BD=D0=BE=D0=BA?=
<114582703+valavshonok@users.noreply.github.com>
Date: Thu, 23 Oct 2025 18:42:47 +0300
Subject: [PATCH] logining
---
src/pages/Home.tsx | 14 +++++++++++++-
src/redux/slices/auth.ts | 2 ++
src/views/home/auth/Register.tsx | 2 +-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx
index 53a4d8d..cb7eb27 100644
--- a/src/pages/Home.tsx
+++ b/src/pages/Home.tsx
@@ -3,8 +3,20 @@ import { Route, Routes } from "react-router-dom";
import Login from "../views/home/auth/Login";
import Register from "../views/home/auth/Register";
import Menu from "../views/home/menu/Menu";
+import { useAppDispatch, useAppSelector } from "../redux/hooks";
+import { useEffect } from "react";
+import { fetchWhoAmI } from "../redux/slices/auth";
const Home = () => {
+ const name = useAppSelector((state) => state.auth.username);
+ const jwt = useAppSelector((state) => state.auth.jwt);
+ const dispatch = useAppDispatch();
+
+ useEffect(() => {
+ dispatch(fetchWhoAmI());
+ }, [jwt])
+
+
return (
@@ -15,7 +27,7 @@ const Home = () => {
} />
} />
} />
-
+
diff --git a/src/redux/slices/auth.ts b/src/redux/slices/auth.ts
index c526bd0..ba9e681 100644
--- a/src/redux/slices/auth.ts
+++ b/src/redux/slices/auth.ts
@@ -98,6 +98,7 @@ const authSlice = createSlice({
});
builder.addCase(registerUser.fulfilled, (state, action: PayloadAction<{ jwt: string; refreshToken: string }>) => {
state.status = "succeeded";
+ axios.defaults.headers.common['Authorization'] = `Bearer ${action.payload.jwt}`;
state.jwt = action.payload.jwt;
state.refreshToken = action.payload.refreshToken;
});
@@ -113,6 +114,7 @@ const authSlice = createSlice({
});
builder.addCase(loginUser.fulfilled, (state, action: PayloadAction<{ jwt: string; refreshToken: string }>) => {
state.status = "succeeded";
+ axios.defaults.headers.common['Authorization'] = `Bearer ${action.payload.jwt}`;
state.jwt = action.payload.jwt;
state.refreshToken = action.payload.refreshToken;
});
diff --git a/src/views/home/auth/Register.tsx b/src/views/home/auth/Register.tsx
index 9d4008e..fb5c38e 100644
--- a/src/views/home/auth/Register.tsx
+++ b/src/views/home/auth/Register.tsx
@@ -24,7 +24,7 @@ const Register = () => {
useEffect(() => {
dispatch(setMenuActivePage("account"));
if (jwt) {
- navigate("/home/offices");
+ navigate("/home");
}
}, [jwt]);