build: fce83541-8c54-465f-a1fc-71388f99db57

android/app/build.gradle

@@ -4,7 +4,7 @@ android {
     namespace = "io.ionic.starter"
     compileSdk = rootProject.ext.compileSdkVersion
     defaultConfig {
-        applicationId "io.ionic.starter"
+        applicationId "com.afmeaglesnzw.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1

android/app/src/main/AndroidManifest.xml

@@ -21,6 +21,12 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="com.afmeaglesnzw.app" />
+            </intent-filter>
 
         </activity>
 

android/app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">healthcare</string>
+    <string name="app_name">AFM.EAGLESNZW</string>
-    <string name="title_activity_main">healthcare</string>
+    <string name="title_activity_main">AFM.EAGLESNZW</string>
     <string name="package_name">io.ionic.starter</string>
     <string name="custom_url_scheme">io.ionic.starter</string>
 </resources>

android/variables.gradle

@@ -15,5 +15,4 @@ ext {
     cordovaAndroidVersion = '14.0.1'
     rgcfaIncludeGoogle = true
     androidxCredentialsVersion = '1.3.0'
-    javaVersion = JavaVersion.VERSION_17
 }

capacitor.config.ts

@@ -1,8 +1,8 @@
 import type { CapacitorConfig } from '@capacitor/cli';
 
 const config: CapacitorConfig = {
-  appId: 'com.healthcare.app',
+  appId: 'com.afmeaglesnzw.app',
-  appName: 'healthcare',
+  appName: 'AFM.EAGLESNZW',
   webDir: 'dist',
   plugins: {
     FirebaseAuthentication: {

ios/App/App.xcodeproj/project.pbxproj

@@ -308,7 +308,7 @@
 				);
 				MARKETING_VERSION = 1.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
-				PRODUCT_BUNDLE_IDENTIFIER = com.healthcare.app;
+				PRODUCT_BUNDLE_IDENTIFIER = com.afmeaglesnzw.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_VERSION = 5.0;
@@ -330,7 +330,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.healthcare.app;
+				PRODUCT_BUNDLE_IDENTIFIER = com.afmeaglesnzw.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
 				SWIFT_VERSION = 5.0;

ios/App/App/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-        <string>healthcare</string>
+        <string>AFM.EAGLESNZW</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -51,12 +51,16 @@
 	<array>
 		<dict>
 			<key>CFBundleURLName</key>
-			<string>com.healthcare.app</string>
+			<string>com.afmeaglesnzw.app</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>com.healthcare.app</string>
+				<string>com.afmeaglesnzw.app</string>
 			</array>
 		</dict>
 	</array>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This app needs access to your photo library.</string>
+	<key>NSCameraUsageDescription</key>
+	<string>This app needs camera access.</string>
 </dict>
 </plist>

package.json

@@ -18,13 +18,14 @@
     "@capacitor/haptics": "8.0.2",
     "@capacitor/ios": "8.3.4",
     "@capacitor/keyboard": "8.0.3",
+    "@capacitor/preferences": "^8.0.1",
     "@capacitor/push-notifications": "^8.1.1",
     "@capacitor/status-bar": "8.0.2",
+    "@hookform/resolvers": "^3.9.0",
     "@ionic/pwa-elements": "^3.0.0",
-    "@ionic/react": "^8.5.0",
+    "@ionic/react": "8.8.7",
-    "@ionic/react-router": "^8.5.0",
+    "@ionic/react-router": "8.8.7",
     "@supabase/supabase-js": "^2.108.1",
-    "date-fns": "^4.4.0",
     "firebase": "^11.0.0",
     "ionicons": "^7.4.0",
     "katex": "^0.16.0",

src/App.tsx

@@ -1,12 +1,22 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Redirect, Route } from 'react-router-dom';
-import { IonApp, IonRouterOutlet, setupIonicReact } from '@ionic/react';
+import {
+  IonApp,
+  IonIcon,
+  IonLabel,
+  IonRouterOutlet,
+  IonTabBar,
+  IonTabButton,
+  IonTabs,
+  setupIonicReact,
+} from '@ionic/react';
 import { IonReactRouter } from '@ionic/react-router';
-import Home from './pages/Home';
+import {
-import Checkups from './pages/Checkups';
+  homeOutline,
-import Diet from './pages/Diet';
+  calendarOutline,
-import Sleep from './pages/Sleep';
+  personOutline,
-import Insights from './pages/Insights';
+  newspaperOutline,
+} from 'ionicons/icons';
 
 /* Core CSS required for Ionic components to work properly */
 import '@ionic/react/css/core.css';
@@ -24,35 +34,133 @@ import '@ionic/react/css/text-transformation.css';
 import '@ionic/react/css/flex-utils.css';
 import '@ionic/react/css/display.css';
 
-/**
- * Ionic Dark Mode
- * -----------------------------------------------------
- * For more info, please see:
- * https://ionicframework.com/docs/theming/dark-mode
- */
-
-/* import '@ionic/react/css/palettes/dark.always.css'; */
-/* import '@ionic/react/css/palettes/dark.class.css'; */
-import '@ionic/react/css/palettes/dark.system.css';
-
 /* Theme variables */
 import './theme/variables.css';
 
+import { AuthProvider, useAuth } from './contexts/AuthContext';
+import ProtectedRoute from './components/ProtectedRoute';
+
+import Auth from './pages/Auth';
+import VerifyEmail from './pages/VerifyEmail';
+import SetupProfile from './pages/SetupProfile';
+import Home from './pages/Home';
+import Events from './pages/Events';
+import Profile from './pages/Profile';
+import EventDetail from './pages/EventDetail';
+import AdminEventForm from './pages/AdminEventForm';
+import News from './pages/News';
+import NewsDetail from './pages/NewsDetail';
+import AdminNewsForm from './pages/AdminNewsForm';
+
+import { setStatusBarStyle, Style } from './utils/statusBar';
+
 setupIonicReact();
 
-const App: React.FC = () => (
+const SetupProfileRoute: React.FC = () => {
+  const { user } = useAuth();
+  if (!user) return <Redirect to="/auth" />;
+  return <SetupProfile />;
+};
+
+const App: React.FC = () => {
+  useEffect(() => {
+    setStatusBarStyle(Style.Dark);
+  }, []);
+
+  return (
     <IonApp>
+      <AuthProvider>
         <IonReactRouter>
           <IonRouterOutlet>
-        <Route exact path="/home" component={Home} />
+            {/* Unprotected Routes */}
-        <Route exact path="/checkups" component={Checkups} />
+            <Route path="/auth" component={Auth} exact />
-        <Route exact path="/diet" component={Diet} />
+            <Route path="/verify-email" component={VerifyEmail} exact />
-        <Route exact path="/sleep" component={Sleep} />
+
-        <Route exact path="/insights" component={Insights} />
+            {/* Profile Setup (requires user, but no profile yet) */}
-        <Route exact path="/" render={() => <Redirect to="/home" />} />
+            <Route path="/setup-profile" component={SetupProfileRoute} exact />
+
+            {/* Non-tab Protected Routes */}
+            <ProtectedRoute
+              path="/event/:id([0-9a-fA-F-]{36})"
+              component={EventDetail}
+              exact
+            />
+            <ProtectedRoute
+              path="/admin/events/new"
+              component={AdminEventForm}
+              exact
+            />
+            <ProtectedRoute
+              path="/admin/events/:id([0-9a-fA-F-]{36})/edit"
+              component={AdminEventForm}
+              exact
+            />
+            <ProtectedRoute
+              path="/news/:id([0-9a-fA-F-]{36})"
+              component={NewsDetail}
+              exact
+            />
+            <ProtectedRoute
+              path="/admin/news/new"
+              component={AdminNewsForm}
+              exact
+            />
+            <ProtectedRoute
+              path="/admin/news/:id([0-9a-fA-F-]{36})"
+              component={AdminNewsForm}
+              exact
+            />
+
+            {/* Tabs */}
+            <ProtectedRoute
+              path={['/home', '/events', '/news', '/profile']}
+              component={() => (
+                <IonTabs>
+                  <IonRouterOutlet>
+                    <Route path="/home" component={Home} exact />
+                    <Route path="/events" component={Events} exact />
+                    <Route path="/news" component={News} exact />
+                    <Route path="/profile" component={Profile} exact />
+                  </IonRouterOutlet>
+                  <IonTabBar
+                    slot="bottom"
+                    style={{
+                      '--background': 'var(--color-surface)',
+                      '--border': 'none',
+                      color: 'var(--color-text-secondary)',
+                      boxShadow: '0 -2px 10px rgba(47,34,29,0.05)',
+                    }}
+                  >
+                    <IonTabButton tab="home" href="/home">
+                      <IonIcon icon={homeOutline} />
+                      <IonLabel>Home</IonLabel>
+                    </IonTabButton>
+                    <IonTabButton tab="events" href="/events">
+                      <IonIcon icon={calendarOutline} />
+                      <IonLabel>Events</IonLabel>
+                    </IonTabButton>
+                    <IonTabButton tab="news" href="/news">
+                      <IonIcon icon={newspaperOutline} />
+                      <IonLabel>News</IonLabel>
+                    </IonTabButton>
+                    <IonTabButton tab="profile" href="/profile">
+                      <IonIcon icon={personOutline} />
+                      <IonLabel>Profile</IonLabel>
+                    </IonTabButton>
+                  </IonTabBar>
+                </IonTabs>
+              )}
+            />
+
+            {/* Root Redirect */}
+            <Route exact path="/">
+              <Redirect to="/auth" />
+            </Route>
           </IonRouterOutlet>
         </IonReactRouter>
+      </AuthProvider>
     </IonApp>
-);
+  );
+};
 
 export default App;

src/components/EventListCard.tsx

@@ -0,0 +1,112 @@
+import React from 'react';
+import { ChurchEvent } from '../types';
+
+interface EventListCardProps {
+  event: ChurchEvent;
+  onClick: () => void;
+}
+
+const EventListCard: React.FC<EventListCardProps> = ({ event, onClick }) => {
+  const categoryName = event.event_categories?.name || 'Event';
+  const date = new Date(event.start_at);
+  const hasTime = date.getHours() !== 0 || date.getMinutes() !== 0;
+
+  const startTime = hasTime
+    ? date.toLocaleTimeString([], {
+        hour: '2-digit',
+        minute: '2-digit',
+      })
+    : null;
+
+  const dateStr = date.toLocaleDateString(undefined, {
+    month: 'short',
+    day: 'numeric',
+  });
+
+  return (
+    <div
+      onClick={onClick}
+      style={{
+        background: '#ffffff',
+        borderRadius: '24px',
+        padding: '18px',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '12px',
+        cursor: 'pointer',
+        boxShadow: '0 2px 4px rgba(0,0,0,0.02)',
+      }}
+    >
+      <div
+        style={{
+          display: 'flex',
+          justifyContent: 'space-between',
+          alignItems: 'center',
+        }}
+      >
+        <div
+          style={{
+            background: 'var(--color-brand-soft)',
+            color: 'var(--color-brand)',
+            borderRadius: '999px',
+            padding: '4px 10px',
+            fontSize: '12px',
+            fontWeight: '600',
+          }}
+        >
+          {dateStr}
+          {startTime ? ` • ${startTime}` : ''}
+        </div>
+        <div
+          style={{
+            fontSize: '12px',
+            fontWeight: '500',
+            color: 'var(--color-text-secondary)',
+          }}
+        >
+          {categoryName}
+        </div>
+      </div>
+
+      <div>
+        <h3
+          style={{
+            margin: '0 0 4px 0',
+            fontSize: '16px',
+            fontWeight: '700',
+            color: 'var(--color-text-primary)',
+          }}
+        >
+          {event.title}
+        </h3>
+        <p
+          style={{
+            margin: 0,
+            fontSize: '13px',
+            fontWeight: '400',
+            color: 'var(--color-text-secondary)',
+            display: '-webkit-box',
+            WebkitLineClamp: 2,
+            WebkitBoxOrient: 'vertical',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}
+        >
+          {event.description}
+        </p>
+      </div>
+
+      <div
+        style={{
+          fontSize: '13px',
+          fontWeight: '500',
+          color: 'var(--color-text-primary)',
+        }}
+      >
+        {event.venue}
+      </div>
+    </div>
+  );
+};
+
+export default EventListCard;

src/components/EventPreviewCard.tsx

@@ -0,0 +1,100 @@
+import React from 'react';
+import { ChurchEvent } from '../types';
+import { IonIcon } from '@ionic/react';
+import { calendarOutline } from 'ionicons/icons';
+
+interface EventPreviewCardProps {
+  event: ChurchEvent;
+  onClick: () => void;
+}
+
+const EventPreviewCard: React.FC<EventPreviewCardProps> = ({
+  event,
+  onClick,
+}) => {
+  const categoryName = event.event_categories?.name || 'Event';
+
+  return (
+    <div
+      onClick={onClick}
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        padding: '8px 0',
+        gap: '10px',
+        background: 'transparent',
+        cursor: 'pointer',
+      }}
+    >
+      <div
+        style={{
+          width: '40px',
+          height: '40px',
+          borderRadius: '12px',
+          background: 'var(--color-brand-soft)',
+          flexShrink: 0,
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+        }}
+      >
+        <IonIcon
+          icon={calendarOutline}
+          style={{ color: 'var(--color-brand)', fontSize: '20px' }}
+        />
+      </div>
+
+      <div style={{ flex: 1, minWidth: 0 }}>
+        <h4
+          style={{
+            margin: '0 0 2px 0',
+            fontSize: '15px',
+            fontWeight: '600',
+            color: 'var(--color-text-primary)',
+            whiteSpace: 'nowrap',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}
+        >
+          {event.title}
+        </h4>
+        <p
+          style={{
+            margin: 0,
+            fontSize: '12px',
+            fontWeight: '400',
+            color: 'var(--color-text-secondary)',
+            whiteSpace: 'nowrap',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}
+        >
+          {(() => {
+            const date = new Date(event.start_at);
+            const hasTime = date.getHours() !== 0 || date.getMinutes() !== 0;
+            const timeStr = hasTime
+              ? `${date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })} • `
+              : '';
+            return `${timeStr}${event.day_label}`;
+          })()}
+        </p>
+      </div>
+
+      <div
+        style={{
+          background: 'var(--color-brand-soft)',
+          color: 'var(--color-brand)',
+          borderRadius: '999px',
+          padding: '4px 10px',
+          fontSize: '12px',
+          fontWeight: '600',
+          flexShrink: 0,
+        }}
+      >
+        {categoryName}
+      </div>
+    </div>
+  );
+};
+
+export default EventPreviewCard;

src/components/HomeStatCard.tsx

@@ -0,0 +1,76 @@
+import React from 'react';
+import { IonIcon } from '@ionic/react';
+
+interface HomeStatCardProps {
+  label: string;
+  value: string;
+  caption: string;
+  icon?: string;
+}
+
+const HomeStatCard: React.FC<HomeStatCardProps> = ({
+  label,
+  value,
+  caption,
+  icon,
+}) => {
+  return (
+    <div
+      style={{
+        background: '#ffffff',
+        borderRadius: '24px',
+        padding: '18px',
+        flex: 1,
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '8px',
+        boxShadow: '0 2px 4px rgba(0,0,0,0.02)',
+      }}
+    >
+      <div
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'space-between',
+        }}
+      >
+        <span
+          style={{
+            fontSize: '12px',
+            fontWeight: '600',
+            color: 'var(--color-text-secondary)',
+          }}
+        >
+          {label}
+        </span>
+        {icon && (
+          <IonIcon
+            icon={icon}
+            style={{ color: 'var(--color-brand)', fontSize: '16px' }}
+          />
+        )}
+      </div>
+      <div
+        style={{
+          fontSize: '28px',
+          fontWeight: '400',
+          color: 'var(--color-text-primary)',
+          margin: '4px 0 0 0',
+        }}
+      >
+        {value}
+      </div>
+      <div
+        style={{
+          fontSize: '12px',
+          fontWeight: '400',
+          color: 'var(--color-text-secondary)',
+        }}
+      >
+        {caption}
+      </div>
+    </div>
+  );
+};
+
+export default HomeStatCard;

src/components/OtpInputRow.tsx

@@ -0,0 +1,70 @@
+import React from 'react';
+import { IonInput } from '@ionic/react';
+
+interface OtpInputRowProps {
+  digits: string[];
+  onChange: (index: number, value: string) => void;
+  onKeyDown: (
+    index: number,
+    e: React.KeyboardEvent<HTMLIonInputElement>
+  ) => void;
+  inputRefs: React.RefObject<HTMLIonInputElement>[];
+}
+
+const OtpInputRow: React.FC<OtpInputRowProps> = ({
+  digits,
+  onChange,
+  onKeyDown,
+  inputRefs,
+}) => {
+  return (
+    <div
+      style={{
+        display: 'flex',
+        gap: '10px',
+        justifyContent: 'center',
+        margin: '0 0 20px 0',
+      }}
+    >
+      {digits.map((digit, index) => (
+        <div
+          key={index}
+          style={{
+            background: '#ffffff',
+            borderRadius: '12px',
+            width: '48px',
+            height: '56px',
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            boxShadow: '0 1px 3px rgba(0,0,0,0.05)',
+          }}
+        >
+          <IonInput
+            ref={inputRefs[index]}
+            type="tel"
+            inputMode="numeric"
+            maxlength={1}
+            value={digit}
+            onIonInput={(e) =>
+              onChange(index, (e.target as HTMLIonInputElement).value as string)
+            }
+            onKeyDown={(e) => onKeyDown(index, e)}
+            style={{
+              fontSize: '24px',
+              fontWeight: '600',
+              color: '#1f2937',
+              textAlign: 'center',
+              '--padding-start': '0px',
+              '--padding-end': '0px',
+              width: '100%',
+              height: '100%',
+            }}
+          />
+        </div>
+      ))}
+    </div>
+  );
+};
+
+export default OtpInputRow;

src/components/ProtectedRoute.tsx

@@ -0,0 +1,34 @@
+import React from 'react';
+import { Route, Redirect, RouteProps } from 'react-router-dom';
+import { useAuth } from '../contexts/AuthContext';
+
+interface ProtectedRouteProps extends RouteProps {
+  component: React.ComponentType<any>;
+}
+
+const ProtectedRoute: React.FC<ProtectedRouteProps> = ({
+  component: Component,
+  ...rest
+}) => {
+  const { user, profile } = useAuth();
+
+  return (
+    <Route
+      {...rest}
+      render={(props) => {
+        if (!user) {
+          return <Redirect to="/auth" />;
+        }
+        if (profile !== undefined && profile === null) {
+          return <Redirect to="/setup-profile" />;
+        }
+        if (profile !== undefined && profile !== null && !profile.full_name) {
+          return <Redirect to="/setup-profile" />;
+        }
+        return <Component {...props} />;
+      }}
+    />
+  );
+};
+
+export default ProtectedRoute;

src/components/cohort/DepartmentSelector.tsx

@@ -1,141 +0,0 @@
-import React from 'react';
-import { Department } from '../../types/cohortHealth';
-import {
-  IonLabel,
-  IonSegment,
-  IonSegmentButton,
-  IonBadge,
-  IonIcon,
-} from '@ionic/react';
-import { shieldCheckmarkOutline, peopleOutline } from 'ionicons/icons';
-
-interface DepartmentSelectorProps {
-  currentDepartment: Department;
-  onDepartmentChange: (dept: Department) => void;
-  cohortSizes: Record<Department, number>;
-}
-
-export const DepartmentSelector: React.FC<DepartmentSelectorProps> = ({
-  currentDepartment,
-  onDepartmentChange,
-  cohortSizes,
-}) => {
-  const departments: { id: Department; label: string; minRequired: number }[] =
-    [
-      { id: 'Engineering', label: 'Engineering', minRequired: 5 },
-      { id: 'Sales', label: 'Sales', minRequired: 5 },
-      { id: 'Operations', label: 'Operations', minRequired: 5 },
-      { id: 'Executive Board', label: 'Exec Board', minRequired: 5 },
-    ];
-
-  return (
-    <div style={{ margin: '12px 0 20px 0' }}>
-      <div
-        style={{
-          display: 'flex',
-          justifyContent: 'space-between',
-          alignItems: 'center',
-          marginBottom: '8px',
-        }}
-      >
-        <span
-          style={{
-            fontSize: '0.85rem',
-            fontWeight: 700,
-            color: 'var(--ion-color-dark)',
-            textTransform: 'uppercase',
-            letterSpacing: '0.05em',
-          }}
-        >
-          Select Workforce Cohort
-        </span>
-        <div
-          style={{
-            display: 'flex',
-            alignItems: 'center',
-            gap: '4px',
-            color: 'var(--ion-color-success)',
-            fontSize: '0.8rem',
-            fontWeight: 600,
-          }}
-        >
-          <IonIcon icon={shieldCheckmarkOutline} />
-          <span>k-Anonymity Protected</span>
-        </div>
-      </div>
-
-      <div
-        style={{
-          display: 'flex',
-          gap: '8px',
-          overflowX: 'auto',
-          paddingBottom: '4px',
-        }}
-      >
-        {departments.map((dept) => {
-          const count = cohortSizes[dept.id] || 0;
-          const isSelected = currentDepartment === dept.id;
-          const isViolating = count > 0 && count < dept.minRequired;
-
-          return (
-            <button
-              key={dept.id}
-              onClick={() => onDepartmentChange(dept.id)}
-              style={{
-                flex: '1 0 auto',
-                padding: '10px 16px',
-                borderRadius: '10px',
-                border: isSelected
-                  ? '2px solid var(--ion-color-primary)'
-                  : '1px solid var(--ion-color-light-shade)',
-                backgroundColor: isSelected
-                  ? 'rgba(56, 128, 255, 0.06)'
-                  : 'var(--ion-color-light)',
-                color: isSelected
-                  ? 'var(--ion-color-primary-shade)'
-                  : 'var(--ion-color-dark)',
-                cursor: 'pointer',
-                transition: 'all 0.15s ease',
-                display: 'flex',
-                flexDirection: 'column',
-                alignItems: 'center',
-                gap: '4px',
-                outline: 'none',
-              }}
-            >
-              <span style={{ fontSize: '0.9rem', fontWeight: 700 }}>
-                {dept.label}
-              </span>
-
-              <div
-                style={{
-                  display: 'flex',
-                  alignItems: 'center',
-                  gap: '4px',
-                  fontSize: '0.75rem',
-                }}
-              >
-                <IonIcon icon={peopleOutline} style={{ opacity: 0.7 }} />
-                <span>N = {count}</span>
-                {isViolating && (
-                  <span
-                    style={{
-                      fontSize: '0.65rem',
-                      color: 'var(--ion-color-danger)',
-                      backgroundColor: 'rgba(235, 68, 90, 0.1)',
-                      padding: '1px 5px',
-                      borderRadius: '4px',
-                      fontWeight: 700,
-                    }}
-                  >
-                    Blocked
-                  </span>
-                )}
-              </div>
-            </button>
-          );
-        })}
-      </div>
-    </div>
-  );
-};

src/components/cohort/MetricSummaryCard.tsx

@@ -1,132 +0,0 @@
-import React from 'react';
-import {
-  IonCard,
-  IonCardContent,
-  IonText,
-  IonIcon,
-  IonRow,
-  IonCol,
-} from '@ionic/react';
-import {
-  moonOutline,
-  flashOutline,
-  fitnessOutline,
-  alertCircleOutline,
-} from 'ionicons/icons';
-
-interface MetricCardProps {
-  title: string;
-  value: string | number;
-  subtext: string;
-  type: 'sleep' | 'stress' | 'activity';
-}
-
-export const MetricSummaryCard: React.FC<MetricCardProps> = ({
-  title,
-  value,
-  subtext,
-  type,
-}) => {
-  const getCardTheme = () => {
-    switch (type) {
-      case 'sleep':
-        return {
-          icon: moonOutline,
-          color: 'var(--ion-color-tertiary)',
-          bg: 'rgba(82, 96, 255, 0.08)',
-          label: 'Sleep Quality',
-        };
-      case 'stress':
-        return {
-          icon: flashOutline,
-          color: 'var(--ion-color-danger)',
-          bg: 'rgba(235, 68, 90, 0.08)',
-          label: 'Stress Index',
-        };
-      case 'activity':
-        return {
-          icon: fitnessOutline,
-          color: 'var(--ion-color-success)',
-          bg: 'rgba(45, 211, 111, 0.08)',
-          label: 'Active Minutes',
-        };
-    }
-  };
-
-  const theme = getCardTheme();
-
-  return (
-    <IonCard
-      className="ion-no-margin"
-      style={{
-        height: '100%',
-        boxShadow: '0 4px 16px rgba(0,0,0,0.04)',
-        borderRadius: '12px',
-        border: '1px solid var(--ion-color-light-shade)',
-      }}
-    >
-      <IonCardContent style={{ padding: '16px' }}>
-        <div
-          style={{
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'space-between',
-            marginBottom: '12px',
-          }}
-        >
-          <span
-            style={{
-              fontSize: '0.85rem',
-              fontWeight: 600,
-              color: 'var(--ion-color-medium)',
-              textTransform: 'uppercase',
-              letterSpacing: '0.05em',
-            }}
-          >
-            {title}
-          </span>
-          <div
-            style={{
-              backgroundColor: theme.bg,
-              color: theme.color,
-              borderRadius: '50%',
-              padding: '8px',
-              display: 'flex',
-              alignItems: 'center',
-              justifyContent: 'center',
-            }}
-          >
-            <IonIcon icon={theme.icon} style={{ fontSize: '20px' }} />
-          </div>
-        </div>
-
-        <div style={{ marginBottom: '6px' }}>
-          <span
-            style={{
-              fontSize: '2rem',
-              fontWeight: 700,
-              color: 'var(--ion-color-dark)',
-            }}
-          >
-            {value}
-          </span>
-        </div>
-
-        <div>
-          <span
-            style={{
-              fontSize: '0.8rem',
-              color: 'var(--ion-color-medium)',
-              fontWeight: 500,
-              display: 'flex',
-              alignItems: 'center',
-              gap: '4px',
-            }}
-          >
-            {subtext}
-          </span>
-        </div>
-      </IonCardContent>
-    </IonCard>
-  );
-};

src/components/cohort/TrendChartCard.tsx

@@ -1,435 +0,0 @@
-import React, { useState } from 'react';
-import {
-  IonCard,
-  IonCardHeader,
-  IonCardSubtitle,
-  IonCardTitle,
-  IonCardContent,
-  IonText,
-  IonButton,
-  IonIcon,
-} from '@ionic/react';
-import { AggregatedTrendPoint } from '../../types/cohortHealth';
-import { moonOutline, flashOutline, eyeOutline } from 'ionicons/icons';
-
-interface TrendChartCardProps {
-  trends: AggregatedTrendPoint[];
-}
-
-export const TrendChartCard: React.FC<TrendChartCardProps> = ({ trends }) => {
-  const [hoveredPoint, setHoveredPoint] = useState<number | null>(null);
-
-  if (!trends || trends.length === 0) {
-    return (
-      <IonCard style={{ borderRadius: '12px' }}>
-        <IonCardContent className="ion-text-center ion-padding">
-          No trend data to display.
-        </IonCardContent>
-      </IonCard>
-    );
-  }
-
-  // Chart configuration
-  const width = 600;
-  const height = 240;
-  const paddingLeft = 40;
-  const paddingRight = 40;
-  const paddingTop = 20;
-  const paddingBottom = 40;
-
-  const chartWidth = width - paddingLeft - paddingRight;
-  const chartHeight = height - paddingTop - paddingBottom;
-
-  const maxPoints = trends.length;
-
-  // X coordinates helper
-  const getX = (index: number) => {
-    if (maxPoints <= 1) return paddingLeft + chartWidth / 2;
-    return paddingLeft + (index / (maxPoints - 1)) * chartWidth;
-  };
-
-  // Y coordinates helper for Sleep Score (0 - 100)
-  const getYSleep = (score: number) => {
-    // Normalizing between 40 and 100 to make the graph visually richer
-    const minScore = 40;
-    const maxScore = 100;
-    const percentage = (score - minScore) / (maxScore - minScore);
-    const clampedPct = Math.max(0, Math.min(1, percentage));
-    return height - paddingBottom - clampedPct * chartHeight;
-  };
-
-  // Y coordinates helper for Stress Index (1 - 10)
-  const getYStress = (stress: number) => {
-    // Normalizing between 1 and 10
-    const minStress = 1;
-    const maxStress = 10;
-    const percentage = (stress - minStress) / (maxStress - minStress);
-    const clampedPct = Math.max(0, Math.min(1, percentage));
-    return height - paddingBottom - clampedPct * chartHeight;
-  };
-
-  // Build SVG Paths
-  let sleepPointsPath = '';
-  let stressPointsPath = '';
-
-  trends.forEach((t, i) => {
-    const x = getX(i);
-    const ySleep = getYSleep(t.avgSleepScore);
-    const yStress = getYStress(t.avgStressIndex);
-
-    if (i === 0) {
-      sleepPointsPath = `M ${x} ${ySleep}`;
-      stressPointsPath = `M ${x} ${yStress}`;
-    } else {
-      sleepPointsPath += ` L ${x} ${ySleep}`;
-      stressPointsPath += ` L ${x} ${yStress}`;
-    }
-  });
-
-  const formatDate = (dateStr: string) => {
-    const date = new Date(dateStr);
-    return date.toLocaleDateString(undefined, {
-      month: 'short',
-      day: 'numeric',
-      timeZone: 'UTC',
-    });
-  };
-
-  return (
-    <IonCard
-      style={{
-        boxShadow: '0 4px 16px rgba(0,0,0,0.04)',
-        borderRadius: '12px',
-        border: '1px solid var(--ion-color-light-shade)',
-        overflow: 'visible',
-      }}
-    >
-      <IonCardHeader style={{ padding: '16px 16px 4px 16px' }}>
-        <div
-          style={{
-            display: 'flex',
-            justifyContent: 'space-between',
-            alignItems: 'center',
-          }}
-        >
-          <div>
-            <IonCardTitle
-              style={{
-                fontSize: '1.1rem',
-                fontWeight: 700,
-                color: 'var(--ion-color-dark)',
-              }}
-            >
-              14-Day Cohort Biomarker Trends
-            </IonCardTitle>
-            <IonCardSubtitle
-              style={{
-                fontSize: '0.8rem',
-                color: 'var(--ion-color-medium)',
-                marginTop: '4px',
-              }}
-            >
-              Tracking stress levels vs sleep restoration patterns
-            </IonCardSubtitle>
-          </div>
-
-          {/* Legend */}
-          <div style={{ display: 'flex', gap: '16px', fontSize: '0.8rem' }}>
-            <div style={{ display: 'flex', alignItems: 'center', gap: '6px' }}>
-              <div
-                style={{
-                  width: '12px',
-                  height: '3px',
-                  backgroundColor: 'var(--ion-color-tertiary)',
-                  borderRadius: '2px',
-                }}
-              />
-              <span style={{ color: 'var(--ion-color-dark)', fontWeight: 600 }}>
-                Sleep Quality
-              </span>
-            </div>
-            <div style={{ display: 'flex', alignItems: 'center', gap: '6px' }}>
-              <div
-                style={{
-                  width: '12px',
-                  height: '3px',
-                  backgroundColor: 'var(--ion-color-danger)',
-                  borderRadius: '2px',
-                }}
-              />
-              <span style={{ color: 'var(--ion-color-dark)', fontWeight: 600 }}>
-                Stress Index
-              </span>
-            </div>
-          </div>
-        </div>
-      </IonCardHeader>
-
-      <IonCardContent
-        style={{ padding: '0px 12px 16px 12px', position: 'relative' }}
-      >
-        {/* SVG Drawing Canvas */}
-        <div
-          style={{
-            width: '100%',
-            overflowX: 'auto',
-            WebkitOverflowScrolling: 'touch',
-          }}
-        >
-          <svg
-            viewBox={`0 0 ${width} ${height}`}
-            style={{ width: '100%', minWidth: '500px', display: 'block' }}
-          >
-            {/* Gridlines (Horizontal) */}
-            {[0, 0.25, 0.5, 0.75, 1].map((val, idx) => {
-              const y = paddingTop + val * chartHeight;
-              return (
-                <g key={idx}>
-                  <line
-                    x1={paddingLeft}
-                    y1={y}
-                    x2={width - paddingRight}
-                    y2={y}
-                    stroke="var(--ion-color-light-shade)"
-                    strokeWidth="1"
-                    strokeDasharray="4 4"
-                  />
-                  {/* Left Label: Sleep Score Scales */}
-                  <text
-                    x={paddingLeft - 8}
-                    y={y + 4}
-                    textAnchor="end"
-                    fill="var(--ion-color-medium)"
-                    fontSize="9px"
-                    fontWeight="500"
-                  >
-                    {Math.round(100 - val * 60)}
-                  </text>
-                  {/* Right Label: Stress Scales */}
-                  <text
-                    x={width - paddingRight + 8}
-                    y={y + 4}
-                    textAnchor="start"
-                    fill="var(--ion-color-medium)"
-                    fontSize="9px"
-                    fontWeight="500"
-                  >
-                    {(10 - val * 9).toFixed(1)}
-                  </text>
-                </g>
-              );
-            })}
-
-            {/* Main Trend Lines */}
-            <path
-              d={sleepPointsPath}
-              fill="none"
-              stroke="var(--ion-color-tertiary)"
-              strokeWidth="3.5"
-              strokeLinecap="round"
-              strokeLinejoin="round"
-            />
-            <path
-              d={stressPointsPath}
-              fill="none"
-              stroke="var(--ion-color-danger)"
-              strokeWidth="3.5"
-              strokeLinecap="round"
-              strokeLinejoin="round"
-            />
-
-            {/* X Axis Labels (Filtered to show 4 ticks to prevent clutter) */}
-            {trends.map((t, i) => {
-              const x = getX(i);
-              const isTick =
-                i === 0 ||
-                i === Math.floor(maxPoints / 3) ||
-                i === Math.floor((maxPoints * 2) / 3) ||
-                i === maxPoints - 1;
-              if (!isTick) return null;
-
-              return (
-                <text
-                  key={i}
-                  x={x}
-                  y={height - paddingBottom + 18}
-                  textAnchor="middle"
-                  fill="var(--ion-color-medium)"
-                  fontSize="10px"
-                  fontWeight="600"
-                >
-                  {formatDate(t.date)}
-                </text>
-              );
-            })}
-
-            {/* Hover Guides & Interactive Circles */}
-            {trends.map((t, i) => {
-              const x = getX(i);
-              const ySleep = getYSleep(t.avgSleepScore);
-              const yStress = getYStress(t.avgStressIndex);
-
-              return (
-                <g key={i}>
-                  {/* Invisible broad hover bar */}
-                  <rect
-                    x={x - chartWidth / maxPoints / 2}
-                    y={paddingTop}
-                    width={chartWidth / maxPoints}
-                    height={chartHeight}
-                    fill="transparent"
-                    style={{ cursor: 'pointer' }}
-                    onMouseEnter={() => setHoveredPoint(i)}
-                    onMouseLeave={() => setHoveredPoint(null)}
-                  />
-
-                  {/* Active Point Hover Guide Line */}
-                  {hoveredPoint === i && (
-                    <>
-                      <line
-                        x1={x}
-                        y1={paddingTop}
-                        x2={x}
-                        y2={height - paddingBottom}
-                        stroke="var(--ion-color-medium)"
-                        strokeWidth="1.5"
-                        strokeDasharray="2 2"
-                        pointerEvents="none"
-                      />
-                      {/* Sleep Dot */}
-                      <circle
-                        cx={x}
-                        cy={ySleep}
-                        r="6"
-                        fill="var(--ion-color-tertiary)"
-                        stroke="#ffffff"
-                        strokeWidth="2"
-                        pointerEvents="none"
-                      />
-                      {/* Stress Dot */}
-                      <circle
-                        cx={x}
-                        cy={yStress}
-                        r="6"
-                        fill="var(--ion-color-danger)"
-                        stroke="#ffffff"
-                        strokeWidth="2"
-                        pointerEvents="none"
-                      />
-                    </>
-                  )}
-                </g>
-              );
-            })}
-          </svg>
-        </div>
-
-        {/* Dynamic Hover Tooltip Banner */}
-        <div
-          style={{
-            marginTop: '8px',
-            backgroundColor: 'var(--ion-color-light)',
-            borderRadius: '8px',
-            padding: '10px 14px',
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: hoveredPoint !== null ? 'space-between' : 'center',
-            border: '1px solid var(--ion-color-light-shade)',
-            transition: 'all 0.2s ease',
-          }}
-        >
-          {hoveredPoint !== null ? (
-            <>
-              <div
-                style={{ display: 'flex', alignItems: 'center', gap: '8px' }}
-              >
-                <span
-                  style={{
-                    fontSize: '0.85rem',
-                    fontWeight: 700,
-                    color: 'var(--ion-color-dark)',
-                  }}
-                >
-                  {formatDate(trends[hoveredPoint].date)}
-                </span>
-                <span
-                  style={{
-                    fontSize: '0.75rem',
-                    color: 'var(--ion-color-medium)',
-                    backgroundColor: 'rgba(0,0,0,0.05)',
-                    padding: '2px 6px',
-                    borderRadius: '4px',
-                  }}
-                >
-                  N = {trends[hoveredPoint].cohortSize} users
-                </span>
-              </div>
-              <div
-                style={{ display: 'flex', gap: '16px', alignItems: 'center' }}
-              >
-                <span
-                  style={{
-                    fontSize: '0.8rem',
-                    display: 'flex',
-                    alignItems: 'center',
-                    gap: '4px',
-                    color: 'var(--ion-color-tertiary)',
-                    fontWeight: 600,
-                  }}
-                >
-                  <IonIcon icon={moonOutline} /> Sleep:{' '}
-                  {trends[hoveredPoint].avgSleepScore}/100
-                  <span
-                    style={{
-                      fontSize: '0.75rem',
-                      fontWeight: 400,
-                      color: 'var(--ion-color-medium)',
-                    }}
-                  >
-                    ({trends[hoveredPoint].poorSleepPercentage}% poor)
-                  </span>
-                </span>
-                <span
-                  style={{
-                    fontSize: '0.8rem',
-                    display: 'flex',
-                    alignItems: 'center',
-                    gap: '4px',
-                    color: 'var(--ion-color-danger)',
-                    fontWeight: 600,
-                  }}
-                >
-                  <IonIcon icon={flashOutline} /> Stress:{' '}
-                  {trends[hoveredPoint].avgStressIndex}/10
-                  <span
-                    style={{
-                      fontSize: '0.75rem',
-                      fontWeight: 400,
-                      color: 'var(--ion-color-medium)',
-                    }}
-                  >
-                    ({trends[hoveredPoint].highStressPercentage}% peak)
-                  </span>
-                </span>
-              </div>
-            </>
-          ) : (
-            <span
-              style={{
-                fontSize: '0.75rem',
-                color: 'var(--ion-color-medium)',
-                display: 'flex',
-                alignItems: 'center',
-                gap: '6px',
-              }}
-            >
-              <IonIcon icon={eyeOutline} style={{ fontSize: '14px' }} /> Hover
-              or tap along the grid timeline to inspect specific historical
-              dates
-            </span>
-          )}
-        </div>
-      </IonCardContent>
-    </IonCard>
-  );
-};

src/components/health/HealthLogList.tsx

@@ -1,217 +0,0 @@
-import React from 'react';
-import { IonIcon, IonButton } from '@ionic/react';
-import {
-  trashOutline,
-  medkitOutline,
-  restaurantOutline,
-  moonOutline,
-  clipboardOutline,
-} from 'ionicons/icons';
-import { format } from 'date-fns';
-
-interface HealthEntry {
-  id: string;
-  createdAt: string;
-  [key: string]: any;
-}
-
-interface Props {
-  type: 'checkup' | 'diet' | 'sleep';
-  entries: HealthEntry[];
-  onDelete: (id: string) => void;
-  emptyTitle: string;
-  emptyActionLabel: string;
-  onEmptyAction: () => void;
-}
-
-const HealthLogList: React.FC<Props> = ({
-  type,
-  entries,
-  onDelete,
-  emptyTitle,
-  emptyActionLabel,
-  onEmptyAction,
-}) => {
-  if (entries.length === 0) {
-    return (
-      <div
-        style={{
-          background: '#ffffff',
-          borderRadius: '24px',
-          padding: '32px 24px',
-          display: 'flex',
-          flexDirection: 'column',
-          alignItems: 'center',
-          textAlign: 'center',
-        }}
-      >
-        <IonIcon
-          icon={
-            type === 'checkup'
-              ? medkitOutline
-              : type === 'diet'
-                ? restaurantOutline
-                : moonOutline
-          }
-          style={{
-            fontSize: '42px',
-            color: 'rgba(3,105,161,0.36)',
-            marginBottom: '16px',
-          }}
-        />
-        <div
-          style={{
-            fontSize: '16px',
-            fontWeight: '700',
-            color: '#1e3a5f',
-            marginBottom: '8px',
-          }}
-        >
-          {emptyTitle}
-        </div>
-        <IonButton
-          onClick={onEmptyAction}
-          style={{
-            '--background': '#0369a1',
-            '--border-radius': '999px',
-            '--color': '#ffffff',
-            fontWeight: '700',
-            height: '44px',
-            marginTop: '16px',
-          }}
-        >
-          {emptyActionLabel}
-        </IonButton>
-      </div>
-    );
-  }
-
-  const getIcon = () => {
-    switch (type) {
-      case 'checkup':
-        return medkitOutline;
-      case 'diet':
-        return restaurantOutline;
-      case 'sleep':
-        return moonOutline;
-      default:
-        return clipboardOutline;
-    }
-  };
-
-  const getTitle = (entry: any) => {
-    switch (type) {
-      case 'checkup':
-        return `Mood: ${entry.mood} (${entry.energy}%)`;
-      case 'diet':
-        return `${entry.mealType} log`;
-      case 'sleep':
-        return `Sleep: ${entry.hours}h (${entry.quality})`;
-      default:
-        return 'Log entry';
-    }
-  };
-
-  const getSubtitle = (entry: any) => {
-    switch (type) {
-      case 'checkup':
-        return entry.symptoms || 'No symptoms noted';
-      case 'diet':
-        return `${entry.waterCups} cups water, ${entry.produceServings} servings produce`;
-      case 'sleep':
-        return `${entry.interruptions} interruptions`;
-      default:
-        return '';
-    }
-  };
-
-  return (
-    <div
-      style={{
-        background: '#ffffff',
-        borderRadius: '24px',
-        padding: '8px',
-        display: 'flex',
-        flexDirection: 'column',
-      }}
-    >
-      {entries.map((entry, index) => (
-        <div
-          key={entry.id}
-          style={{
-            display: 'flex',
-            alignItems: 'center',
-            gap: '12px',
-            padding: '12px',
-            borderBottom:
-              index === entries.length - 1
-                ? 'none'
-                : '1px solid rgba(30,58,95,0.05)',
-          }}
-        >
-          <div
-            style={{
-              width: '40px',
-              height: '40px',
-              borderRadius: '12px',
-              background: 'rgba(56,189,248,0.14)',
-              display: 'flex',
-              alignItems: 'center',
-              justifyContent: 'center',
-              flexShrink: 0,
-            }}
-          >
-            <IonIcon
-              icon={getIcon()}
-              style={{ fontSize: '20px', color: '#0369a1' }}
-            />
-          </div>
-          <div style={{ flex: 1, minWidth: 0 }}>
-            <div
-              style={{
-                fontSize: '15px',
-                fontWeight: '700',
-                color: '#1e3a5f',
-                whiteSpace: 'nowrap',
-                overflow: 'hidden',
-                textOverflow: 'ellipsis',
-              }}
-            >
-              {getTitle(entry)}
-            </div>
-            <div
-              style={{
-                fontSize: '12px',
-                fontWeight: '500',
-                color: 'rgba(30,58,95,0.58)',
-                whiteSpace: 'nowrap',
-                overflow: 'hidden',
-                textOverflow: 'ellipsis',
-              }}
-            >
-              {format(new Date(entry.createdAt), 'MMM d, h:mm a')} •{' '}
-              {getSubtitle(entry)}
-            </div>
-          </div>
-          <IonButton
-            fill="clear"
-            onClick={() => onDelete(entry.id)}
-            style={{
-              '--color': 'rgba(30,58,95,0.38)',
-              '--padding-start': '8px',
-              '--padding-end': '8px',
-            }}
-          >
-            <IonIcon
-              icon={trashOutline}
-              slot="icon-only"
-              style={{ fontSize: '18px' }}
-            />
-          </IonButton>
-        </div>
-      ))}
-    </div>
-  );
-};
-
-export default HealthLogList;

src/components/health/InsightCards.tsx

@@ -1,195 +0,0 @@
-import React from 'react';
-import { IonIcon } from '@ionic/react';
-import {
-  checkmarkCircleOutline,
-  warningOutline,
-  informationCircleOutline,
-  waterOutline,
-  moonOutline,
-  heartOutline,
-  analyticsOutline,
-} from 'ionicons/icons';
-import { WellbeingSummary, LocalInsight } from '../../types/health';
-
-// Use this for mapping string names to IonIcons
-const ICON_MAP: Record<string, string> = {
-  checkmarkCircleOutline,
-  warningOutline,
-  informationCircleOutline,
-  waterOutline,
-  moonOutline,
-  heartOutline,
-  analyticsOutline,
-};
-
-interface SummaryProps {
-  summary: WellbeingSummary;
-  primaryInsight: LocalInsight | null;
-}
-
-export const InsightSummaryCard: React.FC<SummaryProps> = ({
-  summary,
-  primaryInsight,
-}) => {
-  return (
-    <div
-      style={{
-        background: '#1e3a5f',
-        borderRadius: '24px',
-        padding: '24px',
-        marginBottom: '12px',
-        color: '#ffffff',
-      }}
-    >
-      <div
-        style={{
-          fontSize: '13px',
-          fontWeight: '700',
-          color: 'rgba(255,255,255,0.72)',
-          marginBottom: '8px',
-          textTransform: 'uppercase',
-          letterSpacing: '0.05em',
-        }}
-      >
-        Your Pattern
-      </div>
-      <div
-        style={{
-          fontSize: '20px',
-          fontWeight: '700',
-          lineHeight: '26px',
-          marginBottom: '8px',
-        }}
-      >
-        {primaryInsight
-          ? primaryInsight.title
-          : 'Keep tracking to reveal insights'}
-      </div>
-      <div
-        style={{
-          fontSize: '14px',
-          color: 'rgba(255,255,255,0.76)',
-          lineHeight: '20px',
-          marginBottom: '20px',
-        }}
-      >
-        {primaryInsight
-          ? primaryInsight.body
-          : 'Log your checkups, meals, and sleep regularly for personalized health guidance.'}
-      </div>
-      <div style={{ display: 'flex', gap: '8px' }}>
-        <div
-          style={{
-            background: 'rgba(56,189,248,0.18)',
-            borderRadius: '999px',
-            padding: '6px 12px',
-            fontSize: '12px',
-            fontWeight: '700',
-          }}
-        >
-          Score: {summary.score}/100
-        </div>
-        <div
-          style={{
-            background: 'rgba(56,189,248,0.18)',
-            borderRadius: '999px',
-            padding: '6px 12px',
-            fontSize: '12px',
-            fontWeight: '700',
-          }}
-        >
-          {summary.streakDays} day streak
-        </div>
-      </div>
-    </div>
-  );
-};
-
-interface ListProps {
-  insights: LocalInsight[];
-}
-
-export const RecommendationList: React.FC<ListProps> = ({ insights }) => {
-  if (insights.length === 0) return null;
-
-  return (
-    <div
-      style={{
-        background: '#ffffff',
-        borderRadius: '24px',
-        padding: '8px',
-        display: 'flex',
-        flexDirection: 'column',
-      }}
-    >
-      {insights.map((insight, index) => (
-        <div
-          key={insight.id}
-          style={{
-            display: 'flex',
-            alignItems: 'flex-start',
-            gap: '12px',
-            padding: '16px',
-            borderBottom:
-              index === insights.length - 1
-                ? 'none'
-                : '1px solid rgba(30,58,95,0.05)',
-          }}
-        >
-          <div
-            style={{
-              width: '40px',
-              height: '40px',
-              borderRadius: '12px',
-              background:
-                insight.type === 'positive'
-                  ? 'rgba(52,168,83,0.10)'
-                  : insight.type === 'warning'
-                    ? 'rgba(234,67,53,0.10)'
-                    : 'rgba(3,105,161,0.10)',
-              display: 'flex',
-              alignItems: 'center',
-              justifyContent: 'center',
-              flexShrink: 0,
-            }}
-          >
-            <IonIcon
-              icon={ICON_MAP[insight.icon] || informationCircleOutline}
-              style={{
-                fontSize: '20px',
-                color:
-                  insight.type === 'positive'
-                    ? '#34a853'
-                    : insight.type === 'warning'
-                      ? '#ea4335'
-                      : '#0369a1',
-              }}
-            />
-          </div>
-          <div style={{ flex: 1 }}>
-            <div
-              style={{
-                fontSize: '15px',
-                fontWeight: '700',
-                color: '#1e3a5f',
-                marginBottom: '2px',
-              }}
-            >
-              {insight.title}
-            </div>
-            <div
-              style={{
-                fontSize: '13px',
-                fontWeight: '500',
-                color: 'rgba(30,58,95,0.60)',
-                lineHeight: '18px',
-              }}
-            >
-              {insight.body}
-            </div>
-          </div>
-        </div>
-      ))}
-    </div>
-  );
-};

src/components/health/MetricMiniCard.tsx

@@ -1,111 +0,0 @@
-import React from 'react';
-import { IonIcon } from '@ionic/react';
-
-interface Props {
-  label: string;
-  value: string;
-  helper: string;
-  progress: number;
-  icon: string;
-}
-
-const MetricMiniCard: React.FC<Props> = ({
-  label,
-  value,
-  helper,
-  progress,
-  icon,
-}) => {
-  return (
-    <div
-      style={{
-        background: '#ffffff',
-        borderRadius: '24px',
-        padding: '16px',
-        minHeight: '112px',
-        display: 'flex',
-        flexDirection: 'column',
-        justifyContent: 'space-between',
-      }}
-    >
-      <div
-        style={{
-          display: 'flex',
-          justifyContent: 'space-between',
-          alignItems: 'center',
-        }}
-      >
-        <div
-          style={{
-            width: '32px',
-            height: '32px',
-            borderRadius: '12px',
-            background: 'rgba(56,189,248,0.14)',
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center',
-            flexShrink: 0,
-          }}
-        >
-          <IonIcon icon={icon} style={{ fontSize: '18px', color: '#0369a1' }} />
-        </div>
-        <div
-          style={{
-            fontSize: '12px',
-            fontWeight: '700',
-            color: 'rgba(30,58,95,0.58)',
-            textAlign: 'right',
-          }}
-        >
-          {label}
-        </div>
-      </div>
-
-      <div style={{ marginTop: '12px' }}>
-        <div style={{ display: 'flex', alignItems: 'baseline' }}>
-          <span
-            style={{
-              fontSize: '26px',
-              fontWeight: '400',
-              color: '#1e3a5f',
-              fontVariantNumeric: 'tabular-nums',
-            }}
-          >
-            {value}
-          </span>
-          <span
-            style={{
-              fontSize: '12px',
-              fontWeight: '600',
-              color: 'rgba(30,58,95,0.40)',
-              marginLeft: '4px',
-            }}
-          >
-            {helper}
-          </span>
-        </div>
-        <div
-          style={{
-            height: '7px',
-            borderRadius: '999px',
-            background: '#e2f2f8',
-            marginTop: '8px',
-            overflow: 'hidden',
-          }}
-        >
-          <div
-            style={{
-              height: '100%',
-              width: `${Math.min(progress * 100, 100)}%`,
-              background: '#38bdf8',
-              borderRadius: '999px',
-              transition: 'width 0.5s ease-out',
-            }}
-          />
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default MetricMiniCard;

src/components/health/RecentActivityList.tsx

@@ -1,200 +0,0 @@
-import React from 'react';
-import { IonIcon, IonButton } from '@ionic/react';
-import {
-  clipboardOutline,
-  medkitOutline,
-  restaurantOutline,
-  moonOutline,
-  chevronForwardOutline,
-} from 'ionicons/icons';
-import { ActivityEntry } from '../../types/health';
-import { formatDistanceToNow } from 'date-fns';
-
-interface Props {
-  entries: ActivityEntry[];
-  onCreate: () => void;
-  onSeeInsights: () => void;
-}
-
-const RecentActivityList: React.FC<Props> = ({
-  entries,
-  onCreate,
-  onSeeInsights,
-}) => {
-  if (entries.length === 0) {
-    return (
-      <div
-        style={{
-          margin: '0 20px 20px',
-          background: '#ffffff',
-          borderRadius: '24px',
-          padding: '32px 24px',
-          display: 'flex',
-          flexDirection: 'column',
-          alignItems: 'center',
-          textAlign: 'center',
-        }}
-      >
-        <IonIcon
-          icon={clipboardOutline}
-          style={{
-            fontSize: '42px',
-            color: 'rgba(3,105,161,0.36)',
-            marginBottom: '16px',
-          }}
-        />
-        <div
-          style={{
-            fontSize: '16px',
-            fontWeight: '700',
-            color: '#1e3a5f',
-            marginBottom: '8px',
-          }}
-        >
-          No health logs yet
-        </div>
-        <div
-          style={{
-            fontSize: '13px',
-            color: 'rgba(30,58,95,0.58)',
-            marginBottom: '24px',
-          }}
-        >
-          Start your first self checkup to track your wellbeing.
-        </div>
-        <IonButton
-          onClick={onCreate}
-          style={{
-            '--background': '#0369a1',
-            '--border-radius': '999px',
-            '--color': '#ffffff',
-            fontWeight: '700',
-            height: '44px',
-            width: '100%',
-            maxWidth: '200px',
-          }}
-        >
-          Start a checkup
-        </IonButton>
-      </div>
-    );
-  }
-
-  const getIcon = (type: string) => {
-    switch (type) {
-      case 'checkup':
-        return medkitOutline;
-      case 'diet':
-        return restaurantOutline;
-      case 'sleep':
-        return moonOutline;
-      default:
-        return clipboardOutline;
-    }
-  };
-
-  return (
-    <div
-      style={{
-        margin: '0 20px 20px',
-        background: '#ffffff',
-        borderRadius: '24px',
-        padding: '8px',
-        display: 'flex',
-        flexDirection: 'column',
-      }}
-    >
-      {entries.map((entry, index) => (
-        <div
-          key={entry.id}
-          style={{
-            display: 'flex',
-            alignItems: 'center',
-            gap: '12px',
-            padding: '12px',
-            borderBottom:
-              index === entries.length - 1
-                ? 'none'
-                : '1px solid rgba(30,58,95,0.05)',
-          }}
-        >
-          <div
-            style={{
-              width: '40px',
-              height: '40px',
-              borderRadius: '12px',
-              background: 'rgba(3,105,161,0.10)',
-              display: 'flex',
-              alignItems: 'center',
-              justifyContent: 'center',
-              flexShrink: 0,
-            }}
-          >
-            <IonIcon
-              icon={getIcon(entry.type)}
-              style={{ fontSize: '20px', color: '#0369a1' }}
-            />
-          </div>
-          <div style={{ flex: 1, minWidth: 0 }}>
-            <div
-              style={{
-                fontSize: '15px',
-                fontWeight: '700',
-                color: '#1e3a5f',
-                whiteSpace: 'nowrap',
-                overflow: 'hidden',
-                textOverflow: 'ellipsis',
-              }}
-            >
-              {entry.title}
-            </div>
-            <div
-              style={{
-                fontSize: '12px',
-                fontWeight: '500',
-                color: 'rgba(30,58,95,0.58)',
-                whiteSpace: 'nowrap',
-                overflow: 'hidden',
-                textOverflow: 'ellipsis',
-              }}
-            >
-              {entry.subtitle}
-            </div>
-          </div>
-          <div
-            style={{
-              fontSize: '11px',
-              fontWeight: '600',
-              color: 'rgba(30,58,95,0.40)',
-              flexShrink: 0,
-              textAlign: 'right',
-            }}
-          >
-            {formatDistanceToNow(new Date(entry.date), { addSuffix: true })}
-          </div>
-        </div>
-      ))}
-      <div
-        onClick={onSeeInsights}
-        style={{
-          padding: '16px',
-          display: 'flex',
-          justifyContent: 'center',
-          alignItems: 'center',
-          gap: '4px',
-          cursor: 'pointer',
-        }}
-      >
-        <span style={{ fontSize: '13px', fontWeight: '700', color: '#0369a1' }}>
-          View all insights
-        </span>
-        <IonIcon
-          icon={chevronForwardOutline}
-          style={{ fontSize: '14px', color: '#0369a1' }}
-        />
-      </div>
-    </div>
-  );
-};
-
-export default RecentActivityList;

src/components/health/SleepTrendCard.tsx

@@ -1,119 +0,0 @@
-import React from 'react';
-import { IonIcon } from '@ionic/react';
-import { moonOutline } from 'ionicons/icons';
-import { SleepEntry } from '../../types/health';
-import { format } from 'date-fns';
-
-interface Props {
-  entries: SleepEntry[];
-}
-
-const SleepTrendCard: React.FC<Props> = ({ entries }) => {
-  const lastSeven = entries.slice(0, 7).reverse();
-
-  if (entries.length === 0) {
-    return (
-      <div
-        style={{
-          background: '#ffffff',
-          borderRadius: '24px',
-          padding: '24px',
-          display: 'flex',
-          flexDirection: 'column',
-          alignItems: 'center',
-          textAlign: 'center',
-        }}
-      >
-        <IonIcon
-          icon={moonOutline}
-          style={{
-            fontSize: '32px',
-            color: 'rgba(3,105,161,0.20)',
-            marginBottom: '12px',
-          }}
-        />
-        <div
-          style={{
-            fontSize: '14px',
-            fontWeight: '500',
-            color: 'rgba(30,58,95,0.50)',
-          }}
-        >
-          Sleep trends appear after your first log
-        </div>
-      </div>
-    );
-  }
-
-  const maxHours = Math.max(...lastSeven.map((e) => e.hours), 10);
-
-  return (
-    <div
-      style={{
-        background: '#ffffff',
-        borderRadius: '24px',
-        padding: '20px',
-        display: 'flex',
-        flexDirection: 'column',
-      }}
-    >
-      <div
-        style={{
-          fontSize: '16px',
-          fontWeight: '700',
-          color: '#1e3a5f',
-          marginBottom: '16px',
-        }}
-      >
-        7-day sleep trend
-      </div>
-      <div
-        style={{
-          display: 'flex',
-          justifyContent: 'space-between',
-          alignItems: 'flex-end',
-          height: '80px',
-          paddingBottom: '20px',
-        }}
-      >
-        {lastSeven.map((entry) => (
-          <div
-            key={entry.id}
-            style={{
-              display: 'flex',
-              flexDirection: 'column',
-              alignItems: 'center',
-              flex: 1,
-            }}
-          >
-            <div
-              style={{
-                width: '12px',
-                height: `${(entry.hours / maxHours) * 60}px`,
-                background:
-                  entry.quality === 'Restful'
-                    ? '#38bdf8'
-                    : entry.quality === 'Okay'
-                      ? '#0369a1'
-                      : '#1e3a5f',
-                borderRadius: '6px 6px 0 0',
-              }}
-            />
-            <div
-              style={{
-                fontSize: '10px',
-                fontWeight: '600',
-                color: 'rgba(30,58,95,0.40)',
-                marginTop: '4px',
-              }}
-            >
-              {format(new Date(entry.createdAt), 'E')[0]}
-            </div>
-          </div>
-        ))}
-      </div>
-    </div>
-  );
-};
-
-export default SleepTrendCard;

src/components/health/WellbeingScoreCard.tsx

@@ -1,123 +0,0 @@
-import React from 'react';
-import { IonIcon } from '@ionic/react';
-import { pulseOutline } from 'ionicons/icons';
-
-interface Props {
-  score: number;
-  message: string;
-  progress: number;
-}
-
-const WellbeingScoreCard: React.FC<Props> = ({ score, message, progress }) => {
-  return (
-    <div
-      style={{
-        margin: '0 20px 12px',
-        background: '#1e3a5f',
-        borderRadius: '24px',
-        padding: '20px',
-        minHeight: '164px',
-        display: 'flex',
-        flexDirection: 'column',
-        justifyContent: 'space-between',
-        position: 'relative',
-        overflow: 'hidden',
-      }}
-    >
-      <div
-        style={{
-          display: 'flex',
-          justifyContent: 'space-between',
-          alignItems: 'flex-start',
-        }}
-      >
-        <div>
-          <div
-            style={{
-              fontSize: '13px',
-              fontWeight: '700',
-              color: 'rgba(255,255,255,0.72)',
-              marginBottom: '4px',
-            }}
-          >
-            Today’s wellbeing score
-          </div>
-          <div style={{ display: 'flex', alignItems: 'baseline' }}>
-            <span
-              style={{
-                fontSize: '48px',
-                fontWeight: '400',
-                color: '#ffffff',
-                lineHeight: '56px',
-                fontVariantNumeric: 'tabular-nums',
-              }}
-            >
-              {score}
-            </span>
-            <span
-              style={{
-                fontSize: '18px',
-                fontWeight: '400',
-                color: 'rgba(255,255,255,0.52)',
-                marginLeft: '4px',
-              }}
-            >
-              /100
-            </span>
-          </div>
-        </div>
-        <div
-          style={{
-            width: '40px',
-            height: '40px',
-            background: 'rgba(56,189,248,0.16)',
-            borderRadius: '12px',
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center',
-            flexShrink: 0,
-          }}
-        >
-          <IonIcon
-            icon={pulseOutline}
-            style={{ fontSize: '22px', color: '#38bdf8' }}
-          />
-        </div>
-      </div>
-
-      <div>
-        <div
-          style={{
-            fontSize: '14px',
-            fontWeight: '500',
-            color: 'rgba(255,255,255,0.78)',
-            lineHeight: '20px',
-            marginBottom: '12px',
-          }}
-        >
-          {message}
-        </div>
-        <div
-          style={{
-            height: '8px',
-            background: 'rgba(255,255,255,0.16)',
-            borderRadius: '999px',
-            overflow: 'hidden',
-          }}
-        >
-          <div
-            style={{
-              height: '100%',
-              width: `${progress * 100}%`,
-              background: '#38bdf8',
-              borderRadius: '999px',
-              transition: 'width 0.5s ease-out',
-            }}
-          />
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default WellbeingScoreCard;

src/contexts/AuthContext.tsx

@@ -0,0 +1,137 @@
+import React, { createContext, useContext, useEffect, useState } from 'react';
+import { User } from '@supabase/supabase-js';
+import { supabase } from '../supabase';
+import { IonSpinner } from '@ionic/react';
+
+export interface Profile {
+  id: string;
+  email: string;
+  full_name: string;
+  role: string;
+  ministry_group: string | null;
+  avatar_url: string | null;
+}
+
+interface AuthContextType {
+  user: User | null;
+  profile: Profile | null;
+  refreshProfile: () => Promise<void>;
+  signOut: () => Promise<void>;
+}
+
+const AuthContext = createContext<AuthContextType>({
+  user: null,
+  profile: null,
+  refreshProfile: async () => {},
+  signOut: async () => {},
+});
+
+const PROFILE_CACHE_KEY = 'church_app_profile_cache';
+
+async function getCachedProfile(): Promise<Profile | null> {
+  const cached = localStorage.getItem(PROFILE_CACHE_KEY);
+  if (cached) {
+    try {
+      return JSON.parse(cached);
+    } catch (e) {
+      return null;
+    }
+  }
+  return null;
+}
+
+async function cacheProfile(profile: Profile) {
+  localStorage.setItem(PROFILE_CACHE_KEY, JSON.stringify(profile));
+}
+
+async function clearCachedProfile() {
+  localStorage.removeItem(PROFILE_CACHE_KEY);
+}
+
+export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({
+  children,
+}) => {
+  const [user, setUser] = useState<User | null>(null);
+  const [profile, setProfile] = useState<Profile | null>(null);
+  const [initializing, setInitializing] = useState(true);
+
+  const fetchProfile = async (userId: string) => {
+    const cached = await getCachedProfile();
+    if (cached && cached.id === userId) {
+      setProfile(cached);
+    }
+    const { data } = await supabase
+      .from('profiles')
+      .select('*')
+      .eq('id', userId)
+      .single();
+    if (data) {
+      setProfile(data);
+      await cacheProfile(data);
+    }
+  };
+
+  const signOut = async () => {
+    await supabase.auth.signOut();
+  };
+
+  useEffect(() => {
+    // One-shot bootstrap
+    supabase.auth.getSession().then(async ({ data }) => {
+      const currentUser = data.session?.user ?? null;
+      setUser(currentUser);
+      if (currentUser) {
+        await fetchProfile(currentUser.id);
+      }
+      setInitializing(false); // only ever called once - IonReactRouter mounts after this
+    });
+
+    // Subsequent events: update state, never touch initializing
+    const {
+      data: { subscription },
+    } = supabase.auth.onAuthStateChange(async (_event, session) => {
+      const currentUser = session?.user ?? null;
+      setUser(currentUser);
+      if (currentUser) {
+        await fetchProfile(currentUser.id);
+      } else {
+        setProfile(null);
+        await clearCachedProfile();
+      }
+    });
+
+    return () => subscription.unsubscribe();
+  }, []);
+
+  if (initializing) {
+    return (
+      <div
+        style={{
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          height: '100vh',
+          backgroundColor: '#f5f7f4',
+        }}
+      >
+        <IonSpinner name="crescent" color="primary" />
+      </div>
+    );
+  }
+
+  return (
+    <AuthContext.Provider
+      value={{
+        user,
+        profile,
+        refreshProfile: () =>
+          user ? fetchProfile(user.id) : Promise.resolve(),
+        signOut,
+      }}
+    >
+      {children}
+    </AuthContext.Provider>
+  );
+};
+
+export const useAuth = () => useContext(AuthContext);

src/database.types.ts

@@ -0,0 +1,305 @@
+export type Json =
+  | string
+  | number
+  | boolean
+  | null
+  | { [key: string]: Json | undefined }
+  | Json[]
+
+export type Database = {
+  // Allows to automatically instantiate createClient with right options
+  // instead of createClient<Database, { PostgrestVersion: 'XX' }>(URL, KEY)
+  __InternalSupabase: {
+    PostgrestVersion: "14.5"
+  }
+  public: {
+    Tables: {
+      event_categories: {
+        Row: {
+          accent_color: string | null
+          created_at: string
+          id: string
+          name: string
+          slug: string
+        }
+        Insert: {
+          accent_color?: string | null
+          created_at?: string
+          id?: string
+          name: string
+          slug: string
+        }
+        Update: {
+          accent_color?: string | null
+          created_at?: string
+          id?: string
+          name?: string
+          slug?: string
+        }
+        Relationships: []
+      }
+      events: {
+        Row: {
+          audience: string
+          category_id: string | null
+          created_at: string
+          created_by: string | null
+          day_label: string
+          description: string
+          end_at: string | null
+          id: string
+          is_featured: boolean
+          start_at: string
+          title: string
+          updated_at: string
+          venue: string
+        }
+        Insert: {
+          audience?: string
+          category_id?: string | null
+          created_at?: string
+          created_by?: string | null
+          day_label: string
+          description?: string
+          end_at?: string | null
+          id?: string
+          is_featured?: boolean
+          start_at: string
+          title: string
+          updated_at?: string
+          venue: string
+        }
+        Update: {
+          audience?: string
+          category_id?: string | null
+          created_at?: string
+          created_by?: string | null
+          day_label?: string
+          description?: string
+          end_at?: string | null
+          id?: string
+          is_featured?: boolean
+          start_at?: string
+          title?: string
+          updated_at?: string
+          venue?: string
+        }
+        Relationships: [
+          {
+            foreignKeyName: "events_category_id_fkey"
+            columns: ["category_id"]
+            isOneToOne: false
+            referencedRelation: "event_categories"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
+      news: {
+        Row: {
+          content: string
+          created_at: string | null
+          created_by: string
+          id: string
+          image_url: string | null
+          title: string
+          updated_at: string | null
+        }
+        Insert: {
+          content: string
+          created_at?: string | null
+          created_by: string
+          id?: string
+          image_url?: string | null
+          title: string
+          updated_at?: string | null
+        }
+        Update: {
+          content?: string
+          created_at?: string | null
+          created_by?: string
+          id?: string
+          image_url?: string | null
+          title?: string
+          updated_at?: string | null
+        }
+        Relationships: [
+          {
+            foreignKeyName: "news_created_by_fkey"
+            columns: ["created_by"]
+            isOneToOne: false
+            referencedRelation: "profiles"
+            referencedColumns: ["id"]
+          },
+        ]
+      }
+      profiles: {
+        Row: {
+          avatar_url: string | null
+          created_at: string
+          email: string
+          full_name: string | null
+          id: string
+          ministry_group: string | null
+          role: string
+          updated_at: string
+        }
+        Insert: {
+          avatar_url?: string | null
+          created_at?: string
+          email: string
+          full_name?: string | null
+          id: string
+          ministry_group?: string | null
+          role?: string
+          updated_at?: string
+        }
+        Update: {
+          avatar_url?: string | null
+          created_at?: string
+          email?: string
+          full_name?: string | null
+          id?: string
+          ministry_group?: string | null
+          role?: string
+          updated_at?: string
+        }
+        Relationships: []
+      }
+    }
+    Views: {
+      [_ in never]: never
+    }
+    Functions: {
+      [_ in never]: never
+    }
+    Enums: {
+      [_ in never]: never
+    }
+    CompositeTypes: {
+      [_ in never]: never
+    }
+  }
+}
+
+type DatabaseWithoutInternals = Omit<Database, "__InternalSupabase">
+
+type DefaultSchema = DatabaseWithoutInternals[Extract<keyof Database, "public">]
+
+export type Tables<
+  DefaultSchemaTableNameOrOptions extends
+    | keyof (DefaultSchema["Tables"] & DefaultSchema["Views"])
+    | { schema: keyof DatabaseWithoutInternals },
+  TableName extends DefaultSchemaTableNameOrOptions extends {
+    schema: keyof DatabaseWithoutInternals
+  }
+    ? keyof (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+        DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
+    : never = never,
+> = DefaultSchemaTableNameOrOptions extends {
+  schema: keyof DatabaseWithoutInternals
+}
+  ? (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+      DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
+      Row: infer R
+    }
+    ? R
+    : never
+  : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] &
+        DefaultSchema["Views"])
+    ? (DefaultSchema["Tables"] &
+        DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends {
+        Row: infer R
+      }
+      ? R
+      : never
+    : never
+
+export type TablesInsert<
+  DefaultSchemaTableNameOrOptions extends
+    | keyof DefaultSchema["Tables"]
+    | { schema: keyof DatabaseWithoutInternals },
+  TableName extends DefaultSchemaTableNameOrOptions extends {
+    schema: keyof DatabaseWithoutInternals
+  }
+    ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
+    : never = never,
+> = DefaultSchemaTableNameOrOptions extends {
+  schema: keyof DatabaseWithoutInternals
+}
+  ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+      Insert: infer I
+    }
+    ? I
+    : never
+  : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
+    ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
+        Insert: infer I
+      }
+      ? I
+      : never
+    : never
+
+export type TablesUpdate<
+  DefaultSchemaTableNameOrOptions extends
+    | keyof DefaultSchema["Tables"]
+    | { schema: keyof DatabaseWithoutInternals },
+  TableName extends DefaultSchemaTableNameOrOptions extends {
+    schema: keyof DatabaseWithoutInternals
+  }
+    ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
+    : never = never,
+> = DefaultSchemaTableNameOrOptions extends {
+  schema: keyof DatabaseWithoutInternals
+}
+  ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+      Update: infer U
+    }
+    ? U
+    : never
+  : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
+    ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
+        Update: infer U
+      }
+      ? U
+      : never
+    : never
+
+export type Enums<
+  DefaultSchemaEnumNameOrOptions extends
+    | keyof DefaultSchema["Enums"]
+    | { schema: keyof DatabaseWithoutInternals },
+  EnumName extends DefaultSchemaEnumNameOrOptions extends {
+    schema: keyof DatabaseWithoutInternals
+  }
+    ? keyof DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"]
+    : never = never,
+> = DefaultSchemaEnumNameOrOptions extends {
+  schema: keyof DatabaseWithoutInternals
+}
+  ? DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName]
+  : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"]
+    ? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions]
+    : never
+
+export type CompositeTypes<
+  PublicCompositeTypeNameOrOptions extends
+    | keyof DefaultSchema["CompositeTypes"]
+    | { schema: keyof DatabaseWithoutInternals },
+  CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
+    schema: keyof DatabaseWithoutInternals
+  }
+    ? keyof DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"]
+    : never = never,
+> = PublicCompositeTypeNameOrOptions extends {
+  schema: keyof DatabaseWithoutInternals
+}
+  ? DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName]
+  : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"]
+    ? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
+    : never
+
+export const Constants = {
+  public: {
+    Enums: {},
+  },
+} as const

src/main.tsx

@@ -5,7 +5,7 @@ import { Capacitor } from '@capacitor/core';
 import App from './App';
 
 // ── Ionic initialisation ──────────────────────────────────────────────────────
-// ?mode=md|ios overrides (used by AppSuite preview); otherwise follow the platform.
+// ?mode=md|ios overrides (used by Appcakes preview); otherwise follow the platform.
 const _urlMode = new URLSearchParams(window.location.search).get('mode');
 const _platform = Capacitor.getPlatform(); // 'ios' | 'android' | 'web'
 setupIonicReact({
@@ -13,7 +13,7 @@ setupIonicReact({
 });
 
 // Derive the studio parent origin dynamically so this works in both dev
-// (parent at localhost:3000) and production (parent at appcakes.qqura.com).
+// (parent at localhost:3000) and production (parent at studio.appcakes.dev).
 const studioOrigin = (() => {
   try {
     if (document.referrer) return new URL(document.referrer).origin;
@@ -49,7 +49,7 @@ if (import.meta.hot) {
 }
 
 // ── Session bridge ────────────────────────────────────────────────────────────
-// Post auth session to the AppSuite parent frame so the AI can test auth-protected
+// Post auth session to the Appcakes parent frame so the AI can test auth-protected
 // Edge Functions. Uses import.meta.glob so Vite never errors if supabase.ts is absent.
 (async () => {
   const mods = import.meta.glob('./supabase.ts', { eager: false });
@@ -73,12 +73,17 @@ if (import.meta.hot) {
 })();
 
 // ── Runtime error reporting ───────────────────────────────────────────────────
-// Forward uncaught errors to the AppSuite dev server so the AI can read them.
+// Forward uncaught errors to the Appcakes dev server so the AI can read them.
+// Extract projectId from the preview URL (/preview/{projectId}/) so errors are
+// scoped per-project on the server rather than mixed into a global queue.
+const _previewMatch = window.location.pathname.match(/\/preview\/([^/]+)/);
+const _projectId = _previewMatch?.[1] ?? null;
+
 function reportError(message: string, stack?: string) {
   fetch(`${studioOrigin}/api/agent/runtime-error`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ message, stack }),
+    body: JSON.stringify({ message, stack, projectId: _projectId }),
   }).catch(() => {});
 }
 

src/pages/AdminEventForm.tsx

@@ -0,0 +1,685 @@
+import React, { useState, useEffect } from 'react';
+import {
+  IonPage,
+  IonContent,
+  IonHeader,
+  IonToolbar,
+  IonTitle,
+  IonButtons,
+  IonButton,
+  IonIcon,
+  IonSpinner,
+  IonSelect,
+  IonSelectOption,
+  IonDatetime,
+  IonModal,
+  IonItem,
+  IonLabel,
+} from '@ionic/react';
+import { useHistory, useParams } from 'react-router-dom';
+import { supabase } from '../supabase';
+import { useAuth } from '../contexts/AuthContext';
+import {
+  chevronBackOutline,
+  calendarOutline,
+  timeOutline,
+} from 'ionicons/icons';
+import { EventCategory, ChurchEvent } from '../types';
+
+const AdminEventForm: React.FC = () => {
+  const [title, setTitle] = useState('');
+  const [description, setDescription] = useState('');
+  const [categoryId, setCategoryId] = useState('');
+  const [audience, setAudience] = useState<'all' | 'youth' | 'children'>('all');
+  const [venue, setVenue] = useState('');
+
+  // Date states
+  const [startAt, setStartAt] = useState<string>(new Date().toISOString());
+  const [endAt, setEndAt] = useState<string>('');
+
+  const [isFeatured, setIsFeatured] = useState(false);
+
+  const [categories, setCategories] = useState<EventCategory[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [saving, setSaving] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const { id } = useParams<{ id: string }>();
+  const isEditMode = !!id;
+
+  const history = useHistory();
+  const { user, profile } = useAuth();
+
+  useEffect(() => {
+    if (profile && profile.role !== 'admin') {
+      history.replace('/home');
+      return;
+    }
+
+    const loadData = async () => {
+      setLoading(true);
+
+      // Load categories
+      const { data: catData, error: catError } = await supabase
+        .from('event_categories')
+        .select('*')
+        .order('name');
+
+      if (catError) {
+        setError(catError.message);
+        setLoading(false);
+        return;
+      }
+      setCategories(catData as EventCategory[]);
+
+      // If edit mode, load event
+      if (isEditMode) {
+        const { data: eventData, error: eventError } = await supabase
+          .from('events')
+          .select('*')
+          .eq('id', id)
+          .single();
+
+        if (eventError) {
+          setError(eventError.message);
+        } else {
+          const event = eventData as ChurchEvent;
+          setTitle(event.title);
+          setDescription(event.description);
+          setCategoryId(event.category_id);
+          setAudience(event.audience);
+          setVenue(event.venue);
+          setStartAt(event.start_at);
+          setEndAt(event.end_at || '');
+          setIsFeatured(event.is_featured);
+        }
+      } else if (catData && catData.length > 0) {
+        setCategoryId(catData[0].id); // default category
+      }
+
+      setLoading(false);
+    };
+
+    if (profile?.role === 'admin') {
+      loadData();
+    }
+  }, [id, isEditMode, profile, history]);
+
+  const showError = (msg: string) => {
+    setError(msg);
+    setTimeout(() => setError(null), 4000);
+  };
+
+  const getDayLabel = (dateString: string) => {
+    const d = new Date(dateString);
+    return d.toLocaleDateString(undefined, { weekday: 'long' });
+  };
+
+  const handleSave = async (e: React.FormEvent) => {
+    e.preventDefault();
+    if (!title || !description || !categoryId || !venue || !startAt) {
+      showError('Please fill out all required fields');
+      return;
+    }
+    if (!user || profile?.role !== 'admin') {
+      showError('Unauthorized');
+      return;
+    }
+
+    setSaving(true);
+    setError(null);
+
+    const dayLabel = getDayLabel(startAt);
+    const eventPayload = {
+      title,
+      description,
+      category_id: categoryId,
+      audience,
+      venue,
+      start_at: startAt,
+      end_at: endAt || null,
+      day_label: dayLabel,
+      is_featured: isFeatured,
+    };
+
+    if (isEditMode) {
+      const { error: updateError } = await supabase
+        .from('events')
+        .update(eventPayload)
+        .eq('id', id);
+
+      if (updateError) {
+        showError(updateError.message);
+        setSaving(false);
+        return;
+      }
+    } else {
+      const { error: insertError } = await supabase.from('events').insert({
+        ...eventPayload,
+        created_by: user.id,
+      });
+
+      if (insertError) {
+        showError(insertError.message);
+        setSaving(false);
+        return;
+      }
+    }
+
+    setSaving(false);
+    history.goBack();
+  };
+
+  const handleDelete = async () => {
+    if (!isEditMode) return;
+    const confirmDelete = window.confirm(
+      'Are you sure you want to delete this event?'
+    );
+    if (!confirmDelete) return;
+
+    setSaving(true);
+    const { error: deleteError } = await supabase
+      .from('events')
+      .delete()
+      .eq('id', id);
+
+    if (deleteError) {
+      showError(deleteError.message);
+      setSaving(false);
+      return;
+    }
+
+    history.replace('/events');
+  };
+
+  return (
+    <IonPage style={{ background: '#f5f7f4' }}>
+      <IonHeader className="ion-no-border">
+        <IonToolbar style={{ '--background': '#f5f7f4' }}>
+          <IonButtons slot="start">
+            <IonButton onClick={() => history.goBack()} disabled={saving}>
+              <IonIcon
+                icon={chevronBackOutline}
+                style={{ color: '#1f2937' }}
+                slot="icon-only"
+              />
+            </IonButton>
+          </IonButtons>
+          <IonTitle
+            style={{ fontSize: '18px', fontWeight: '700', color: '#1f2937' }}
+          >
+            {isEditMode ? 'Edit Event' : 'New Event'}
+          </IonTitle>
+        </IonToolbar>
+      </IonHeader>
+
+      <IonContent
+        style={{
+          '--background': '#f5f7f4',
+          '--padding-start': '20px',
+          '--padding-end': '20px',
+          '--padding-top': '16px',
+          '--padding-bottom': '24px',
+        }}
+      >
+        {loading ? (
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'center',
+              padding: '40px 0',
+            }}
+          >
+            <IonSpinner name="crescent" color="primary" />
+          </div>
+        ) : (
+          <>
+            <div
+              style={{
+                background: '#ffffff',
+                borderRadius: '24px',
+                padding: '20px',
+                margin: '0 0 16px 0',
+                boxShadow: '0 2px 4px rgba(0,0,0,0.02)',
+              }}
+            >
+              <h2
+                style={{
+                  margin: 0,
+                  fontSize: '18px',
+                  fontWeight: '700',
+                  color: '#1f2937',
+                }}
+              >
+                Event Details
+              </h2>
+              <p
+                style={{
+                  margin: '4px 0 0 0',
+                  fontSize: '14px',
+                  fontWeight: '400',
+                  color: '#6b7280',
+                }}
+              >
+                Provide the schedule and venue info for members.
+              </p>
+            </div>
+
+            {error && (
+              <div
+                style={{
+                  background: 'rgba(163, 59, 50, 0.10)',
+                  borderRadius: '12px',
+                  padding: '12px 14px',
+                  marginBottom: '16px',
+                }}
+              >
+                <p
+                  style={{
+                    margin: 0,
+                    fontSize: '13px',
+                    fontWeight: '500',
+                    color: '#a33b32',
+                    lineHeight: '1.4',
+                  }}
+                >
+                  {error}
+                </p>
+              </div>
+            )}
+
+            <form
+              onSubmit={handleSave}
+              style={{
+                background: '#ffffff',
+                borderRadius: '24px',
+                padding: '24px',
+                margin: '0 0 16px 0',
+                display: 'flex',
+                flexDirection: 'column',
+                gap: '16px',
+                boxShadow: '0 2px 4px rgba(0,0,0,0.02)',
+              }}
+            >
+              {/* Title */}
+              <div>
+                <label
+                  style={{
+                    display: 'block',
+                    marginBottom: '6px',
+                    fontSize: '14px',
+                    fontWeight: '600',
+                    color: '#1f2937',
+                  }}
+                >
+                  Event Title
+                </label>
+                <input
+                  type="text"
+                  placeholder="e.g. Sunday Service"
+                  value={title}
+                  onChange={(e) => setTitle(e.target.value)}
+                  required
+                  style={{
+                    width: '100%',
+                    background: '#eef2ec',
+                    border: 'none',
+                    borderRadius: '12px',
+                    padding: '0 14px',
+                    height: '48px',
+                    fontSize: '15px',
+                    color: '#1f2937',
+                    outline: 'none',
+                    boxSizing: 'border-box',
+                  }}
+                />
+              </div>
+
+              {/* Category */}
+              <div>
+                <label
+                  style={{
+                    display: 'block',
+                    marginBottom: '6px',
+                    fontSize: '14px',
+                    fontWeight: '600',
+                    color: '#1f2937',
+                  }}
+                >
+                  Category
+                </label>
+                <div
+                  style={{
+                    background: '#eef2ec',
+                    borderRadius: '12px',
+                    padding: '0 14px',
+                    height: '48px',
+                    display: 'flex',
+                    alignItems: 'center',
+                  }}
+                >
+                  <IonSelect
+                    value={categoryId}
+                    onIonChange={(e) => setCategoryId(e.detail.value)}
+                    interface="popover"
+                    style={{
+                      width: '100%',
+                      color: '#1f2937',
+                      fontSize: '15px',
+                    }}
+                  >
+                    {categories.map((cat) => (
+                      <IonSelectOption key={cat.id} value={cat.id}>
+                        {cat.name}
+                      </IonSelectOption>
+                    ))}
+                  </IonSelect>
+                </div>
+              </div>
+
+              {/* Audience */}
+              <div>
+                <label
+                  style={{
+                    display: 'block',
+                    marginBottom: '6px',
+                    fontSize: '14px',
+                    fontWeight: '600',
+                    color: '#1f2937',
+                  }}
+                >
+                  Audience
+                </label>
+                <div style={{ display: 'flex', gap: '8px' }}>
+                  <button
+                    type="button"
+                    onClick={() => setAudience('all')}
+                    style={{
+                      flex: 1,
+                      background: audience === 'all' ? '#2f6b4f' : '#eef2ec',
+                      color: audience === 'all' ? '#ffffff' : '#4b5563',
+                      border: 'none',
+                      borderRadius: '999px',
+                      padding: '12px',
+                      fontSize: '14px',
+                      fontWeight: '600',
+                      cursor: 'pointer',
+                    }}
+                  >
+                    All Members
+                  </button>
+                  <button
+                    type="button"
+                    onClick={() => setAudience('youth')}
+                    style={{
+                      flex: 1,
+                      background: audience === 'youth' ? '#2f6b4f' : '#eef2ec',
+                      color: audience === 'youth' ? '#ffffff' : '#4b5563',
+                      border: 'none',
+                      borderRadius: '999px',
+                      padding: '12px',
+                      fontSize: '14px',
+                      fontWeight: '600',
+                      cursor: 'pointer',
+                    }}
+                  >
+                    Youth Only
+                  </button>
+                  <button
+                    type="button"
+                    onClick={() => setAudience('children')}
+                    style={{
+                      flex: 1,
+                      background:
+                        audience === 'children' ? '#2f6b4f' : '#eef2ec',
+                      color: audience === 'children' ? '#ffffff' : '#4b5563',
+                      border: 'none',
+                      borderRadius: '999px',
+                      padding: '12px',
+                      fontSize: '14px',
+                      fontWeight: '600',
+                      cursor: 'pointer',
+                    }}
+                  >
+                    Children
+                  </button>
+                </div>
+              </div>
+
+              {/* Venue */}
+              <div>
+                <label
+                  style={{
+                    display: 'block',
+                    marginBottom: '6px',
+                    fontSize: '14px',
+                    fontWeight: '600',
+                    color: '#1f2937',
+                  }}
+                >
+                  Venue
+                </label>
+                <input
+                  type="text"
+                  placeholder="e.g. Main Auditorium"
+                  value={venue}
+                  onChange={(e) => setVenue(e.target.value)}
+                  required
+                  style={{
+                    width: '100%',
+                    background: '#eef2ec',
+                    border: 'none',
+                    borderRadius: '12px',
+                    padding: '0 14px',
+                    height: '48px',
+                    fontSize: '15px',
+                    color: '#1f2937',
+                    outline: 'none',
+                    boxSizing: 'border-box',
+                  }}
+                />
+              </div>
+
+              {/* Dates */}
+              <div>
+                <label
+                  style={{
+                    display: 'block',
+                    marginBottom: '6px',
+                    fontSize: '14px',
+                    fontWeight: '600',
+                    color: '#1f2937',
+                  }}
+                >
+                  Start Time
+                </label>
+                <div
+                  style={{
+                    background: '#eef2ec',
+                    borderRadius: '12px',
+                    padding: '4px 14px',
+                    display: 'flex',
+                    alignItems: 'center',
+                  }}
+                >
+                  <IonDatetime
+                    presentation="date-time"
+                    value={startAt}
+                    onIonChange={(e) => setStartAt(e.detail.value as string)}
+                    style={{ background: 'transparent' }}
+                  />
+                </div>
+              </div>
+
+              <div>
+                <label
+                  style={{
+                    display: 'block',
+                    marginBottom: '6px',
+                    fontSize: '14px',
+                    fontWeight: '600',
+                    color: '#1f2937',
+                  }}
+                >
+                  End Time (Optional)
+                </label>
+                <div
+                  style={{
+                    background: '#eef2ec',
+                    borderRadius: '12px',
+                    padding: '4px 14px',
+                    display: 'flex',
+                    alignItems: 'center',
+                  }}
+                >
+                  <IonDatetime
+                    presentation="date-time"
+                    value={endAt}
+                    onIonChange={(e) =>
+                      setEndAt((e.detail.value as string) || '')
+                    }
+                    showClearButton={true}
+                    style={{ background: 'transparent' }}
+                  />
+                </div>
+              </div>
+
+              {/* Description */}
+              <div>
+                <label
+                  style={{
+                    display: 'block',
+                    marginBottom: '6px',
+                    fontSize: '14px',
+                    fontWeight: '600',
+                    color: '#1f2937',
+                  }}
+                >
+                  Description
+                </label>
+                <textarea
+                  placeholder="Describe the event..."
+                  value={description}
+                  onChange={(e) => setDescription(e.target.value)}
+                  required
+                  style={{
+                    width: '100%',
+                    background: '#eef2ec',
+                    border: 'none',
+                    borderRadius: '12px',
+                    padding: '14px',
+                    minHeight: '120px',
+                    fontSize: '15px',
+                    color: '#1f2937',
+                    outline: 'none',
+                    resize: 'vertical',
+                    boxSizing: 'border-box',
+                  }}
+                />
+              </div>
+
+              {/* Featured Toggle */}
+              <div
+                style={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'space-between',
+                  padding: '8px 0',
+                }}
+              >
+                <span
+                  style={{
+                    fontSize: '14px',
+                    fontWeight: '600',
+                    color: '#1f2937',
+                  }}
+                >
+                  Feature on Home Screen
+                </span>
+                <button
+                  type="button"
+                  onClick={() => setIsFeatured(!isFeatured)}
+                  style={{
+                    width: '44px',
+                    height: '24px',
+                    background: isFeatured ? '#2f6b4f' : '#eef2ec',
+                    borderRadius: '12px',
+                    border: 'none',
+                    position: 'relative',
+                    cursor: 'pointer',
+                    transition: '0.2s',
+                  }}
+                >
+                  <div
+                    style={{
+                      width: '20px',
+                      height: '20px',
+                      background: '#ffffff',
+                      borderRadius: '50%',
+                      position: 'absolute',
+                      top: '2px',
+                      left: isFeatured ? '22px' : '2px',
+                      transition: '0.2s',
+                    }}
+                  />
+                </button>
+              </div>
+
+              <button
+                type="submit"
+                disabled={saving}
+                style={{
+                  background: '#2f6b4f',
+                  border: 'none',
+                  borderRadius: '999px',
+                  padding: '16px',
+                  fontSize: '15px',
+                  fontWeight: '600',
+                  color: '#ffffff',
+                  cursor: 'pointer',
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  marginTop: '8px',
+                }}
+              >
+                {saving ? (
+                  <IonSpinner name="dots" color="light" />
+                ) : isEditMode ? (
+                  'Update Event'
+                ) : (
+                  'Create Event'
+                )}
+              </button>
+
+              {isEditMode && (
+                <button
+                  type="button"
+                  onClick={handleDelete}
+                  disabled={saving}
+                  style={{
+                    background: 'rgba(163, 59, 50, 0.10)',
+                    border: 'none',
+                    borderRadius: '999px',
+                    padding: '16px',
+                    fontSize: '15px',
+                    fontWeight: '600',
+                    color: '#a33b32',
+                    cursor: 'pointer',
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                  }}
+                >
+                  Delete Event
+                </button>
+              )}
+            </form>
+          </>
+        )}
+      </IonContent>
+    </IonPage>
+  );
+};
+
+export default AdminEventForm;

src/pages/AdminNewsForm.tsx

@@ -0,0 +1,330 @@
+import React, { useState, useEffect } from 'react';
+import {
+  IonPage,
+  IonContent,
+  IonHeader,
+  IonToolbar,
+  IonTitle,
+  IonButtons,
+  IonButton,
+  IonIcon,
+  IonSpinner,
+  IonItem,
+  IonLabel,
+  IonInput,
+  IonTextarea,
+} from '@ionic/react';
+import { useHistory, useParams } from 'react-router-dom';
+import { supabase } from '../supabase';
+import { useAuth } from '../contexts/AuthContext';
+import { chevronBackOutline, saveOutline, trashOutline } from 'ionicons/icons';
+
+const AdminNewsForm: React.FC = () => {
+  const history = useHistory();
+  const { id } = useParams<{ id: string }>();
+  const isEdit = !!id && id !== 'new';
+  const { user, profile } = useAuth();
+
+  const [loading, setLoading] = useState(false);
+  const [initialLoading, setInitialLoading] = useState(isEdit);
+  const [error, setError] = useState<string | null>(null);
+
+  const [title, setTitle] = useState('');
+  const [content, setContent] = useState('');
+  const [imageUrl, setImageUrl] = useState('');
+
+  const showError = (msg: string) => {
+    setError(msg);
+    setTimeout(() => setError(null), 4000);
+  };
+
+  useEffect(() => {
+    if (profile?.role !== 'admin') {
+      history.replace('/profile');
+      return;
+    }
+
+    if (isEdit) {
+      loadNewsItem();
+    }
+  }, [profile, isEdit]);
+
+  const loadNewsItem = async () => {
+    try {
+      const { data, error } = await supabase
+        .from('news')
+        .select('*')
+        .eq('id', id)
+        .single();
+      if (error) throw error;
+      if (data) {
+        setTitle(data.title);
+        setContent(data.content);
+        setImageUrl(data.image_url || '');
+      }
+    } catch (err: any) {
+      showError(err.message);
+    } finally {
+      setInitialLoading(false);
+    }
+  };
+
+  const handleSave = async () => {
+    if (!title.trim() || !content.trim()) {
+      showError('Title and content are required.');
+      return;
+    }
+
+    setLoading(true);
+    try {
+      if (isEdit) {
+        const { error } = await supabase
+          .from('news')
+          .update({
+            title,
+            content,
+            image_url: imageUrl.trim() || null,
+          })
+          .eq('id', id);
+        if (error) throw error;
+      } else {
+        const { error } = await supabase.from('news').insert({
+          title,
+          content,
+          image_url: imageUrl.trim() || null,
+          created_by: user!.id,
+        });
+        if (error) throw error;
+      }
+      history.goBack();
+    } catch (err: any) {
+      showError(err.message);
+      setLoading(false);
+    }
+  };
+
+  const handleDelete = async () => {
+    if (!window.confirm('Delete this news item?')) return;
+    setLoading(true);
+    try {
+      const { error } = await supabase.from('news').delete().eq('id', id);
+      if (error) throw error;
+      history.goBack();
+    } catch (err: any) {
+      showError(err.message);
+      setLoading(false);
+    }
+  };
+
+  if (initialLoading) {
+    return (
+      <IonPage>
+        <IonHeader className="ion-no-border">
+          <IonToolbar style={{ '--background': '#f5f7f4' }}>
+            <IonButtons slot="start">
+              <IonButton onClick={() => history.goBack()}>
+                <IonIcon icon={chevronBackOutline} slot="icon-only" />
+              </IonButton>
+            </IonButtons>
+          </IonToolbar>
+        </IonHeader>
+        <IonContent style={{ '--background': '#f5f7f4' }}>
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'center',
+              marginTop: '40px',
+            }}
+          >
+            <IonSpinner name="crescent" />
+          </div>
+        </IonContent>
+      </IonPage>
+    );
+  }
+
+  return (
+    <IonPage>
+      <IonHeader className="ion-no-border">
+        <IonToolbar style={{ '--background': '#f5f7f4' }}>
+          <IonButtons slot="start">
+            <IonButton onClick={() => history.goBack()}>
+              <IonIcon icon={chevronBackOutline} slot="icon-only" />
+            </IonButton>
+          </IonButtons>
+          <IonTitle style={{ fontWeight: '700', fontSize: '18px' }}>
+            {isEdit ? 'Edit News' : 'Create News'}
+          </IonTitle>
+          {isEdit && (
+            <IonButtons slot="end">
+              <IonButton onClick={handleDelete} color="danger">
+                <IonIcon icon={trashOutline} slot="icon-only" />
+              </IonButton>
+            </IonButtons>
+          )}
+        </IonToolbar>
+      </IonHeader>
+
+      <IonContent style={{ '--background': '#f5f7f4' }}>
+        <div style={{ padding: '20px', maxWidth: '600px', margin: '0 auto' }}>
+          {error && (
+            <div
+              style={{
+                background: '#fee2e2',
+                color: '#991b1b',
+                padding: '12px',
+                borderRadius: '8px',
+                fontSize: '14px',
+                marginBottom: '20px',
+              }}
+            >
+              {error}
+            </div>
+          )}
+
+          <div
+            style={{
+              background: '#ffffff',
+              borderRadius: '24px',
+              padding: '20px',
+              display: 'flex',
+              flexDirection: 'column',
+              gap: '16px',
+              boxShadow: '0 2px 4px rgba(0,0,0,0.02)',
+            }}
+          >
+            <div>
+              <label
+                style={{
+                  display: 'block',
+                  fontSize: '12px',
+                  fontWeight: '600',
+                  color: '#4b5563',
+                  marginBottom: '8px',
+                  textTransform: 'uppercase',
+                  letterSpacing: '0.05em',
+                }}
+              >
+                Title
+              </label>
+              <IonItem
+                lines="none"
+                style={{
+                  '--background': '#f9faf9',
+                  '--border-radius': '12px',
+                  '--padding-start': '16px',
+                }}
+              >
+                <IonInput
+                  value={title}
+                  onIonChange={(e) => setTitle(e.detail.value!)}
+                  placeholder="Enter news title"
+                  style={{ fontWeight: '500' }}
+                />
+              </IonItem>
+            </div>
+
+            <div>
+              <label
+                style={{
+                  display: 'block',
+                  fontSize: '12px',
+                  fontWeight: '600',
+                  color: '#4b5563',
+                  marginBottom: '8px',
+                  textTransform: 'uppercase',
+                  letterSpacing: '0.05em',
+                }}
+              >
+                Image URL (Optional)
+              </label>
+              <IonItem
+                lines="none"
+                style={{
+                  '--background': '#f9faf9',
+                  '--border-radius': '12px',
+                  '--padding-start': '16px',
+                }}
+              >
+                <IonInput
+                  value={imageUrl}
+                  onIonChange={(e) => setImageUrl(e.detail.value!)}
+                  placeholder="https://example.com/image.jpg"
+                />
+              </IonItem>
+            </div>
+
+            <div>
+              <label
+                style={{
+                  display: 'block',
+                  fontSize: '12px',
+                  fontWeight: '600',
+                  color: '#4b5563',
+                  marginBottom: '8px',
+                  textTransform: 'uppercase',
+                  letterSpacing: '0.05em',
+                }}
+              >
+                Content
+              </label>
+              <IonItem
+                lines="none"
+                style={{
+                  '--background': '#f9faf9',
+                  '--border-radius': '12px',
+                  '--padding-start': '16px',
+                  alignItems: 'flex-start',
+                }}
+              >
+                <IonTextarea
+                  value={content}
+                  onIonChange={(e) => setContent(e.detail.value!)}
+                  placeholder="Write your news update here..."
+                  autoGrow
+                  style={{ minHeight: '150px' }}
+                />
+              </IonItem>
+            </div>
+          </div>
+
+          <button
+            onClick={handleSave}
+            disabled={loading}
+            style={{
+              width: '100%',
+              background: '#2f6b4f',
+              color: '#ffffff',
+              border: 'none',
+              borderRadius: '999px',
+              padding: '16px',
+              fontSize: '16px',
+              fontWeight: '600',
+              marginTop: '24px',
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+              gap: '8px',
+              cursor: loading ? 'not-allowed' : 'pointer',
+              opacity: loading ? 0.7 : 1,
+            }}
+          >
+            {loading ? (
+              <IonSpinner
+                name="crescent"
+                style={{ width: '24px', height: '24px' }}
+              />
+            ) : (
+              <>
+                <IonIcon icon={saveOutline} />
+                Save News
+              </>
+            )}
+          </button>
+        </div>
+      </IonContent>
+    </IonPage>
+  );
+};
+
+export default AdminNewsForm;

