format code
This commit is contained in:
parent
42c0ef8569
commit
56f8aca796
6 changed files with 201 additions and 212 deletions
|
|
@ -6,7 +6,7 @@ export const CatchAllRoute = () => {
|
||||||
|
|
||||||
// Redirect to the root ("/") when the catch-all route is matched
|
// Redirect to the root ("/") when the catch-all route is matched
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
navigate('/');
|
navigate("/");
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
|
||||||
|
|
@ -49,12 +49,9 @@ function ApiInterceptor() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!refreshToken && error?.config?.url?.includes(
|
if (!refreshToken && error?.config?.url?.includes("login")) {
|
||||||
"login"
|
|
||||||
) ){
|
|
||||||
return Promise.reject(error);
|
return Promise.reject(error);
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
logout();
|
logout();
|
||||||
navigate("/login");
|
navigate("/login");
|
||||||
}
|
}
|
||||||
|
|
@ -63,7 +60,6 @@ function ApiInterceptor() {
|
||||||
return Promise.reject(error);
|
return Promise.reject(error);
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@ import {
|
||||||
} from "../../types/components";
|
} from "../../types/components";
|
||||||
import { nodeIconsLucide } from "../../utils/styleUtils";
|
import { nodeIconsLucide } from "../../utils/styleUtils";
|
||||||
import BaseModal from "../baseModal";
|
import BaseModal from "../baseModal";
|
||||||
import InputComponent from "../../components/inputComponent";
|
|
||||||
|
|
||||||
export default function UserManagementModal({
|
export default function UserManagementModal({
|
||||||
title,
|
title,
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ import {
|
||||||
TableRow,
|
TableRow,
|
||||||
} from "../../components/ui/table";
|
} from "../../components/ui/table";
|
||||||
import { alertContext } from "../../contexts/alertContext";
|
import { alertContext } from "../../contexts/alertContext";
|
||||||
|
import { AuthContext } from "../../contexts/authContext";
|
||||||
import {
|
import {
|
||||||
addUser,
|
addUser,
|
||||||
deleteUser,
|
deleteUser,
|
||||||
|
|
@ -23,7 +24,6 @@ import {
|
||||||
} from "../../controllers/API";
|
} from "../../controllers/API";
|
||||||
import ConfirmationModal from "../../modals/ConfirmationModal";
|
import ConfirmationModal from "../../modals/ConfirmationModal";
|
||||||
import UserManagementModal from "../../modals/UserManagementModal";
|
import UserManagementModal from "../../modals/UserManagementModal";
|
||||||
import { AuthContext } from "../../contexts/authContext";
|
|
||||||
|
|
||||||
export default function AdminPage() {
|
export default function AdminPage() {
|
||||||
const [inputValue, setInputValue] = useState("");
|
const [inputValue, setInputValue] = useState("");
|
||||||
|
|
@ -49,9 +49,9 @@ export default function AdminPage() {
|
||||||
setLoadingUsers(true);
|
setLoadingUsers(true);
|
||||||
getUsersPage(index, size)
|
getUsersPage(index, size)
|
||||||
.then((users) => {
|
.then((users) => {
|
||||||
setTotalRowsCount(users['total_count']);
|
setTotalRowsCount(users["total_count"]);
|
||||||
userList.current = users['users'];
|
userList.current = users["users"];
|
||||||
setFilterUserList(users['users']);
|
setFilterUserList(users["users"]);
|
||||||
setLoadingUsers(false);
|
setLoadingUsers(false);
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
|
|
@ -140,12 +140,8 @@ export default function AdminPage() {
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|
||||||
<>
|
<>
|
||||||
{
|
{userData && (
|
||||||
userData && (
|
|
||||||
|
|
||||||
|
|
||||||
<div className="main-page-panel">
|
<div className="main-page-panel">
|
||||||
<div className="m-auto flex h-full flex-row justify-center">
|
<div className="m-auto flex h-full flex-row justify-center">
|
||||||
<div className="basis-5/6">
|
<div className="basis-5/6">
|
||||||
|
|
@ -345,9 +341,7 @@ export default function AdminPage() {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)}
|
||||||
}
|
|
||||||
|
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
import { Route, Routes } from "react-router-dom";
|
import { Route, Routes } from "react-router-dom";
|
||||||
|
import { ProtectedAdminRoute } from "./components/authAdminGuard";
|
||||||
|
import { ProtectedRoute } from "./components/authGuard";
|
||||||
import { ProtectedLoginRoute } from "./components/authLoginGuard";
|
import { ProtectedLoginRoute } from "./components/authLoginGuard";
|
||||||
|
import { CatchAllRoute } from "./components/catchAllRoutes";
|
||||||
import AdminPage from "./pages/AdminPage";
|
import AdminPage from "./pages/AdminPage";
|
||||||
import LoginAdminPage from "./pages/AdminPage/LoginPage";
|
import LoginAdminPage from "./pages/AdminPage/LoginPage";
|
||||||
import CommunityPage from "./pages/CommunityPage";
|
import CommunityPage from "./pages/CommunityPage";
|
||||||
|
|
@ -8,9 +11,6 @@ import HomePage from "./pages/MainPage";
|
||||||
import DeleteAccountPage from "./pages/deleteAccountPage";
|
import DeleteAccountPage from "./pages/deleteAccountPage";
|
||||||
import LoginPage from "./pages/loginPage";
|
import LoginPage from "./pages/loginPage";
|
||||||
import SignUp from "./pages/signUpPage";
|
import SignUp from "./pages/signUpPage";
|
||||||
import { CatchAllRoute } from "./components/catchAllRoutes";
|
|
||||||
import { ProtectedRoute } from "./components/authGuard";
|
|
||||||
import { ProtectedAdminRoute } from "./components/authAdminGuard";
|
|
||||||
|
|
||||||
const Router = () => {
|
const Router = () => {
|
||||||
return (
|
return (
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue