Skip to content

fIX: logout redirect #369

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

Merged
dotunv merged 1 commit into from
Jun 27, 2026
Merged

fIX: logout redirect #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
87 changes: 64 additions & 23 deletions frontend/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,40 +22,81 @@ import { ThemeProvider } from './context/ThemeContext';
import { ToastProvider } from './context/ToastContext';
import { NetworkStatusProvider } from './context/NetworkStatusContext';
import { OfflineBanner } from './components/OfflineBanner';
import { useAuth } from './context/AuthContext';

export default function App() {
const location = useLocation();
const hideNavbar =
location.pathname.startsWith('/widget/') || location.pathname.startsWith('/embed/');
function PrivateRoute({ children }) {
const { user, ready } = useAuth();
if (!ready) return null;
return user ? children : <Navigate to="/login" replace />;
}

return (
<ThemeProvider>
<AuthProvider>
<ToastProvider>
<NetworkStatusProvider>
<OfflineBanner />
{!hideNavbar && <Navbar />}
<Routes>
<Route path="/" element={<Home />} />
<Route path="/campaigns/new" element={<CreateCampaign />} />
<Route path="/campaigns/:id" element={<Campaign />} />
<Route path="/campaigns/:id/invite/:token" element={<AcceptInvite />} />
<Route path="/embed/campaigns/:id" element={<CampaignEmbed />} />
<Route path="/widget/campaigns/:id" element={<Widget />} />
<Route path="/login" element={<Login />} />
<Route path="/register" element={<Register />} />
<Route path="/forgot-password" element={<ForgotPassword />} />
<Route path="/reset-password" element={<ResetPassword />} />
<Route path="/admin" element={<AdminDashboard />} />
<Route path="/developer" element={<Developer />} />
<Route path="/dashboard" element={<Dashboard />} />
<Route path="/profile" element={<Profile />} />
<Route
path="/my-contributions"
element={<Navigate to="/dashboard?tab=contributions" replace />}
/>
<Route path="*" element={<NotFound />} />
</Routes>
<OfflineBanner />
{!hideNavbar && <Navbar />}
<Routes>
<Route path="/" element={<Home />} />
<Route
path="/campaigns/new"
element={
<PrivateRoute>
<CreateCampaign />
</PrivateRoute>
}
/>
<Route path="/campaigns/:id" element={<Campaign />} />
<Route path="/campaigns/:id/invite/:token" element={<AcceptInvite />} />
<Route path="/embed/campaigns/:id" element={<CampaignEmbed />} />
<Route path="/widget/campaigns/:id" element={<Widget />} />
<Route path="/login" element={<Login />} />
<Route path="/register" element={<Register />} />
<Route path="/forgot-password" element={<ForgotPassword />} />
<Route path="/reset-password" element={<ResetPassword />} />
<Route
path="/admin"
element={
<PrivateRoute>
<AdminDashboard />
</PrivateRoute>
}
/>
<Route
path="/developer"
element={
<PrivateRoute>
<Developer />
</PrivateRoute>
}
/>
<Route
path="/dashboard"
element={
<PrivateRoute>
<Dashboard />
</PrivateRoute>
}
/>
<Route
path="/profile"
element={
<PrivateRoute>
<Profile />
</PrivateRoute>
}
/>
<Route
path="/my-contributions"
element={<Navigate to="/dashboard?tab=contributions" replace />}
/>
<Route path="*" element={<NotFound />} />
</Routes>
</NetworkStatusProvider>
</ToastProvider>
</AuthProvider>
Expand Down
26 changes: 15 additions & 11 deletions frontend/src/components/Navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,25 @@ export default function Navbar() {
}
}

function handleLogout() {
logout();
navigate('/');
async function handleMarkRead(id) {
try {
await api.markNotificationRead(id);
setNotifications((prev) =>
prev.map((n) => (n.id === id ? { ...n, read_at: new Date().toISOString() } : n))
);
} catch (_err) {}
}

function handleMarkRead(id) {
api.markNotificationRead(id).catch(() => {});
setNotifications((prev) =>
prev.map((n) => (n.id === id ? { ...n, read_at: new Date().toISOString() } : n))
);
async function handleMarkAllRead() {
try {
await api.markAllNotificationsRead();
setNotifications((prev) => prev.map((n) => ({ ...n, read_at: new Date().toISOString() })));
} catch (_err) {}
}

function handleMarkAllRead() {
api.markAllNotificationsRead().catch(() => {});
setNotifications((prev) => prev.map((n) => ({ ...n, read_at: new Date().toISOString() })));
async function handleLogout() {
await logout();
navigate('/');
}

return (
Expand Down