src/pages/Auth.tsx

@@ -0,0 +1,323 @@
+import React, { useState, useEffect } from 'react';
+import {
+  IonPage,
+  IonContent,
+  IonSpinner,
+  useIonViewWillEnter,
+} from '@ionic/react';
+import { useHistory } from 'react-router-dom';
+import { supabase } from '../supabase';
+import { useAuth } from '../contexts/AuthContext';
+
+const Auth: React.FC = () => {
+  const [activeTab, setActiveTab] = useState<'login' | 'register'>('login');
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const history = useHistory();
+  const { user, profile } = useAuth();
+
+  useIonViewWillEnter(() => {
+    setActiveTab('login');
+    setError(null);
+  });
+
+  const loadProfileAndNavigate = () => {
+    if (!user) return;
+    if (profile !== undefined && profile === null) {
+      history.replace('/setup-profile');
+    } else if (profile !== undefined && profile !== null) {
+      history.replace('/home');
+    }
+  };
+
+  useEffect(() => {
+    if (user) {
+      loadProfileAndNavigate();
+    }
+  }, [user, profile]);
+
+  const showError = (msg: string) => {
+    setError(msg);
+    setTimeout(() => setError(null), 4000);
+  };
+
+  const handleSignIn = async (e: React.FormEvent) => {
+    e.preventDefault();
+    setLoading(true);
+    setError(null);
+    const { error } = await supabase.auth.signInWithPassword({
+      email,
+      password,
+    });
+    if (error) {
+      if (error.message.toLowerCase().includes('email not confirmed')) {
+        await supabase.auth.resend({ type: 'signup', email });
+        history.push('/verify-email', { email, resent: true });
+        setLoading(false);
+        return;
+      } else {
+        showError(error.message);
+      }
+      setLoading(false);
+      return;
+    }
+    // Success: keep loading=true — useEffect above navigates when user arrives in context
+  };
+
+  const handleSignUp = async (e: React.FormEvent) => {
+    e.preventDefault();
+    if (password !== confirmPassword) {
+      showError('Passwords do not match');
+      return;
+    }
+    setLoading(true);
+    setError(null);
+    const { error } = await supabase.auth.signUp({ email, password });
+    if (error) {
+      showError(error.message);
+      setLoading(false);
+      return;
+    }
+    history.push('/verify-email', { email });
+    setLoading(false);
+  };
+
+  const handleTabChange = (tab: 'login' | 'register') => {
+    setActiveTab(tab);
+    setError(null);
+    if (tab === 'login') {
+      setConfirmPassword('');
+    }
+  };
+
+  return (
+    <IonPage style={{ background: '#f6f1e8' }}>
+      <IonContent
+        style={{
+          '--background': 'linear-gradient(180deg, #f9f5ee 0%, #f3ede3 100%)',
+          '--padding-start': '0px',
+          '--padding-end': '0px',
+          '--padding-top': '0px',
+          '--padding-bottom': '0px',
+        }}
+      >
+        <div
+          style={{
+            padding:
+              'calc(var(--ion-safe-area-top, 0px) + 18px) 20px calc(var(--ion-safe-area-bottom, 0px) + 28px)',
+            minHeight: '100%',
+            display: 'flex',
+            flexDirection: 'column',
+          }}
+        >
+          {/* Welcome header block */}
+          <div
+            style={{
+              background: 'transparent',
+              borderRadius: '0px',
+              padding: '0px',
+              margin: '0 0 24px 0',
+              display: 'flex',
+              flexDirection: 'column',
+              gap: '8px',
+            }}
+          >
+            <h1
+              style={{
+                margin: 0,
+                fontSize: '24px',
+                fontWeight: '700',
+                color: '#1f2937',
+                lineHeight: '1.2',
+              }}
+            >
+              EAGLES ASSEMBLY
+            </h1>
+            <p
+              style={{
+                margin: 0,
+                fontSize: '14px',
+                fontWeight: '400',
+                color: '#6b7280',
+                lineHeight: '1.5',
+              }}
+            >
+              Welcome back to our community app
+            </p>
+          </div>
+
+          {/* Auth mode pill switcher */}
+          <div
+            style={{
+              background: '#ffffff',
+              borderRadius: '999px',
+              padding: '4px',
+              margin: '0 0 20px 0',
+              display: 'flex',
+              gap: '4px',
+            }}
+          >
+            <button
+              onClick={() => handleTabChange('login')}
+              style={{
+                flex: 1,
+                background: activeTab === 'login' ? '#2f6b4f' : 'transparent',
+                border: 'none',
+                borderRadius: '999px',
+                padding: '12px 18px',
+                fontSize: '14px',
+                fontWeight: '600',
+                color: activeTab === 'login' ? '#ffffff' : '#6b7280',
+                cursor: 'pointer',
+              }}
+            >
+              Login
+            </button>
+            <button
+              onClick={() => handleTabChange('register')}
+              style={{
+                flex: 1,
+                background:
+                  activeTab === 'register' ? '#2f6b4f' : 'transparent',
+                border: 'none',
+                borderRadius: '999px',
+                padding: '12px 18px',
+                fontSize: '14px',
+                fontWeight: '600',
+                color: activeTab === 'register' ? '#ffffff' : '#6b7280',
+                cursor: 'pointer',
+              }}
+            >
+              Register
+            </button>
+          </div>
+
+          {/* Form card */}
+          <form
+            onSubmit={activeTab === 'login' ? handleSignIn : handleSignUp}
+            style={{
+              background: '#ffffff',
+              borderRadius: '24px',
+              padding: '24px',
+              margin: '0 0 16px 0',
+              display: 'flex',
+              flexDirection: 'column',
+              gap: '16px',
+            }}
+          >
+            <input
+              type="email"
+              placeholder="Email address"
+              value={email}
+              onChange={(e) => setEmail(e.target.value)}
+              required
+              style={{
+                background: '#eef2ec',
+                border: 'none',
+                borderRadius: '12px',
+                padding: '0 14px',
+                height: '48px',
+                fontSize: '15px',
+                color: '#1f2937',
+                outline: 'none',
+              }}
+            />
+            <input
+              type="password"
+              placeholder="Password"
+              value={password}
+              onChange={(e) => setPassword(e.target.value)}
+              required
+              style={{
+                background: '#eef2ec',
+                border: 'none',
+                borderRadius: '12px',
+                padding: '0 14px',
+                height: '48px',
+                fontSize: '15px',
+                color: '#1f2937',
+                outline: 'none',
+              }}
+            />
+            {activeTab === 'register' && (
+              <input
+                type="password"
+                placeholder="Confirm password"
+                value={confirmPassword}
+                onChange={(e) => setConfirmPassword(e.target.value)}
+                required
+                style={{
+                  background: '#eef2ec',
+                  border: 'none',
+                  borderRadius: '12px',
+                  padding: '0 14px',
+                  height: '48px',
+                  fontSize: '15px',
+                  color: '#1f2937',
+                  outline: 'none',
+                }}
+              />
+            )}
+            <button
+              type="submit"
+              disabled={loading}
+              style={{
+                background: '#2f6b4f',
+                border: 'none',
+                borderRadius: '999px',
+                padding: '16px',
+                fontSize: '15px',
+                fontWeight: '600',
+                color: '#ffffff',
+                cursor: 'pointer',
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                marginTop: '8px',
+              }}
+            >
+              {loading ? (
+                <IonSpinner name="dots" color="light" />
+              ) : activeTab === 'login' ? (
+                'Sign In'
+              ) : (
+                'Create Account'
+              )}
+            </button>
+          </form>
+
+          {/* Error area */}
+          {error && (
+            <div
+              style={{
+                background: 'rgba(190, 60, 60, 0.10)',
+                borderRadius: '12px',
+                padding: '12px 14px',
+                margin: '0',
+                display: 'flex',
+              }}
+            >
+              <p
+                style={{
+                  margin: 0,
+                  fontSize: '13px',
+                  fontWeight: '500',
+                  color: '#a33b32',
+                  lineHeight: '1.4',
+                }}
+              >
+                {error}
+              </p>
+            </div>
+          )}
+        </div>
+      </IonContent>
+    </IonPage>
+  );
+};
+
+export default Auth;

