Skip to content
This repository has been archived by the owner on Nov 20, 2023. It is now read-only.

Commit

Permalink
sidebar design add and login and signup page customize the code
Browse files Browse the repository at this point in the history
  • Loading branch information
mytechworker committed Nov 6, 2023
1 parent 4a400da commit b8725fe
Show file tree
Hide file tree
Showing 26 changed files with 344 additions and 434 deletions.
80 changes: 47 additions & 33 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import Login from "./pages/auth/Login";
import Register from "./pages/auth/Register";
import { ToastContainer } from "react-toastify";
import "react-toastify/dist/ReactToastify.css";
import PrivateRoutes from "./components/PrivateRoutes";
import Jobs from "./pages/Jobs";
import Tasks from "./pages/Tasks";
import JobForm from "./pages/Jobs/Form";
Expand Down Expand Up @@ -39,6 +38,7 @@ import Dote from "@/assets/images/Dote.svg";
import { setMenuItems } from "@/redux/features/menuSlice";
import { useEffect } from "react";
import { useAppDispatch } from "./app/hooks";
import UnauthorizePage from "./pages/UnAuthorized";
function App() {
const dispatch = useAppDispatch();
const newMenuItems = [
Expand Down Expand Up @@ -116,6 +116,7 @@ function App() {
<Routes>
<Route path="/" element={<Login />} />
<Route path="/signup" element={<Register />} />
<Route path="/unauthorized" element={<UnauthorizePage />} />
<Route path="/change-password" element={<ChangePass />} />
<Route path="*" element={<NotFound />} />

Expand All @@ -127,50 +128,63 @@ function App() {
</Route>
</Route>

<Route path="/dashboard" element={<Outlet />}>
<Route index element={<Dashboard />} />
<Route element={<RequireUser />}>
<Route path="/dashboard" element={<Outlet />}>
<Route index element={<Dashboard />} />
</Route>
</Route>

<Route path="/tasks" element={<Outlet />}>
<Route index element={<Tasks />} />
<Route path="form" element={<TaskForm />} />
<Route path="form/:id" element={<TaskForm />} />
<Route element={<RequireUser />}>
<Route path="/tasks" element={<Outlet />}>
<Route index element={<Tasks />} />
<Route path="form" element={<TaskForm />} />
<Route path="form/:id" element={<TaskForm />} />
</Route>
</Route>

<Route path="/dependency" element={<Outlet />}>
<Route index element={<Dependencys />} />
<Route path="form" element={<DependencyForm />} />
<Route path="form/:id" element={<DependencyForm />} />
<Route path="dependencytype" element={<Outlet />}>
<Route index element={<DependencyType />} />
<Route path="form" element={<DependencyTypeForm />} />
<Route path="form/:id" element={<DependencyTypeForm />} />
<Route element={<RequireUser />}>
<Route path="/dependency" element={<Outlet />}>
<Route index element={<Dependencys />} />
<Route path="form" element={<DependencyForm />} />
<Route path="form/:id" element={<DependencyForm />} />
<Route path="dependencytype" element={<Outlet />}>
<Route index element={<DependencyType />} />
<Route path="form" element={<DependencyTypeForm />} />
<Route path="form/:id" element={<DependencyTypeForm />} />
</Route>
</Route>
</Route>

<Route path="/resources" element={<Outlet />}>
<Route index element={<Resources />} />
<Route path="form" element={<ResourceForm />} />
<Route path="form/:id" element={<ResourceForm />} />
<Route element={<RequireUser />}>
<Route path="/resources" element={<Outlet />}>
<Route index element={<Resources />} />
<Route path="form" element={<ResourceForm />} />
<Route path="form/:id" element={<ResourceForm />} />
</Route>

<Route path="resourcegroup" element={<Outlet />}>
<Route index element={<ResourcesGroup />} />
<Route path="form" element={<ResourceGroupForm />} />
<Route path="form/:id" element={<ResourceGroupForm />} />
<Route element={<RequireUser />}>
<Route path="resourcegroup" element={<Outlet />}>
<Route index element={<ResourcesGroup />} />
<Route path="form" element={<ResourceGroupForm />} />
<Route path="form/:id" element={<ResourceGroupForm />} />
</Route>
</Route>
</Route>

<Route path="/exception" element={<Outlet />}>
<Route path="/exception" index element={<Exception />} />
<Route path="form" element={<ExceptionForm />} />
<Route path="form/:id" element={<ExceptionForm />} />
<Route path="exception-type" element={<ExceptionType />} />
<Route element={<RequireUser />}>
<Route path="/exception" element={<Outlet />}>
<Route path="/exception" index element={<Exception />} />
<Route path="form" element={<ExceptionForm />} />
<Route path="form/:id" element={<ExceptionForm />} />
<Route path="exception-type" element={<ExceptionType />} />
</Route>
</Route>

<Route path="/template" element={<Outlet />}>
<Route index element={<Template />} />
<Route path="form" element={<TemplateForm />} />
<Route path="form/:id" element={<TemplateForm />} />
<Route element={<RequireUser />}>
<Route path="/template" element={<Outlet />}>
<Route index element={<Template />} />
<Route path="form" element={<TemplateForm />} />
<Route path="form/:id" element={<TemplateForm />} />
</Route>
</Route>
</Routes>
</ThemeProvider>
Expand Down
Binary file added frontend/src/assets/images/delete.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions frontend/src/assets/sidebar/dashboard.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions frontend/src/assets/sidebar/description.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions frontend/src/assets/sidebar/production.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions frontend/src/assets/sidebar/resource.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b8725fe

Please sign in to comment.