EHSAN official look & auth (Task #5)
Reskin the EHSAN POC to match ehsan.sa and gate the admin area behind a simple POC login. - Official header: cropped EHSAN logo, nav (الرئيسية/الوقف/فرص التبرع/ خدماتنا dropdown→طلب دعم/عن إحسان/براعم إحسان), login/cart/search icons, language toggle, mobile menu. Functional items link; rest are visual-only. - Colors: green primary tuned + orange accent token added in index.css. - Auth: AuthContext (localStorage, admin/admin) + login page; /admin and /whatsapp-log now behind a Protected wrapper redirecting to /login. - Redesigned OpportunityCard (photo, green progress bar with %, category badge, تم جمع/المبلغ المتبقي columns, inline donate button + amount), used on home and opportunities pages. - Two-step donate page (التفاصيل → الدفع): step indicator, presets 100/50/10, custom amount (prefilled via ?amount=), "تبرع عن أهلك" checkbox, donor form (phone min 10 for OpenClaw loop). - 8 need-type card images added; needImages helper maps need→image. - Seed: added published opportunities (req-012..017) with partial progress to showcase cards; one kept near-full for an easy closed-loop demo. Deviation (from code review): donate handler now ACCUMULATES collectedAmount and clamps to target, validates finite/positive amount, and only advances to the closed-loop pipeline when a case is fully funded (previously overwrote and force-advanced — broke partial-progress cases). Donate buttons kept green to match the reference; orange is an accent only.
This commit is contained in:
@@ -1,10 +1,12 @@
|
||||
import { Switch, Route, Router as WouterRouter } from "wouter";
|
||||
import { Switch, Route, Router as WouterRouter, Redirect } from "wouter";
|
||||
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
||||
import { Toaster } from "@/components/ui/toaster";
|
||||
import { TooltipProvider } from "@/components/ui/tooltip";
|
||||
import { LanguageProvider } from "./contexts/LanguageContext";
|
||||
import { AuthProvider, useAuth } from "./contexts/AuthContext";
|
||||
import { AppLayout } from "./components/layout/AppLayout";
|
||||
import NotFound from "@/pages/not-found";
|
||||
import { ComponentType } from "react";
|
||||
|
||||
// Page imports
|
||||
import Home from "./pages/home";
|
||||
@@ -15,9 +17,18 @@ import Admin from "./pages/admin";
|
||||
import Track from "./pages/track";
|
||||
import ThankYou from "./pages/thank-you";
|
||||
import WhatsappLog from "./pages/whatsapp-log";
|
||||
import Login from "./pages/login";
|
||||
|
||||
const queryClient = new QueryClient();
|
||||
|
||||
function Protected({ component: Component }: { component: ComponentType<any> }) {
|
||||
const { isAuthenticated } = useAuth();
|
||||
if (!isAuthenticated) {
|
||||
return <Redirect to="/login" />;
|
||||
}
|
||||
return <Component />;
|
||||
}
|
||||
|
||||
function Router() {
|
||||
return (
|
||||
<AppLayout>
|
||||
@@ -26,10 +37,15 @@ function Router() {
|
||||
<Route path="/request" component={RequestSupport} />
|
||||
<Route path="/opportunities" component={Opportunities} />
|
||||
<Route path="/donate/:id" component={Donate} />
|
||||
<Route path="/admin" component={Admin} />
|
||||
<Route path="/login" component={Login} />
|
||||
<Route path="/admin">
|
||||
<Protected component={Admin} />
|
||||
</Route>
|
||||
<Route path="/track/:id" component={Track} />
|
||||
<Route path="/thank-you/:id" component={ThankYou} />
|
||||
<Route path="/whatsapp-log" component={WhatsappLog} />
|
||||
<Route path="/whatsapp-log">
|
||||
<Protected component={WhatsappLog} />
|
||||
</Route>
|
||||
<Route component={NotFound} />
|
||||
</Switch>
|
||||
</AppLayout>
|
||||
@@ -40,12 +56,14 @@ function App() {
|
||||
return (
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<LanguageProvider>
|
||||
<TooltipProvider>
|
||||
<WouterRouter base={import.meta.env.BASE_URL.replace(/\/$/, "")}>
|
||||
<Router />
|
||||
</WouterRouter>
|
||||
<Toaster />
|
||||
</TooltipProvider>
|
||||
<AuthProvider>
|
||||
<TooltipProvider>
|
||||
<WouterRouter base={import.meta.env.BASE_URL.replace(/\/$/, "")}>
|
||||
<Router />
|
||||
</WouterRouter>
|
||||
<Toaster />
|
||||
</TooltipProvider>
|
||||
</AuthProvider>
|
||||
</LanguageProvider>
|
||||
</QueryClientProvider>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user