src/pages/Checkups.tsx

@@ -1,339 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import {
-  IonContent,
-  IonHeader,
-  IonPage,
-  IonTitle,
-  IonToolbar,
-  IonButtons,
-  IonButton,
-  IonIcon,
-  IonRange,
-  IonInput,
-  IonTextarea,
-  IonAlert,
-  useIonViewWillEnter,
-} from '@ionic/react';
-import { useHistory } from 'react-router-dom';
-import {
-  chevronBackOutline,
-  trashOutline,
-  medkitOutline,
-} from 'ionicons/icons';
-import {
-  getCheckups,
-  addCheckup,
-  deleteCheckup,
-  clearCheckups,
-} from '../services/localHealthStore';
-import { CheckupEntry, CheckupMood } from '../types/health';
-import HealthLogList from '../components/health/HealthLogList';
-
-const Checkups: React.FC = () => {
-  const history = useHistory();
-  const [entries, setEntries] = useState<CheckupEntry[]>([]);
-  const [mood, setMood] = useState<CheckupMood | ''>('');
-  const [energy, setEnergy] = useState<number>(70);
-  const [symptoms, setSymptoms] = useState<string>('');
-  const [note, setNote] = useState<string>('');
-  const [error, setError] = useState<string | null>(null);
-  const [showClearAlert, setShowClearAlert] = useState(false);
-
-  const refreshData = () => {
-    setEntries(getCheckups());
-  };
-
-  useIonViewWillEnter(() => {
-    refreshData();
-  });
-
-  const handleSave = () => {
-    if (!mood) {
-      setError('Please select a mood');
-      setTimeout(() => setError(null), 4000);
-      return;
-    }
-
-    addCheckup({
-      mood: mood as CheckupMood,
-      energy,
-      symptoms,
-      note,
-    });
-
-    setMood('');
-    setEnergy(70);
-    setSymptoms('');
-    setNote('');
-    refreshData();
-  };
-
-  const handleDelete = (id: string) => {
-    deleteCheckup(id);
-    refreshData();
-  };
-
-  const handleClear = () => {
-    clearCheckups();
-    refreshData();
-  };
-
-  const moods: CheckupMood[] = ['Great', 'Okay', 'Low', 'Unwell'];
-
-  return (
-    <IonPage style={{ background: '#eef7fb' }}>
-      <IonHeader className="ion-no-border">
-        <IonToolbar style={{ '--background': '#eef7fb', '--color': '#1e3a5f' }}>
-          <IonButtons slot="start">
-            <IonButton onClick={() => history.goBack()}>
-              <IonIcon icon={chevronBackOutline} slot="icon-only" />
-            </IonButton>
-          </IonButtons>
-          <IonTitle style={{ fontWeight: '700' }}>Self Checkup</IonTitle>
-          <IonButtons slot="end">
-            {entries.length > 0 && (
-              <IonButton onClick={() => setShowClearAlert(true)}>
-                <IonIcon
-                  icon={trashOutline}
-                  slot="icon-only"
-                  style={{ opacity: 0.5 }}
-                />
-              </IonButton>
-            )}
-          </IonButtons>
-        </IonToolbar>
-      </IonHeader>
-
-      <IonContent
-        style={{
-          '--background': '#eef7fb',
-          '--padding-start': '20px',
-          '--padding-end': '20px',
-          '--padding-top': '16px',
-        }}
-      >
-        {/* Form Card */}
-        <div
-          style={{
-            background: '#ffffff',
-            borderRadius: '24px',
-            padding: '24px',
-            marginBottom: '20px',
-            display: 'flex',
-            flexDirection: 'column',
-            gap: '16px',
-          }}
-        >
-          <div
-            style={{ fontSize: '18px', fontWeight: '700', color: '#1e3a5f' }}
-          >
-            How do you feel right now?
-          </div>
-
-          <div>
-            <div
-              style={{
-                fontSize: '13px',
-                fontWeight: '700',
-                color: 'rgba(30,58,95,0.60)',
-                marginBottom: '12px',
-              }}
-            >
-              Mood
-            </div>
-            <div style={{ display: 'flex', gap: '8px', flexWrap: 'wrap' }}>
-              {moods.map((m) => (
-                <div
-                  key={m}
-                  onClick={() => setMood(m)}
-                  style={{
-                    padding: '10px 16px',
-                    borderRadius: '999px',
-                    fontSize: '13px',
-                    fontWeight: '700',
-                    cursor: 'pointer',
-                    background: mood === m ? '#0369a1' : '#e2f2f8',
-                    color: mood === m ? '#ffffff' : '#1e3a5f',
-                    transition: 'all 0.2s ease',
-                  }}
-                >
-                  {m}
-                </div>
-              ))}
-            </div>
-          </div>
-
-          <div>
-            <div
-              style={{
-                display: 'flex',
-                justifyContent: 'space-between',
-                marginBottom: '8px',
-              }}
-            >
-              <span
-                style={{
-                  fontSize: '13px',
-                  fontWeight: '700',
-                  color: 'rgba(30,58,95,0.60)',
-                }}
-              >
-                Energy
-              </span>
-              <span
-                style={{
-                  fontSize: '13px',
-                  fontWeight: '700',
-                  color: '#0369a1',
-                }}
-              >
-                {energy}%
-              </span>
-            </div>
-            <IonRange
-              value={energy}
-              onIonChange={(e) => setEnergy(e.detail.value as number)}
-              style={{
-                '--bar-background': '#e2f2f8',
-                '--bar-background-active': '#38bdf8',
-                '--knob-background': '#0369a1',
-                padding: '0',
-              }}
-            />
-          </div>
-
-          <div>
-            <div
-              style={{
-                fontSize: '13px',
-                fontWeight: '700',
-                color: 'rgba(30,58,95,0.60)',
-                marginBottom: '8px',
-              }}
-            >
-              Symptoms
-            </div>
-            <IonInput
-              value={symptoms}
-              onIonInput={(e) => setSymptoms(e.detail.value!)}
-              placeholder="e.g. Headache, fatigue..."
-              style={{
-                '--background': '#f3f8fb',
-                '--padding-start': '16px',
-                '--padding-end': '16px',
-                '--border-radius': '12px',
-                fontSize: '14px',
-                color: '#1e3a5f',
-              }}
-            />
-          </div>
-
-          <div>
-            <div
-              style={{
-                fontSize: '13px',
-                fontWeight: '700',
-                color: 'rgba(30,58,95,0.60)',
-                marginBottom: '8px',
-              }}
-            >
-              Notes
-            </div>
-            <IonTextarea
-              value={note}
-              onIonInput={(e) => setNote(e.detail.value!)}
-              placeholder="Add more details..."
-              rows={3}
-              style={{
-                '--background': '#f3f8fb',
-                '--padding-start': '16px',
-                '--padding-end': '16px',
-                '--padding-top': '12px',
-                '--padding-bottom': '12px',
-                '--border-radius': '12px',
-                fontSize: '14px',
-                color: '#1e3a5f',
-              }}
-            />
-          </div>
-
-          {error && (
-            <div
-              style={{
-                fontSize: '12px',
-                color: '#dc2626',
-                textAlign: 'center',
-              }}
-            >
-              {error}
-            </div>
-          )}
-
-          <IonButton
-            expand="block"
-            onClick={handleSave}
-            style={{
-              '--background': '#0369a1',
-              '--border-radius': '999px',
-              '--color': '#ffffff',
-              fontWeight: '700',
-              height: '48px',
-              marginTop: '8px',
-            }}
-          >
-            Save checkup
-          </IonButton>
-        </div>
-
-        {/* History Section */}
-        <div
-          style={{
-            display: 'flex',
-            justifyContent: 'space-between',
-            alignItems: 'baseline',
-            margin: '0 0 12px',
-          }}
-        >
-          <span
-            style={{ fontSize: '17px', fontWeight: '700', color: '#1e3a5f' }}
-          >
-            History
-          </span>
-          <span
-            style={{
-              fontSize: '12px',
-              fontWeight: '600',
-              color: 'rgba(30,58,95,0.40)',
-            }}
-          >
-            {entries.length} logs
-          </span>
-        </div>
-
-        <HealthLogList
-          type="checkup"
-          entries={entries}
-          onDelete={handleDelete}
-          emptyTitle="No checkups yet"
-          emptyActionLabel="Save your first checkup"
-          onEmptyAction={() => {}} // Form is already on page
-        />
-
-        <div style={{ height: '40px' }} />
-
-        <IonAlert
-          isOpen={showClearAlert}
-          onDidDismiss={() => setShowClearAlert(false)}
-          header="Clear history?"
-          message="This will delete all checkup logs permanently."
-          buttons={[
-            { text: 'Cancel', role: 'cancel' },
-            { text: 'Clear All', role: 'destructive', handler: handleClear },
-          ]}
-        />
-      </IonContent>
-    </IonPage>
-  );
-};
-
-export default Checkups;

