Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions web/src/components/App/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,6 @@ const App = () => {
<Route path="auth/*" element={<AuthPage />} />
<Route path="admin/*">
<Route index element={<Navigate to="users" />} />
<Route
path="activity/*"
element={
<ProtectedRoute adminRequired>
<ActivityLogPage />
</ProtectedRoute>
}
/>
<Route
path="acl/*"
element={
Expand Down Expand Up @@ -172,6 +164,14 @@ const App = () => {
/>
<Route path="*" element={<Navigate to="users" />} />
</Route>
<Route
path="activity/*"
element={
<ProtectedRoute>
<ActivityLogPage />
</ProtectedRoute>
}
/>
<Route
path="me/*"
element={
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/Navigation/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@ export const Navigation = () => {
},
{
title: LL.navigation.bar.activity(),
linkPath: '/admin/activity',
linkPath: '/activity',
icon: <NavigationActivityLogPageIcon />,
adminOnly: true,
adminOnly: false,
enabled: true,
},
{
Expand Down