Skip to content

added admin controllerwhere admin can delete user id #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dynamic-Aryan wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

added admin controllerwhere admin can delete user id #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2882be3
added admin controllerwhere admin can delete user id
aryanpachchigar Apr 16, 2025
007797d
added admin controller updated as required
aryanpachchigar Apr 17, 2025
452c778
added admin controller updated as required
aryanpachchigar Apr 17, 2025
6a1ed2f
updated new things for admin and owner
aryanpachchigar Apr 18, 2025
74e50e8
updated new things for admin and owner
aryanpachchigar Apr 18, 2025
eb77279
as per requiremnt ,new changes are done hereby for admin
aryanpachchigar Apr 19, 2025
a180767
as per requiremnt ,new changes are done hereby for admin
aryanpachchigar Apr 19, 2025
61e1da1
Merge branch 'dev' into adminpart
alvarotorrestx Apr 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
248 changes: 156 additions & 92 deletions client/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.6",
"vite": "^5.2.0"
"vite": "^5.4.18"
}
}
51 changes: 38 additions & 13 deletions client/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,49 +21,74 @@ import ThemeContext from './assets/context/ThemeContext';
import useAuth from './auth/useAuth';
import { ProfileProvider } from './assets/context/ProfileContext';
import Network from './assets/components/network/Network';
import Adminpage from './assets/components/Admin/Adminpage';
import Usersprofile from './assets/components/Admin/Usersprofile';


function App() {

const { darkMode } = useContext(ThemeContext);
const { auth } = useAuth();

return (
<main className='w-full min-h-screen' data-theme={darkMode ? "dim" : "nord"}>
<div className='max-w-[2000px] mx-auto min-h-screen px-2 py-6 bg-base-200'>
<Routes>
<main
className="w-full min-h-screen"
data-theme={darkMode ? "dim" : "nord"}
>
<div className="max-w-[2000px] mx-auto min-h-screen px-2 py-6 bg-base-200">
<Routes>
<Route path="*" element={<NotFound />} />
<Route path='*' element={<Navigate to='/' replace />} />
<Route path='/unauthorized' element={<Unauthorized />} />

<Route element={<PersistLogin />}>
<Route element={<RedirectIfAuth />}>
<Route path='/' element={<Login />} />
<Route path='/register' element={<Register />} />
<Route path='/login' element={<Login />} />
<Route path="/" element={<Login />} />
<Route path="/register" element={<Register />} />
<Route path="/login" element={<Login />} />
</Route>
</Route>

{/* Protected Routes */}
<Route element={<PersistLogin />}>
<Route element={<RequireAuth allowedRoles={['owner', 'admin', 'moderator', 'user']} />}>
<Route
element={
<RequireAuth
allowedRoles={["owner", "admin", "moderator", "user"]}
/>
}
>
<Route element={<Layout />}>
<Route path='/dashboard' element={<Dashboard />} />
<Route path='/profile' element={<Navigate to={`/profile/${auth?.username}`} />} />
<Route path="/dashboard" element={<Dashboard />} />
<Route
path="/profile"
element={<Navigate to={`/profile/${auth?.username}`} />}
/>
<Route path="/profile/:username" element={<ProfileProvider />}>
<Route index element={<Profile />} />
<Route path="edit" element={<EditProfile />} />
</Route>
<Route path='/network' element={<Network />} />
<Route path='/tester' element={<TesterComponent />} />
<Route path="/network" element={<Network />} />

<Route path="/tester" element={<TesterComponent />} />
</Route>
</Route>

<Route element={<RequireAuth allowedRoles={["owner", "admin"]} />}>
<Route element={<Layout />}>
<Route path="/adminpage" element={<Adminpage />} />
<Route path="/admin/profile/:username" element={<ProfileProvider />} >
<Route index element={<Usersprofile />} />
<Route path="edit" element={<EditProfile />} />
</Route>
</Route>
</Route>
</Route>
{/* End Protected Routes */}

</Routes>
</div>
</main>
)
);
}

export default App
Loading