src/pages/Diet.tsx

@@ -1,376 +0,0 @@
-import React, { useState } from 'react';
-import {
-  IonContent,
-  IonHeader,
-  IonPage,
-  IonTitle,
-  IonToolbar,
-  IonButtons,
-  IonButton,
-  IonIcon,
-  IonInput,
-  IonTextarea,
-  IonSelect,
-  IonSelectOption,
-  IonAlert,
-  useIonViewWillEnter,
-} from '@ionic/react';
-import { useHistory } from 'react-router-dom';
-import {
-  chevronBackOutline,
-  trashOutline,
-  waterOutline,
-  leafOutline,
-} from 'ionicons/icons';
-import {
-  getDietEntries,
-  addDietEntry,
-  deleteDietEntry,
-  clearDietEntries,
-  getWellbeingSummary,
-} from '../services/localHealthStore';
-import { DietEntry, MealType, WellbeingSummary } from '../types/health';
-import HealthLogList from '../components/health/HealthLogList';
-import MetricMiniCard from '../components/health/MetricMiniCard';
-
-const Diet: React.FC = () => {
-  const history = useHistory();
-  const [entries, setEntries] = useState<DietEntry[]>([]);
-  const [summary, setSummary] = useState<WellbeingSummary | null>(null);
-
-  const [mealType, setMealType] = useState<MealType | ''>('');
-  const [waterCups, setWaterCups] = useState<string>('');
-  const [produceServings, setProduceServings] = useState<string>('');
-  const [notes, setNotes] = useState<string>('');
-
-  const [error, setError] = useState<string | null>(null);
-  const [showClearAlert, setShowClearAlert] = useState(false);
-
-  const refreshData = () => {
-    setEntries(getDietEntries());
-    setSummary(getWellbeingSummary());
-  };
-
-  useIonViewWillEnter(() => {
-    refreshData();
-  });
-
-  const handleSave = () => {
-    if (!mealType) {
-      setError('Please select a meal type');
-      setTimeout(() => setError(null), 4000);
-      return;
-    }
-
-    addDietEntry({
-      mealType: mealType as MealType,
-      waterCups: parseInt(waterCups) || 0,
-      produceServings: parseInt(produceServings) || 0,
-      notes,
-    });
-
-    setMealType('');
-    setWaterCups('');
-    setProduceServings('');
-    setNotes('');
-    refreshData();
-  };
-
-  const handleDelete = (id: string) => {
-    deleteDietEntry(id);
-    refreshData();
-  };
-
-  const handleClear = () => {
-    clearDietEntries();
-    refreshData();
-  };
-
-  const mealTypes: MealType[] = ['Breakfast', 'Lunch', 'Dinner', 'Snack'];
-
-  return (
-    <IonPage style={{ background: '#eef7fb' }}>
-      <IonHeader className="ion-no-border">
-        <IonToolbar style={{ '--background': '#eef7fb', '--color': '#1e3a5f' }}>
-          <IonButtons slot="start">
-            <IonButton onClick={() => history.goBack()}>
-              <IonIcon icon={chevronBackOutline} slot="icon-only" />
-            </IonButton>
-          </IonButtons>
-          <IonTitle style={{ fontWeight: '700' }}>Diet</IonTitle>
-          <IonButtons slot="end">
-            {entries.length > 0 && (
-              <IonButton onClick={() => setShowClearAlert(true)}>
-                <IonIcon
-                  icon={trashOutline}
-                  slot="icon-only"
-                  style={{ opacity: 0.5 }}
-                />
-              </IonButton>
-            )}
-          </IonButtons>
-        </IonToolbar>
-      </IonHeader>
-
-      <IonContent
-        style={{
-          '--background': '#eef7fb',
-          '--padding-start': '20px',
-          '--padding-end': '20px',
-          '--padding-top': '16px',
-        }}
-      >
-        {/* Form Card */}
-        <div
-          style={{
-            background: '#ffffff',
-            borderRadius: '24px',
-            padding: '24px',
-            marginBottom: '20px',
-            display: 'flex',
-            flexDirection: 'column',
-            gap: '16px',
-          }}
-        >
-          <div
-            style={{ fontSize: '18px', fontWeight: '700', color: '#1e3a5f' }}
-          >
-            Log today’s nutrition
-          </div>
-
-          <div>
-            <div
-              style={{
-                fontSize: '13px',
-                fontWeight: '700',
-                color: 'rgba(30,58,95,0.60)',
-                marginBottom: '8px',
-              }}
-            >
-              Meal Type
-            </div>
-            <IonSelect
-              value={mealType}
-              onIonChange={(e) => setMealType(e.detail.value)}
-              interface="action-sheet"
-              placeholder="Select a meal"
-              style={{
-                '--background': '#f3f8fb',
-                '--padding-start': '16px',
-                '--padding-end': '16px',
-                '--border-radius': '12px',
-                fontSize: '14px',
-                color: '#1e3a5f',
-                width: '100%',
-                '--placeholder-color': 'rgba(30,58,95,0.38)',
-              }}
-            >
-              {mealTypes.map((m) => (
-                <IonSelectOption key={m} value={m}>
-                  {m}
-                </IonSelectOption>
-              ))}
-            </IonSelect>
-          </div>
-
-          <div
-            style={{
-              display: 'grid',
-              gridTemplateColumns: '1fr 1fr',
-              gap: '12px',
-            }}
-          >
-            <div>
-              <div
-                style={{
-                  fontSize: '13px',
-                  fontWeight: '700',
-                  color: 'rgba(30,58,95,0.60)',
-                  marginBottom: '8px',
-                }}
-              >
-                Water (cups)
-              </div>
-              <IonInput
-                type="text"
-                inputMode="numeric"
-                value={waterCups}
-                onIonInput={(e) =>
-                  setWaterCups(e.detail.value!.replace(/[^0-9]/g, ''))
-                }
-                placeholder="0"
-                style={{
-                  '--background': '#f3f8fb',
-                  '--padding-start': '16px',
-                  '--border-radius': '12px',
-                  fontSize: '14px',
-                  color: '#1e3a5f',
-                }}
-              />
-            </div>
-            <div>
-              <div
-                style={{
-                  fontSize: '13px',
-                  fontWeight: '700',
-                  color: 'rgba(30,58,95,0.60)',
-                  marginBottom: '8px',
-                }}
-              >
-                Produce (servings)
-              </div>
-              <IonInput
-                type="text"
-                inputMode="numeric"
-                value={produceServings}
-                onIonInput={(e) =>
-                  setProduceServings(e.detail.value!.replace(/[^0-9]/g, ''))
-                }
-                placeholder="0"
-                style={{
-                  '--background': '#f3f8fb',
-                  '--padding-start': '16px',
-                  '--border-radius': '12px',
-                  fontSize: '14px',
-                  color: '#1e3a5f',
-                }}
-              />
-            </div>
-          </div>
-
-          <div>
-            <div
-              style={{
-                fontSize: '13px',
-                fontWeight: '700',
-                color: 'rgba(30,58,95,0.60)',
-                marginBottom: '8px',
-              }}
-            >
-              Notes
-            </div>
-            <IonTextarea
-              value={notes}
-              onIonInput={(e) => setNotes(e.detail.value!)}
-              placeholder="Add more details..."
-              rows={3}
-              style={{
-                '--background': '#f3f8fb',
-                '--padding-start': '16px',
-                '--padding-end': '16px',
-                '--padding-top': '12px',
-                '--padding-bottom': '12px',
-                '--border-radius': '12px',
-                fontSize: '14px',
-                color: '#1e3a5f',
-              }}
-            />
-          </div>
-
-          {error && (
-            <div
-              style={{
-                fontSize: '12px',
-                color: '#dc2626',
-                textAlign: 'center',
-              }}
-            >
-              {error}
-            </div>
-          )}
-
-          <IonButton
-            expand="block"
-            onClick={handleSave}
-            style={{
-              '--background': '#0369a1',
-              '--border-radius': '999px',
-              '--color': '#ffffff',
-              fontWeight: '700',
-              height: '48px',
-              marginTop: '8px',
-            }}
-          >
-            Save diet log
-          </IonButton>
-        </div>
-
-        {/* Today Summary */}
-        {summary && (
-          <div
-            style={{
-              display: 'grid',
-              gridTemplateColumns: '1fr 1fr',
-              gap: '12px',
-              marginBottom: '20px',
-            }}
-          >
-            <MetricMiniCard
-              label="Today's Water"
-              value={summary.hydrationCups.toString()}
-              helper="cups"
-              progress={summary.hydrationCups / 8}
-              icon={waterOutline}
-            />
-            <MetricMiniCard
-              label="Today's Produce"
-              value={summary.produceServings.toString()}
-              helper="servings"
-              progress={summary.produceServings / 5}
-              icon={leafOutline}
-            />
-          </div>
-        )}
-
-        {/* History Section */}
-        <div
-          style={{
-            display: 'flex',
-            justifyContent: 'space-between',
-            alignItems: 'baseline',
-            margin: '0 0 12px',
-          }}
-        >
-          <span
-            style={{ fontSize: '17px', fontWeight: '700', color: '#1e3a5f' }}
-          >
-            History
-          </span>
-          <span
-            style={{
-              fontSize: '12px',
-              fontWeight: '600',
-              color: 'rgba(30,58,95,0.40)',
-            }}
-          >
-            {entries.length} logs
-          </span>
-        </div>
-
-        <HealthLogList
-          type="diet"
-          entries={entries}
-          onDelete={handleDelete}
-          emptyTitle="No diet logs yet"
-          emptyActionLabel="Log a meal"
-          onEmptyAction={() => {}} // Form is already on page
-        />
-
-        <div style={{ height: '40px' }} />
-
-        <IonAlert
-          isOpen={showClearAlert}
-          onDidDismiss={() => setShowClearAlert(false)}
-          header="Clear history?"
-          message="This will delete all diet logs permanently."
-          buttons={[
-            { text: 'Cancel', role: 'cancel' },
-            { text: 'Clear All', role: 'destructive', handler: handleClear },
-          ]}
-        />
-      </IonContent>
-    </IonPage>
-  );
-};
-
-export default Diet;

src/pages/EventDetail.tsx

@@ -0,0 +1,380 @@
+import React, { useState, useEffect } from 'react';
+import {
+  IonPage,
+  IonContent,
+  IonHeader,
+  IonToolbar,
+  IonTitle,
+  IonButtons,
+  IonButton,
+  IonIcon,
+  IonSpinner,
+} from '@ionic/react';
+import { useHistory, useParams } from 'react-router-dom';
+import { supabase } from '../supabase';
+import { ChurchEvent } from '../types';
+import { useAuth } from '../contexts/AuthContext';
+import {
+  chevronBackOutline,
+  createOutline,
+  timeOutline,
+  locationOutline,
+  calendarOutline,
+} from 'ionicons/icons';
+
+const EventDetail: React.FC = () => {
+  const [event, setEvent] = useState<ChurchEvent | null>(null);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+
+  const { id } = useParams<{ id: string }>();
+  const history = useHistory();
+  const { profile } = useAuth();
+
+  const loadEvent = async () => {
+    setLoading(true);
+    setError(null);
+
+    const { data, error: fetchError } = await supabase
+      .from('events')
+      .select('*, event_categories(*)')
+      .eq('id', id)
+      .single();
+
+    if (fetchError) {
+      setError(fetchError.message);
+      setEvent(null);
+    } else {
+      setEvent(data as ChurchEvent);
+    }
+    setLoading(false);
+  };
+
+  useEffect(() => {
+    loadEvent();
+  }, [id]);
+
+  const goToEdit = () => {
+    if (!event) return;
+    history.push(`/admin/events/${event.id}/edit`);
+  };
+
+  const isAdmin = profile?.role === 'admin';
+
+  return (
+    <IonPage style={{ background: '#f5f7f4' }}>
+      <IonHeader className="ion-no-border">
+        <IonToolbar style={{ '--background': '#f5f7f4' }}>
+          <IonButtons slot="start">
+            <IonButton onClick={() => history.goBack()}>
+              <IonIcon
+                icon={chevronBackOutline}
+                style={{ color: '#1f2937' }}
+                slot="icon-only"
+              />
+            </IonButton>
+          </IonButtons>
+          <IonTitle
+            style={{ fontSize: '18px', fontWeight: '700', color: '#1f2937' }}
+          >
+            Event Detail
+          </IonTitle>
+          {isAdmin && (
+            <IonButtons slot="end">
+              <IonButton onClick={goToEdit}>
+                <IonIcon
+                  icon={createOutline}
+                  style={{ color: '#2f6b4f', fontSize: '20px' }}
+                  slot="icon-only"
+                />
+              </IonButton>
+            </IonButtons>
+          )}
+        </IonToolbar>
+      </IonHeader>
+
+      <IonContent
+        style={{
+          '--background': '#f5f7f4',
+          '--padding-start': '20px',
+          '--padding-end': '20px',
+          '--padding-top': '16px',
+          '--padding-bottom': '24px',
+        }}
+      >
+        {loading ? (
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'center',
+              padding: '40px 0',
+            }}
+          >
+            <IonSpinner name="crescent" color="primary" />
+          </div>
+        ) : error || !event ? (
+          <div
+            style={{
+              padding: '12px',
+              background: 'rgba(190,60,60,0.1)',
+              borderRadius: '12px',
+              color: '#a33b32',
+              fontSize: '13px',
+            }}
+          >
+            {error || 'Event not found'}
+          </div>
+        ) : (
+          <>
+            {/* Header Detail Card */}
+            <div
+              style={{
+                background: '#ffffff',
+                borderRadius: '24px',
+                padding: '24px',
+                margin: '0 0 16px 0',
+                display: 'flex',
+                flexDirection: 'column',
+                gap: '10px',
+                boxShadow: '0 2px 4px rgba(0,0,0,0.02)',
+              }}
+            >
+              <div style={{ display: 'flex' }}>
+                <div
+                  style={{
+                    background: 'rgba(47, 107, 79, 0.10)',
+                    color: '#2f6b4f',
+                    borderRadius: '999px',
+                    padding: '5px 12px',
+                    fontSize: '12px',
+                    fontWeight: '600',
+                  }}
+                >
+                  {event.event_categories?.name || 'Event'}
+                </div>
+              </div>
+              <h1
+                style={{
+                  margin: 0,
+                  fontSize: '24px',
+                  fontWeight: '700',
+                  color: '#1f2937',
+                }}
+              >
+                {event.title}
+              </h1>
+            </div>
+
+            {/* Info Rows Card */}
+            <div
+              style={{
+                background: '#ffffff',
+                borderRadius: '24px',
+                padding: '20px',
+                margin: '0 0 16px 0',
+                display: 'flex',
+                flexDirection: 'column',
+                gap: '14px',
+                boxShadow: '0 2px 4px rgba(0,0,0,0.02)',
+              }}
+            >
+              {/* Date Row */}
+              <div
+                style={{ display: 'flex', alignItems: 'center', gap: '12px' }}
+              >
+                <div
+                  style={{
+                    width: '36px',
+                    height: '36px',
+                    borderRadius: '12px',
+                    background: 'rgba(47, 107, 79, 0.12)',
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    flexShrink: 0,
+                  }}
+                >
+                  <IonIcon
+                    icon={calendarOutline}
+                    style={{ color: '#2f6b4f', fontSize: '18px' }}
+                  />
+                </div>
+                <div>
+                  <div
+                    style={{
+                      fontSize: '12px',
+                      fontWeight: '600',
+                      color: '#7a847f',
+                    }}
+                  >
+                    Date
+                  </div>
+                  <div
+                    style={{
+                      fontSize: '15px',
+                      fontWeight: '600',
+                      color: '#1f2937',
+                      marginTop: '2px',
+                    }}
+                  >
+                    {new Date(event.start_at).toLocaleDateString(undefined, {
+                      weekday: 'long',
+                      month: 'long',
+                      day: 'numeric',
+                      year: 'numeric',
+                    })}
+                  </div>
+                </div>
+              </div>
+
+              {/* Time Row */}
+              {(() => {
+                const date = new Date(event.start_at);
+                const hasTime =
+                  date.getHours() !== 0 || date.getMinutes() !== 0;
+                if (!hasTime) return null;
+
+                return (
+                  <div
+                    style={{
+                      display: 'flex',
+                      alignItems: 'center',
+                      gap: '12px',
+                    }}
+                  >
+                    <div
+                      style={{
+                        width: '36px',
+                        height: '36px',
+                        borderRadius: '12px',
+                        background: 'rgba(47, 107, 79, 0.12)',
+                        display: 'flex',
+                        alignItems: 'center',
+                        justifyContent: 'center',
+                        flexShrink: 0,
+                      }}
+                    >
+                      <IonIcon
+                        icon={timeOutline}
+                        style={{ color: '#2f6b4f', fontSize: '18px' }}
+                      />
+                    </div>
+                    <div>
+                      <div
+                        style={{
+                          fontSize: '12px',
+                          fontWeight: '600',
+                          color: '#7a847f',
+                        }}
+                      >
+                        Time
+                      </div>
+                      <div
+                        style={{
+                          fontSize: '15px',
+                          fontWeight: '600',
+                          color: '#1f2937',
+                          marginTop: '2px',
+                        }}
+                      >
+                        {date.toLocaleTimeString([], {
+                          hour: '2-digit',
+                          minute: '2-digit',
+                        })}
+                        {event.end_at &&
+                          ` - ${new Date(event.end_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}`}
+                      </div>
+                    </div>
+                  </div>
+                );
+              })()}
+
+              {/* Location Row */}
+              <div
+                style={{ display: 'flex', alignItems: 'center', gap: '12px' }}
+              >
+                <div
+                  style={{
+                    width: '36px',
+                    height: '36px',
+                    borderRadius: '12px',
+                    background: 'rgba(47, 107, 79, 0.12)',
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                    flexShrink: 0,
+                  }}
+                >
+                  <IonIcon
+                    icon={locationOutline}
+                    style={{ color: '#2f6b4f', fontSize: '18px' }}
+                  />
+                </div>
+                <div>
+                  <div
+                    style={{
+                      fontSize: '12px',
+                      fontWeight: '600',
+                      color: '#7a847f',
+                    }}
+                  >
+                    Location
+                  </div>
+                  <div
+                    style={{
+                      fontSize: '15px',
+                      fontWeight: '600',
+                      color: '#1f2937',
+                      marginTop: '2px',
+                    }}
+                  >
+                    {event.venue}
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            {/* About Card */}
+            <div
+              style={{
+                background: '#ffffff',
+                borderRadius: '24px',
+                padding: '20px',
+                margin: '0 0 16px 0',
+                display: 'flex',
+                flexDirection: 'column',
+                gap: '10px',
+                boxShadow: '0 2px 4px rgba(0,0,0,0.02)',
+              }}
+            >
+              <h3
+                style={{
+                  margin: 0,
+                  fontSize: '16px',
+                  fontWeight: '700',
+                  color: '#1f2937',
+                }}
+              >
+                About
+              </h3>
+              <p
+                style={{
+                  margin: 0,
+                  fontSize: '14px',
+                  fontWeight: '400',
+                  color: '#4b5563',
+                  lineHeight: '1.6',
+                  whiteSpace: 'pre-wrap',
+                }}
+              >
+                {event.description}
+              </p>
+            </div>
+          </>
+        )}
+      </IonContent>
+    </IonPage>
+  );
+};
+
+export default EventDetail;

src/pages/Events.tsx

@@ -0,0 +1,350 @@
+import React, { useState } from 'react';
+import {
+  IonPage,
+  IonContent,
+  IonSpinner,
+  useIonViewWillEnter,
+  IonIcon,
+  IonRefresher,
+  IonRefresherContent,
+} from '@ionic/react';
+import { useHistory } from 'react-router-dom';
+import { supabase } from '../supabase';
+import { ChurchEvent } from '../types';
+import EventListCard from '../components/EventListCard';
+import {
+  searchOutline,
+  filterOutline,
+  calendarClearOutline,
+} from 'ionicons/icons';
+
+const Events: React.FC = () => {
+  const [allEvents, setAllEvents] = useState<ChurchEvent[]>([]);
+  const [events, setEvents] = useState<ChurchEvent[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+
+  const [searchTerm, setSearchTerm] = useState('');
+  const [activeCategory, setActiveCategory] = useState<
+    'all' | 'weekly' | 'youth' | 'sunday-school'
+  >('all');
+
+  const history = useHistory();
+
+  const loadEvents = async (event?: any) => {
+    if (!event) setLoading(true);
+    setError(null);
+
+    const now = new Date();
+    now.setDate(now.getDate() - 1);
+    const dateString = now.toISOString();
+
+    const { data, error: fetchError } = await supabase
+      .from('events')
+      .select('*, event_categories(*)')
+      .gte('start_at', dateString)
+      .order('start_at', { ascending: true });
+
+    if (fetchError) {
+      setError(fetchError.message);
+      setAllEvents([]);
+      setEvents([]);
+    } else {
+      const fetched = data as ChurchEvent[];
+      setAllEvents(fetched);
+      applyFilters(fetched, activeCategory, searchTerm);
+    }
+
+    setLoading(false);
+    if (event) {
+      event.detail.complete();
+    }
+  };
+
+  useIonViewWillEnter(() => {
+    loadEvents();
+  });
+
+  const applyFilters = (
+    source: ChurchEvent[],
+    category: 'all' | 'weekly' | 'youth' | 'sunday-school',
+    search: string
+  ) => {
+    let filtered = [...source];
+
+    if (category === 'weekly') {
+      filtered = filtered.filter((e) => e.event_categories?.slug === 'weekly');
+    } else if (category === 'youth') {
+      filtered = filtered.filter(
+        (e) => e.event_categories?.slug === 'youth' || e.audience === 'youth'
+      );
+    } else if (category === 'sunday-school') {
+      filtered = filtered.filter(
+        (e) => e.event_categories?.slug === 'sunday-school'
+      );
+    }
+
+    if (search.trim()) {
+      const term = search.toLowerCase();
+      filtered = filtered.filter(
+        (e) =>
+          e.title.toLowerCase().includes(term) ||
+          e.description.toLowerCase().includes(term) ||
+          e.venue.toLowerCase().includes(term)
+      );
+    }
+
+    setEvents(filtered);
+  };
+
+  const handleCategoryChange = (
+    category: 'all' | 'weekly' | 'youth' | 'sunday-school'
+  ) => {
+    setActiveCategory(category);
+    applyFilters(allEvents, category, searchTerm);
+  };
+
+  const handleSearchChange = (val: string) => {
+    setSearchTerm(val);
+    applyFilters(allEvents, activeCategory, val);
+  };
+
+  const openEvent = (id: string) => {
+    history.push(`/event/${id}`);
+  };
+
+  return (
+    <IonPage style={{ background: '#f5f7f4' }}>
+      <IonContent
+        style={{
+          '--background': '#f5f7f4',
+          '--padding-start': '0px',
+          '--padding-end': '0px',
+          '--padding-top': '0px',
+          '--padding-bottom': '24px',
+        }}
+      >
+        <IonRefresher slot="fixed" onIonRefresh={loadEvents}>
+          <IonRefresherContent />
+        </IonRefresher>
+
+        {/* Top Title Row */}
+        <div
+          style={{
+            padding: 'calc(16px + var(--ion-safe-area-top)) 20px 8px',
+            margin: '0',
+            background: 'transparent',
+            display: 'flex',
+            flexDirection: 'column',
+            gap: '6px',
+          }}
+        >
+          <h1
+            style={{
+              margin: 0,
+              fontSize: '24px',
+              fontWeight: '700',
+              color: '#1f2937',
+            }}
+          >
+            Events
+          </h1>
+          <p
+            style={{
+              margin: 0,
+              fontSize: '14px',
+              fontWeight: '400',
+              color: '#6b7280',
+            }}
+          >
+            Discover what's happening at church
+          </p>
+        </div>
+
+        {/* Search Row */}
+        <div style={{ display: 'flex', gap: '8px', margin: '0 20px 12px' }}>
+          <div
+            style={{
+              flex: 1,
+              background: '#ffffff',
+              borderRadius: '24px',
+              height: '44px',
+              display: 'flex',
+              alignItems: 'center',
+              padding: '0 16px',
+              gap: '10px',
+            }}
+          >
+            <IonIcon
+              icon={searchOutline}
+              style={{ color: '#9aa3a0', fontSize: '18px', flexShrink: 0 }}
+            />
+            <input
+              type="text"
+              placeholder="Search events..."
+              value={searchTerm}
+              onChange={(e) => handleSearchChange(e.target.value)}
+              style={{
+                flex: 1,
+                border: 'none',
+                background: 'transparent',
+                outline: 'none',
+                fontSize: '15px',
+                color: '#1f2937',
+              }}
+            />
+          </div>
+          <div
+            onClick={() => handleCategoryChange('all')}
+            style={{
+              width: '44px',
+              height: '44px',
+              background: '#ffffff',
+              borderRadius: '12px',
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+              flexShrink: 0,
+              cursor: 'pointer',
+            }}
+          >
+            <IonIcon
+              icon={filterOutline}
+              style={{ color: '#2f6b4f', fontSize: '20px' }}
+            />
+          </div>
+        </div>
+
+        {/* Category Chips */}
+        <div
+          style={{
+            display: 'flex',
+            gap: '8px',
+            margin: '0 20px 12px',
+            overflowX: 'auto',
+            paddingBottom: '4px',
+            WebkitOverflowScrolling: 'touch',
+            scrollbarWidth: 'none',
+          }}
+        >
+          {['all', 'weekly', 'youth', 'sunday-school'].map((cat) => (
+            <button
+              key={cat}
+              onClick={() => handleCategoryChange(cat as any)}
+              style={{
+                background: activeCategory === cat ? '#2f6b4f' : '#ffffff',
+                color: activeCategory === cat ? '#ffffff' : '#4b5563',
+                border: 'none',
+                borderRadius: '999px',
+                padding: '8px 14px',
+                fontSize: '13px',
+                fontWeight: '600',
+                cursor: 'pointer',
+                whiteSpace: 'nowrap',
+                boxShadow:
+                  activeCategory === cat
+                    ? 'none'
+                    : '0 1px 2px rgba(0,0,0,0.02)',
+              }}
+            >
+              {cat === 'all'
+                ? 'All Events'
+                : cat === 'sunday-school'
+                  ? 'Sunday School'
+                  : cat.charAt(0).toUpperCase() + cat.slice(1)}
+            </button>
+          ))}
+        </div>
+
+        {/* Main Content */}
+        {loading ? (
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'center',
+              padding: '40px 0',
+            }}
+          >
+            <IonSpinner name="crescent" color="primary" />
+          </div>
+        ) : error ? (
+          <div
+            style={{
+              margin: '0 20px',
+              padding: '12px',
+              background: 'rgba(190,60,60,0.1)',
+              borderRadius: '12px',
+              color: '#a33b32',
+              fontSize: '13px',
+            }}
+          >
+            {error}
+          </div>
+        ) : events.length > 0 ? (
+          <div
+            style={{
+              display: 'flex',
+              flexDirection: 'column',
+              gap: '12px',
+              margin: '0 20px',
+            }}
+          >
+            {events.map((event) => (
+              <EventListCard
+                key={event.id}
+                event={event}
+                onClick={() => openEvent(event.id)}
+              />
+            ))}
+          </div>
+        ) : (
+          <div
+            style={{
+              display: 'flex',
+              flexDirection: 'column',
+              alignItems: 'center',
+              justifyContent: 'center',
+              padding: '60px 20px',
+              textAlign: 'center',
+              gap: '12px',
+            }}
+          >
+            <IonIcon
+              icon={calendarClearOutline}
+              style={{ fontSize: '44px', color: '#7a847f' }}
+            />
+            <p
+              style={{
+                margin: 0,
+                fontSize: '14px',
+                fontWeight: '400',
+                color: '#6b7280',
+              }}
+            >
+              No events match this filter.
+            </p>
+            <button
+              onClick={() => {
+                setSearchTerm('');
+                handleCategoryChange('all');
+              }}
+              style={{
+                background: 'transparent',
+                border: 'none',
+                fontSize: '14px',
+                fontWeight: '600',
+                color: '#2f6b4f',
+                cursor: 'pointer',
+                marginTop: '4px',
+              }}
+            >
+              Show all events
+            </button>
+          </div>
+        )}
+      </IonContent>
+    </IonPage>
+  );
+};
+
+export default Events;

src/pages/Home.tsx

@@ -1,239 +1,588 @@
 import React, { useState } from 'react';
 import {
-  IonContent,
   IonPage,
-  IonIcon,
+  IonContent,
-  IonText,
+  IonSpinner,
   useIonViewWillEnter,
+  IonIcon,
 } from '@ionic/react';
 import { useHistory } from 'react-router-dom';
+import { supabase } from '../supabase';
+import { useAuth } from '../contexts/AuthContext';
+import { ChurchEvent } from '../types';
+import EventPreviewCard from '../components/EventPreviewCard';
+import HomeStatCard from '../components/HomeStatCard';
 import {
-  heartCircleOutline,
+  calendarOutline,
-  medkitOutline,
+  peopleOutline,
-  restaurantOutline,
+  newspaperOutline,
-  moonOutline,
-  chevronForwardOutline,
 } from 'ionicons/icons';
-import WellbeingScoreCard from '../components/health/WellbeingScoreCard';
-import MetricMiniCard from '../components/health/MetricMiniCard';
-import RecentActivityList from '../components/health/RecentActivityList';
-import {
-  getWellbeingSummary,
-  getRecentActivity,
-} from '../services/localHealthStore';
-import { WellbeingSummary, ActivityEntry } from '../types/health';
 
 const Home: React.FC = () => {
-  const history = useHistory();
+  const [featuredEvent, setFeaturedEvent] = useState<ChurchEvent | null>(null);
-  const [summary, setSummary] = useState<WellbeingSummary>(
+  const [upcomingEvents, setUpcomingEvents] = useState<ChurchEvent[]>([]);
-    getWellbeingSummary()
+  const [latestNews, setLatestNews] = useState<any[]>([]);
-  );
+  const [weeklyCount, setWeeklyCount] = useState(0);
-  const [recentEntries, setRecentEntries] =
+  const [youthCount, setYouthCount] = useState(0);
-    useState<ActivityEntry[]>(getRecentActivity());
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
 
-  const refreshData = () => {
+  const { profile } = useAuth();
-    setSummary(getWellbeingSummary());
+  const history = useHistory();
-    setRecentEntries(getRecentActivity());
+
+  const loadHomeData = async () => {
+    setLoading(true);
+    setError(null);
+    const now = new Date().toISOString();
+
+    const [{ data, error: fetchError }, { data: newsData, error: newsError }] =
+      await Promise.all([
+        supabase
+          .from('events')
+          .select('*, event_categories(*)')
+          .gte('start_at', now)
+          .order('start_at', { ascending: true })
+          .limit(20),
+        supabase
+          .from('news')
+          .select('*')
+          .order('created_at', { ascending: false })
+          .limit(3),
+      ]);
+
+    if (newsData) {
+      setLatestNews(newsData);
+    }
+
+    if (fetchError) {
+      setError(fetchError.message);
+      setFeaturedEvent(null);
+      setUpcomingEvents([]);
+      setWeeklyCount(0);
+      setYouthCount(0);
+      setLoading(false);
+      return;
+    }
+
+    const allUpcoming = data as ChurchEvent[];
+    if (allUpcoming.length > 0) {
+      const featured = allUpcoming.find((e) => e.is_featured) || allUpcoming[0];
+      setFeaturedEvent(featured);
+      setUpcomingEvents(allUpcoming.slice(0, 4));
+    } else {
+      setFeaturedEvent(null);
+      setUpcomingEvents([]);
+    }
+
+    const weekly = allUpcoming.filter(
+      (e) => e.event_categories?.slug === 'weekly'
+    ).length;
+    const youth = allUpcoming.filter(
+      (e) => e.audience === 'youth' || e.event_categories?.slug === 'youth'
+    ).length;
+
+    setWeeklyCount(weekly);
+    setYouthCount(youth);
+    setLoading(false);
   };
 
   useIonViewWillEnter(() => {
-    refreshData();
+    loadHomeData();
   });
 
+  const openEventDetail = (id: string) => {
+    history.push(`/event/${id}`);
+  };
+
+  const goToEvents = () => {
+    history.push('/events');
+  };
+
+  const initials = profile?.full_name
+    ? profile.full_name
+        .split(' ')
+        .map((n) => n[0])
+        .join('')
+        .substring(0, 2)
+        .toUpperCase()
+    : 'U';
+
   return (
-    <IonPage style={{ background: '#eef7fb' }}>
+    <IonPage style={{ background: 'var(--color-bg)' }}>
       <IonContent
-        fullscreen
         style={{
-          '--background':
+          '--background': 'linear-gradient(180deg, #f8f4ef 0%, #f3ece3 100%)',
-            'linear-gradient(160deg, rgba(56,189,248,0.16) 0%, #eef7fb 58%, #f8fbfd 100%)',
+          '--padding-start': '0px',
+          '--padding-end': '0px',
+          '--padding-top': '0px',
+          '--padding-bottom': '24px',
         }}
       >
         {/* Top Content Row */}
         <div
           style={{
             padding: 'calc(16px + var(--ion-safe-area-top)) 20px 12px',
+            margin: '0',
             display: 'flex',
             alignItems: 'center',
+            justifyContent: 'space-between',
             gap: '12px',
           }}
         >
+          <div>
             <div
+              style={{
+                fontSize: '12px',
+                fontWeight: '600',
+                color: 'var(--color-text-secondary)',
+                textTransform: 'uppercase',
+              }}
+            >
+              Welcome to
+            </div>
+            <div
+              style={{
+                fontSize: '18px',
+                fontWeight: '700',
+                color: 'var(--color-text-primary)',
+              }}
+            >
+              EAGLES ASSEMBLY
+            </div>
+          </div>
+          <div
+            onClick={() => history.push('/profile')}
             style={{
               width: '40px',
               height: '40px',
-              background: 'rgba(3,105,161,0.12)',
               borderRadius: '12px',
+              background: 'var(--color-brand-soft)',
               display: 'flex',
               alignItems: 'center',
               justifyContent: 'center',
-              flexShrink: 0,
+              fontSize: '14px',
-            }}
-          >
-            <IonIcon
-              icon={heartCircleOutline}
-              style={{ fontSize: '22px', color: '#0369a1' }}
-            />
-          </div>
-          <div style={{ flex: 1 }}>
-            <div
-              style={{
-                fontSize: '12px',
               fontWeight: '700',
-                color: 'rgba(30,58,95,0.60)',
+              color: 'var(--color-brand)',
-                lineHeight: '16px',
-              }}
-            >
-              Wellbeing
-            </div>
-            <div
-              style={{
-                fontSize: '20px',
-                fontWeight: '700',
-                color: '#1e3a5f',
-                lineHeight: '24px',
-              }}
-            >
-              Good morning
-            </div>
-          </div>
-          <div
-            style={{
-              background: '#ffffff',
-              borderRadius: '999px',
-              padding: '8px 12px',
-              fontSize: '12px',
-              fontWeight: '700',
-              color: '#0369a1',
-            }}
-          >
-            Local
-          </div>
-        </div>
-
-        {/* Score Widget */}
-        <WellbeingScoreCard
-          score={summary.score}
-          message={summary.scoreMessage}
-          progress={summary.scoreProgress}
-        />
-
-        {/* Metric Row */}
-        <div
-          style={{
-            margin: '0 20px 12px',
-            display: 'grid',
-            gridTemplateColumns: '1fr 1fr',
-            gap: '12px',
-          }}
-        >
-          <MetricMiniCard
-            label="Sleep"
-            value={summary.sleepHours.toString()}
-            helper="hrs"
-            progress={summary.sleepHours / 8}
-            icon={moonOutline}
-          />
-          <MetricMiniCard
-            label="Water"
-            value={summary.hydrationCups.toString()}
-            helper="cups"
-            progress={summary.hydrationCups / 8}
-            icon={restaurantOutline}
-          />
-        </div>
-
-        {/* Action Strip */}
-        <div
-          style={{
-            display: 'flex',
-            gap: '8px',
-            overflowX: 'auto',
-            padding: '0 20px 20px',
-            msOverflowStyle: 'none',
-            scrollbarWidth: 'none',
-          }}
-        >
-          {[
-            { label: 'Checkup', icon: medkitOutline, path: '/checkups' },
-            { label: 'Diet', icon: restaurantOutline, path: '/diet' },
-            { label: 'Sleep', icon: moonOutline, path: '/sleep' },
-          ].map((action) => (
-            <div
-              key={action.label}
-              onClick={() => history.push(action.path)}
-              style={{
-                flexShrink: 0,
-                background: '#ffffff',
-                borderRadius: '999px',
-                padding: '10px 18px',
-                display: 'flex',
-                alignItems: 'center',
-                gap: '8px',
-                minHeight: '44px',
               cursor: 'pointer',
             }}
           >
-              <IonIcon
+            {initials}
-                icon={action.icon}
+          </div>
-                style={{ fontSize: '18px', color: '#0369a1' }}
+        </div>
-              />
+
+        {/* Greeting Widget */}
+        <div
+          style={{
+            background: 'var(--color-surface)',
+            borderRadius: '24px',
+            padding: '22px',
+            margin: '0 20px 12px',
+            display: 'flex',
+            flexDirection: 'column',
+            gap: '6px',
+            boxShadow: '0 2px 4px rgba(0,0,0,0.02)',
+          }}
+        >
+          <div
+            style={{
+              display: 'flex',
+              alignItems: 'baseline',
+              gap: '6px',
+              flexWrap: 'wrap',
+            }}
+          >
             <span
+              style={{
+                fontSize: '22px',
+                fontWeight: '400',
+                color: 'var(--color-text-primary)',
+              }}
+            >
+              Hello,
+            </span>
+            <span
+              style={{
+                fontSize: '22px',
+                fontWeight: '700',
+                color: 'var(--color-text-primary)',
+              }}
+            >
+              {profile?.full_name?.split(' ')[0] || 'Friend'}
+            </span>
+          </div>
+          <div
+            style={{
+              fontSize: '14px',
+              fontWeight: '400',
+              color: 'var(--color-text-secondary)',
+            }}
+          >
+            Here is what's happening at church this week.
+          </div>
+        </div>
+
+        {loading ? (
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'center',
+              padding: '40px 0',
+            }}
+          >
+            <IonSpinner name="crescent" color="primary" />
+          </div>
+        ) : (
+          <>
+            {/* Feature Upcoming Event Widget */}
+            {featuredEvent && (
+              <div
+                onClick={() => openEventDetail(featuredEvent.id)}
+                style={{
+                  background: 'var(--color-brand)',
+                  borderRadius: '24px',
+                  padding: '22px',
+                  margin: '0 20px 12px',
+                  display: 'flex',
+                  flexDirection: 'column',
+                  gap: '10px',
+                  cursor: 'pointer',
+                }}
+              >
+                <div
+                  style={{
+                    fontSize: '11px',
+                    fontWeight: '600',
+                    color: 'rgba(255,255,255,0.70)',
+                    textTransform: 'uppercase',
+                    letterSpacing: '0.5px',
+                  }}
+                >
+                  Next Up
+                </div>
+                <div
+                  style={{
+                    fontSize: '24px',
+                    fontWeight: '700',
+                    color: '#ffffff',
+                    lineHeight: '1.2',
+                  }}
+                >
+                  {featuredEvent.title}
+                </div>
+                <div
                   style={{
                     fontSize: '13px',
-                  fontWeight: '700',
+                    fontWeight: '500',
-                  color: '#1e3a5f',
+                    color: 'rgba(255,255,255,0.85)',
                   }}
                 >
-                {action.label}
+                  {new Date(featuredEvent.start_at).toLocaleTimeString([], {
-              </span>
+                    hour: '2-digit',
+                    minute: '2-digit',
+                  })}{' '}
+                  • {featuredEvent.day_label}
                 </div>
-          ))}
+                <div style={{ marginTop: '4px' }}>
+                  <button
+                    style={{
+                      background: 'rgba(255,255,255,0.16)',
+                      border: 'none',
+                      borderRadius: '999px',
+                      padding: '10px 16px',
+                      fontSize: '13px',
+                      fontWeight: '600',
+                      color: '#ffffff',
+                    }}
+                  >
+                    View Details
+                  </button>
                 </div>
+              </div>
+            )}
 
-        {/* Section Header */}
+            {/* Latest News Row (Horizontal Scroll) */}
+            {latestNews.length > 0 && (
+              <div style={{ marginBottom: '24px' }}>
                 <div
                   style={{
-            margin: '4px 20px 12px',
                     display: 'flex',
                     justifyContent: 'space-between',
-            alignItems: 'baseline',
+                    alignItems: 'center',
+                    padding: '0 20px 12px',
                   }}
                 >
-          <span
-            style={{ fontSize: '17px', fontWeight: '700', color: '#1e3a5f' }}
-          >
-            Recent Activity
-          </span>
                   <div
-            onClick={() => history.push('/insights')}
                     style={{
-              display: 'flex',
+                      fontSize: '16px',
-              alignItems: 'center',
+                      fontWeight: '700',
-              gap: '2px',
+                      color: 'var(--color-text-primary)',
+                    }}
+                  >
+                    Latest News
+                  </div>
+                  <div
+                    onClick={() => history.push('/news')}
+                    style={{
+                      fontSize: '14px',
+                      fontWeight: '600',
+                      color: 'var(--color-brand)',
                       cursor: 'pointer',
                     }}
                   >
-            <span
+                    See all
-              style={{ fontSize: '13px', fontWeight: '700', color: '#0369a1' }}
+                  </div>
+                </div>
+
+                <div
+                  style={{
+                    display: 'flex',
+                    overflowX: 'auto',
+                    scrollSnapType: 'x mandatory',
+                    padding: '0 20px',
+                    gap: '12px',
+                    scrollbarWidth: 'none',
+                    msOverflowStyle: 'none',
+                  }}
+                  className="hide-scrollbar"
+                >
+                  {latestNews.map((news) => (
+                    <div
+                      key={news.id}
+                      onClick={() => history.push(`/news/${news.id}`)}
+                      style={{
+                        minWidth: '260px',
+                        maxWidth: '260px',
+                        background: 'var(--color-surface)',
+                        borderRadius: '24px',
+                        padding: '16px',
+                        display: 'flex',
+                        flexDirection: 'column',
+                        gap: '12px',
+                        scrollSnapAlign: 'start',
+                        boxShadow: '0 2px 4px rgba(0,0,0,0.02)',
+                        cursor: 'pointer',
+                      }}
+                    >
+                      {news.image_url ? (
+                        <img
+                          src={news.image_url}
+                          alt=""
+                          style={{
+                            width: '100%',
+                            height: '120px',
+                            objectFit: 'cover',
+                            borderRadius: '16px',
+                            background: 'var(--color-surface-raised)',
+                          }}
+                        />
+                      ) : (
+                        <div
+                          style={{
+                            width: '100%',
+                            height: '120px',
+                            borderRadius: '16px',
+                            background: 'var(--color-brand-soft)',
+                            display: 'flex',
+                            alignItems: 'center',
+                            justifyContent: 'center',
+                          }}
                         >
-              See insights
-            </span>
                           <IonIcon
-              icon={chevronForwardOutline}
+                            icon={newspaperOutline}
-              style={{ fontSize: '14px', color: '#0369a1' }}
+                            style={{
+                              color: 'var(--color-brand)',
+                              fontSize: '32px',
+                            }}
                           />
                         </div>
+                      )}
+                      <div>
+                        <div
+                          style={{
+                            fontSize: '12px',
+                            fontWeight: '600',
+                            color: 'var(--color-text-tertiary)',
+                            marginBottom: '4px',
+                          }}
+                        >
+                          {new Date(news.created_at).toLocaleDateString(
+                            undefined,
+                            {
+                              month: 'short',
+                              day: 'numeric',
+                            }
+                          )}
+                        </div>
+                        <div
+                          style={{
+                            fontSize: '15px',
+                            fontWeight: '700',
+                            color: 'var(--color-text-primary)',
+                            lineHeight: '1.3',
+                            display: '-webkit-box',
+                            WebkitLineClamp: 2,
+                            WebkitBoxOrient: 'vertical',
+                            overflow: 'hidden',
+                          }}
+                        >
+                          {news.title}
+                        </div>
+                      </div>
+                    </div>
+                  ))}
+                  <div style={{ minWidth: '8px' }}></div>
+                </div>
+                <style>{`
+                  .hide-scrollbar::-webkit-scrollbar { display: none; }
+                `}</style>
+              </div>
+            )}
+
+            {/* Two Stat Widgets */}
+            <div
+              style={{ display: 'flex', gap: '12px', margin: '0 20px 12px' }}
+            >
+              <HomeStatCard
+                label="Weekly"
+                value={weeklyCount.toString()}
+                caption="Upcoming events"
+                icon={calendarOutline}
+              />
+              <HomeStatCard
+                label="Youth"
+                value={youthCount.toString()}
+                caption="Activities planned"
+                icon={peopleOutline}
+              />
+            </div>
+
+            {/* Upcoming This Week List */}
+            {upcomingEvents.length > 0 ? (
+              <div
+                style={{
+                  background: '#fcf8f0',
+                  borderRadius: '24px',
+                  padding: '20px',
+                  margin: '0 20px 16px',
+                  display: 'flex',
+                  flexDirection: 'column',
+                  gap: '14px',
+                  boxShadow: '0 2px 8px rgba(123, 45, 38, 0.05)',
+                  border: '1px solid rgba(176, 122, 58, 0.1)',
+                }}
+              >
+                <div
+                  style={{
+                    display: 'flex',
+                    justifyContent: 'space-between',
+                    alignItems: 'center',
+                  }}
+                >
+                  <div
+                    style={{
+                      fontSize: '16px',
+                      fontWeight: '700',
+                      color: 'var(--color-text-primary)',
+                    }}
+                  >
+                    Upcoming Schedule
+                  </div>
+                  <div
+                    onClick={goToEvents}
+                    style={{
+                      fontSize: '14px',
+                      fontWeight: '600',
+                      color: 'var(--color-brand)',
+                      cursor: 'pointer',
+                    }}
+                  >
+                    See all
+                  </div>
                 </div>
 
-        {/* Recent Activity List */}
+                <div
-        <RecentActivityList
+                  style={{
-          entries={recentEntries}
+                    display: 'flex',
-          onCreate={() => history.push('/checkups')}
+                    flexDirection: 'column',
-          onSeeInsights={() => history.push('/insights')}
+                    gap: '4px',
+                  }}
+                >
+                  {upcomingEvents.map((event) => (
+                    <EventPreviewCard
+                      key={event.id}
+                      event={event}
+                      onClick={() => openEventDetail(event.id)}
                     />
+                  ))}
+                </div>
+              </div>
+            ) : (
+              <div
+                style={{
+                  background: 'var(--color-surface)',
+                  borderRadius: '24px',
+                  padding: '32px 20px',
+                  margin: '0 20px 16px',
+                  display: 'flex',
+                  flexDirection: 'column',
+                  alignItems: 'center',
+                  gap: '12px',
+                  textAlign: 'center',
+                  boxShadow: '0 2px 4px rgba(0,0,0,0.02)',
+                }}
+              >
+                <IonIcon
+                  icon={calendarOutline}
+                  style={{
+                    fontSize: '40px',
+                    color: 'var(--color-text-tertiary)',
+                  }}
+                />
+                <p
+                  style={{
+                    margin: 0,
+                    fontSize: '14px',
+                    fontWeight: '400',
+                    color: 'var(--color-text-secondary)',
+                  }}
+                >
+                  No church events have been posted yet.
+                </p>
+                <button
+                  onClick={goToEvents}
+                  style={{
+                    background: 'var(--color-brand-soft)',
+                    border: 'none',
+                    borderRadius: '999px',
+                    padding: '10px 16px',
+                    fontSize: '14px',
+                    fontWeight: '600',
+                    color: 'var(--color-brand)',
+                    cursor: 'pointer',
+                    marginTop: '4px',
+                  }}
+                >
+                  Go to events
+                </button>
+              </div>
+            )}
+          </>
+        )}
 
-        <div style={{ height: '20px' }} />
+        {error && (
+          <div
+            style={{
+              margin: '0 20px',
+              padding: '12px',
+              background: 'rgba(190,60,60,0.1)',
+              borderRadius: '12px',
+              color: '#a33b32',
+              fontSize: '13px',
+            }}
+          >
+            {error}
+          </div>
+        )}
       </IonContent>
     </IonPage>
   );

src/pages/Insights.tsx

@@ -1,204 +0,0 @@
-import React, { useState } from 'react';
-import {
-  IonContent,
-  IonHeader,
-  IonPage,
-  IonTitle,
-  IonToolbar,
-  IonButtons,
-  IonButton,
-  IonIcon,
-  IonGrid,
-  IonRow,
-  IonCol,
-  useIonViewWillEnter,
-} from '@ionic/react';
-import { useHistory } from 'react-router-dom';
-import {
-  chevronBackOutline,
-  analyticsOutline,
-  medkitOutline,
-  restaurantOutline,
-  moonOutline,
-} from 'ionicons/icons';
-import {
-  getWellbeingSummary,
-  calculateInsights,
-} from '../services/localHealthStore';
-import { WellbeingSummary, LocalInsight } from '../types/health';
-import {
-  InsightSummaryCard,
-  RecommendationList,
-} from '../components/health/InsightCards';
-
-const Insights: React.FC = () => {
-  const history = useHistory();
-  const [summary, setSummary] = useState<WellbeingSummary>(
-    getWellbeingSummary()
-  );
-  const [insights, setInsights] = useState<LocalInsight[]>(calculateInsights());
-
-  const refreshData = () => {
-    setSummary(getWellbeingSummary());
-    setInsights(calculateInsights());
-  };
-
-  useIonViewWillEnter(() => {
-    refreshData();
-  });
-
-  return (
-    <IonPage style={{ background: '#eef7fb' }}>
-      <IonHeader className="ion-no-border">
-        <IonToolbar style={{ '--background': '#eef7fb', '--color': '#1e3a5f' }}>
-          <IonButtons slot="start">
-            <IonButton onClick={() => history.goBack()}>
-              <IonIcon icon={chevronBackOutline} slot="icon-only" />
-            </IonButton>
-          </IonButtons>
-          <IonTitle style={{ fontWeight: '700' }}>Insights</IonTitle>
-        </IonToolbar>
-      </IonHeader>
-
-      <IonContent
-        style={{
-          '--background': '#eef7fb',
-          '--padding-start': '20px',
-          '--padding-end': '20px',
-          '--padding-top': '16px',
-        }}
-      >
-        {insights.length > 0 ? (
-          <>
-            <InsightSummaryCard
-              summary={summary}
-              primaryInsight={insights[0]}
-            />
-
-            <div
-              style={{
-                margin: '24px 0 12px',
-                fontSize: '17px',
-                fontWeight: '700',
-                color: '#1e3a5f',
-              }}
-            >
-              Habit Guidance
-            </div>
-
-            <RecommendationList insights={insights} />
-          </>
-        ) : (
-          <div
-            style={{
-              background: '#ffffff',
-              borderRadius: '24px',
-              padding: '40px 24px',
-              display: 'flex',
-              flexDirection: 'column',
-              alignItems: 'center',
-              textAlign: 'center',
-              marginTop: '20px',
-            }}
-          >
-            <div
-              style={{
-                width: '64px',
-                height: '64px',
-                borderRadius: '20px',
-                background: 'rgba(3,105,161,0.06)',
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'center',
-                marginBottom: '20px',
-              }}
-            >
-              <IonIcon
-                icon={analyticsOutline}
-                style={{ fontSize: '32px', color: 'rgba(3,105,161,0.30)' }}
-              />
-            </div>
-            <div
-              style={{
-                fontSize: '18px',
-                fontWeight: '700',
-                color: '#1e3a5f',
-                marginBottom: '8px',
-              }}
-            >
-              Insights need a few logs first
-            </div>
-            <div
-              style={{
-                fontSize: '14px',
-                color: 'rgba(30,58,95,0.58)',
-                lineHeight: '20px',
-                marginBottom: '32px',
-              }}
-            >
-              Add a checkup, meal, or sleep log to see personalized guidance
-              based on your patterns.
-            </div>
-
-            <div
-              style={{
-                display: 'flex',
-                flexDirection: 'column',
-                gap: '12px',
-                width: '100%',
-              }}
-            >
-              <IonButton
-                onClick={() => history.push('/checkups')}
-                style={{
-                  '--background': '#0369a1',
-                  '--border-radius': '999px',
-                  '--color': '#ffffff',
-                  fontWeight: '700',
-                  height: '48px',
-                }}
-              >
-                <IonIcon icon={medkitOutline} slot="start" />
-                Add Checkup
-              </IonButton>
-              <div style={{ display: 'flex', gap: '12px' }}>
-                <IonButton
-                  onClick={() => history.push('/diet')}
-                  style={{
-                    flex: 1,
-                    '--background': '#e2f2f8',
-                    '--border-radius': '999px',
-                    '--color': '#1e3a5f',
-                    fontWeight: '700',
-                    height: '48px',
-                  }}
-                >
-                  <IonIcon icon={restaurantOutline} slot="start" />
-                  Diet
-                </IonButton>
-                <IonButton
-                  onClick={() => history.push('/sleep')}
-                  style={{
-                    flex: 1,
-                    '--background': '#e2f2f8',
-                    '--border-radius': '999px',
-                    '--color': '#1e3a5f',
-                    fontWeight: '700',
-                    height: '48px',
-                  }}
-                >
-                  <IonIcon icon={moonOutline} slot="start" />
-                  Sleep
-                </IonButton>
-              </div>
-            </div>
-          </div>
-        )}
-
-        <div style={{ height: '40px' }} />
-      </IonContent>
-    </IonPage>
-  );
-};
-
-export default Insights;

src/pages/News.tsx

@@ -0,0 +1,229 @@
+import React, { useState } from 'react';
+import {
+  IonPage,
+  IonContent,
+  IonHeader,
+  IonToolbar,
+  IonTitle,
+  IonSpinner,
+  useIonViewWillEnter,
+  IonRefresher,
+  IonRefresherContent,
+  IonButtons,
+  IonButton,
+  IonIcon,
+} from '@ionic/react';
+import { useHistory } from 'react-router-dom';
+import { supabase } from '../supabase';
+import { useAuth } from '../contexts/AuthContext';
+import { NewsItem } from '../types';
+import { addOutline, newspaperOutline } from 'ionicons/icons';
+
+const News: React.FC = () => {
+  const history = useHistory();
+  const { profile } = useAuth();
+  const [news, setNews] = useState<NewsItem[]>([]);
+  const [loading, setLoading] = useState(true);
+
+  const fetchNews = async () => {
+    try {
+      const { data, error } = await supabase
+        .from('news')
+        .select('*')
+        .order('created_at', { ascending: false });
+
+      if (error) throw error;
+      setNews(data || []);
+    } catch (err) {
+      console.error('Error fetching news:', err);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  useIonViewWillEnter(() => {
+    fetchNews();
+  });
+
+  const doRefresh = async (event: any) => {
+    await fetchNews();
+    event.detail.complete();
+  };
+
+  return (
+    <IonPage>
+      <IonHeader className="ion-no-border">
+        <IonToolbar style={{ '--background': '#f5f7f4' }}>
+          <IonTitle
+            style={{ fontWeight: '700', fontSize: '24px', color: '#1f2937' }}
+          >
+            News
+          </IonTitle>
+          {profile?.role === 'admin' && (
+            <IonButtons slot="end">
+              <IonButton onClick={() => history.push('/admin/news/new')}>
+                <IonIcon icon={addOutline} style={{ color: '#2f6b4f' }} />
+              </IonButton>
+            </IonButtons>
+          )}
+        </IonToolbar>
+      </IonHeader>
+
+      <IonContent style={{ '--background': '#f5f7f4' }}>
+        <IonRefresher slot="fixed" onIonRefresh={doRefresh}>
+          <IonRefresherContent />
+        </IonRefresher>
+
+        <div style={{ padding: '0 20px 20px' }}>
+          {loading ? (
+            <div
+              style={{
+                display: 'flex',
+                justifyContent: 'center',
+                marginTop: '40px',
+              }}
+            >
+              <IonSpinner name="crescent" />
+            </div>
+          ) : news.length === 0 ? (
+            <div
+              style={{
+                textAlign: 'center',
+                padding: '60px 20px',
+                color: '#6b7280',
+              }}
+            >
+              <IonIcon
+                icon={newspaperOutline}
+                style={{
+                  fontSize: '48px',
+                  color: '#cbd5e1',
+                  marginBottom: '16px',
+                }}
+              />
+              <p style={{ margin: 0, fontSize: '16px', fontWeight: '500' }}>
+                No news yet.
+              </p>
+              {profile?.role === 'admin' && (
+                <button
+                  onClick={() => history.push('/admin/news/new')}
+                  style={{
+                    background: '#2f6b4f',
+                    color: '#fff',
+                    border: 'none',
+                    borderRadius: '999px',
+                    padding: '10px 20px',
+                    fontWeight: '600',
+                    marginTop: '20px',
+                    cursor: 'pointer',
+                  }}
+                >
+                  Create Post
+                </button>
+              )}
+            </div>
+          ) : (
+            <div
+              style={{
+                display: 'flex',
+                flexDirection: 'column',
+                gap: '16px',
+                paddingTop: '8px',
+              }}
+            >
+              {news.map((item) => (
+                <div
+                  key={item.id}
+                  onClick={() => history.push(`/news/${item.id}`)}
+                  style={{
+                    background: '#ffffff',
+                    borderRadius: '24px',
+                    padding: '16px',
+                    display: 'flex',
+                    gap: '16px',
+                    cursor: 'pointer',
+                    boxShadow: '0 2px 4px rgba(0,0,0,0.02)',
+                    alignItems: 'center',
+                  }}
+                >
+                  {item.image_url ? (
+                    <img
+                      src={item.image_url}
+                      alt=""
+                      style={{
+                        width: '80px',
+                        height: '80px',
+                        borderRadius: '16px',
+                        objectFit: 'cover',
+                        flexShrink: 0,
+                        background: '#f1f5f9',
+                      }}
+                    />
+                  ) : (
+                    <div
+                      style={{
+                        width: '80px',
+                        height: '80px',
+                        borderRadius: '16px',
+                        background: 'rgba(47, 107, 79, 0.1)',
+                        display: 'flex',
+                        alignItems: 'center',
+                        justifyContent: 'center',
+                        flexShrink: 0,
+                      }}
+                    >
+                      <IonIcon
+                        icon={newspaperOutline}
+                        style={{ color: '#2f6b4f', fontSize: '28px' }}
+                      />
+                    </div>
+                  )}
+
+                  <div
+                    style={{
+                      flex: 1,
+                      minWidth: 0,
+                      display: 'flex',
+                      flexDirection: 'column',
+                      gap: '6px',
+                    }}
+                  >
+                    <div
+                      style={{
+                        fontSize: '12px',
+                        fontWeight: '600',
+                        color: '#9ca3af',
+                      }}
+                    >
+                      {new Date(item.created_at).toLocaleDateString(undefined, {
+                        month: 'short',
+                        day: 'numeric',
+                        year: 'numeric',
+                      })}
+                    </div>
+                    <div
+                      style={{
+                        fontSize: '16px',
+                        fontWeight: '700',
+                        color: '#1f2937',
+                        lineHeight: '1.3',
+                        display: '-webkit-box',
+                        WebkitLineClamp: 2,
+                        WebkitBoxOrient: 'vertical',
+                        overflow: 'hidden',
+                      }}
+                    >
+                      {item.title}
+                    </div>
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
+        </div>
+      </IonContent>
+    </IonPage>
+  );
+};
+
+export default News;

src/pages/NewsDetail.tsx

@@ -0,0 +1,187 @@
+import React, { useState } from 'react';
+import {
+  IonPage,
+  IonContent,
+  IonHeader,
+  IonToolbar,
+  IonButtons,
+  IonButton,
+  IonIcon,
+  IonSpinner,
+  useIonViewWillEnter,
+} from '@ionic/react';
+import { useHistory, useParams } from 'react-router-dom';
+import { supabase } from '../supabase';
+import { useAuth } from '../contexts/AuthContext';
+import { NewsItem } from '../types';
+import { chevronBackOutline, createOutline } from 'ionicons/icons';
+
+const NewsDetail: React.FC = () => {
+  const history = useHistory();
+  const { id } = useParams<{ id: string }>();
+  const { profile } = useAuth();
+  const [news, setNews] = useState<NewsItem | null>(null);
+  const [loading, setLoading] = useState(true);
+
+  useIonViewWillEnter(() => {
+    fetchNewsItem();
+  });
+
+  const fetchNewsItem = async () => {
+    try {
+      const { data, error } = await supabase
+        .from('news')
+        .select('*')
+        .eq('id', id)
+        .single();
+      if (error) throw error;
+      setNews(data);
+    } catch (err) {
+      console.error('Error fetching news:', err);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  if (loading) {
+    return (
+      <IonPage>
+        <IonHeader className="ion-no-border">
+          <IonToolbar style={{ '--background': '#f5f7f4' }}>
+            <IonButtons slot="start">
+              <IonButton onClick={() => history.goBack()}>
+                <IonIcon icon={chevronBackOutline} slot="icon-only" />
+              </IonButton>
+            </IonButtons>
+          </IonToolbar>
+        </IonHeader>
+        <IonContent style={{ '--background': '#f5f7f4' }}>
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'center',
+              marginTop: '40px',
+            }}
+          >
+            <IonSpinner name="crescent" />
+          </div>
+        </IonContent>
+      </IonPage>
+    );
+  }
+
+  if (!news) {
+    return (
+      <IonPage>
+        <IonHeader className="ion-no-border">
+          <IonToolbar style={{ '--background': '#f5f7f4' }}>
+            <IonButtons slot="start">
+              <IonButton onClick={() => history.goBack()}>
+                <IonIcon icon={chevronBackOutline} slot="icon-only" />
+              </IonButton>
+            </IonButtons>
+          </IonToolbar>
+        </IonHeader>
+        <IonContent style={{ '--background': '#f5f7f4' }}>
+          <div
+            style={{ textAlign: 'center', marginTop: '60px', color: '#6b7280' }}
+          >
+            News item not found.
+          </div>
+        </IonContent>
+      </IonPage>
+    );
+  }
+
+  return (
+    <IonPage>
+      <IonHeader className="ion-no-border">
+        <IonToolbar style={{ '--background': '#f5f7f4' }}>
+          <IonButtons slot="start">
+            <IonButton onClick={() => history.goBack()}>
+              <IonIcon icon={chevronBackOutline} slot="icon-only" />
+            </IonButton>
+          </IonButtons>
+          {profile?.role === 'admin' && (
+            <IonButtons slot="end">
+              <IonButton onClick={() => history.push(`/admin/news/${news.id}`)}>
+                <IonIcon
+                  icon={createOutline}
+                  slot="icon-only"
+                  style={{ color: '#2f6b4f' }}
+                />
+              </IonButton>
+            </IonButtons>
+          )}
+        </IonToolbar>
+      </IonHeader>
+
+      <IonContent style={{ '--background': '#f5f7f4' }}>
+        <div
+          style={{
+            padding: '0 20px 40px',
+            maxWidth: '600px',
+            margin: '0 auto',
+          }}
+        >
+          {news.image_url && (
+            <div style={{ marginBottom: '24px' }}>
+              <img
+                src={news.image_url}
+                alt=""
+                style={{
+                  width: '100%',
+                  height: '240px',
+                  objectFit: 'cover',
+                  borderRadius: '24px',
+                  background: '#eef2ec',
+                }}
+              />
+            </div>
+          )}
+
+          <div
+            style={{
+              fontSize: '14px',
+              fontWeight: '600',
+              color: '#2f6b4f',
+              marginBottom: '12px',
+            }}
+          >
+            {new Date(news.created_at).toLocaleDateString(undefined, {
+              weekday: 'long',
+              month: 'long',
+              day: 'numeric',
+              year: 'numeric',
+            })}
+          </div>
+
+          <h1
+            style={{
+              margin: '0 0 24px',
+              fontSize: '28px',
+              fontWeight: '800',
+              color: '#1f2937',
+              lineHeight: '1.2',
+            }}
+          >
+            {news.title}
+          </h1>
+
+          <div
+            style={{
+              fontSize: '16px',
+              color: '#4b5563',
+              lineHeight: '1.6',
+              whiteSpace: 'pre-wrap',
+            }}
+          >
+            {news.content}
+          </div>
+        </div>
+      </IonContent>
+    </IonPage>
+  );
+};
+
+export default NewsDetail;

src/pages/Profile.tsx

@@ -0,0 +1,521 @@
+import React, { useRef, useState } from 'react';
+import { IonPage, IonContent, IonIcon, IonSpinner } from '@ionic/react';
+import { useHistory } from 'react-router-dom';
+import { supabase } from '../supabase';
+import { useAuth } from '../contexts/AuthContext';
+import {
+  cameraOutline,
+  personOutline,
+  chevronForwardOutline,
+  settingsOutline,
+  helpCircleOutline,
+} from 'ionicons/icons';
+
+const Profile: React.FC = () => {
+  const [signingOut, setSigningOut] = useState(false);
+  const [uploadingAvatar, setUploadingAvatar] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const { user, profile, refreshProfile } = useAuth();
+  const history = useHistory();
+  const fileInputRef = useRef<HTMLInputElement | null>(null);
+
+  const handleSignOut = async () => {
+    setSigningOut(true);
+    setError(null);
+    const { error: signOutError } = await supabase.auth.signOut();
+    if (signOutError) {
+      setError(signOutError.message);
+      setSigningOut(false);
+      return;
+    }
+    history.replace('/auth');
+  };
+
+  const goToCreateEvent = () => {
+    history.push('/admin/events/new');
+  };
+
+  const initials = profile?.full_name
+    ? profile.full_name
+        .split(' ')
+        .map((n) => n[0])
+        .join('')
+        .substring(0, 2)
+        .toUpperCase()
+    : 'U';
+
+  const isAdmin = profile?.role === 'admin';
+  const avatarUrl = profile?.avatar_url
+    ? `${supabase.storage.from('avatars').getPublicUrl(profile.avatar_url).data.publicUrl}?t=${Date.now()}`
+    : null;
+
+  const showError = (message: string) => {
+    setError(message);
+    setTimeout(() => setError(null), 4000);
+  };
+
+  const handleAvatarSelect = async (
+    event: React.ChangeEvent<HTMLInputElement>
+  ) => {
+    const file = event.target.files?.[0];
+    if (!file || !user) {
+      return;
+    }
+
+    setUploadingAvatar(true);
+    setError(null);
+
+    const extension = file.name.split('.').pop()?.toLowerCase() || 'jpg';
+    const filePath = `${user.id}/avatar-${Date.now()}.${extension}`;
+
+    const { error: uploadError } = await supabase.storage
+      .from('avatars')
+      .upload(filePath, file);
+
+    if (uploadError) {
+      showError(uploadError.message);
+      setUploadingAvatar(false);
+      event.target.value = '';
+      return;
+    }
+
+    const { error: profileError } = await supabase
+      .from('profiles')
+      .update({ avatar_url: filePath, updated_at: new Date().toISOString() })
+      .eq('id', user.id);
+
+    if (profileError) {
+      showError(profileError.message);
+      setUploadingAvatar(false);
+      event.target.value = '';
+      return;
+    }
+
+    await refreshProfile();
+    setUploadingAvatar(false);
+    event.target.value = '';
+  };
+
+  return (
+    <IonPage style={{ background: '#f5f7f4' }}>
+      <IonContent
+        style={{
+          '--background': '#f5f7f4',
+          '--padding-start': '0px',
+          '--padding-end': '0px',
+          '--padding-top': '0px',
+          '--padding-bottom': '24px',
+        }}
+      >
+        {/* Top Title Row */}
+        <div
+          style={{
+            padding: 'calc(16px + var(--ion-safe-area-top)) 20px 8px',
+            margin: '0',
+            background: 'transparent',
+            display: 'flex',
+            flexDirection: 'column',
+            gap: '6px',
+          }}
+        >
+          <h1
+            style={{
+              margin: 0,
+              fontSize: '24px',
+              fontWeight: '700',
+              color: '#1f2937',
+            }}
+          >
+            Profile
+          </h1>
+          <p
+            style={{
+              margin: 0,
+              fontSize: '14px',
+              fontWeight: '400',
+              color: '#6b7280',
+            }}
+          >
+            Manage your account
+          </p>
+        </div>
+
+        {/* Profile Summary Card */}
+        <div
+          style={{
+            background: '#ffffff',
+            borderRadius: '24px',
+            padding: '20px',
+            margin: '0 20px 12px',
+            display: 'flex',
+            alignItems: 'center',
+            gap: '12px',
+          }}
+        >
+          <div
+            style={{
+              position: 'relative',
+              width: '52px',
+              height: '52px',
+              flexShrink: 0,
+            }}
+          >
+            <button
+              onClick={() => fileInputRef.current?.click()}
+              disabled={uploadingAvatar}
+              style={{
+                width: '52px',
+                height: '52px',
+                borderRadius: '16px',
+                background: 'rgba(47, 107, 79, 0.12)',
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                fontSize: '18px',
+                fontWeight: '700',
+                color: '#2f6b4f',
+                flexShrink: 0,
+                border: 'none',
+                padding: 0,
+                overflow: 'hidden',
+                cursor: uploadingAvatar ? 'default' : 'pointer',
+              }}
+            >
+              {avatarUrl ? (
+                <img
+                  src={avatarUrl}
+                  alt={profile?.full_name || 'Profile'}
+                  style={{ width: '100%', height: '100%', objectFit: 'cover' }}
+                />
+              ) : (
+                initials
+              )}
+            </button>
+            <button
+              onClick={() => fileInputRef.current?.click()}
+              disabled={uploadingAvatar}
+              style={{
+                position: 'absolute',
+                right: '-4px',
+                bottom: '-4px',
+                width: '24px',
+                height: '24px',
+                borderRadius: '12px',
+                border: 'none',
+                background: '#2f6b4f',
+                color: '#ffffff',
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                cursor: uploadingAvatar ? 'default' : 'pointer',
+                padding: 0,
+              }}
+            >
+              {uploadingAvatar ? (
+                <IonSpinner
+                  name="crescent"
+                  color="light"
+                  style={{ width: '14px', height: '14px' }}
+                />
+              ) : (
+                <IonIcon icon={cameraOutline} style={{ fontSize: '13px' }} />
+              )}
+            </button>
+            <input
+              ref={fileInputRef}
+              type="file"
+              accept="image/jpeg,image/png,image/webp"
+              onChange={handleAvatarSelect}
+              style={{ display: 'none' }}
+            />
+          </div>
+          <div
+            style={{
+              flex: 1,
+              minWidth: 0,
+              display: 'flex',
+              flexDirection: 'column',
+              gap: '4px',
+            }}
+          >
+            <div
+              style={{
+                fontSize: '18px',
+                fontWeight: '700',
+                color: '#1f2937',
+                whiteSpace: 'nowrap',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+              }}
+            >
+              {profile?.full_name || 'Member'}
+            </div>
+            <div
+              style={{
+                fontSize: '13px',
+                fontWeight: '400',
+                color: '#6b7280',
+                whiteSpace: 'nowrap',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+              }}
+            >
+              {profile?.email || ''}
+            </div>
+          </div>
+          {profile?.ministry_group && (
+            <div
+              style={{
+                background: '#eef2ec',
+                color: '#4b5563',
+                borderRadius: '999px',
+                padding: '4px 10px',
+                fontSize: '12px',
+                fontWeight: '600',
+              }}
+            >
+              {profile.ministry_group}
+            </div>
+          )}
+        </div>
+
+        {/* Settings / Action List Card */}
+        <div
+          style={{
+            background: '#ffffff',
+            borderRadius: '24px',
+            padding: '8px 18px',
+            margin: '0 20px 12px',
+            display: 'flex',
+            flexDirection: 'column',
+            boxShadow: '0 2px 4px rgba(0,0,0,0.02)',
+          }}
+        >
+          <div
+            style={{
+              minHeight: '56px',
+              display: 'flex',
+              alignItems: 'center',
+              gap: '12px',
+            }}
+          >
+            <div
+              style={{
+                width: '36px',
+                height: '36px',
+                borderRadius: '12px',
+                background: '#eef2ec',
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                flexShrink: 0,
+              }}
+            >
+              <IonIcon
+                icon={personOutline}
+                style={{ color: '#2f6b4f', fontSize: '18px' }}
+              />
+            </div>
+            <div
+              style={{
+                flex: 1,
+                fontSize: '15px',
+                fontWeight: '600',
+                color: '#1f2937',
+              }}
+            >
+              Personal Info
+            </div>
+            <IonIcon
+              icon={chevronForwardOutline}
+              style={{ color: '#9aa3a0', fontSize: '18px' }}
+            />
+          </div>
+
+          <div
+            style={{
+              minHeight: '56px',
+              display: 'flex',
+              alignItems: 'center',
+              gap: '12px',
+            }}
+          >
+            <div
+              style={{
+                width: '36px',
+                height: '36px',
+                borderRadius: '12px',
+                background: '#eef2ec',
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                flexShrink: 0,
+              }}
+            >
+              <IonIcon
+                icon={settingsOutline}
+                style={{ color: '#2f6b4f', fontSize: '18px' }}
+              />
+            </div>
+            <div
+              style={{
+                flex: 1,
+                fontSize: '15px',
+                fontWeight: '600',
+                color: '#1f2937',
+              }}
+            >
+              Account Settings
+            </div>
+            <IonIcon
+              icon={chevronForwardOutline}
+              style={{ color: '#9aa3a0', fontSize: '18px' }}
+            />
+          </div>
+
+          <div
+            style={{
+              minHeight: '56px',
+              display: 'flex',
+              alignItems: 'center',
+              gap: '12px',
+            }}
+          >
+            <div
+              style={{
+                width: '36px',
+                height: '36px',
+                borderRadius: '12px',
+                background: '#eef2ec',
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                flexShrink: 0,
+              }}
+            >
+              <IonIcon
+                icon={helpCircleOutline}
+                style={{ color: '#2f6b4f', fontSize: '18px' }}
+              />
+            </div>
+            <div
+              style={{
+                flex: 1,
+                fontSize: '15px',
+                fontWeight: '600',
+                color: '#1f2937',
+              }}
+            >
+              Help & Support
+            </div>
+            <IonIcon
+              icon={chevronForwardOutline}
+              style={{ color: '#9aa3a0', fontSize: '18px' }}
+            />
+          </div>
+        </div>
+
+        {/* Admin Shortcut Card */}
+        {isAdmin && (
+          <div
+            style={{
+              background: 'rgba(47, 107, 79, 0.08)',
+              borderRadius: '24px',
+              padding: '18px',
+              margin: '0 20px 12px',
+              display: 'flex',
+              flexDirection: 'column',
+              gap: '12px',
+            }}
+          >
+            <div
+              style={{ fontSize: '14px', fontWeight: '600', color: '#2f6b4f' }}
+            >
+              Admin Tools
+            </div>
+            <button
+              onClick={goToCreateEvent}
+              style={{
+                background: '#2f6b4f',
+                border: 'none',
+                borderRadius: '999px',
+                padding: '14px 16px',
+                fontSize: '14px',
+                fontWeight: '600',
+                color: '#ffffff',
+                cursor: 'pointer',
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                width: '100%',
+              }}
+            >
+              Create New Event
+            </button>
+            <button
+              onClick={() => history.push('/admin/news/new')}
+              style={{
+                background: 'rgba(47, 107, 79, 0.1)',
+                border: 'none',
+                borderRadius: '999px',
+                padding: '14px 16px',
+                fontSize: '14px',
+                fontWeight: '600',
+                color: '#2f6b4f',
+                cursor: 'pointer',
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                width: '100%',
+              }}
+            >
+              Manage News
+            </button>
+          </div>
+        )}
+
+        {/* Sign Out Button */}
+        <div style={{ margin: '0 20px 24px 20px' }}>
+          <button
+            onClick={handleSignOut}
+            disabled={signingOut}
+            style={{
+              background: '#a33b32',
+              border: 'none',
+              borderRadius: '999px',
+              padding: '16px',
+              fontSize: '15px',
+              fontWeight: '600',
+              color: '#ffffff',
+              cursor: 'pointer',
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+              width: '100%',
+            }}
+          >
+            {signingOut ? <IonSpinner name="dots" color="light" /> : 'Sign Out'}
+          </button>
+        </div>
+
+        {error && (
+          <div
+            style={{
+              margin: '0 20px',
+              padding: '12px',
+              background: 'rgba(190,60,60,0.1)',
+              borderRadius: '12px',
+              color: '#a33b32',
+              fontSize: '13px',
+            }}
+          >
+            {error}
+          </div>
+        )}
+      </IonContent>
+    </IonPage>
+  );
+};
+
+export default Profile;

src/pages/SetupProfile.tsx

@@ -0,0 +1,250 @@
+import React, { useState } from 'react';
+import {
+  IonPage,
+  IonContent,
+  IonHeader,
+  IonToolbar,
+  IonTitle,
+  IonSpinner,
+  IonSelect,
+  IonSelectOption,
+  IonIcon,
+} from '@ionic/react';
+import { useHistory } from 'react-router-dom';
+import { supabase } from '../supabase';
+import { useAuth } from '../contexts/AuthContext';
+import { personAddOutline } from 'ionicons/icons';
+
+const SetupProfile: React.FC = () => {
+  const [fullName, setFullName] = useState('');
+  const [ministryGroup, setMinistryGroup] = useState('');
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const history = useHistory();
+  const { user, refreshProfile } = useAuth();
+
+  const showError = (msg: string) => {
+    setError(msg);
+    setTimeout(() => setError(null), 4000);
+  };
+
+  const handleProfileSetup = async (e: React.FormEvent) => {
+    e.preventDefault();
+    if (!fullName.trim()) {
+      showError('Please enter your name');
+      return;
+    }
+    if (!user) {
+      showError('No user session found. Please log in again.');
+      return;
+    }
+
+    setLoading(true);
+    setError(null);
+
+    const { error: insertError } = await supabase.from('profiles').insert({
+      id: user.id,
+      email: user.email ?? '',
+      full_name: fullName.trim(),
+      role: 'member',
+      ministry_group: ministryGroup || null,
+    });
+
+    if (insertError) {
+      showError(insertError.message);
+      setLoading(false);
+      return;
+    }
+
+    await refreshProfile();
+    history.replace('/home');
+    setLoading(false);
+  };
+
+  return (
+    <IonPage style={{ background: '#f5f7f4' }}>
+      <IonHeader className="ion-no-border">
+        <IonToolbar style={{ '--background': '#f5f7f4' }}>
+          <IonTitle
+            style={{ fontSize: '18px', fontWeight: '700', color: '#1f2937' }}
+          >
+            Setup Profile
+          </IonTitle>
+        </IonToolbar>
+      </IonHeader>
+
+      <IonContent
+        style={{
+          '--background': '#f5f7f4',
+          '--padding-start': '20px',
+          '--padding-end': '20px',
+          '--padding-top': '16px',
+          '--padding-bottom': '20px',
+        }}
+      >
+        <div
+          style={{
+            background: '#ffffff',
+            borderRadius: '24px',
+            padding: '24px',
+            margin: '0 0 16px 0',
+            display: 'flex',
+            flexDirection: 'column',
+            gap: '12px',
+          }}
+        >
+          <div
+            style={{
+              background: 'rgba(47, 107, 79, 0.12)',
+              borderRadius: '12px',
+              width: '44px',
+              height: '44px',
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+              flexShrink: 0,
+            }}
+          >
+            <IonIcon
+              icon={personAddOutline}
+              style={{ fontSize: '20px', color: '#2f6b4f' }}
+            />
+          </div>
+          <h2
+            style={{
+              margin: 0,
+              fontSize: '20px',
+              fontWeight: '700',
+              color: '#1f2937',
+            }}
+          >
+            Welcome to EAGLES ASSEMBLY
+          </h2>
+          <p
+            style={{
+              margin: 0,
+              fontSize: '14px',
+              fontWeight: '400',
+              color: '#6b7280',
+            }}
+          >
+            Please let us know who you are so we can personalize your
+            experience.
+          </p>
+        </div>
+
+        <form
+          onSubmit={handleProfileSetup}
+          style={{
+            background: '#ffffff',
+            borderRadius: '24px',
+            padding: '24px',
+            margin: '0 0 16px 0',
+            display: 'flex',
+            flexDirection: 'column',
+            gap: '16px',
+          }}
+        >
+          <input
+            type="text"
+            placeholder="Full Name (e.g. John Doe)"
+            value={fullName}
+            onChange={(e) => setFullName(e.target.value)}
+            required
+            style={{
+              background: '#eef2ec',
+              border: 'none',
+              borderRadius: '12px',
+              padding: '0 14px',
+              height: '48px',
+              fontSize: '15px',
+              color: '#1f2937',
+              outline: 'none',
+            }}
+          />
+
+          <div
+            style={{
+              background: '#eef2ec',
+              borderRadius: '12px',
+              padding: '0 14px',
+              height: '48px',
+              display: 'flex',
+              alignItems: 'center',
+            }}
+          >
+            <IonSelect
+              value={ministryGroup}
+              placeholder="Select Ministry Group (Optional)"
+              onIonChange={(e) => setMinistryGroup(e.detail.value)}
+              interface="popover"
+              style={{
+                width: '100%',
+                color: '#1f2937',
+                fontSize: '15px',
+                '--placeholder-color': '#9aa3a0',
+                '--placeholder-opacity': '1',
+              }}
+            >
+              <IonSelectOption value="Youth">Youth</IonSelectOption>
+              <IonSelectOption value="Choir">Choir</IonSelectOption>
+              <IonSelectOption value="Ushering">Ushering</IonSelectOption>
+              <IonSelectOption value="Media">Media</IonSelectOption>
+            </IonSelect>
+          </div>
+
+          <button
+            type="submit"
+            disabled={loading}
+            style={{
+              background: '#2f6b4f',
+              border: 'none',
+              borderRadius: '999px',
+              padding: '16px',
+              fontSize: '15px',
+              fontWeight: '600',
+              color: '#ffffff',
+              cursor: 'pointer',
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+              marginTop: '8px',
+            }}
+          >
+            {loading ? (
+              <IonSpinner name="dots" color="light" />
+            ) : (
+              'Complete Setup'
+            )}
+          </button>
+        </form>
+
+        {error && (
+          <div
+            style={{
+              background: 'rgba(190, 60, 60, 0.10)',
+              borderRadius: '12px',
+              padding: '12px 14px',
+              margin: '0',
+            }}
+          >
+            <p
+              style={{
+                margin: 0,
+                fontSize: '13px',
+                fontWeight: '500',
+                color: '#a33b32',
+                lineHeight: '1.4',
+              }}
+            >
+              {error}
+            </p>
+          </div>
+        )}
+      </IonContent>
+    </IonPage>
+  );
+};
+
+export default SetupProfile;

src/pages/Sleep.tsx

@@ -1,351 +0,0 @@
-import React, { useState } from 'react';
-import {
-  IonContent,
-  IonHeader,
-  IonPage,
-  IonTitle,
-  IonToolbar,
-  IonButtons,
-  IonButton,
-  IonIcon,
-  IonInput,
-  IonTextarea,
-  IonAlert,
-  useIonViewWillEnter,
-} from '@ionic/react';
-import { useHistory } from 'react-router-dom';
-import { chevronBackOutline, trashOutline, moonOutline } from 'ionicons/icons';
-import {
-  getSleepEntries,
-  addSleepEntry,
-  deleteSleepEntry,
-  clearSleepEntries,
-} from '../services/localHealthStore';
-import { SleepEntry, SleepQuality } from '../types/health';
-import HealthLogList from '../components/health/HealthLogList';
-import SleepTrendCard from '../components/health/SleepTrendCard';
-
-const Sleep: React.FC = () => {
-  const history = useHistory();
-  const [entries, setEntries] = useState<SleepEntry[]>([]);
-
-  const [hours, setHours] = useState<string>('');
-  const [quality, setQuality] = useState<SleepQuality | ''>('');
-  const [interruptions, setInterruptions] = useState<string>('');
-  const [notes, setNotes] = useState<string>('');
-
-  const [error, setError] = useState<string | null>(null);
-  const [showClearAlert, setShowClearAlert] = useState(false);
-
-  const refreshData = () => {
-    setEntries(getSleepEntries());
-  };
-
-  useIonViewWillEnter(() => {
-    refreshData();
-  });
-
-  const handleSave = () => {
-    const hoursNum = parseFloat(hours);
-    if (!hours || isNaN(hoursNum) || hoursNum <= 0) {
-      setError('Please enter a valid sleep duration');
-      setTimeout(() => setError(null), 4000);
-      return;
-    }
-    if (!quality) {
-      setError('Please select sleep quality');
-      setTimeout(() => setError(null), 4000);
-      return;
-    }
-
-    addSleepEntry({
-      hours: hoursNum,
-      quality: quality as SleepQuality,
-      interruptions: parseInt(interruptions) || 0,
-      notes,
-    });
-
-    setHours('');
-    setQuality('');
-    setInterruptions('');
-    setNotes('');
-    refreshData();
-  };
-
-  const handleDelete = (id: string) => {
-    deleteSleepEntry(id);
-    refreshData();
-  };
-
-  const handleClear = () => {
-    clearSleepEntries();
-    refreshData();
-  };
-
-  const qualities: SleepQuality[] = ['Restful', 'Okay', 'Restless'];
-
-  return (
-    <IonPage style={{ background: '#eef7fb' }}>
-      <IonHeader className="ion-no-border">
-        <IonToolbar style={{ '--background': '#eef7fb', '--color': '#1e3a5f' }}>
-          <IonButtons slot="start">
-            <IonButton onClick={() => history.goBack()}>
-              <IonIcon icon={chevronBackOutline} slot="icon-only" />
-            </IonButton>
-          </IonButtons>
-          <IonTitle style={{ fontWeight: '700' }}>Sleep</IonTitle>
-          <IonButtons slot="end">
-            {entries.length > 0 && (
-              <IonButton onClick={() => setShowClearAlert(true)}>
-                <IonIcon
-                  icon={trashOutline}
-                  slot="icon-only"
-                  style={{ opacity: 0.5 }}
-                />
-              </IonButton>
-            )}
-          </IonButtons>
-        </IonToolbar>
-      </IonHeader>
-
-      <IonContent
-        style={{
-          '--background': '#eef7fb',
-          '--padding-start': '20px',
-          '--padding-end': '20px',
-          '--padding-top': '16px',
-        }}
-      >
-        {/* Form Card */}
-        <div
-          style={{
-            background: '#ffffff',
-            borderRadius: '24px',
-            padding: '24px',
-            marginBottom: '20px',
-            display: 'flex',
-            flexDirection: 'column',
-            gap: '16px',
-          }}
-        >
-          <div
-            style={{ fontSize: '18px', fontWeight: '700', color: '#1e3a5f' }}
-          >
-            Record your sleep
-          </div>
-
-          <div
-            style={{
-              display: 'grid',
-              gridTemplateColumns: '1fr 1fr',
-              gap: '12px',
-            }}
-          >
-            <div>
-              <div
-                style={{
-                  fontSize: '13px',
-                  fontWeight: '700',
-                  color: 'rgba(30,58,95,0.60)',
-                  marginBottom: '8px',
-                }}
-              >
-                Duration (hours)
-              </div>
-              <IonInput
-                type="text"
-                inputMode="decimal"
-                value={hours}
-                onIonInput={(e) => {
-                  const val = e.detail.value!.replace(/[^0-9.]/g, '');
-                  if ((val.match(/\./g) || []).length <= 1) setHours(val);
-                }}
-                placeholder="0.0"
-                style={{
-                  '--background': '#f3f8fb',
-                  '--padding-start': '16px',
-                  '--border-radius': '12px',
-                  fontSize: '14px',
-                  color: '#1e3a5f',
-                }}
-              />
-            </div>
-            <div>
-              <div
-                style={{
-                  fontSize: '13px',
-                  fontWeight: '700',
-                  color: 'rgba(30,58,95,0.60)',
-                  marginBottom: '8px',
-                }}
-              >
-                Interruptions
-              </div>
-              <IonInput
-                type="text"
-                inputMode="numeric"
-                value={interruptions}
-                onIonInput={(e) =>
-                  setInterruptions(e.detail.value!.replace(/[^0-9]/g, ''))
-                }
-                placeholder="0"
-                style={{
-                  '--background': '#f3f8fb',
-                  '--padding-start': '16px',
-                  '--border-radius': '12px',
-                  fontSize: '14px',
-                  color: '#1e3a5f',
-                }}
-              />
-            </div>
-          </div>
-
-          <div>
-            <div
-              style={{
-                fontSize: '13px',
-                fontWeight: '700',
-                color: 'rgba(30,58,95,0.60)',
-                marginBottom: '12px',
-              }}
-            >
-              Quality
-            </div>
-            <div style={{ display: 'flex', gap: '8px' }}>
-              {qualities.map((q) => (
-                <div
-                  key={q}
-                  onClick={() => setQuality(q)}
-                  style={{
-                    padding: '10px 16px',
-                    borderRadius: '999px',
-                    fontSize: '13px',
-                    fontWeight: '700',
-                    cursor: 'pointer',
-                    background: quality === q ? '#0369a1' : '#e2f2f8',
-                    color: quality === q ? '#ffffff' : '#1e3a5f',
-                    transition: 'all 0.2s ease',
-                    flex: 1,
-                    textAlign: 'center',
-                  }}
-                >
-                  {q}
-                </div>
-              ))}
-            </div>
-          </div>
-
-          <div>
-            <div
-              style={{
-                fontSize: '13px',
-                fontWeight: '700',
-                color: 'rgba(30,58,95,0.60)',
-                marginBottom: '8px',
-              }}
-            >
-              Notes
-            </div>
-            <IonTextarea
-              value={notes}
-              onIonInput={(e) => setNotes(e.detail.value!)}
-              placeholder="Add more details..."
-              rows={3}
-              style={{
-                '--background': '#f3f8fb',
-                '--padding-start': '16px',
-                '--padding-end': '16px',
-                '--padding-top': '12px',
-                '--padding-bottom': '12px',
-                '--border-radius': '12px',
-                fontSize: '14px',
-                color: '#1e3a5f',
-              }}
-            />
-          </div>
-
-          {error && (
-            <div
-              style={{
-                fontSize: '12px',
-                color: '#dc2626',
-                textAlign: 'center',
-              }}
-            >
-              {error}
-            </div>
-          )}
-
-          <IonButton
-            expand="block"
-            onClick={handleSave}
-            style={{
-              '--background': '#0369a1',
-              '--border-radius': '999px',
-              '--color': '#ffffff',
-              fontWeight: '700',
-              height: '48px',
-              marginTop: '8px',
-            }}
-          >
-            Save sleep log
-          </IonButton>
-        </div>
-
-        {/* Trend Widget */}
-        <div style={{ marginBottom: '20px' }}>
-          <SleepTrendCard entries={entries} />
-        </div>
-
-        {/* History Section */}
-        <div
-          style={{
-            display: 'flex',
-            justifyContent: 'space-between',
-            alignItems: 'baseline',
-            margin: '0 0 12px',
-          }}
-        >
-          <span
-            style={{ fontSize: '17px', fontWeight: '700', color: '#1e3a5f' }}
-          >
-            History
-          </span>
-          <span
-            style={{
-              fontSize: '12px',
-              fontWeight: '600',
-              color: 'rgba(30,58,95,0.40)',
-            }}
-          >
-            {entries.length} logs
-          </span>
-        </div>
-
-        <HealthLogList
-          type="sleep"
-          entries={entries}
-          onDelete={handleDelete}
-          emptyTitle="No sleep logs yet"
-          emptyActionLabel="Log sleep"
-          onEmptyAction={() => {}} // Form is already on page
-        />
-
-        <div style={{ height: '40px' }} />
-
-        <IonAlert
-          isOpen={showClearAlert}
-          onDidDismiss={() => setShowClearAlert(false)}
-          header="Clear history?"
-          message="This will delete all sleep logs permanently."
-          buttons={[
-            { text: 'Cancel', role: 'cancel' },
-            { text: 'Clear All', role: 'destructive', handler: handleClear },
-          ]}
-        />
-      </IonContent>
-    </IonPage>
-  );
-};
-
-export default Sleep;

src/pages/VerifyEmail.tsx

@@ -0,0 +1,296 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { IonPage, IonContent, IonSpinner, IonIcon } from '@ionic/react';
+import { useHistory, useLocation } from 'react-router-dom';
+import { supabase } from '../supabase';
+import OtpInputRow from '../components/OtpInputRow';
+import { checkmarkCircleOutline } from 'ionicons/icons';
+
+const VerifyEmail: React.FC = () => {
+  const [digits, setDigits] = useState<string[]>(Array(6).fill(''));
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [cooldown, setCooldown] = useState(0);
+  const [verified, setVerified] = useState(false);
+
+  const history = useHistory();
+  const location = useLocation<{ email?: string; resent?: boolean }>();
+  const email = location.state?.email || '';
+  const resent = location.state?.resent || false;
+
+  const inputRefs = [
+    useRef<HTMLIonInputElement>(null),
+    useRef<HTMLIonInputElement>(null),
+    useRef<HTMLIonInputElement>(null),
+    useRef<HTMLIonInputElement>(null),
+    useRef<HTMLIonInputElement>(null),
+    useRef<HTMLIonInputElement>(null),
+  ];
+
+  useEffect(() => {
+    if (!email) {
+      history.replace('/auth');
+    }
+    if (resent) {
+      setCooldown(60);
+    }
+  }, [email, resent, history]);
+
+  useEffect(() => {
+    if (cooldown > 0) {
+      const timer = setTimeout(() => setCooldown(cooldown - 1), 1000);
+      return () => clearTimeout(timer);
+    }
+  }, [cooldown]);
+
+  const handleDigitChange = (index: number, value: string) => {
+    const sanitized = value.replace(/[^0-9]/g, '').slice(-1);
+    const newDigits = [...digits];
+    newDigits[index] = sanitized;
+    setDigits(newDigits);
+
+    if (sanitized && index < 5) {
+      inputRefs[index + 1].current?.setFocus();
+    }
+  };
+
+  const handleKeyDown = (
+    index: number,
+    e: React.KeyboardEvent<HTMLIonInputElement>
+  ) => {
+    if (e.key === 'Backspace') {
+      if (!digits[index] && index > 0) {
+        inputRefs[index - 1].current?.setFocus();
+      }
+    }
+  };
+
+  const handleVerifyOtp = async () => {
+    const code = digits.join('');
+    if (code.length !== 6) {
+      setError('Please enter all 6 digits');
+      return;
+    }
+
+    setLoading(true);
+    setError(null);
+    const { error } = await supabase.auth.verifyOtp({
+      email,
+      token: code,
+      type: 'email',
+    });
+    if (error) {
+      setError(error.message);
+      setLoading(false);
+      return;
+    }
+    setVerified(true);
+    setLoading(false);
+  };
+
+  const handleResend = async () => {
+    if (cooldown > 0) return;
+    setLoading(true);
+    setError(null);
+    const { error } = await supabase.auth.resend({ type: 'signup', email });
+    if (error) {
+      setError(error.message);
+      setLoading(false);
+      return;
+    }
+    setCooldown(60);
+    setLoading(false);
+  };
+
+  const goBackToAuth = () => {
+    history.replace('/auth');
+  };
+
+  return (
+    <IonPage style={{ background: '#f6f1e8' }}>
+      <IonContent
+        style={{
+          '--background': 'linear-gradient(180deg, #f9f5ee 0%, #f3ede3 100%)',
+          '--padding-start': '0px',
+          '--padding-end': '0px',
+          '--padding-top': '0px',
+          '--padding-bottom': '0px',
+        }}
+      >
+        <div
+          style={{
+            padding:
+              'calc(var(--ion-safe-area-top, 0px) + 18px) 20px calc(var(--ion-safe-area-bottom, 0px) + 28px)',
+            minHeight: '100%',
+            display: 'flex',
+            flexDirection: 'column',
+          }}
+        >
+          <div
+            style={{
+              background: 'transparent',
+              borderRadius: '0px',
+              padding: '0px',
+              margin: '0 0 24px 0',
+              display: 'flex',
+              flexDirection: 'column',
+              gap: '8px',
+            }}
+          >
+            <h1
+              style={{
+                margin: 0,
+                fontSize: '24px',
+                fontWeight: '700',
+                color: '#1f2937',
+              }}
+            >
+              Check your email
+            </h1>
+            <p
+              style={{
+                margin: 0,
+                fontSize: '14px',
+                fontWeight: '400',
+                color: '#6b7280',
+              }}
+            >
+              We sent a 6-digit code to {email}.
+            </p>
+          </div>
+
+          {!verified ? (
+            <>
+              <OtpInputRow
+                digits={digits}
+                onChange={handleDigitChange}
+                onKeyDown={handleKeyDown}
+                inputRefs={inputRefs}
+              />
+
+              <button
+                onClick={handleVerifyOtp}
+                disabled={loading}
+                style={{
+                  background: '#2f6b4f',
+                  border: 'none',
+                  borderRadius: '999px',
+                  padding: '16px',
+                  fontSize: '15px',
+                  fontWeight: '600',
+                  color: '#ffffff',
+                  cursor: 'pointer',
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  margin: '0 0 16px 0',
+                }}
+              >
+                {loading ? <IonSpinner name="dots" color="light" /> : 'Verify'}
+              </button>
+
+              <div style={{ display: 'flex', justifyContent: 'center' }}>
+                <button
+                  onClick={handleResend}
+                  disabled={cooldown > 0 || loading}
+                  style={{
+                    background: 'transparent',
+                    border: 'none',
+                    borderRadius: '999px',
+                    padding: '10px 14px',
+                    fontSize: '14px',
+                    fontWeight: '600',
+                    color: cooldown > 0 ? '#9aa3a0' : '#2f6b4f',
+                    cursor: cooldown > 0 ? 'default' : 'pointer',
+                  }}
+                >
+                  {cooldown > 0 ? `Resend code in ${cooldown}s` : 'Resend code'}
+                </button>
+              </div>
+
+              {error && (
+                <div
+                  style={{
+                    background: 'rgba(190, 60, 60, 0.10)',
+                    borderRadius: '12px',
+                    padding: '12px 14px',
+                    margin: '16px 0 0 0',
+                  }}
+                >
+                  <p
+                    style={{
+                      margin: 0,
+                      fontSize: '13px',
+                      fontWeight: '500',
+                      color: '#a33b32',
+                      lineHeight: '1.4',
+                    }}
+                  >
+                    {error}
+                  </p>
+                </div>
+              )}
+            </>
+          ) : (
+            <div
+              style={{
+                background: '#ffffff',
+                borderRadius: '24px',
+                padding: '24px',
+                margin: '24px 0 0 0',
+                display: 'flex',
+                flexDirection: 'column',
+                gap: '12px',
+                alignItems: 'center',
+                textAlign: 'center',
+              }}
+            >
+              <IonIcon
+                icon={checkmarkCircleOutline}
+                style={{ fontSize: '36px', color: '#2f6b4f' }}
+              />
+              <h2
+                style={{
+                  margin: 0,
+                  fontSize: '18px',
+                  fontWeight: '700',
+                  color: '#1f2937',
+                }}
+              >
+                Email confirmed
+              </h2>
+              <p
+                style={{
+                  margin: 0,
+                  fontSize: '14px',
+                  fontWeight: '400',
+                  color: '#6b7280',
+                }}
+              >
+                You can now sign in to your account.
+              </p>
+              <button
+                onClick={goBackToAuth}
+                style={{
+                  background: '#2f6b4f',
+                  border: 'none',
+                  borderRadius: '999px',
+                  padding: '16px',
+                  fontSize: '15px',
+                  fontWeight: '600',
+                  color: '#ffffff',
+                  cursor: 'pointer',
+                  width: '100%',
+                  marginTop: '12px',
+                }}
+              >
+                Back to Sign In
+              </button>
+            </div>
+          )}
+        </div>
+      </IonContent>
+    </IonPage>
+  );
+};
+
+export default VerifyEmail;

src/services/cohortHealth/analytics.ts

@@ -1,255 +0,0 @@
-import {
-  Department,
-  CohortAnalyticsSummary,
-  AnalyticsResponse,
-  TelemetryLog,
-  AggregatedTrendPoint,
-} from '../../types/cohortHealth';
-import { getRawUsers, getRawTelemetry } from './dataStore';
-
-/**
- * Enterprise Aggregation & Privacy Preservation Layer.
- *
- * DESIGN PRINCIPLE:
- * In a true Zero-Trust enterprise healthcare or corporate wellness deployment,
- * raw device telemetry (containing exact timestamps, high-frequency heart rates,
- * and device sleep signals) is considered highly sensitive.
- *
- * To guarantee absolute privacy:
- * 1. The client browser NEVER has access to raw database tables or individual-level records.
- * 2. Mathematical aggregations occur solely on the server-side.
- * 3. Cohort minimum sizes (k-anonymity) are programmatically enforced at the API boundary.
- * 4. Identification vectors are scrubbed using randomized keys and cryptographic hashes.
- */
-
-// MINIMUM COHORT SIZE (k-anonymity privacy floor)
-// If the selected cohort contains fewer than 5 individuals, the API refuses execution
-// to eliminate the possibility of an HR administrator identifying a specific employee's
-// biometric signals (e.g. recognizing a specific day's stress spike of a single engineer).
-const PRIVACY_FLOOR_LIMIT = 5;
-
-export const getCohortAnalytics = (
-  department: Department
-): AnalyticsResponse => {
-  try {
-    const allUsers = getRawUsers();
-    const allTelemetry = getRawTelemetry();
-
-    // 1. Filter cohort members
-    const cohortUsers = allUsers.filter((u) => u.department === department);
-    const cohortSize = cohortUsers.length;
-
-    // --- PRIVACY GUARD: k-ANONYMITY ENFORCEMENT ---
-    // In production, this prevents "differential attacks" where an attacker isolates
-    // a department with 1 or 2 users to view their personal health metrics.
-    if (cohortSize < PRIVACY_FLOOR_LIMIT) {
-      return {
-        success: false,
-        errorCode: 'INSUFFICIENT_COHORT_SIZE',
-        error: `Privacy Guard Refusal: Cohort '${department}' is too small.`,
-        details: `Under strict privacy compliance (k-anonymity >= 5), we refuse aggregate telemetry queries for departments with fewer than ${PRIVACY_FLOOR_LIMIT} members (current cohort size: ${cohortSize}). This prevents re-identification risks.`,
-      };
-    }
-
-    if (cohortSize === 0 || allTelemetry.length === 0) {
-      return {
-        success: false,
-        errorCode: 'NO_DATA',
-        error: 'No active telemetry found.',
-        details:
-          'The system has no telemetry records on file. Seed the data generator to proceed.',
-      };
-    }
-
-    const cohortUserIds = new Set(cohortUsers.map((u) => u.id));
-
-    // 2. Filter telemetry logs for this cohort
-    const cohortTelemetry = allTelemetry.filter((log) =>
-      cohortUserIds.has(log.userId)
-    );
-
-    // 3. Group telemetry logs by date to compute daily averages
-    const telemetryByDate: Record<string, TelemetryLog[]> = {};
-    cohortTelemetry.forEach((log) => {
-      if (!telemetryByDate[log.date]) {
-        telemetryByDate[log.date] = [];
-      }
-      telemetryByDate[log.date].push(log);
-    });
-
-    // Sort dates chronologically
-    const sortedDates = Object.keys(telemetryByDate).sort();
-
-    // Map to aggregated points
-    const trends: AggregatedTrendPoint[] = sortedDates.map((date) => {
-      const logs = telemetryByDate[date];
-      const count = logs.length;
-
-      const sumSleep = logs.reduce((acc, l) => acc + l.sleepScore, 0);
-      const sumStress = logs.reduce((acc, l) => acc + l.stressIndex, 0);
-      const sumActive = logs.reduce((acc, l) => acc + l.activeMinutes, 0);
-
-      // Poor sleep: sleepScore < 60 (Clinical cutoff for disrupted restorative sleep)
-      const poorSleepCount = logs.filter((l) => l.sleepScore < 60).length;
-      // High stress: stressIndex >= 7 (Corresponds to low heart-rate variability / hyper-arousal)
-      const highStressCount = logs.filter((l) => l.stressIndex >= 7).length;
-
-      return {
-        date,
-        avgSleepScore: parseFloat((sumSleep / count).toFixed(1)),
-        avgStressIndex: parseFloat((sumStress / count).toFixed(1)),
-        avgActiveMinutes: parseFloat((sumActive / count).toFixed(1)),
-        poorSleepPercentage: parseFloat(
-          ((poorSleepCount / count) * 100).toFixed(0)
-        ),
-        highStressPercentage: parseFloat(
-          ((highStressCount / count) * 100).toFixed(0)
-        ),
-        cohortSize: count,
-      };
-    });
-
-    // 4. Compute overall statistics for the cohort
-    const overallAvgSleep = parseFloat(
-      (
-        trends.reduce((acc, t) => acc + t.avgSleepScore, 0) / trends.length
-      ).toFixed(1)
-    );
-    const overallAvgStress = parseFloat(
-      (
-        trends.reduce((acc, t) => acc + t.avgStressIndex, 0) / trends.length
-      ).toFixed(1)
-    );
-    const overallAvgActive = parseFloat(
-      (
-        trends.reduce((acc, t) => acc + t.avgActiveMinutes, 0) / trends.length
-      ).toFixed(1)
-    );
-
-    // 5. Generate dynamic insights and alert classification
-    const insightData = analyzeTrendsAndGenerateInsight(trends, department);
-
-    return {
-      success: true,
-      data: {
-        department,
-        trends,
-        overallAvgSleep,
-        overallAvgStress,
-        overallAvgActive,
-        cohortSize,
-        insight: insightData.message,
-        insightSeverity: insightData.severity,
-      },
-    };
-  } catch (err: any) {
-    return {
-      success: false,
-      error: 'Internal aggregate error.',
-      details: err.message || 'An unknown aggregation error occurred.',
-    };
-  }
-};
-
-/**
- * Clinical analytics engine that reads aggregated trend lines to trigger enterprise alerts.
- * Identifies burnout markers, recovery indexes, and sedentary cycles.
- */
-const analyzeTrendsAndGenerateInsight = (
-  trends: AggregatedTrendPoint[],
-  department: Department
-): {
-  message: string;
-  severity: 'success' | 'warning' | 'danger' | 'medium';
-} => {
-  if (trends.length < 5) {
-    return {
-      message:
-        'Monitoring active. Insufficient trend history to run statistical drift alerts.',
-      severity: 'medium',
-    };
-  }
-
-  // Look at last 5 days vs the preceding days to find trends
-  const halfLength = Math.floor(trends.length / 2);
-  const olderTrend = trends.slice(0, halfLength);
-  const newerTrend = trends.slice(halfLength);
-
-  const olderAvgStress =
-    olderTrend.reduce((acc, t) => acc + t.avgStressIndex, 0) /
-    olderTrend.length;
-  const newerAvgStress =
-    newerTrend.reduce((acc, t) => acc + t.avgStressIndex, 0) /
-    newerTrend.length;
-
-  const olderAvgSleep =
-    olderTrend.reduce((acc, t) => acc + t.avgSleepScore, 0) / olderTrend.length;
-  const newerAvgSleep =
-    newerTrend.reduce((acc, t) => acc + t.avgSleepScore, 0) / newerTrend.length;
-
-  const stressDeltaPct =
-    ((newerAvgStress - olderAvgStress) / olderAvgStress) * 100;
-  const sleepDeltaPct = ((newerAvgSleep - olderAvgSleep) / olderAvgSleep) * 100;
-
-  // Engineering Burnout Anomaly check
-  if (
-    department === 'Engineering' &&
-    stressDeltaPct > 12 &&
-    sleepDeltaPct < -5
-  ) {
-    return {
-      message: `⚠️ COHORT ALERT: The Engineering division has experienced a ${Math.abs(stressDeltaPct).toFixed(0)}% increase in elevated stress markers and a ${Math.abs(sleepDeltaPct).toFixed(0)}% drop in restorative sleep over the last 7 days. Action Recommendation: High likelihood of workload burnout. Consider a meeting-light week or deploying wellness interventions.`,
-      severity: 'danger',
-    };
-  }
-
-  // Sales Stress check
-  if (department === 'Sales') {
-    const weekendTrend = trends.filter((t) => {
-      const day = new Date(t.date).getDay();
-      return day === 0 || day === 6;
-    });
-    const weekdayTrend = trends.filter((t) => {
-      const day = new Date(t.date).getDay();
-      return day !== 0 && day !== 6;
-    });
-
-    const wkStress =
-      weekdayTrend.reduce((acc, t) => acc + t.avgStressIndex, 0) /
-      Math.max(1, weekdayTrend.length);
-    const weStress =
-      weekendTrend.reduce((acc, t) => acc + t.avgStressIndex, 0) /
-      Math.max(1, weekendTrend.length);
-
-    if (wkStress > weStress + 2.0) {
-      return {
-        message: `📊 Dynamic Cohort Insights: Sales telemetry displays high weekday stress peaks (${wkStress.toFixed(1)}/10) with healthy weekend decompression (${weStress.toFixed(1)}/10). Recommendation: Ensure micro-breaks are integrated during intensive mid-week sales sprints.`,
-        severity: 'warning',
-      };
-    }
-  }
-
-  // Operations physical health check
-  if (department === 'Operations') {
-    const avgActive =
-      trends.reduce((acc, t) => acc + t.avgActiveMinutes, 0) / trends.length;
-    if (avgActive > 70) {
-      return {
-        message: `🟢 Healthy Cohort Signal: Operations logs highly consistent physical engagement averaging ${avgActive.toFixed(0)} minutes of active cardiovascular telemetry daily. This correlates with stable stress metrics (${overallAverageStress(trends).toFixed(1)}/10).`,
-        severity: 'success',
-      };
-    }
-  }
-
-  // Default Fallback
-  return {
-    message: `📈 Baseline Trend Analysis: Biomarkers for ${department} are within normal enterprise tolerances. Sleep quality index is stable at ${overallAverageSleep(trends).toFixed(0)}/100, and sympathetic nervous activation indicates low-to-moderate occupational strain.`,
-    severity: 'success',
-  };
-};
-
-const overallAverageStress = (trends: AggregatedTrendPoint[]) =>
-  trends.reduce((acc, t) => acc + t.avgStressIndex, 0) / trends.length;
-
-const overallAverageSleep = (trends: AggregatedTrendPoint[]) =>
-  trends.reduce((acc, t) => acc + t.avgSleepScore, 0) / trends.length;

src/services/cohortHealth/dataStore.ts

@@ -1,39 +0,0 @@
-import { User, TelemetryLog } from '../../types/cohortHealth';
-
-const STORAGE_KEY_USERS = 'cohorthealth_raw_users';
-const STORAGE_KEY_TELEMETRY = 'cohorthealth_raw_telemetry';
-
-/**
- * Enterprise Data Architecture Mock Store.
- *
- * DESIGN BOUNDARY NOTE:
- * This represents the internal, firewalled raw telemetry database. In a production enterprise setting,
- * this database sits behind strict network VPC guidelines and is completely inaccessible
- * from public client applications or APIs.
- *
- * ONLY the anonymizer/aggregator microservice has secure read permissions to this store.
- * The client UI is programmatically blocked from calling any function in this file.
- */
-
-export const getRawUsers = (): User[] => {
-  const data = localStorage.getItem(STORAGE_KEY_USERS);
-  return data ? JSON.parse(data) : [];
-};
-
-export const saveRawUsers = (users: User[]): void => {
-  localStorage.setItem(STORAGE_KEY_USERS, JSON.stringify(users));
-};
-
-export const getRawTelemetry = (): TelemetryLog[] => {
-  const data = localStorage.getItem(STORAGE_KEY_TELEMETRY);
-  return data ? JSON.parse(data) : [];
-};
-
-export const saveRawTelemetry = (telemetry: TelemetryLog[]): void => {
-  localStorage.setItem(STORAGE_KEY_TELEMETRY, JSON.stringify(telemetry));
-};
-
-export const clearAllData = (): void => {
-  localStorage.removeItem(STORAGE_KEY_USERS);
-  localStorage.removeItem(STORAGE_KEY_TELEMETRY);
-};

src/services/cohortHealth/generator.ts

@@ -1,247 +0,0 @@
-import { User, TelemetryLog, Department } from '../../types/cohortHealth';
-import {
-  getRawUsers,
-  saveRawUsers,
-  getRawTelemetry,
-  saveRawTelemetry,
-} from './dataStore';
-
-// In production, we would use a secure cryptographic hashing function like HMAC-SHA256
-// with a salt rotated daily, which completely obfuscates individual identities
-// before ingestion. This ensures zero PII (Personally Identifiable Information) enters the telemetry table.
-const generateSecureEmployeeHash = (
-  index: number,
-  department: string
-): string => {
-  // Simple deterministic mockup of an anonymized secure employee token
-  return `emp_hash_${department.toLowerCase().substring(0, 3)}_${(1000 + index).toString(16)}`;
-};
-
-/**
- * Enterprise Telemetry Simulation Engine.
- *
- * Generates high-fidelity wearable telemetry logs for users across 3 corporate departments:
- * - Engineering (Injected Burnout Anomaly: 70% experience 14-day decline in sleep and spike in stress)
- * - Sales (High volatility, weekend recovery, elevated stress levels)
- * - Operations (Stable baseline, high physical activity, healthy sleep indicators)
- */
-export const generateWorkforceData = (
-  userCount: number = 100,
-  forceReset = false
-): { users: User[]; logs: TelemetryLog[] } => {
-  const existingUsers = getRawUsers();
-  const existingLogs = getRawTelemetry();
-
-  if (existingUsers.length > 0 && existingLogs.length > 0 && !forceReset) {
-    return { users: existingUsers, logs: existingLogs };
-  }
-
-  const departments: Department[] = ['Engineering', 'Sales', 'Operations'];
-  const users: User[] = [];
-
-  // Distribute users across departments
-  // Engineering: 40%, Sales: 30%, Operations: 30%
-  for (let i = 0; i < userCount; i++) {
-    let dept: Department = 'Operations';
-    if (i < userCount * 0.4) {
-      dept = 'Engineering';
-    } else if (i < userCount * 0.7) {
-      dept = 'Sales';
-    }
-
-    users.push({
-      id: generateSecureEmployeeHash(i, dept),
-      department: dept,
-      joinedAt: new Date(Date.now() - 30 * 24 * 60 * 60 * 1000)
-        .toISOString()
-        .split('T')[0],
-    });
-  }
-
-  // Programmatically append exactly 3 Executive Board users to demonstrate
-  // the Privacy Guard k-anonymity limit (< 5 users) refusing aggregate rendering.
-  for (let i = 0; i < 3; i++) {
-    users.push({
-      id: generateSecureEmployeeHash(userCount + i, 'Executive Board'),
-      department: 'Executive Board',
-      joinedAt: new Date(Date.now() - 30 * 24 * 60 * 60 * 1000)
-        .toISOString()
-        .split('T')[0],
-    });
-  }
-
-  saveRawUsers(users);
-
-  // Generate 14 days of historical data for each user
-  const logs: TelemetryLog[] = [];
-  const today = new Date();
-
-  for (let dayOffset = 13; dayOffset >= 0; dayOffset--) {
-    const currentDate = new Date(today);
-    currentDate.setDate(today.getDate() - dayOffset);
-    const dateStr = currentDate.toISOString().split('T')[0];
-
-    users.forEach((user, uIndex) => {
-      logs.push(generateDailyLogForUser(user, uIndex, dateStr, dayOffset));
-    });
-  }
-
-  saveRawTelemetry(logs);
-
-  // Track current simulation day offset in localstorage so we can increment it during "Wearable Sync Pulse"
-  localStorage.setItem('cohorthealth_sim_day_offset', '0');
-
-  return { users, logs };
-};
-
-/**
- * Generates single-day wearable biomarkers with specific trends and injected anomalies.
- * @param dayOffset Days in the past (13 = 13 days ago, 0 = today)
- */
-const generateDailyLogForUser = (
-  user: User,
-  userIndex: number,
-  dateStr: string,
-  dayOffset: number
-): TelemetryLog => {
-  let sleepScore = 75;
-  let stressIndex = 4;
-  let activeMinutes = 45;
-
-  const isWeekend = isDateWeekend(dateStr);
-
-  if (user.department === 'Engineering') {
-    // Burnout Anomaly injection: 70% of Engineering department experiences steady decline
-    const affectedByAnomaly = userIndex % 10 < 7;
-
-    if (affectedByAnomaly) {
-      // Linear decline of sleep score from dayOffset 13 to 0
-      // dayOffset 13 (oldest) -> sleep starts high, stress starts normal
-      // dayOffset 0 (newest) -> sleep drops low, stress spikes high
-      const progression = (13 - dayOffset) / 13; // 0.0 to 1.0 over the 14 days
-
-      sleepScore = Math.round(76 - progression * 24 + (Math.random() * 8 - 4)); // Starts ~76, drops to ~52
-      stressIndex = Math.round(
-        3.5 + progression * 4.5 + (Math.random() * 1.5 - 0.75)
-      ); // Starts ~3.5, spikes to ~8.0
-      activeMinutes = Math.round(
-        50 - progression * 25 + (Math.random() * 15 - 7)
-      ); // Decline in physical activity
-    } else {
-      // 30% control group - remains relatively healthy
-      sleepScore = Math.round(74 + (Math.random() * 12 - 6));
-      stressIndex = Math.round(4.0 + (Math.random() * 2 - 1));
-      activeMinutes = Math.round(45 + (Math.random() * 20 - 10));
-    }
-  } else if (user.department === 'Sales') {
-    // Sales: High volatility. High weekdays stress, weekend recovery.
-    if (isWeekend) {
-      sleepScore = Math.round(80 + (Math.random() * 8 - 4));
-      stressIndex = Math.round(3.0 + (Math.random() * 1.5 - 0.75));
-      activeMinutes = Math.round(65 + (Math.random() * 30 - 15));
-    } else {
-      sleepScore = Math.round(68 + (Math.random() * 10 - 5));
-      stressIndex = Math.round(6.2 + (Math.random() * 2.2 - 1.1));
-      activeMinutes = Math.round(35 + (Math.random() * 15 - 7));
-    }
-  } else {
-    // Operations: High active minutes, stable sleep and stress
-    sleepScore = Math.round(75 + (Math.random() * 8 - 4));
-    stressIndex = Math.round(3.8 + (Math.random() * 1.5 - 0.75));
-    activeMinutes = Math.round(80 + (Math.random() * 30 - 15));
-
-    // Slight weekend boost
-    if (isWeekend) {
-      sleepScore += 4;
-      stressIndex -= 0.5;
-    }
-  }
-
-  // Bounds enforcement
-  sleepScore = Math.max(0, Math.min(100, sleepScore));
-  stressIndex = Math.max(1, Math.min(10, stressIndex));
-  activeMinutes = Math.max(0, Math.min(180, activeMinutes));
-
-  return {
-    id: `log_${user.id}_${dateStr}`,
-    userId: user.id,
-    date: dateStr,
-    sleepScore,
-    stressIndex,
-    activeMinutes,
-  };
-};
-
-const isDateWeekend = (dateStr: string): boolean => {
-  const day = new Date(dateStr).getDay();
-  return day === 0 || day === 6; // Sunday or Saturday
-};
-
-/**
- * Simulates a new wearable data synchronization event (typically run daily via worker threads).
- * Instantly appends another 24 hours of mock telemetry logs to the database for all users,
- * progressing the anomaly trends.
- */
-export const triggerWearableSyncPulse = (): {
-  success: boolean;
-  dateSynced: string;
-  recordCount: number;
-} => {
-  const users = getRawUsers();
-  const logs = getRawTelemetry();
-
-  if (users.length === 0 || logs.length === 0) {
-    // Seed first if empty
-    const { users: seededUsers, logs: seededLogs } = generateWorkforceData(
-      100,
-      true
-    );
-    return {
-      success: true,
-      dateSynced: new Date().toISOString().split('T')[0],
-      recordCount: seededLogs.length,
-    };
-  }
-
-  // Determine what next date is
-  let currentSimOffset = parseInt(
-    localStorage.getItem('cohorthealth_sim_day_offset') || '0',
-    10
-  );
-  currentSimOffset += 1; // Progress 1 day forward
-  localStorage.setItem(
-    'cohorthealth_sim_day_offset',
-    currentSimOffset.toString()
-  );
-
-  const today = new Date();
-  const targetDate = new Date(today);
-  targetDate.setDate(today.getDate() + currentSimOffset);
-  const targetDateStr = targetDate.toISOString().split('T')[0];
-
-  const newLogs: TelemetryLog[] = [];
-  users.forEach((user, uIndex) => {
-    // Use negative dayOffset to simulate ongoing burnout/stable trends in generator
-    // (the linear burnout continues trending slightly negative/tense)
-    const mockOffset = -currentSimOffset;
-    newLogs.push(
-      generateDailyLogForUser(user, uIndex, targetDateStr, mockOffset)
-    );
-  });
-
-  const updatedLogs = [...logs, ...newLogs];
-  saveRawTelemetry(updatedLogs);
-
-  return {
-    success: true,
-    dateSynced: targetDateStr,
-    recordCount: newLogs.length,
-  };
-};
-
-/**
- * Resets the local store completely and seeds fresh 14-day history.
- */
-export const resetDatabase = (): void => {
-  generateWorkforceData(100, true);
-};

src/services/localHealthStore.ts

@@ -1,239 +0,0 @@
-import {
-  CheckupEntry,
-  DietEntry,
-  SleepEntry,
-  ActivityEntry,
-  WellbeingSummary,
-  LocalInsight,
-} from '../types/health';
-
-const KEYS = {
-  CHECKUPS: 'healthcare.checkups.v1',
-  DIET: 'healthcare.diet.v1',
-  SLEEP: 'healthcare.sleep.v1',
-};
-
-// --- CRUD HELPERS ---
-
-const getItems = <T,>(key: string): T[] => {
-  const data = localStorage.getItem(key);
-  return data ? JSON.parse(data) : [];
-};
-
-const saveItems = <T,>(key: string, items: T[]): void => {
-  localStorage.setItem(key, JSON.stringify(items));
-};
-
-export const getCheckups = (): CheckupEntry[] =>
-  getItems<CheckupEntry>(KEYS.CHECKUPS);
-export const addCheckup = (entry: Omit<CheckupEntry, 'id' | 'createdAt'>) => {
-  const items = getCheckups();
-  const newItem: CheckupEntry = {
-    ...entry,
-    id: crypto.randomUUID(),
-    createdAt: new Date().toISOString(),
-  };
-  saveItems(KEYS.CHECKUPS, [newItem, ...items]);
-};
-export const deleteCheckup = (id: string) => {
-  const items = getCheckups().filter((i) => i.id !== id);
-  saveItems(KEYS.CHECKUPS, items);
-};
-export const clearCheckups = () => saveItems(KEYS.CHECKUPS, []);
-
-export const getDietEntries = (): DietEntry[] => getItems<DietEntry>(KEYS.DIET);
-export const addDietEntry = (entry: Omit<DietEntry, 'id' | 'createdAt'>) => {
-  const items = getDietEntries();
-  const newItem: DietEntry = {
-    ...entry,
-    id: crypto.randomUUID(),
-    createdAt: new Date().toISOString(),
-  };
-  saveItems(KEYS.DIET, [newItem, ...items]);
-};
-export const deleteDietEntry = (id: string) => {
-  const items = getDietEntries().filter((i) => i.id !== id);
-  saveItems(KEYS.DIET, items);
-};
-export const clearDietEntries = () => saveItems(KEYS.DIET, []);
-
-export const getSleepEntries = (): SleepEntry[] =>
-  getItems<SleepEntry>(KEYS.SLEEP);
-export const addSleepEntry = (entry: Omit<SleepEntry, 'id' | 'createdAt'>) => {
-  const items = getSleepEntries();
-  const newItem: SleepEntry = {
-    ...entry,
-    id: crypto.randomUUID(),
-    createdAt: new Date().toISOString(),
-  };
-  saveItems(KEYS.SLEEP, [newItem, ...items]);
-};
-export const deleteSleepEntry = (id: string) => {
-  const items = getSleepEntries().filter((i) => i.id !== id);
-  saveItems(KEYS.SLEEP, items);
-};
-export const clearSleepEntries = () => saveItems(KEYS.SLEEP, []);
-
-// --- DASHBOARD HELPERS ---
-
-export const getRecentActivity = (): ActivityEntry[] => {
-  const checkups = getCheckups().map((i) => ({
-    id: i.id,
-    type: 'checkup' as const,
-    date: i.createdAt,
-    title: `Checkup: ${i.mood}`,
-    subtitle: i.symptoms || 'No symptoms noted',
-  }));
-  const diet = getDietEntries().map((i) => ({
-    id: i.id,
-    type: 'diet' as const,
-    date: i.createdAt,
-    title: `${i.mealType} log`,
-    subtitle: `${i.waterCups} cups water, ${i.produceServings} servings produce`,
-  }));
-  const sleep = getSleepEntries().map((i) => ({
-    id: i.id,
-    type: 'sleep' as const,
-    date: i.createdAt,
-    title: `Sleep: ${i.hours}h`,
-    subtitle: `${i.quality} quality`,
-  }));
-
-  return [...checkups, ...diet, ...sleep]
-    .sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime())
-    .slice(0, 5);
-};
-
-export const getWellbeingSummary = (): WellbeingSummary => {
-  const today = new Date().toISOString().split('T')[0];
-  const checkups = getCheckups();
-  const diet = getDietEntries();
-  const sleep = getSleepEntries();
-
-  const todayDiet = diet.filter((i) => i.createdAt.startsWith(today));
-  const water = todayDiet.reduce((sum, i) => sum + i.waterCups, 0);
-  const produce = todayDiet.reduce((sum, i) => sum + i.produceServings, 0);
-
-  const lastSleep = sleep[0];
-  const lastCheckup = checkups[0];
-
-  // Simple score calculation (0-100)
-  let score = 50;
-  if (lastCheckup) {
-    if (lastCheckup.mood === 'Great') score += 15;
-    if (lastCheckup.mood === 'Low') score -= 10;
-    if (lastCheckup.mood === 'Unwell') score -= 20;
-    score += lastCheckup.energy / 10;
-  }
-  if (lastSleep) {
-    if (lastSleep.hours >= 7 && lastSleep.hours <= 9) score += 10;
-    if (lastSleep.quality === 'Restful') score += 5;
-  }
-  score += Math.min(water, 8); // +1 per cup up to 8
-  score = Math.min(Math.max(score, 0), 100);
-
-  let message = 'Keep tracking to see your wellbeing score improve.';
-  if (score > 80) message = "You're doing great! Keep up the healthy habits.";
-  else if (score > 60)
-    message = 'Good progress. Try adding more hydration today.';
-  else if (score > 40)
-    message = 'A bit low today. Make sure to get enough rest.';
-
-  return {
-    score: Math.round(score),
-    scoreMessage: message,
-    scoreProgress: score / 100,
-    sleepHours: lastSleep?.hours || 0,
-    sleepQuality: lastSleep?.quality || 'N/A',
-    hydrationCups: water,
-    produceServings: produce,
-    streakDays: calculateStreak([...checkups, ...diet, ...sleep]),
-  };
-};
-
-const calculateStreak = (entries: { createdAt: string }[]): number => {
-  if (entries.length === 0) return 0;
-  const dates = [...new Set(entries.map((e) => e.createdAt.split('T')[0]))]
-    .sort()
-    .reverse();
-
-  let streak = 0;
-  let current = new Date();
-
-  for (const dateStr of dates) {
-    const entryDate = new Date(dateStr);
-    const diff = Math.floor(
-      (current.getTime() - entryDate.getTime()) / (1000 * 3600 * 24)
-    );
-
-    if (diff === 0 || diff === 1) {
-      streak++;
-      current = entryDate;
-    } else {
-      break;
-    }
-  }
-  return streak;
-};
-
-// --- INSIGHT RULES ---
-
-export const calculateInsights = (): LocalInsight[] => {
-  const checkups = getCheckups();
-  const diet = getDietEntries();
-  const sleep = getSleepEntries();
-  const insights: LocalInsight[] = [];
-
-  if (checkups.length === 0 && diet.length === 0 && sleep.length === 0)
-    return [];
-
-  const lastSleep = sleep[0];
-  if (lastSleep) {
-    if (lastSleep.hours < 6) {
-      insights.push({
-        id: 'sleep-low',
-        type: 'warning',
-        title: 'Low sleep duration',
-        body: 'You slept less than 6 hours. Consistent sleep is key for recovery.',
-        icon: 'moonOutline',
-      });
-    } else if (lastSleep.hours >= 7) {
-      insights.push({
-        id: 'sleep-good',
-        type: 'positive',
-        title: 'Healthy sleep pattern',
-        body: 'Great job getting over 7 hours of rest.',
-        icon: 'checkmarkCircleOutline',
-      });
-    }
-  }
-
-  const today = new Date().toISOString().split('T')[0];
-  const todayDiet = diet.filter((i) => i.createdAt.startsWith(today));
-  const water = todayDiet.reduce((sum, i) => sum + i.waterCups, 0);
-
-  if (water < 4 && diet.length > 0) {
-    insights.push({
-      id: 'water-low',
-      type: 'info',
-      title: 'Boost hydration',
-      body: 'Try to drink at least 8 cups of water daily for better energy.',
-      icon: 'waterOutline',
-    });
-  }
-
-  const lowMoods = checkups
-    .filter((c) => c.mood === 'Low' || c.mood === 'Unwell')
-    .slice(0, 3);
-  if (lowMoods.length >= 2) {
-    insights.push({
-      id: 'mood-warning',
-      type: 'warning',
-      title: 'Mood patterns',
-      body: 'You recorded several low mood entries recently. Consider checking in with a friend.',
-      icon: 'heartOutline',
-    });
-  }
-
-  return insights;
-};

src/supabase.ts

@@ -0,0 +1,7 @@
+import { createClient } from '@supabase/supabase-js';
+import type { Database } from './database.types';
+
+export const supabase = createClient<Database>(
+  'https://kxejpmyjfdrbaupauexc.supabase.co',
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Imt4ZWpwbXlqZmRyYmF1cGF1ZXhjIiwicm9sZSI6ImFub24iLCJpYXQiOjE3ODM2OTkzMzksImV4cCI6MjA5OTI3NTMzOX0.FteANsPY4x605R26bxC6sR4iiYbw_nwG4zrcDYEH83Y',
+);

src/test-globals.d.ts

@@ -0,0 +1,51 @@
+// Ambient test globals for optional *.test.* files in the editor / tsc.
+// No test runner is installed in the template; stubs avoid spurious TS errors.
+
+interface Matchers<R = void> {
+  toBeDefined(): R;
+  toBe(expected: unknown): R;
+  toEqual(expected: unknown): R;
+  toBeTruthy(): R;
+  toBeFalsy(): R;
+  toBeNull(): R;
+  toContain(item: unknown): R;
+  toHaveLength(length: number): R;
+  toMatch(expected: string | RegExp): R;
+  toThrow(expected?: string | RegExp | Error): R;
+  not: Matchers<R>;
+}
+
+interface Expect {
+  <T = unknown>(actual: T): Matchers;
+}
+
+declare const expect: Expect;
+
+type TestCaseFn = (
+  name: string,
+  fn?: () => void | Promise<void>,
+  timeout?: number,
+) => void;
+
+declare const test: TestCaseFn;
+declare const it: TestCaseFn;
+declare const describe: TestCaseFn;
+
+declare function beforeEach(fn: () => void | Promise<void>): void;
+declare function afterEach(fn: () => void | Promise<void>): void;
+declare function beforeAll(fn: () => void | Promise<void>): void;
+declare function afterAll(fn: () => void | Promise<void>): void;
+
+declare module "@testing-library/react" {
+  export function render(
+    ui: unknown,
+    options?: object,
+  ): {
+    baseElement: Element;
+    container: Element;
+    unmount(): void;
+    rerender(ui: unknown): void;
+  };
+  export const screen: Record<string, (...args: unknown[]) => Element>;
+  export function cleanup(): void;
+}

src/theme/variables.css

@@ -1,99 +1,73 @@
-/* Ionic CSS Variables — customise to match your app's brand */
+/* Ionic Variables and Color Palette */
+
 :root {
-  /** primary **/
+  --ion-color-primary: #7b2d26;
-  --ion-color-primary: #0369a1;
+  --ion-color-primary-rgb: 123, 45, 38;
-  --ion-color-primary-rgb: 3, 105, 161;
   --ion-color-primary-contrast: #ffffff;
   --ion-color-primary-contrast-rgb: 255, 255, 255;
-  --ion-color-primary-shade: #035c8e;
+  --ion-color-primary-shade: #6c2721;
-  --ion-color-primary-tint: #1c78aa;
+  --ion-color-primary-tint: #883f3a;
 
-  /** secondary **/
+  --ion-color-secondary: #b07a3a;
-  --ion-color-secondary: #38bdf8;
+  --ion-color-secondary-rgb: 176, 122, 58;
-  --ion-color-secondary-rgb: 56, 189, 248;
   --ion-color-secondary-contrast: #ffffff;
   --ion-color-secondary-contrast-rgb: 255, 255, 255;
-  --ion-color-secondary-shade: #31a6da;
+  --ion-color-secondary-shade: #9b6b33;
-  --ion-color-secondary-tint: #4cc4f9;
+  --ion-color-secondary-tint: #b8894e;
 
-  /** tertiary **/
+  --ion-background-color: #f8f4ef;
-  --ion-color-tertiary: #1e3a5f;
+  --color-bg: #f8f4ef;
-  --ion-color-tertiary-rgb: 30, 58, 95;
+  --color-surface: #ffffff;
-  --ion-color-tertiary-contrast: #ffffff;
+  --color-surface-raised: #f2ece4;
-  --ion-color-tertiary-contrast-rgb: 255, 255, 255;
+  --color-brand: #7b2d26;
-  --ion-color-tertiary-shade: #1a3353;
+  --color-brand-soft: rgba(123, 45, 38, 0.1);
-  --ion-color-tertiary-tint: #354e6f;
+  --color-brand-medium: rgba(123, 45, 38, 0.18);
 
-  /** success **/
+  --ion-text-color: #2f221d;
-  --ion-color-success: #2dd36f;
+  --ion-text-color-rgb: 47, 34, 29;
-  --ion-color-success-rgb: 45, 211, 111;
+  --color-text-primary: #2f221d;
-  --ion-color-success-contrast: #ffffff;
+  --color-text-secondary: rgba(47, 34, 29, 0.64);
-  --ion-color-success-contrast-rgb: 255, 255, 255;
+  --color-text-tertiary: rgba(47, 34, 29, 0.42);
-  --ion-color-success-shade: #28ba62;
+  --color-border: rgba(47, 34, 29, 0.08);
-  --ion-color-success-tint: #42d77d;
 
-  /** warning **/
+  --ion-color-success: #7b2d26;
-  --ion-color-warning: #ffc409;
+  --ion-color-warning: #d29a3f;
-  --ion-color-warning-rgb: 255, 196, 9;
+  --ion-color-danger: #a33b32;
-  --ion-color-warning-contrast: #000000;
+  --ion-color-medium: #8e7d73;
-  --ion-color-warning-contrast-rgb: 0, 0, 0;
+  --ion-color-light: #f8f4ef;
-  --ion-color-warning-shade: #e0ad08;
-  --ion-color-warning-tint: #ffca22;
-
-  /** danger **/
-  --ion-color-danger: #eb445a;
-  --ion-color-danger-rgb: 235, 68, 90;
-  --ion-color-danger-contrast: #ffffff;
-  --ion-color-danger-contrast-rgb: 255, 255, 255;
-  --ion-color-danger-shade: #cf3c4f;
-  --ion-color-danger-tint: #ed576b;
-
-  /** dark **/
-  --ion-color-dark: #222428;
-  --ion-color-dark-rgb: 34, 36, 40;
-  --ion-color-dark-contrast: #ffffff;
-  --ion-color-dark-contrast-rgb: 255, 255, 255;
-  --ion-color-dark-shade: #1e2023;
-  --ion-color-dark-tint: #383a3e;
-
-  /** medium **/
-  --ion-color-medium: #92949c;
-  --ion-color-medium-rgb: 146, 148, 156;
-  --ion-color-medium-contrast: #ffffff;
-  --ion-color-medium-contrast-rgb: 255, 255, 255;
-  --ion-color-medium-shade: #808289;
-  --ion-color-medium-tint: #9d9fa6;
-
-  /** light **/
-  --ion-color-light: #f4f5f8;
-  --ion-color-light-rgb: 244, 245, 248;
-  --ion-color-light-contrast: #000000;
-  --ion-color-light-contrast-rgb: 0, 0, 0;
-  --ion-color-light-shade: #d7d8da;
-  --ion-color-light-tint: #f5f6f9;
-
-  /* Custom Background */
-  --color-bg: #eef7fb;
-  --ion-background-color: #eef7fb;
-  --ion-background-color-rgb: 238, 247, 251;
-  --ion-text-color: #1e3a5f;
-  --ion-text-color-rgb: 30, 58, 95;
 }
 
-/* 
+@media (prefers-color-scheme: dark) {
- * App-wide styles
+  :root {
- */
+    --ion-background-color: #201513;
-* {
+    --color-bg: #201513;
-  font-family:
+    --color-surface: #2b1c19;
-    -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial,
+    --color-surface-raised: #3a2723;
-    sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+    --color-brand: #c7865f;
+    --color-brand-soft: rgba(199, 134, 95, 0.14);
+    --color-brand-medium: rgba(199, 134, 95, 0.22);
+
+    --ion-text-color: #f5ebe3;
+    --ion-text-color-rgb: 245, 235, 227;
+    --color-text-primary: #f5ebe3;
+    --color-text-secondary: rgba(245, 235, 227, 0.68);
+    --color-text-tertiary: rgba(245, 235, 227, 0.44);
+
+    --ion-color-primary: #c7865f;
+    --ion-color-primary-rgb: 199, 134, 95;
+    --ion-color-primary-contrast: #201513;
+    --ion-color-primary-contrast-rgb: 32, 21, 19;
+    --ion-color-primary-shade: #b27754;
+    --ion-color-primary-tint: #cd9270;
+  }
 }
 
-ion-content {
+html,
-  --background: var(--color-bg);
+body {
+  background-color: var(--color-bg);
 }
 
-ion-toolbar {
+.page-shell {
-  --background: var(--color-bg);
+  padding: calc(var(--ion-safe-area-top, 0px) + 18px) 20px
-  --color: #1e3a5f;
+    calc(var(--ion-safe-area-bottom, 0px) + 28px);
 }

src/types.ts

@@ -0,0 +1,34 @@
+export interface EventCategory {
+  id: string;
+  slug: string;
+  name: string;
+  accent_color: string;
+  created_at: string;
+}
+
+export interface ChurchEvent {
+  id: string;
+  title: string;
+  description: string;
+  category_id: string;
+  audience: 'all' | 'youth' | 'children';
+  venue: string;
+  start_at: string;
+  end_at: string | null;
+  day_label: string;
+  is_featured: boolean;
+  created_by: string;
+  created_at: string;
+  updated_at: string;
+  event_categories?: EventCategory; // Relation
+}
+
+export interface NewsItem {
+  id: string;
+  title: string;
+  content: string;
+  image_url: string | null;
+  created_at: string;
+  updated_at: string;
+  created_by: string;
+}

src/types/cohortHealth.ts

@@ -1,49 +0,0 @@
-export type Department =
-  | 'Engineering'
-  | 'Sales'
-  | 'Operations'
-  | 'Executive Board';
-
-export interface User {
-  id: string; // Securely generated hash in production
-  department: Department;
-  joinedAt: string;
-}
-
-export interface TelemetryLog {
-  id: string;
-  userId: string; // References User.id
-  date: string; // YYYY-MM-DD
-  sleepScore: number; // 0 - 100
-  stressIndex: number; // 1 - 10 (derived from HRV metrics)
-  activeMinutes: number; // 0 - 120+
-}
-
-export interface AggregatedTrendPoint {
-  date: string;
-  avgSleepScore: number;
-  avgStressIndex: number;
-  avgActiveMinutes: number;
-  poorSleepPercentage: number; // sleepScore < 60
-  highStressPercentage: number; // stressIndex >= 7
-  cohortSize: number;
-}
-
-export interface CohortAnalyticsSummary {
-  department: Department;
-  trends: AggregatedTrendPoint[];
-  overallAvgSleep: number;
-  overallAvgStress: number;
-  overallAvgActive: number;
-  cohortSize: number;
-  insight: string;
-  insightSeverity: 'success' | 'warning' | 'danger' | 'medium';
-}
-
-export interface AnalyticsResponse {
-  success: boolean;
-  data?: CohortAnalyticsSummary;
-  error?: string;
-  errorCode?: 'INSUFFICIENT_COHORT_SIZE' | 'NO_DATA';
-  details?: string;
-}

src/types/health.ts

@@ -1,61 +0,0 @@
-export type CheckupMood = 'Great' | 'Okay' | 'Low' | 'Unwell';
-
-export interface CheckupEntry {
-  id: string;
-  createdAt: string;
-  mood: CheckupMood;
-  energy: number; // 0-100
-  symptoms: string;
-  note: string;
-}
-
-export type MealType = 'Breakfast' | 'Lunch' | 'Dinner' | 'Snack';
-
-export interface DietEntry {
-  id: string;
-  createdAt: string;
-  mealType: MealType;
-  waterCups: number;
-  produceServings: number;
-  notes: string;
-}
-
-export type SleepQuality = 'Restful' | 'Okay' | 'Restless';
-
-export interface SleepEntry {
-  id: string;
-  createdAt: string;
-  hours: number;
-  quality: SleepQuality;
-  interruptions: number;
-  notes: string;
-}
-
-export type ActivityType = 'checkup' | 'diet' | 'sleep';
-
-export interface ActivityEntry {
-  id: string;
-  type: ActivityType;
-  date: string;
-  title: string;
-  subtitle: string;
-}
-
-export interface WellbeingSummary {
-  score: number; // 0-100
-  scoreMessage: string;
-  scoreProgress: number; // 0-1
-  sleepHours: number; // last entry or average
-  sleepQuality: SleepQuality | 'N/A';
-  hydrationCups: number; // today's total
-  produceServings: number; // today's total
-  streakDays: number;
-}
-
-export interface LocalInsight {
-  id: string;
-  type: 'positive' | 'warning' | 'info';
-  title: string;
-  body: string;
-  icon: string;
-}

vite.config.ts

@@ -1,3 +1,6 @@
+// NOTE: @ionic/react and @ionic/react-router are pinned to 8.8.7 in package.json.
+// 8.8.8 introduced a regression that breaks IonRouterOutlet page transition animations.
+// Do not upgrade until the upstream fix is confirmed.
 import { defineConfig, type Plugin } from 'vite';
 import react from '@vitejs/plugin-react';
 
@@ -14,8 +17,18 @@ const injectRouterBasename: Plugin = {
   },
 };
 
+const hideScrollbars: Plugin = {
+  name: 'hide-scrollbars',
+  transformIndexHtml(html) {
+    return html.replace(
+      '</head>',
+      '<style>*{scrollbar-width:none!important;-ms-overflow-style:none!important}*::-webkit-scrollbar{display:none!important}</style></head>',
+    );
+  },
+};
+
 export default defineConfig({
-  plugins: [injectRouterBasename, react()],
+  plugins: [injectRouterBasename, hideScrollbars, react()],
   server: {
     host: '0.0.0.0',
     port: 8100,

yarn.lock

@@ -324,6 +324,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@capacitor/preferences@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "@capacitor/preferences@npm:8.0.1"
+  peerDependencies:
+    "@capacitor/core": ">=8.0.0"
+  checksum: 10c0/cbed0229a685f484c396fd043354688fdeec69264f322180b62c5adb0322561b288a63eb38ee9b38cf78ea7dbc3b9dc8dd8c2e52b54a7f752a1b2f07bfd29f0d
+  languageName: node
+  linkType: hard
+
 "@capacitor/push-notifications@npm:^8.1.1":
   version: 8.1.1
   resolution: "@capacitor/push-notifications@npm:8.1.1"
@@ -1043,11 +1052,11 @@ __metadata:
   linkType: hard
 
 "@googlemaps/js-api-loader@npm:^2.0.2":
-  version: 2.1.0
+  version: 2.1.1
-  resolution: "@googlemaps/js-api-loader@npm:2.1.0"
+  resolution: "@googlemaps/js-api-loader@npm:2.1.1"
   dependencies:
     "@types/google.maps": "npm:^3.53.1"
-  checksum: 10c0/dc9593252f59af6c8af0056d1045bc6ce8335962fde51b4e294b864f47d3c640c4259c3afedfb9c0f60b62f76d9c8786062888c6f22518ce88f2e0d95dc6b510
+  checksum: 10c0/06cb6eaf686b838be51efd8293010b7bee42e341e9ad41b42a0ee8909cf06cc5711ba6cfdbcd0c62ff05c8ba35d8622c34130e738bc5844011c8bc457d14de64
   languageName: node
   linkType: hard
 
@@ -1086,6 +1095,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@hookform/resolvers@npm:^3.9.0":
+  version: 3.10.0
+  resolution: "@hookform/resolvers@npm:3.10.0"
+  peerDependencies:
+    react-hook-form: ^7.0.0
+  checksum: 10c0/7ee44533b4cdc28c4fa2a94894c735411e5a1f830f4a617c580533321a9b901df0cc8c1e2fad81ad8d55154ebc5cb844cf9c116a3148ffae2bc48758c33cbb8e
+  languageName: node
+  linkType: hard
+
 "@ionic/cli-framework-output@npm:^2.2.8":
   version: 2.2.8
   resolution: "@ionic/cli-framework-output@npm:2.2.8"
@@ -1108,17 +1126,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ionic/core@npm:8.8.8":
-  version: 8.8.8
-  resolution: "@ionic/core@npm:8.8.8"
-  dependencies:
-    "@stencil/core": "npm:4.43.0"
-    ionicons: "npm:^8.0.13"
-    tslib: "npm:^2.1.0"
-  checksum: 10c0/fea32925aaebec558c1c3bb9c30f8c0806d3480a67936e63cdcce8846138688d9b6b5b853ebe771132f0f79efef16568b17d11495f7997ea325a265a7e7d7af3
-  languageName: node
-  linkType: hard
-
 "@ionic/pwa-elements@npm:^3.0.0":
   version: 3.4.0
   resolution: "@ionic/pwa-elements@npm:3.4.0"
@@ -1126,36 +1133,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ionic/react-router@npm:^8.5.0":
+"@ionic/react-router@npm:8.8.7":
-  version: 8.8.8
+  version: 8.8.7
-  resolution: "@ionic/react-router@npm:8.8.8"
+  resolution: "@ionic/react-router@npm:8.8.7"
   dependencies:
-    "@ionic/react": "npm:8.8.8"
+    "@ionic/react": "npm:8.8.7"
     tslib: "npm:*"
   peerDependencies:
     react: ">=16.8.6"
     react-dom: ">=16.8.6"
     react-router: ^5.0.1
     react-router-dom: ^5.0.1
-  checksum: 10c0/be9555ec4dbfd0565cada39d42236eb0b9e2283a13f500b42d5c0c06d6198c17a7be385cfb2ce4f9e89236c71992c30169328b861943a3fe7344c672ad94ae0c
+  checksum: 10c0/302d6ad9c0d450cf6466ff18622aa7708af77c1c4a676d2ff39eca6add440fe96d36a157feae146c3da460c32e7799357320b3270740b050ab040a664b9f0ff2
   languageName: node
   linkType: hard
 
-"@ionic/react@npm:8.8.8":
+"@ionic/react@npm:8.8.7":
-  version: 8.8.8
-  resolution: "@ionic/react@npm:8.8.8"
-  dependencies:
-    "@ionic/core": "npm:8.8.8"
-    ionicons: "npm:^8.0.13"
-    tslib: "npm:*"
-  peerDependencies:
-    react: ">=16.8.6"
-    react-dom: ">=16.8.6"
-  checksum: 10c0/b1b8888f487dc564735adde57ef3cd054e6c9bc38601f133823e69cb98d8e51c99c8902fe48fdd11ee5521ae58b322f110a1fbc8b8fd9bc62e27fc0b806bddd0
-  languageName: node
-  linkType: hard
-
-"@ionic/react@npm:^8.5.0":
   version: 8.8.7
   resolution: "@ionic/react@npm:8.8.7"
   dependencies:
@@ -1365,13 +1358,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@protobufjs/inquire@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@protobufjs/inquire@npm:1.1.2"
-  checksum: 10c0/af69597818a14cac6a00a74cd5b3fb85aa96658b9dbbae73e6d907cb154ebf470953a8c537b3e6095a43de565ec4e6c5b40227c72f4a7d762d34fbec7ac179e7
-  languageName: node
-  linkType: hard
-
 "@protobufjs/path@npm:^1.1.2":
   version: 1.1.2
   resolution: "@protobufjs/path@npm:1.1.2"
@@ -1387,9 +1373,9 @@ __metadata:
   linkType: hard
 
 "@protobufjs/utf8@npm:^1.1.1":
-  version: 1.1.1
+  version: 1.1.2
-  resolution: "@protobufjs/utf8@npm:1.1.1"
+  resolution: "@protobufjs/utf8@npm:1.1.2"
-  checksum: 10c0/641fc145f00626405e8984b6e90b9edcbcc072ffc82d0647ca3176e09c730b2d022f988e65f011a7a17e2e4d77cde7733643aa10d8ac2bfa30f134dbcad553fd
+  checksum: 10c0/975c6e2c0319bd50c17531d186b537a88cb4d3205e3ca9297cd842b631d341da0ee3ff16be8656cd2660756dc753b29c8a6a14c0ad8ed602c1f91ddf22e7b3f3
   languageName: node
   linkType: hard
 
@@ -1757,70 +1743,70 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@supabase/auth-js@npm:2.108.1":
+"@supabase/auth-js@npm:2.110.2":
-  version: 2.108.1
+  version: 2.110.2
-  resolution: "@supabase/auth-js@npm:2.108.1"
+  resolution: "@supabase/auth-js@npm:2.110.2"
   dependencies:
     tslib: "npm:2.8.1"
-  checksum: 10c0/8bf1bce42703b63284a0562d5a6588ac879b4fdeb477046a92fa9ba6fa0d75de7d85f4177d389654f68b812e359e9f0c9c3a659e7d37d96aaa2f6eba12d9cff0
+  checksum: 10c0/3cb1bd3e78498c964ed897032fc09e19a5d8640c1d6b0edbf66a9cad5884547b9107d769f327a556ffab848656fca0de405ba9b961f38b71d44870c28d7b3bd6
   languageName: node
   linkType: hard
 
-"@supabase/functions-js@npm:2.108.1":
+"@supabase/functions-js@npm:2.110.2":
-  version: 2.108.1
+  version: 2.110.2
-  resolution: "@supabase/functions-js@npm:2.108.1"
+  resolution: "@supabase/functions-js@npm:2.110.2"
   dependencies:
     tslib: "npm:2.8.1"
-  checksum: 10c0/da67a82c4a79e049fa3d077f1ca3917a58707fa35df642d39d8b23edf5056a2a2427ea201d3f49bb11eafb06413dfde552a6bf63b2da4865a421d44c690c0fe7
+  checksum: 10c0/1e6de0a6e6304b1c2593d5ddf232a996688f8c442eb00a704f6b20d2042ae0246240f93c9dc1f5e2a936602c7b9f1ffcdd95921672d2790b30882baa24406b9d
   languageName: node
   linkType: hard
 
-"@supabase/phoenix@npm:^0.4.2":
+"@supabase/phoenix@npm:0.4.4":
-  version: 0.4.2
+  version: 0.4.4
-  resolution: "@supabase/phoenix@npm:0.4.2"
+  resolution: "@supabase/phoenix@npm:0.4.4"
-  checksum: 10c0/7d426ea70715539d76ef09a5d2364b335f848ffc32cefdc07b67707a9415c654d3f82ebf611851fceb987bdde31f1f77c088a05c40e372b65221801ca502945c
+  checksum: 10c0/b4ba930c82b20d412358826aa87ce0735147fd168efb817bfc34e31d78605220947dc7c5844726268ac6bf338f0cd081f9908a7bab87aaff4058cb80bf71ab5b
   languageName: node
   linkType: hard
 
-"@supabase/postgrest-js@npm:2.108.1":
+"@supabase/postgrest-js@npm:2.110.2":
-  version: 2.108.1
+  version: 2.110.2
-  resolution: "@supabase/postgrest-js@npm:2.108.1"
+  resolution: "@supabase/postgrest-js@npm:2.110.2"
   dependencies:
     tslib: "npm:2.8.1"
-  checksum: 10c0/29168464f44a723175ef510410df36f993581229d617816dfd33eb9bf5378742910fb9c18508040188ba2a16c20988f84d6f722decd79e34190daea35a5374af
+  checksum: 10c0/d08f91dbd924d39ce194a7a698ce0a56b61208efd5642368ede0ff9c419cff026da477293b11870c02850bf8e31f69148fce71a051794af83f1175c12b951d9c
   languageName: node
   linkType: hard
 
-"@supabase/realtime-js@npm:2.108.1":
+"@supabase/realtime-js@npm:2.110.2":
-  version: 2.108.1
+  version: 2.110.2
-  resolution: "@supabase/realtime-js@npm:2.108.1"
+  resolution: "@supabase/realtime-js@npm:2.110.2"
   dependencies:
-    "@supabase/phoenix": "npm:^0.4.2"
+    "@supabase/phoenix": "npm:0.4.4"
     tslib: "npm:2.8.1"
-  checksum: 10c0/bb4cea92714389b6f5f4b626e4c3cbacee2a57c543b71217d3d3032bfe35574cd26fe305bfbde0426230ca3b887e2116c78d47aa37117160b2b9d5ba11564ded
+  checksum: 10c0/3b6bca9a6e629293b3e41be467a99ac311ebd1ff581979abbd91da646312e7f1f6a2b944ff6d9c409532aa4271f8ad5b23a028546c14d3c0fadcc0a76799af69
   languageName: node
   linkType: hard
 
-"@supabase/storage-js@npm:2.108.1":
+"@supabase/storage-js@npm:2.110.2":
-  version: 2.108.1
+  version: 2.110.2
-  resolution: "@supabase/storage-js@npm:2.108.1"
+  resolution: "@supabase/storage-js@npm:2.110.2"
   dependencies:
     iceberg-js: "npm:^0.8.1"
     tslib: "npm:2.8.1"
-  checksum: 10c0/5a010b4d3af565b26ceb1d07e3d3f0541c8fe538350931c4fc15d0b560b3e40c354cc66259882a8b378e70dace59bc83dd53849feb48509155b8b342e00724a2
+  checksum: 10c0/a672ac600a5f37ccc196b3a5e8e17f6d57d142b8bed7ab979d69d664d4782dd050e5c3166280b5f1753b18911de7529d43487c02c1e1d1efef20c0b53deb503d
   languageName: node
   linkType: hard
 
 "@supabase/supabase-js@npm:^2.108.1":
-  version: 2.108.1
+  version: 2.110.2
-  resolution: "@supabase/supabase-js@npm:2.108.1"
+  resolution: "@supabase/supabase-js@npm:2.110.2"
   dependencies:
-    "@supabase/auth-js": "npm:2.108.1"
+    "@supabase/auth-js": "npm:2.110.2"
-    "@supabase/functions-js": "npm:2.108.1"
+    "@supabase/functions-js": "npm:2.110.2"
-    "@supabase/postgrest-js": "npm:2.108.1"
+    "@supabase/postgrest-js": "npm:2.110.2"
-    "@supabase/realtime-js": "npm:2.108.1"
+    "@supabase/realtime-js": "npm:2.110.2"
-    "@supabase/storage-js": "npm:2.108.1"
+    "@supabase/storage-js": "npm:2.110.2"
-  checksum: 10c0/9b8c3dd7153b4eb3c0bf47296e326c3e57bf77b979a5dc5d18b96a25c041195de942d227d13a5ce83a20203163580204e9102f2346f0a9461de4042b95f69f03
+  checksum: 10c0/5ec5432898bc801e871b7aa700429f6e97a77fb70b61de456b6d1e6f84feccab689fdbc4efdfc44fb4c74d48bcde3446c4cf26fcbfa72c787005efe4a72981c2
   languageName: node
   linkType: hard
 
@@ -1889,9 +1875,9 @@ __metadata:
   linkType: hard
 
 "@types/google.maps@npm:^3.53.1, @types/google.maps@npm:^3.58.1":
-  version: 3.65.0
+  version: 3.65.2
-  resolution: "@types/google.maps@npm:3.65.0"
+  resolution: "@types/google.maps@npm:3.65.2"
-  checksum: 10c0/d41bc1ed2c63f297a8956b097953515e87aa21d25ef918102067efa97113ea558bb42be521337af93698b36d4c6283439b3e087b4b57c7033f59128cdc7159cb
+  checksum: 10c0/790aed74128385bfa6c8b41c6bf18b8f1901e6c7b7c806615e904e9093703a8238f8b2504027ebe714e95f9cd5b2a94fd63306f8b71907a23ba24673754843ea
   languageName: node
   linkType: hard
 
@@ -1909,7 +1895,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0":
+"@types/node@npm:*":
   version: 25.9.1
   resolution: "@types/node@npm:25.9.1"
   dependencies:
@@ -1918,6 +1904,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0":
+  version: 26.1.1
+  resolution: "@types/node@npm:26.1.1"
+  dependencies:
+    undici-types: "npm:~8.3.0"
+  checksum: 10c0/25ac5093195736dd074d5027adbba85617bc951d5a41506ebd3b9073048acb7233613f3822d5f9b9447f9c0841c91f6387c46283916767e3ef79f23917452c46
+  languageName: node
+  linkType: hard
+
 "@types/react-dom@npm:^19.0.0":
   version: 19.2.3
   resolution: "@types/react-dom@npm:19.2.3"
@@ -2041,11 +2036,13 @@ __metadata:
     "@capacitor/haptics": "npm:8.0.2"
     "@capacitor/ios": "npm:8.3.4"
     "@capacitor/keyboard": "npm:8.0.3"
+    "@capacitor/preferences": "npm:^8.0.1"
     "@capacitor/push-notifications": "npm:^8.1.1"
     "@capacitor/status-bar": "npm:8.0.2"
+    "@hookform/resolvers": "npm:^3.9.0"
     "@ionic/pwa-elements": "npm:^3.0.0"
-    "@ionic/react": "npm:^8.5.0"
+    "@ionic/react": "npm:8.8.7"
-    "@ionic/react-router": "npm:^8.5.0"
+    "@ionic/react-router": "npm:8.8.7"
     "@supabase/supabase-js": "npm:^2.108.1"
     "@types/katex": "npm:^0.16.0"
     "@types/react": "npm:^19.0.0"
@@ -2053,7 +2050,6 @@ __metadata:
     "@types/react-router": "npm:^5.1.20"
     "@types/react-router-dom": "npm:^5.3.3"
     "@vitejs/plugin-react": "npm:^4.0.1"
-    date-fns: "npm:^4.4.0"
     firebase: "npm:^11.0.0"
     ionicons: "npm:^7.4.0"
     katex: "npm:^0.16.0"
@@ -2249,13 +2245,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"date-fns@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "date-fns@npm:4.4.0"
-  checksum: 10c0/988f0a13db183f5dfc85c36bbb6847a9c135a9225888bbea4005876ec15539a8613c21a07370a4e7ea543918d5a1cafb423c528b42cdbbde5fdfddb178126b21
-  languageName: node
-  linkType: hard
-
 "debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.3.1, debug@npm:^4.3.4, debug@npm:^4.4.0":
   version: 4.4.3
   resolution: "debug@npm:4.4.3"
@@ -2400,9 +2389,9 @@ __metadata:
   linkType: hard
 
 "fast-equals@npm:^5.2.2":
-  version: 5.4.0
+  version: 5.4.1
-  resolution: "fast-equals@npm:5.4.0"
+  resolution: "fast-equals@npm:5.4.1"
-  checksum: 10c0/4fdce3a8f814e78af7296ca4ebe82f4765074a6dfe557ee98c18f5d2958c3de59025fbff7556d65f250165ccef424d37f9952ee159400f8ebe5f2edb704ec80e
+  checksum: 10c0/18faf5894c39591d61e802b2f574cbc57d2ff2530c71b8cd4e2b4f3c250174002a9aa0b5f4d6f61073a9942a96d71bc7f36514a9b0dc9a2a5cc3395b2a910dbf
   languageName: node
   linkType: hard
 
@@ -3002,8 +2991,8 @@ __metadata:
   linkType: hard
 
 "protobufjs@npm:^7.2.5":
-  version: 7.6.1
+  version: 7.6.5
-  resolution: "protobufjs@npm:7.6.1"
+  resolution: "protobufjs@npm:7.6.5"
   dependencies:
     "@protobufjs/aspromise": "npm:^1.1.2"
     "@protobufjs/base64": "npm:^1.1.2"
@@ -3011,13 +3000,12 @@ __metadata:
     "@protobufjs/eventemitter": "npm:^1.1.1"
     "@protobufjs/fetch": "npm:^1.1.1"
     "@protobufjs/float": "npm:^1.0.2"
-    "@protobufjs/inquire": "npm:^1.1.2"
     "@protobufjs/path": "npm:^1.1.2"
     "@protobufjs/pool": "npm:^1.1.0"
     "@protobufjs/utf8": "npm:^1.1.1"
     "@types/node": "npm:>=13.7.0"
     long: "npm:^5.3.2"
-  checksum: 10c0/364c6914facac19ace915e353f71c5d5996bfa8177a3a68c09bd2513a3ecf780538aca06cb3439237f50489db2fae321c4a4db60fd7f9ec65315b7ad66bea029
+  checksum: 10c0/863eaca9c6f45bfcfb8787c545f53e9c6696507e328e3981b4643c12d35df7f2826021c10e3fd30bef342c13a8e9d306547bac9c0849ee3bf50f770a12f01dc5
   languageName: node
   linkType: hard
 
@@ -3501,6 +3489,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"undici-types@npm:~8.3.0":
+  version: 8.3.0
+  resolution: "undici-types@npm:8.3.0"
+  checksum: 10c0/c8aa7e2fbebfce519654dafadc0ece59be888d2ccaf180fb4495da875e7b536d2456345c384069c7e6f3e9c9ab7435f074957da306f142343eee86ff8048855a
+  languageName: node
+  linkType: hard
+
 "undici@npm:^6.25.0":
   version: 6.25.0
   resolution: "undici@npm:6.25.0"
@@ -3601,13 +3596,13 @@ __metadata:
   linkType: hard
 
 "websocket-driver@npm:>=0.5.1":
-  version: 0.7.4
+  version: 0.7.5
-  resolution: "websocket-driver@npm:0.7.4"
+  resolution: "websocket-driver@npm:0.7.5"
   dependencies:
     http-parser-js: "npm:>=0.5.1"
     safe-buffer: "npm:>=5.1.0"
     websocket-extensions: "npm:>=0.1.1"
-  checksum: 10c0/5f09547912b27bdc57bac17b7b6527d8993aa4ac8a2d10588bb74aebaf785fdcf64fea034aae0c359b7adff2044dd66f3d03866e4685571f81b13e548f9021f1
+  checksum: 10c0/843a3c9f529ce07f2721829f70f62986247525ab22625e857b69da13dc90967bacfe57b85e196801b565cd797e309ddd5b06fa8435732e34e8a8ab6201d7abed
   languageName: node
   linkType: hard
 
@@ -3704,8 +3699,8 @@ __metadata:
   linkType: hard
 
 "yargs@npm:^17.7.2":
-  version: 17.7.2
+  version: 17.7.3
-  resolution: "yargs@npm:17.7.2"
+  resolution: "yargs@npm:17.7.3"
   dependencies:
     cliui: "npm:^8.0.1"
     escalade: "npm:^3.1.1"
@@ -3714,7 +3709,7 @@ __metadata:
     string-width: "npm:^4.2.3"
     y18n: "npm:^5.0.5"
     yargs-parser: "npm:^21.1.1"
-  checksum: 10c0/ccd7e723e61ad5965fffbb791366db689572b80cca80e0f96aad968dfff4156cd7cd1ad18607afe1046d8241e6fb2d6c08bf7fa7bfb5eaec818735d8feac8f05
+  checksum: 10c0/7a28572f7e785a57886e34fdbddb9b28756dec552e1453d5f6e7cdd00ad8721a4e8c4321d33683f5e61cacb36ad43258adbb48396b71ec4ed14abee0fc0d0c1f
   languageName: node
   linkType: hard