@jmruthers/pace-core 0.6.8 → 0.6.10

package/dist/{chunk-EURB7QFZ.js → chunk-TFIPNIPE.js}

@@ -1,33 +1,33 @@
-import { AccessDenied } from './chunk-S6ZQKDY6.js';
-import { Input, Dialog, DialogContent, DialogHeader, DialogBody, DialogFooter, Select, SelectTrigger, SelectValue, SelectContent, SelectItem, Alert, AlertDescription, Label, SelectLabel, SelectSeparator, DialogTitle, deriveFormKey, useSessionDraft, filterSensitiveFields, isSensitiveField, SelectGroup, AlertTitle, Progress } from './chunk-NKHKXPI4.js';
-import { Button, useRBAC, useResolvedScope, usePermissions, useEvents, useCan } from './chunk-GS5672WG.js';
-import { useAddressAutocomplete, createFileReferenceService, uploadFileWithReference, usePublicFileDisplay, useFileDisplay, getPublicUrl, getSignedUrl, generateFileUrlsBatch, useEventTheme, usePreventTabReload } from './chunk-MPBLMWVR.js';
-import { clearPalette } from './chunk-5W2A3DRC.js';
-import { useToast } from './chunk-S7DKJPLT.js';
-import { Card, CardHeader, CardTitle, CardDescription, CardContent, CardFooter, useIsPublicPage, PublicPageContext, useAppConfig, ErrorBoundary } from './chunk-EF2UGZWY.js';
-import { useUnifiedAuth, useOrganisations, UnifiedAuthContext, EventServiceContext, useSessionRestoration } from './chunk-T5CVK4R3.js';
-import { EventContextRequiredError, OrganisationContextRequiredError, isSuperAdmin } from './chunk-LX6U42O3.js';
+import { useRBAC, useSecureSupabase, useEvents, AccessDenied } from './chunk-X5EAU5G7.js';
+import { Input, Dialog, DialogContent, DialogHeader, DialogBody, DialogFooter, Label, Select, SelectTrigger, SelectContent, SelectLabel, SelectSeparator, SelectItem, DialogTitle, SelectValue, deriveFormKey, useSessionDraft, filterSensitiveFields, isSensitiveField, SelectGroup, Progress } from './chunk-MPY44PWB.js';
+import { Button, Card, CardHeader, CardTitle, CardDescription, CardContent, Alert, AlertDescription, CardFooter, useResolvedScope, usePermissions, useCan, AlertTitle } from './chunk-KYURMOQM.js';
+import { useAddressAutocomplete, createFileReferenceService, uploadFileWithReference, usePublicFileDisplay, useFileDisplay, getPublicUrl, getSignedUrl, generateFileUrlsBatch, useEventTheme, usePreventTabReload } from './chunk-FBZ7U3ID.js';
+import { clearPalette } from './chunk-JJEYZ3DX.js';
+import { useOrganisationSecurity } from './chunk-KPYQWGFQ.js';
+import { useToast } from './chunk-BCTXBU6U.js';
+import { useIsPublicPage, PublicPageContext, useAppConfig } from './chunk-3GWSPISD.js';
+import { useUnifiedAuth, useOrganisations, UnifiedAuthContext, EventServiceContext, useSessionRestoration } from './chunk-Y4PF6HIM.js';
+import { EventContextRequiredError, OrganisationContextRequiredError, isSuperAdmin } from './chunk-LNHFAF4X.js';
 import { assertAppId } from './chunk-4SXLQIZO.js';
-import { getAppId } from './chunk-FEJLJNWA.js';
-import { LoadingSpinner } from './chunk-A3W6LW53.js';
-import { getCurrentAppName } from './chunk-OJ4SKRSV.js';
-import { cn } from './chunk-7ILTDCL2.js';
-import { createLogger, logger } from './chunk-TTRFSOKR.js';
-import * as React6 from 'react';
-import React6__default, { useState, useRef, useMemo, useCallback, useEffect, useContext } from 'react';
+import { getUserTimeZone, getAppIcon, getAppId } from './chunk-FN52B75D.js';
+import { cn, LoadingSpinner, getCurrentAppName } from './chunk-UZNAFKGW.js';
+import { performanceBudgetMonitor } from './chunk-7YDC7LMU.js';
+import { createLogger, logger } from './chunk-BTHN5MKC.js';
+import * as React from 'react';
+import React__default, { useState, useRef, useMemo, useCallback, useEffect, createContext, useContext, Component } from 'react';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
-import { FileText, ExternalLink, X, ChevronDown, KeyRound, LogOut, Calendar as Calendar$1, Building2, AlertCircle, RefreshCw, File, Check } from 'lucide-react';
+import { FileText, ExternalLink, X, ChevronDown, KeyRound, LogOut, Clock, Calendar as Calendar$1, Building2, AlertCircle, RefreshCw, File, Check } from 'lucide-react';
 import * as SwitchPrimitive from '@radix-ui/react-switch';
 import * as TabsPrimitive from '@radix-ui/react-tabs';
-import { useDayPicker, DayPicker } from 'react-day-picker';
+import { DayPicker } from 'react-day-picker';
 import { enAU } from 'date-fns/locale';
-import { format } from 'date-fns';
 import * as ToastPrimitives from '@radix-ui/react-toast';
 import { useForm, useWatch, FormProvider, useFormContext, Controller } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useLocation, Link, useNavigate, Outlet, Navigate } from 'react-router-dom';
+import { createClient } from '@supabase/supabase-js';
 
-var AddressField = React6.forwardRef(
+var AddressField = React.forwardRef(
   ({
     apiKey,
     value: controlledValue,
@@ -46,14 +46,14 @@ var AddressField = React6.forwardRef(
     cacheTTL,
     ...props
   }, ref) => {
-    const [internalValue, setInternalValue] = React6.useState(defaultValue);
-    const [isOpen, setIsOpen] = React6.useState(false);
-    const [selectedIndex, setSelectedIndex] = React6.useState(-1);
-    const [inputFocused, setInputFocused] = React6.useState(false);
-    const inputRef = React6.useRef(null);
-    const suggestionsRef = React6.useRef(null);
-    const containerRef = React6.useRef(null);
-    const blurTimeoutRef = React6.useRef(null);
+    const [internalValue, setInternalValue] = React.useState(defaultValue);
+    const [isOpen, setIsOpen] = React.useState(false);
+    const [selectedIndex, setSelectedIndex] = React.useState(-1);
+    const [inputFocused, setInputFocused] = React.useState(false);
+    const inputRef = React.useRef(null);
+    const suggestionsRef = React.useRef(null);
+    const containerRef = React.useRef(null);
+    const blurTimeoutRef = React.useRef(null);
     const value = controlledValue !== void 0 ? controlledValue : internalValue;
     const { suggestions, isLoading, error: autocompleteError, selectAddress, clearSuggestions } = useAddressAutocomplete(apiKey, value, {
       autocompleteOptions,
@@ -61,14 +61,14 @@ var AddressField = React6.forwardRef(
       cacheEnabled,
       cacheTTL
     });
-    React6.useEffect(() => {
+    React.useEffect(() => {
       if (suggestions.length > 0 && inputFocused && value.trim()) {
         setIsOpen(true);
       } else if (suggestions.length === 0 || !value.trim()) {
         setIsOpen(false);
       }
     }, [suggestions, inputFocused, value]);
-    const handleInputChange = React6.useCallback(
+    const handleInputChange = React.useCallback(
       (e) => {
         const newValue = e.target.value;
         if (controlledValue === void 0) {
@@ -83,7 +83,7 @@ var AddressField = React6.forwardRef(
       },
       [controlledValue, onInputChange, onChange, clearSuggestions]
     );
-    const handleSelectAddress = React6.useCallback(
+    const handleSelectAddress = React.useCallback(
       async (placeId) => {
         setIsOpen(false);
         setSelectedIndex(-1);
@@ -100,7 +100,7 @@ var AddressField = React6.forwardRef(
       },
       [selectAddress, onChange, onInputChange, controlledValue]
     );
-    const handleKeyDown = React6.useCallback(
+    const handleKeyDown = React.useCallback(
       (e) => {
         if (!isOpen || suggestions.length === 0) {
           if (e.key === "Escape") {
@@ -138,14 +138,14 @@ var AddressField = React6.forwardRef(
       },
       [isOpen, suggestions, selectedIndex, handleSelectAddress]
     );
-    const handleFocus = React6.useCallback(() => {
+    const handleFocus = React.useCallback(() => {
       setInputFocused(true);
       if (suggestions.length > 0 && value.trim()) {
         setIsOpen(true);
       }
     }, [suggestions, value]);
-    const handleBlur = React6.useCallback(
-      (e) => {
+    const handleBlur = React.useCallback(
+      (_e) => {
         if (blurTimeoutRef.current) {
           clearTimeout(blurTimeoutRef.current);
           blurTimeoutRef.current = null;
@@ -165,7 +165,7 @@ var AddressField = React6.forwardRef(
       },
       []
     );
-    React6.useEffect(() => {
+    React.useEffect(() => {
       return () => {
         if (blurTimeoutRef.current) {
           clearTimeout(blurTimeoutRef.current);
@@ -173,7 +173,7 @@ var AddressField = React6.forwardRef(
         }
       };
     }, []);
-    React6.useEffect(() => {
+    React.useEffect(() => {
       const handleClickOutside = (event) => {
         if (containerRef.current && !containerRef.current.contains(event.target)) {
           setIsOpen(false);
@@ -187,8 +187,8 @@ var AddressField = React6.forwardRef(
         };
       }
     }, [isOpen]);
-    const suggestionsId = React6.useId();
-    React6.useEffect(() => {
+    const suggestionsId = React.useId();
+    React.useEffect(() => {
       if (selectedIndex >= 0) {
         const selectedItem = document.getElementById(
           `${suggestionsId}-item-${selectedIndex}`
@@ -198,7 +198,7 @@ var AddressField = React6.forwardRef(
         }
       }
     }, [selectedIndex, suggestionsId]);
-    React6.useImperativeHandle(ref, () => inputRef.current);
+    React.useImperativeHandle(ref, () => inputRef.current);
     const hasError = error || !!autocompleteError;
     return /* @__PURE__ */ jsxs("form", { ref: containerRef, className: cn("relative w-full", className), children: [
       /* @__PURE__ */ jsx(
@@ -238,7 +238,7 @@ var AddressField = React6.forwardRef(
             "list-none p-0 m-0"
           ),
           "data-testid": "address-suggestions",
-          children: suggestions.map((suggestion, index) => /* @__PURE__ */ jsxs(React6.Fragment, { children: [
+          children: suggestions.map((suggestion, index) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
             /* @__PURE__ */ jsx(
               "dt",
               {
@@ -420,7 +420,7 @@ function defaultGenerateFallbackText(fileName) {
   if (words.length === 0) return "FL";
   return words.map((word) => word.charAt(0).toUpperCase()).join("").substring(0, 3);
 }
-var FileDisplayContent = React6__default.memo(function FileDisplayContent2({
+var FileDisplayContent = React__default.memo(function FileDisplayContent2({
   isLoading,
   error,
   fileUrl,
@@ -436,7 +436,7 @@ var FileDisplayContent = React6__default.memo(function FileDisplayContent2({
   children,
   onDelete,
   clearError,
-  organisation_id,
+  organisation_id: _organisation_id,
   loadingComponent: LoadingComponent,
   errorComponent: ErrorComponent,
   showFallback = false,
@@ -495,7 +495,7 @@ var FileDisplayContent = React6__default.memo(function FileDisplayContent2({
         await onDelete();
       }
       setImageError(false);
-    } catch (error2) {
+    } catch (_error) {
       setImageError(false);
     }
   };
@@ -564,7 +564,7 @@ var FileDisplayContent = React6__default.memo(function FileDisplayContent2({
     if (LoadingComponent) {
       return /* @__PURE__ */ jsx(LoadingComponent, {});
     }
-    return /* @__PURE__ */ jsx("figure", { className, title: "Loading", children: /* @__PURE__ */ jsx("p", { className: "flex items-center justify-center p-4", children: /* @__PURE__ */ jsx(LoadingSpinner, {}) }) });
+    return /* @__PURE__ */ jsx("figure", { className, title: "Loading", children: /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center p-4", children: /* @__PURE__ */ jsx(LoadingSpinner, {}) }) });
   }
   if ((category || displayOnly) && fileReference) {
     const isImage = fileReference.file_metadata.fileType?.startsWith("image/");
@@ -680,7 +680,7 @@ var FileDisplayContent = React6__default.memo(function FileDisplayContent2({
         ] })
       ] })
     ) : /* @__PURE__ */ jsxs(Fragment, { children: [
-      /* @__PURE__ */ jsxs("p", { className: "flex items-center space-x-3 p-3 bg-sec-50 rounded-lg border border-sec-200", children: [
+      /* @__PURE__ */ jsxs("div", { className: "flex items-center space-x-3 p-3 bg-sec-50 rounded-lg border border-sec-200", children: [
         /* @__PURE__ */ jsx("span", { className: "text-2xl", children: getFileIcon(fileReference.file_metadata.fileType || "") }),
         showDelete && /* @__PURE__ */ jsxs(Fragment, { children: [
           /* @__PURE__ */ jsx(
@@ -743,7 +743,7 @@ var FileDisplayContent = React6__default.memo(function FileDisplayContent2({
             fileRef.file_metadata.category
           ] })
         ] }),
-        /* @__PURE__ */ jsxs("p", { className: "flex items-center space-x-2", children: [
+        /* @__PURE__ */ jsxs("div", { className: "flex items-center space-x-2", children: [
           canDownload && /* @__PURE__ */ jsx(
             "a",
             {
@@ -800,8 +800,7 @@ function FileDisplayPublic({
     fileUrls,
     fileCount,
     isLoading,
-    error,
-    refetch
+    error
   } = usePublicFileDisplay(
     table_name,
     record_id,
@@ -1081,7 +1080,6 @@ function FileDisplay({
     }
   );
 }
-createLogger("useFileReference");
 var urlRefreshManager = {
   subscriptions: /* @__PURE__ */ new Map(),
   subscribe(key, callback) {
@@ -1156,7 +1154,7 @@ function useFileReference(supabase) {
       setIsLoading(false);
     }
   }, [service]);
-  const getSignedUrl3 = useCallback(async (table_name, record_id, organisation_id, expires_in) => {
+  const getSignedUrl2 = useCallback(async (table_name, record_id, organisation_id, expires_in) => {
     setIsLoading(true);
     setError(null);
     try {
@@ -1257,7 +1255,7 @@ function useFileReference(supabase) {
     getFileReference,
     getFileReferenceById,
     getFileUrl,
-    getSignedUrl: getSignedUrl3,
+    getSignedUrl: getSignedUrl2,
     updateFileReference,
     deleteFileReference,
     listFileReferences,
@@ -1383,7 +1381,7 @@ function useFileReferenceById(supabase, fileReferenceId, organisationId) {
           organisationId
         );
         setFileUrl(url);
-      } catch (error2) {
+      } catch (_error) {
         setFileUrl(null);
       }
     };
@@ -1443,7 +1441,7 @@ var sizeClasses = {
   xl: "size-16 text-xl",
   "2xl": "size-20 text-2xl"
 };
-var Avatar = React6.forwardRef(
+var Avatar = React.forwardRef(
   ({
     table_name,
     record_id,
@@ -1457,10 +1455,10 @@ var Avatar = React6.forwardRef(
     size = "md",
     ...props
   }, ref) => {
-    const [imageError, setImageError] = React6.useState(false);
+    const [imageError, setImageError] = React.useState(false);
     const { supabase } = useUnifiedAuth();
     const canFetchFileId = Boolean(fileId && organisation_id && supabase);
-    const { fileReference, fileUrl: fileIdUrl, isLoading: fileIdLoading } = useFileReferenceById(
+    const { fileUrl: fileIdUrl, isLoading: fileIdLoading } = useFileReferenceById(
       supabase || {},
       // Hook requires SupabaseClient, but we check canFetchFileId before using result
       canFetchFileId ? fileId : null,
@@ -1474,10 +1472,10 @@ var Avatar = React6.forwardRef(
     const fallbackClasses = "size-full grid place-items-center text-center text-sec-50 bg-sec-500";
     const imageClasses = "object-cover size-full";
     const containerClasses = cn(baseClasses, className);
-    const handleImageError = React6.useCallback(() => {
+    const handleImageError = React.useCallback(() => {
       setImageError(true);
     }, []);
-    React6.useEffect(() => {
+    React.useEffect(() => {
       if (src) {
         setImageError(false);
       }
@@ -1626,7 +1624,7 @@ function Badge({ className, variant = "solid-main-normal", ref, ...props }) {
   );
 }
 Badge.displayName = "Badge";
-var Switch = React6.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
+var Switch = React.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
   SwitchPrimitive.Root,
   {
     className: cn(
@@ -1667,9 +1665,9 @@ var Switch = React6.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */
   }
 ));
 Switch.displayName = SwitchPrimitive.Root.displayName;
-var Tabs = React6.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsx(TabsPrimitive.Root, { asChild: true, ...props, children: /* @__PURE__ */ jsx("section", { ref, className, children }) }));
+var Tabs = React.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsx(TabsPrimitive.Root, { asChild: true, ...props, children: /* @__PURE__ */ jsx("section", { ref, className, children }) }));
 Tabs.displayName = TabsPrimitive.Root.displayName || "Tabs";
-var TabsList = React6.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsx(TabsPrimitive.List, { asChild: true, ...props, children: /* @__PURE__ */ jsx(
+var TabsList = React.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsx(TabsPrimitive.List, { asChild: true, ...props, children: /* @__PURE__ */ jsx(
   "nav",
   {
     ref,
@@ -1681,7 +1679,7 @@ var TabsList = React6.forwardRef(({ className, children, ...props }, ref) => /*
   }
 ) }));
 TabsList.displayName = TabsPrimitive.List.displayName || "TabsList";
-var TabsTrigger = React6.forwardRef(({ className, variant, size, children, ...props }, ref) => {
+var TabsTrigger = React.forwardRef(({ className, variant, size = "lg", children, ...props }, ref) => {
   return /* @__PURE__ */ jsx(TabsPrimitive.Trigger, { asChild: true, ...props, children: /* @__PURE__ */ jsx(
     Button,
     {
@@ -1689,9 +1687,9 @@ var TabsTrigger = React6.forwardRef(({ className, variant, size, children, ...pr
       variant,
       size,
       className: cn(
-        "rounded-b-none",
+        "rounded-b-none text-lg px-4",
         "data-[state=active]:bg-main-50 data-[state=active]:text-main-950 data-[state=active]:border-t-1 data-[state=active]:border-x-1 data-[state=active]:shadow-md",
-        "data-[state=inactive]:bg-main-300 data-[state=inactive]:text-main-800 ",
+        "data-[state=inactive]:bg-main-300 data-[state=inactive]:text-main-800 data-[state=inactive]:border-t-1 data-[state=inactive]:border-x-1",
         "data-[state=inactive]:hover:bg-acc-400",
         className
       ),
@@ -1700,7 +1698,7 @@ var TabsTrigger = React6.forwardRef(({ className, variant, size, children, ...pr
   ) });
 });
 TabsTrigger.displayName = TabsPrimitive.Trigger.displayName || "TabsTrigger";
-var TabsContent = React6.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsx(TabsPrimitive.Content, { asChild: true, ...props, children: /* @__PURE__ */ jsx(
+var TabsContent = React.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsx(TabsPrimitive.Content, { asChild: true, ...props, children: /* @__PURE__ */ jsx(
   "aside",
   {
     ref,
@@ -1712,41 +1710,58 @@ var TabsContent = React6.forwardRef(({ className, children, ...props }, ref) =>
   }
 ) }));
 TabsContent.displayName = TabsPrimitive.Content.displayName || "TabsContent";
-var assignToRef = (ref, value) => {
-  if (!ref) {
-    return;
-  }
-  if (typeof ref === "function") {
-    ref(value);
-    return;
-  }
-  ref.current = value;
-};
-var Calendar = React6.forwardRef(
+var Calendar = React.forwardRef(
   ({ className, classNames, mode, components, locale, month: controlledMonth, onMonthChange: controlledOnMonthChange, onSelect, captionLayout, startMonth, endMonth, ...props }, ref) => {
-    const tableRef = React6.useRef(null);
-    const setForwardedRef = React6.useCallback(
-      (node) => {
-        tableRef.current = node;
-        if (!ref) {
-          return;
+    const dayPickerRef = React.useRef(null);
+    React.useEffect(() => {
+      if (ref && dayPickerRef.current) {
+        const tableElement = dayPickerRef.current.querySelector("table");
+        if (tableElement && typeof ref === "function") {
+          ref(tableElement);
+        } else if (tableElement && ref && "current" in ref) {
+          ref.current = tableElement;
         }
-        if (typeof ref === "function") {
-          ref(node);
-        } else {
-          ref.current = node;
-        }
-      },
-      [ref]
-    );
-    const rootPropsRef = React6.useRef(null);
+      }
+    }, [ref]);
     const selected = props.selected;
     const isMonthControlled = controlledMonth !== void 0;
-    const [internalMonth, setInternalMonth] = React6.useState(() => {
+    const [internalMonth, setInternalMonth] = React.useState(() => {
+      if (selected) {
+        if (selected instanceof Date) {
+          return new Date(selected.getFullYear(), selected.getMonth(), 1);
+        }
+        if (typeof selected === "object" && "from" in selected && selected.from) {
+          return new Date(selected.from.getFullYear(), selected.from.getMonth(), 1);
+        }
+        if (Array.isArray(selected) && selected.length > 0 && selected[0] instanceof Date) {
+          return new Date(selected[0].getFullYear(), selected[0].getMonth(), 1);
+        }
+      }
       const now = /* @__PURE__ */ new Date();
       return new Date(now.getFullYear(), now.getMonth(), 1);
     });
-    const month = React6.useMemo(() => {
+    React.useEffect(() => {
+      if (!isMonthControlled && selected) {
+        let monthToSync = null;
+        if (selected instanceof Date) {
+          monthToSync = new Date(selected.getFullYear(), selected.getMonth(), 1);
+        } else if (typeof selected === "object" && "from" in selected && selected.from) {
+          monthToSync = new Date(selected.from.getFullYear(), selected.from.getMonth(), 1);
+        } else if (Array.isArray(selected) && selected.length > 0 && selected[0] instanceof Date) {
+          monthToSync = new Date(selected[0].getFullYear(), selected[0].getMonth(), 1);
+        }
+        if (monthToSync) {
+          setInternalMonth((prevMonth) => {
+            const currentMonth = new Date(prevMonth.getFullYear(), prevMonth.getMonth(), 1);
+            if (monthToSync.getTime() !== currentMonth.getTime()) {
+              return monthToSync;
+            }
+            return prevMonth;
+          });
+        }
+      }
+    }, [selected, isMonthControlled]);
+    const month = React.useMemo(() => {
       const monthToUse = isMonthControlled ? controlledMonth : internalMonth;
       if (!monthToUse) {
         const now = /* @__PURE__ */ new Date();
@@ -1755,350 +1770,98 @@ var Calendar = React6.forwardRef(
       const normalized = new Date(monthToUse.getFullYear(), monthToUse.getMonth(), 1);
       return normalized;
     }, [isMonthControlled, controlledMonth, internalMonth]);
-    const handleMonthChange = React6.useCallback((newMonth) => {
+    const handleMonthChange = React.useCallback((newMonth) => {
       if (!isMonthControlled) {
         setInternalMonth(newMonth);
       }
       controlledOnMonthChange?.(newMonth);
     }, [isMonthControlled, controlledOnMonthChange]);
-    const wrappedHandleMonthChange = React6.useCallback((newMonth) => {
-      handleMonthChange(newMonth);
-    }, [handleMonthChange]);
-    const CustomRoot = React6.memo(({ children, rootRef: dayPickerRootRef, ...rootProps }) => {
-      const {
-        className: rootClassName,
-        style: rootStyle,
-        children: _ignoredChildren,
-        ...restProps
-      } = rootProps;
-      rootPropsRef.current = {
-        className: rootClassName,
-        style: rootStyle,
-        rootRef: dayPickerRootRef,
-        restProps
-      };
-      return /* @__PURE__ */ jsx(Fragment, { children });
-    });
-    CustomRoot.displayName = "CustomRoot";
-    const CustomMonths = React6.memo(({ children }) => {
-      const childrenArray = React6.Children.toArray(children);
-      const filteredChildren = childrenArray.filter((child) => {
-        if (!React6.isValidElement(child)) return true;
-        const childType = child.type;
-        const displayName = childType?.displayName || childType?.name;
-        if (displayName === "MonthCaption" || displayName === "Dropdown" || displayName === "DropdownMonth" || displayName === "DropdownYear" || typeof childType === "string" && childType.includes("dropdown")) {
-          return false;
-        }
-        if (childType === "div") {
-          const childProps = child.props;
-          if (childProps?.children) {
-            const childChildren = React6.Children.toArray(childProps.children);
-            const hasCaptionSpan = childChildren.some((cc) => {
-              if (!React6.isValidElement(cc) || cc.type !== "span") return false;
-              const spanProps = cc.props;
-              return spanProps?.role === "status" && spanProps?.["aria-live"] === "polite";
-            });
-            if (hasCaptionSpan) {
-              return false;
-            }
-          }
-        }
-        return true;
-      });
-      return /* @__PURE__ */ jsx(Fragment, { children: filteredChildren });
-    });
-    CustomMonths.displayName = "CustomMonths";
-    const CustomMonthGrid = React6.forwardRef((props2, forwardedRef) => {
-      return /* @__PURE__ */ jsx("table", { ref: forwardedRef, ...props2 });
-    });
-    CustomMonthGrid.displayName = "CustomMonthGrid";
-    const CustomMonthCaption = React6.memo(({ displayMonth, startMonth: captionStartMonth, endMonth: captionEndMonth, locale: captionLocale }) => {
-      const { goToMonth } = useDayPicker();
-      const calendarLocale = captionLocale || enAU;
-      const fromDate = captionStartMonth || new Date(1900, 0);
-      const toDate = captionEndMonth || new Date(2100, 11);
-      const monthOptions = React6.useMemo(() => {
-        const months = [];
-        for (let i = 0; i < 12; i++) {
-          const monthDate = new Date(displayMonth.getFullYear(), i, 1);
-          const label = format(monthDate, "MMMM", { locale: calendarLocale });
-          months.push({ value: i.toString(), label });
-        }
-        return months;
-      }, [calendarLocale, displayMonth]);
-      const yearOptions = React6.useMemo(() => {
-        const years = [];
-        const startYear = fromDate.getFullYear();
-        const endYear = toDate.getFullYear();
-        for (let year = startYear; year <= endYear; year++) {
-          years.push({ value: year.toString(), label: year.toString() });
-        }
-        return years;
-      }, [fromDate, toDate]);
-      const currentMonth = displayMonth.getMonth();
-      const currentYear = displayMonth.getFullYear();
-      const handleMonthChange2 = React6.useCallback((value) => {
-        const newMonth = parseInt(value, 10);
-        const newDate = new Date(currentYear, newMonth, 1);
-        goToMonth(newDate);
-      }, [currentYear, goToMonth]);
-      const handleYearChange = React6.useCallback((value) => {
-        const newYear = parseInt(value, 10);
-        const newDate = new Date(newYear, currentMonth, 1);
-        goToMonth(newDate);
-      }, [currentMonth, goToMonth]);
-      return /* @__PURE__ */ jsxs("nav", { className: "relative flex items-center justify-center gap-2", children: [
-        /* @__PURE__ */ jsxs(Select, { value: currentMonth.toString(), onValueChange: handleMonthChange2, children: [
-          /* @__PURE__ */ jsx(SelectTrigger, { className: "w-auto min-w-[120px]", children: /* @__PURE__ */ jsx(SelectValue, {}) }),
-          /* @__PURE__ */ jsx(SelectContent, { children: monthOptions.map((option) => /* @__PURE__ */ jsx(SelectItem, { value: option.value, children: option.label }, option.value)) })
-        ] }),
-        /* @__PURE__ */ jsxs(Select, { value: currentYear.toString(), onValueChange: handleYearChange, children: [
-          /* @__PURE__ */ jsx(SelectTrigger, { className: "w-auto min-w-[100px]", children: /* @__PURE__ */ jsx(SelectValue, {}) }),
-          /* @__PURE__ */ jsx(SelectContent, { children: yearOptions.map((option) => /* @__PURE__ */ jsx(SelectItem, { value: option.value, children: option.label }, option.value)) })
-        ] })
-      ] });
-    });
-    CustomMonthCaption.displayName = "CustomMonthCaption";
-    const CustomMonth = React6.memo(({ calendarMonth, displayIndex, className: className2, children, captionLayout: monthCaptionLayout, startMonth: monthStartMonth, endMonth: monthEndMonth }) => {
-      const { formatters, components: components2, labels, classNames: classNames2, previousMonth, nextMonth, goToMonth } = useDayPicker();
-      const caption = formatters.formatCaption(calendarMonth.date, {});
-      const Chevron = components2?.Chevron;
-      const childrenArray = React6.Children.toArray(children);
-      const monthGridIndex = childrenArray.findIndex((child) => {
-        if (!React6.isValidElement(child)) return false;
-        const childType = child.type;
-        return typeof childType === "function" && childType.displayName === "MonthGrid" || child.type === "table";
-      });
-      return /* @__PURE__ */ jsx(Fragment, { children: childrenArray.map((child, index) => {
-        if (React6.isValidElement(child) && child.type?.displayName === "MonthCaption") {
-          return null;
-        }
-        if (index === monthGridIndex && React6.isValidElement(child)) {
-          const monthGridChild = child;
-          const applyRootProps = displayIndex === 0 && index === monthGridIndex;
-          const storedRootProps = applyRootProps ? rootPropsRef.current : null;
-          const { children: monthGridChildren, className: monthGridClassName, style: monthGridStyle, ...monthGridRest } = monthGridChild.props;
-          const mergedClassName = cn(
-            "w-full border-collapse rounded-md border border-sec-200 bg-background",
-            applyRootProps ? storedRootProps?.className : void 0,
-            className2,
-            monthGridClassName
-          );
-          const mergedStyle = {
-            ...applyRootProps ? storedRootProps?.style ?? {} : {},
-            ...monthGridStyle ?? {}
-          };
-          const tableProps = {
-            ...applyRootProps && storedRootProps?.restProps ? storedRootProps.restProps : {},
-            ...monthGridRest,
-            className: mergedClassName,
-            ...Object.keys(mergedStyle).length ? { style: mergedStyle } : {}
-          };
-          if (mode && tableProps["data-mode"] === void 0) {
-            tableProps["data-mode"] = mode;
-          }
-          const shouldAttachRef = applyRootProps || storedRootProps?.rootRef;
-          const handleTableRef = shouldAttachRef ? (node) => {
-            if (applyRootProps) {
-              setForwardedRef(node);
-            }
-            if (storedRootProps?.rootRef) {
-              assignToRef(storedRootProps.rootRef, node);
-            }
-          } : void 0;
-          const handlePreviousClick = (event) => {
-            event.preventDefault();
-            if (!previousMonth) return;
-            goToMonth(previousMonth);
-          };
-          const handleNextClick = (event) => {
-            event.preventDefault();
-            if (!nextMonth) return;
-            goToMonth(nextMonth);
-          };
-          const monthGridElement = monthGridChild;
-          const mergedRef = handleTableRef || monthGridElement.ref ? (node) => {
-            if (handleTableRef) {
-              handleTableRef(node);
-            }
-            assignToRef(monthGridElement.ref, node);
-          } : void 0;
-          const isDropdownLayout = monthCaptionLayout === "dropdown";
-          return React6.cloneElement(
-            monthGridElement,
-            {
-              key: child.key ?? `month-grid-${displayIndex}`,
-              ...tableProps,
-              ...mergedRef ? { ref: mergedRef } : {}
-            },
-            /* @__PURE__ */ jsxs(Fragment, { children: [
-              /* @__PURE__ */ jsx("caption", { className: "relative", children: isDropdownLayout ? /* @__PURE__ */ jsx(
-                CustomMonthCaption,
-                {
-                  displayMonth: calendarMonth.date,
-                  startMonth: monthStartMonth,
-                  endMonth: monthEndMonth,
-                  locale
-                }
-              ) : /* @__PURE__ */ jsxs("nav", { className: "relative flex items-center justify-center gap-1", children: [
-                /* @__PURE__ */ jsx(
-                  "button",
-                  {
-                    type: "button",
-                    className: cn(
-                      "h-7 w-7 bg-transparent p-0",
-                      "inline-flex items-center justify-center rounded-md",
-                      "hover:bg-acc-100",
-                      "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-main-600 focus-visible:ring-offset-2",
-                      "disabled:opacity-50 disabled:pointer-events-none",
-                      classNames2?.button_previous
-                    ),
-                    tabIndex: previousMonth ? void 0 : -1,
-                    "aria-disabled": previousMonth ? void 0 : true,
-                    "aria-label": previousMonth ? labels.labelPrevious(previousMonth) : void 0,
-                    onClick: handlePreviousClick,
-                    disabled: !previousMonth,
-                    children: Chevron ? /* @__PURE__ */ jsx(Chevron, { orientation: "left", className: "size-4", disabled: !previousMonth }) : /* @__PURE__ */ jsx("span", { children: "\u2039" })
-                  }
-                ),
-                /* @__PURE__ */ jsx("span", { className: "text-sm font-medium", children: caption }),
-                /* @__PURE__ */ jsx(
-                  "button",
-                  {
-                    type: "button",
-                    className: cn(
-                      "h-7 w-7 bg-transparent p-0",
-                      "inline-flex items-center justify-center rounded-md",
-                      "hover:bg-acc-100",
-                      "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-main-600 focus-visible:ring-offset-2",
-                      "disabled:opacity-50 disabled:pointer-events-none",
-                      classNames2?.button_next
-                    ),
-                    tabIndex: nextMonth ? void 0 : -1,
-                    "aria-disabled": nextMonth ? void 0 : true,
-                    "aria-label": nextMonth ? labels.labelNext(nextMonth) : void 0,
-                    onClick: handleNextClick,
-                    disabled: !nextMonth,
-                    children: Chevron ? /* @__PURE__ */ jsx(Chevron, { orientation: "right", className: "size-4", disabled: !nextMonth }) : /* @__PURE__ */ jsx("span", { children: "\u203A" })
-                  }
-                )
-              ] }) }),
-              monthGridChildren
-            ] })
-          );
-        }
-        return React6.isValidElement(child) ? React6.cloneElement(child, { key: child.key ?? `calendar-child-${index}` }) : child;
-      }) });
-    });
-    CustomMonth.displayName = "CustomMonth";
-    const CustomWeekdays = React6.memo(({ className: className2, children, ...props2 }) => {
-      return /* @__PURE__ */ jsx("thead", { children: /* @__PURE__ */ jsx("tr", { className: cn("text-xs text-sec-500", className2), ...props2, children }) });
-    });
-    CustomWeekdays.displayName = "CustomWeekdays";
-    const CustomMonthWithProps = React6.useCallback((props2) => {
-      return /* @__PURE__ */ jsx(
-        CustomMonth,
-        {
-          ...props2,
-          captionLayout,
-          startMonth,
-          endMonth
-        }
-      );
-    }, [captionLayout, startMonth, endMonth]);
-    const CustomMonthCaptionWrapper = React6.memo((_props) => {
-      return null;
-    });
-    CustomMonthCaptionWrapper.displayName = "CustomMonthCaptionWrapper";
-    const defaultComponents = React6.useMemo(() => ({
-      Root: CustomRoot,
-      Months: CustomMonths,
-      Month: CustomMonthWithProps,
-      MonthGrid: CustomMonthGrid,
-      // MonthCaption returns null - actual caption is rendered in CustomMonth inside <caption>
-      MonthCaption: CustomMonthCaptionWrapper,
-      Weekdays: CustomWeekdays,
-      // Spread user components AFTER ours so ours take precedence
-      ...components || {}
-    }), [components, CustomRoot, CustomMonths, CustomMonthWithProps, CustomMonthCaptionWrapper, CustomWeekdays]);
-    return /* @__PURE__ */ jsx(
-      DayPicker,
+    const {
+      captionLayout: _captionLayoutFromProps,
+      startMonth: _startMonthFromProps,
+      endMonth: _endMonthFromProps,
+      ...restProps
+    } = props;
+    const dayPickerProps = {
+      ...mode ? { mode } : {},
+      locale: locale ?? enAU,
+      // Explicitly pass captionLayout, startMonth, endMonth to ensure they're not overridden
+      ...captionLayout !== void 0 ? { captionLayout } : {},
+      ...startMonth !== void 0 ? { startMonth } : {},
+      ...endMonth !== void 0 ? { endMonth } : {},
+      ...restProps,
+      ...selected !== void 0 ? { selected } : {},
+      ...onSelect !== void 0 ? { onSelect } : {},
+      month,
+      onMonthChange: handleMonthChange,
+      className,
+      classNames: {
+        // Basic spacing for calendar grid
+        month_grid: "w-full border-collapse",
+        weekdays: "text-xs text-sec-500",
+        weekday: "w-9 p-0 font-normal text-center",
+        week: "mt-2",
+        day: "p-0 text-center",
+        day_button: cn(
+          "h-9 w-9 p-0 font-normal",
+          "hover:bg-acc-100 hover:text-main-600",
+          "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-main-600 focus-visible:ring-offset-2",
+          "inline-flex items-center justify-center rounded-md"
+        ),
+        selected: "bg-main-600 text-main-50 hover:bg-main-600 hover:text-main-50",
+        today: "bg-sec-100 text-main-600 font-semibold",
+        disabled: "text-sec-400 opacity-50 cursor-not-allowed",
+        // Caption and dropdown layout styling
+        month_caption: "flex items-center justify-center gap-2 mb-2",
+        caption_label: captionLayout === "dropdown" ? "hidden" : "text-sm font-medium",
+        // Hide label when using dropdowns
+        dropdowns: "flex items-center gap-2",
+        months_dropdown: "px-2 py-1 text-sm border border-sec-300 rounded bg-background",
+        years_dropdown: "px-2 py-1 text-sm border border-sec-300 rounded bg-background",
+        chevron: "hidden",
+        // Hide extra chevron icons
+        ...classNames
+      },
+      ...components ? { components } : {}
+    };
+    return /* @__PURE__ */ jsx("div", { ref: dayPickerRef, children: /* @__PURE__ */ jsx(DayPicker, { ...dayPickerProps }) });
+  }
+);
+Calendar.displayName = "Calendar";
+function DatePickerWithTimezone({
+  selected,
+  onSelect,
+  onDone,
+  timezone,
+  className
+}) {
+  const userTimezone = getUserTimeZone();
+  const displayTimezone = timezone || userTimezone;
+  const timezoneDisplay = displayTimezone === userTimezone ? "Local" : displayTimezone;
+  return /* @__PURE__ */ jsxs("form", { className: cn("grid grid-cols-[1fr_auto] gap-2", className), children: [
+    /* @__PURE__ */ jsx(
+      Calendar,
       {
-        ...mode ? { mode } : {},
-        locale: locale ?? enAU,
-        hideNavigation: true,
-        ...props,
+        mode: "single",
         selected,
         onSelect,
-        month,
-        onMonthChange: wrappedHandleMonthChange,
-        className,
-        classNames: {
-          // v9 API: Updated for table-based structure
-          months: "",
-          // No wrapper - removed by CustomMonths
-          month: "",
-          // No wrapper - removed by CustomMonth
-          month_caption: "",
-          // Now handled by custom component (renders as <caption>)
-          caption_label: "text-sm font-medium",
-          nav: "relative flex items-center justify-center space-x-1",
-          // v9: button_previous and button_next for navigation buttons
-          button_previous: cn(
-            "absolute left-1 h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100",
-            "border border-input hover:bg-acc-100",
-            "inline-flex items-center justify-center rounded-md",
-            "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-main-600 focus-visible:ring-offset-2"
-          ),
-          button_next: cn(
-            "absolute right-1 h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100",
-            "border border-input hover:bg-acc-100",
-            "inline-flex items-center justify-center rounded-md",
-            "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-main-600 focus-visible:ring-offset-2"
-          ),
-          // v9: table -> month_grid (now a proper <table>)
-          month_grid: "",
-          // Styles applied directly to table in CustomMonth
-          // v9: head_row -> weekdays (now wrapped in <thead> by custom component)
-          weekdays: "",
-          // Styles applied to <tr> inside <thead>
-          weekday: "text-sec-600 rounded-md w-9 font-normal text-[0.8rem]",
-          // v9: row -> week (now a proper <tr>)
-          week: "mt-2",
-          // v9: cell -> day (now a proper <td> by custom component)
-          day: "",
-          // Styles moved to <td> in custom component
-          // v9: day -> day_button (the button inside the cell)
-          day_button: cn(
-            "h-9 w-9 p-0 font-normal aria-selected:opacity-100",
-            "hover:bg-acc-100 hover:text-main-600",
-            "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-main-600 focus-visible:ring-offset-2",
-            "inline-flex items-center justify-center rounded-md"
-          ),
-          // v9: day_range_end -> range_end
-          range_end: "range-end",
-          // v9: day_selected -> selected
-          selected: "bg-main-600 text-main-50 hover:bg-main-600 hover:text-main-50 focus:bg-main-600 focus:text-main-50",
-          // v9: day_today -> today
-          today: "bg-sec-100 text-main-600 font-semibold",
-          // v9: day_outside -> outside
-          outside: "outside text-sec-400 opacity-50 aria-selected:bg-acc-50/50 aria-selected:text-sec-400 aria-selected:opacity-30",
-          // v9: day_disabled -> disabled
-          disabled: "text-sec-400 opacity-50 cursor-not-allowed",
-          // v9: day_range_middle -> range_middle
-          range_middle: "aria-selected:bg-acc-100 aria-selected:text-main-600",
-          // v9: day_hidden -> hidden
-          hidden: "invisible",
-          ...classNames
-        },
-        components: defaultComponents
+        initialFocus: true,
+        captionLayout: "dropdown",
+        startMonth: new Date(1900, 0),
+        endMonth: new Date(2100, 11),
+        className: "p-0 col-span-full"
       }
-    );
-  }
-);
-Calendar.displayName = "Calendar";
+    ),
+    /* @__PURE__ */ jsxs("label", { htmlFor: "timezone", children: [
+      /* @__PURE__ */ jsx(Clock, { className: "size-4 inline-block mr-2", "aria-hidden": "true" }),
+      "Timezone: ",
+      /* @__PURE__ */ jsx("span", { "aria-label": `Timezone ${timezoneDisplay}`, children: timezoneDisplay })
+    ] }),
+    onDone && /* @__PURE__ */ jsx(Button, { onClick: onDone, size: "sm", className: "ml-auto h-8", children: "Done" })
+  ] });
+}
 var ToastProvider = ToastPrimitives.Provider;
-var ToastViewport = React6.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
+var ToastViewport = React.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
   ToastPrimitives.Viewport,
   {
     ref,
@@ -2111,7 +1874,7 @@ var ToastViewport = React6.forwardRef(({ className, ...props }, ref) => /* @__PU
   }
 ));
 ToastViewport.displayName = ToastPrimitives.Viewport.displayName;
-var Toast = React6.forwardRef(({ className, ...props }, ref) => {
+var Toast = React.forwardRef(({ className, ...props }, ref) => {
   return /* @__PURE__ */ jsx(
     ToastPrimitives.Root,
     {
@@ -2126,7 +1889,7 @@ var Toast = React6.forwardRef(({ className, ...props }, ref) => {
   );
 });
 Toast.displayName = ToastPrimitives.Root.displayName;
-var ToastAction = React6.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
+var ToastAction = React.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
   ToastPrimitives.Action,
   {
     ref,
@@ -2139,7 +1902,7 @@ var ToastAction = React6.forwardRef(({ className, ...props }, ref) => /* @__PURE
   }
 ));
 ToastAction.displayName = ToastPrimitives.Action.displayName;
-var ToastClose = React6.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
+var ToastClose = React.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
   ToastPrimitives.Close,
   {
     ref,
@@ -2154,7 +1917,7 @@ var ToastClose = React6.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 ToastClose.displayName = ToastPrimitives.Close.displayName;
-var ToastTitle = React6.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
+var ToastTitle = React.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
   ToastPrimitives.Title,
   {
     ref,
@@ -2164,7 +1927,7 @@ var ToastTitle = React6.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 ToastTitle.displayName = ToastPrimitives.Title.displayName;
-var ToastDescription = React6.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
+var ToastDescription = React.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
   ToastPrimitives.Description,
   {
     ref,
@@ -2198,6 +1961,7 @@ function Form({
   children,
   className
 }) {
+  const logger2 = createLogger("Form");
   const location = useLocation();
   const auth = useUnifiedAuth();
   const userId = auth.user?.id || null;
@@ -2303,7 +2067,7 @@ function Form({
             valuesToRestore[fieldName] = persistedValues[numericKey];
           }
         }
-        console.log("[Form Persistence] Mapped numeric keys to field names:", {
+        logger2.debug("[Form Persistence] Mapped numeric keys to field names:", {
           numericKeys: persistedKeys,
           fieldNames,
           mappedValues: valuesToRestore
@@ -2321,7 +2085,7 @@ function Form({
         const type = fieldTypes?.[name];
         return isSensitiveField(name, type);
       });
-      console.log("[Form Persistence] \u2705 Restoring persisted values:", {
+      logger2.debug("[Form Persistence] \u2705 Restoring persisted values:", {
         persistenceKey,
         persistedValuesKeys: persistedKeys,
         persistedValuesString: JSON.stringify(persistedValues),
@@ -2344,7 +2108,7 @@ function Form({
         }
       }
       if (hasValuesToSet) {
-        console.log("[Form Persistence] \u{1F504} Setting form values via reset():", {
+        logger2.debug("[Form Persistence] \u{1F504} Setting form values via reset():", {
           persistenceKey,
           valuesToSetKeys: Object.keys(valuesToSet),
           valuesToSet,
@@ -2354,12 +2118,12 @@ function Form({
           ...methods.getValues(),
           ...valuesToSet
         });
-        console.log("[Form Persistence] \u2705 Form values set successfully", {
+        logger2.debug("[Form Persistence] \u2705 Form values set successfully", {
           persistenceKey,
           currentValues: methods.getValues()
         });
       } else {
-        console.log("[Form Persistence] \u23ED\uFE0F No values to set (all values already match)", {
+        logger2.debug("[Form Persistence] \u23ED\uFE0F No values to set (all values already match)", {
           persistenceKey
         });
       }
@@ -2404,7 +2168,7 @@ function Form({
         const type = fieldTypes?.[name];
         return isSensitiveField(name, type);
       });
-      console.log("[Form Persistence] \u{1F4BE} Persisting form values:", {
+      logger2.debug("[Form Persistence] \u{1F4BE} Persisting form values:", {
         persistenceKey,
         filteredValuesKeys: Object.keys(filteredValues),
         originalValuesKeys: Object.keys(watchedValues),
@@ -2415,15 +2179,19 @@ function Form({
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       });
       setPersistedValues(filteredValues);
-      if (persistenceKey) {
+      if (persistenceKey && typeof sessionStorage !== "undefined") {
         setTimeout(() => {
-          const storageKey = `pace-core:draft:${persistenceKey}`;
-          const stored = sessionStorage.getItem(storageKey);
-          console.log("[Form Persistence] \u{1F4E6} SessionStorage AFTER setPersistedValues:", {
-            persistenceKey,
-            storageKey,
-            stored: stored ? JSON.parse(stored) : null
-          });
+          try {
+            const storageKey = `pace-core:draft:${persistenceKey}`;
+            const stored = sessionStorage.getItem(storageKey);
+            logger2.debug("[Form Persistence] \u{1F4E6} SessionStorage AFTER setPersistedValues:", {
+              persistenceKey,
+              storageKey,
+              stored: stored ? JSON.parse(stored) : null
+            });
+          } catch (error) {
+            logger2.debug("[Form Persistence] Could not access sessionStorage after setPersistedValues", { error });
+          }
         }, 100);
       }
       persistTimeoutRef.current = null;
@@ -2437,34 +2205,40 @@ function Form({
   }, [watchedValues, persistenceKey]);
   const handleSubmit = methods.handleSubmit(
     async (data) => {
-      console.log("[Form Lifecycle] \u{1F4E4} Form submit started", {
+      logger2.debug("[Form Lifecycle] \u{1F4E4} Form submit started", {
         persistenceKey,
         dataKeys: Object.keys(data),
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       });
       await onSubmit(data);
-      console.log("[Form Lifecycle] \u2705 Form submit successful", {
+      logger2.debug("[Form Lifecycle] \u2705 Form submit successful", {
         persistenceKey,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       });
       if (persistenceKey && clearDraft) {
-        console.log("[Form Persistence] \u{1F5D1}\uFE0F Clearing draft after successful submit", {
+        logger2.debug("[Form Persistence] \u{1F5D1}\uFE0F Clearing draft after successful submit", {
           persistenceKey
         });
         clearDraft();
-        setTimeout(() => {
-          const storageKey = `pace-core:draft:${persistenceKey}`;
-          const stored = sessionStorage.getItem(storageKey);
-          console.log("[Form Persistence] \u{1F4E6} SessionStorage AFTER clearDraft (submit):", {
-            persistenceKey,
-            storageKey,
-            stored: stored ? JSON.parse(stored) : null
-          });
-        }, 100);
+        if (typeof sessionStorage !== "undefined") {
+          setTimeout(() => {
+            try {
+              const storageKey = `pace-core:draft:${persistenceKey}`;
+              const stored = sessionStorage.getItem(storageKey);
+              logger2.debug("[Form Persistence] \u{1F4E6} SessionStorage AFTER clearDraft (submit):", {
+                persistenceKey,
+                storageKey,
+                stored: stored ? JSON.parse(stored) : null
+              });
+            } catch (error) {
+              logger2.debug("[Form Persistence] Could not access sessionStorage after clearDraft", { error });
+            }
+          }, 100);
+        }
       }
     },
     (errors) => {
-      console.log("[Form Lifecycle] \u274C Form submit failed with errors", {
+      logger2.debug("[Form Lifecycle] \u274C Form submit failed with errors", {
         persistenceKey,
         errors,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
@@ -2528,7 +2302,7 @@ function FormField({
     )
   ] });
 }
-var LoginForm = React6__default.memo(({
+var LoginForm = React__default.memo(({
   onSignIn,
   onSuccess,
   onError,
@@ -2629,6 +2403,363 @@ var LoginForm = React6__default.memo(({
     ] })
   ] }) });
 });
+function useAccessibleApps(currentAppName) {
+  const supabase = useSecureSupabase();
+  const authContext = useUnifiedAuth();
+  const user = authContext?.user ?? null;
+  const { superAdminContext } = useOrganisationSecurity();
+  const isSuperAdmin2 = superAdminContext.isSuperAdmin;
+  const [apps, setApps] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState(null);
+  const fetchApps = useMemo(
+    () => async () => {
+      if (!supabase || !user) {
+        setApps([]);
+        setLoading(false);
+        return;
+      }
+      setLoading(true);
+      setError(null);
+      try {
+        let data = [];
+        let actualIsSuperAdmin = isSuperAdmin2;
+        if (user && supabase) {
+          try {
+            const now = (/* @__PURE__ */ new Date()).toISOString();
+            const { data: superAdminData, error: superAdminError } = await supabase.from("rbac_global_roles").select("role").eq("user_id", user.id).eq("role", "super_admin").lte("valid_from", now).or(`valid_to.is.null,valid_to.gte.${now}`).limit(1);
+            if (!superAdminError && superAdminData && superAdminData.length > 0) {
+              actualIsSuperAdmin = true;
+            } else {
+              actualIsSuperAdmin = false;
+            }
+          } catch (checkError) {
+            logger.warn("useAccessibleApps", "Error checking super admin status directly:", checkError);
+            actualIsSuperAdmin = isSuperAdmin2;
+          }
+        }
+        if (actualIsSuperAdmin) {
+          const { data: allApps, error: queryError } = await supabase.from("rbac_apps").select("id, name, display_name, is_active").eq("is_active", true).order("display_name");
+          if (queryError) {
+            logger.error("useAccessibleApps", "Failed to fetch all apps for super admin:", queryError);
+            throw new Error(`Failed to fetch all apps: ${queryError.message}`);
+          }
+          data = allApps || [];
+        } else {
+          const now = (/* @__PURE__ */ new Date()).toISOString();
+          const { data: roleData, error: queryError } = await supabase.from("rbac_event_app_roles").select(
+            `
+              app_id,
+              rbac_apps!inner (
+                id,
+                name,
+                display_name,
+                is_active
+              )
+              `
+          ).eq("user_id", user.id).eq("status", "active").or(`valid_to.is.null,valid_to.gt.${now}`);
+          if (queryError) {
+            throw new Error(`Failed to fetch accessible apps: ${queryError.message}`);
+          }
+          if (!roleData) {
+            setApps([]);
+            setLoading(false);
+            return;
+          }
+          const appMap2 = /* @__PURE__ */ new Map();
+          for (const row of roleData) {
+            const appData = row.rbac_apps;
+            if (!appData || !appData.is_active) {
+              continue;
+            }
+            if (!appMap2.has(appData.id)) {
+              appMap2.set(appData.id, {
+                id: appData.id,
+                name: appData.name,
+                display_name: appData.display_name,
+                is_active: appData.is_active
+              });
+            }
+          }
+          data = Array.from(appMap2.values());
+        }
+        const appMap = /* @__PURE__ */ new Map();
+        for (const appData of data) {
+          if (!appData.is_active) {
+            continue;
+          }
+          if (currentAppName && appData.name.toUpperCase() === currentAppName.toUpperCase()) {
+            continue;
+          }
+          if (!appMap.has(appData.id)) {
+            appMap.set(appData.id, {
+              id: appData.id,
+              name: appData.name,
+              displayName: appData.display_name
+            });
+          }
+        }
+        const appsArray = Array.from(appMap.values()).sort(
+          (a, b) => a.displayName.localeCompare(b.displayName)
+        );
+        setApps(appsArray);
+      } catch (err) {
+        const error2 = err instanceof Error ? err : new Error("Unknown error fetching apps");
+        setError(error2);
+        setApps([]);
+      } finally {
+        setLoading(false);
+      }
+    },
+    [supabase, user, currentAppName, isSuperAdmin2]
+  );
+  useEffect(() => {
+    void fetchApps();
+  }, [fetchApps]);
+  return {
+    apps,
+    loading,
+    error,
+    refetch: fetchApps
+  };
+}
+
+// src/utils/app/appPortMap.ts
+var DEFAULT_APP_PORT_MAP = {
+  "CORE": 8080,
+  "ADMIN": 8081,
+  "BASE": 8082,
+  "CAKE": 8083,
+  "GEAR": 8084,
+  "MINT": 8085,
+  "PORTAL": 8086,
+  "PUMP": 8087,
+  "TRAC": 8088
+};
+function getAppPort(appName) {
+  const upperAppName = appName.toUpperCase();
+  return DEFAULT_APP_PORT_MAP[upperAppName];
+}
+function getAllAppPorts() {
+  return { ...DEFAULT_APP_PORT_MAP };
+}
+
+// src/utils/app/buildAppUrl.ts
+function buildAppUrl(options) {
+  const { appName, path = "/", port } = options;
+  const isDevelopment = isDevEnvironment();
+  if (isDevelopment) {
+    const appPort = port || getAppPort(appName);
+    if (!appPort) {
+      const currentPort = window.location.port || "3000";
+      return `http://localhost:${currentPort}${path}`;
+    }
+    return `http://localhost:${appPort}${path}`;
+  } else {
+    const baseDomain = getBaseDomain();
+    const appSubdomain = appName.toLowerCase();
+    const protocol = window.location.protocol;
+    const url = `${protocol}//${appSubdomain}.${baseDomain}${path}`;
+    return url;
+  }
+}
+function isDevEnvironment() {
+  const hostname = window.location.hostname;
+  return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "[::1]";
+}
+function getBaseDomain() {
+  const hostname = window.location.hostname;
+  const parts = hostname.split(".");
+  if (parts.length > 2) {
+    return parts.slice(1).join(".");
+  }
+  return hostname;
+}
+var APP_DISPLAY_ORDER = [
+  "ADMIN",
+  "PACE",
+  "TEAM",
+  "TRIP",
+  "BASE",
+  "GEAR",
+  "MINT",
+  "MEDI",
+  "TRAC",
+  "PUMP",
+  "CAKE",
+  "CORE"
+];
+var getCacheKey = (userId) => {
+  return `pace-core:appswitcher:apps:${userId}`;
+};
+var loadAppsFromCache = (userId) => {
+  if (typeof window === "undefined" || !window.sessionStorage) {
+    return null;
+  }
+  try {
+    const cacheKey = getCacheKey(userId);
+    const cached = window.sessionStorage.getItem(cacheKey);
+    if (!cached) {
+      return null;
+    }
+    const parsed = JSON.parse(cached);
+    return Array.isArray(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+};
+var saveAppsToCache = (userId, apps) => {
+  if (typeof window === "undefined" || !window.sessionStorage) {
+    return;
+  }
+  try {
+    const cacheKey = getCacheKey(userId);
+    window.sessionStorage.setItem(cacheKey, JSON.stringify(apps));
+  } catch {
+  }
+};
+function enrichAppsWithCacheData(apps) {
+  const orderMap = new Map(APP_DISPLAY_ORDER.map((name, index) => [name.toUpperCase(), index]));
+  return apps.map((app) => ({
+    id: app.id,
+    name: app.name,
+    displayName: app.displayName,
+    logoUrl: getAppIcon(app.name),
+    sortId: orderMap.get(app.name.toUpperCase()) ?? -1
+    // -1 if not in APP_DISPLAY_ORDER
+  }));
+}
+function AppSwitcher({
+  currentAppName,
+  trigger,
+  className,
+  showSwitcher = true
+}) {
+  const { apps, loading, error } = useAccessibleApps(currentAppName);
+  const { session, user } = useUnifiedAuth();
+  const [cachedApps, setCachedApps] = React__default.useState(null);
+  React__default.useEffect(() => {
+    if (!user?.id) {
+      setCachedApps(null);
+      return;
+    }
+    const cached = loadAppsFromCache(user.id);
+    if (cached) {
+      setCachedApps(cached);
+    }
+  }, [user?.id]);
+  React__default.useEffect(() => {
+    if (!user?.id || loading || error || apps.length === 0) {
+      return;
+    }
+    const enriched = enrichAppsWithCacheData(apps);
+    saveAppsToCache(user.id, enriched);
+    setCachedApps(enriched);
+  }, [apps, loading, error, user?.id]);
+  React__default.useEffect(() => {
+    return () => {
+      if (user?.id) ;
+    };
+  }, [user?.id]);
+  const processedApps = (() => {
+    if (!cachedApps) return [];
+    const filtered = cachedApps.filter(
+      (app) => app.name.toUpperCase() !== currentAppName.toUpperCase()
+    );
+    return filtered.sort((a, b) => {
+      if (a.sortId >= 0 && b.sortId >= 0) return a.sortId - b.sortId;
+      if (a.sortId >= 0) return -1;
+      if (b.sortId >= 0) return 1;
+      return a.displayName.localeCompare(b.displayName);
+    });
+  })();
+  if (!showSwitcher || !loading && processedApps.length === 0) {
+    return trigger ? /* @__PURE__ */ jsx(Fragment, { children: trigger }) : null;
+  }
+  const handleAppSelect = (appName) => {
+    let url = buildAppUrl({ appName, path: "/" });
+    if (session?.access_token && session?.refresh_token) {
+      const urlObj = new URL(url);
+      try {
+        const sessionData = JSON.stringify({
+          access_token: session.access_token,
+          refresh_token: session.refresh_token,
+          expires_at: session.expires_at,
+          expires_in: session.expires_in,
+          token_type: session.token_type,
+          user: {
+            id: session.user.id,
+            email: session.user.email
+            // Include minimal user data needed
+          }
+        });
+        const encodedSession = btoa(sessionData);
+        urlObj.searchParams.set("session", encodedSession);
+        url = urlObj.toString();
+      } catch (_error) {
+        urlObj.searchParams.set("session_token", session.access_token);
+        url = urlObj.toString();
+      }
+    }
+    window.open(url, "_blank");
+  };
+  if (error) {
+    return trigger ? /* @__PURE__ */ jsx(Fragment, { children: trigger }) : null;
+  }
+  const hasApps = processedApps.length > 0;
+  const isDisabled = loading || !hasApps;
+  return /* @__PURE__ */ jsxs(
+    Select,
+    {
+      onValueChange: handleAppSelect,
+      disabled: isDisabled,
+      className: cn(className),
+      children: [
+        trigger ? /* @__PURE__ */ jsx(
+          SelectTrigger,
+          {
+            asChild: true,
+            disabled: isDisabled,
+            variant: "ghost",
+            showChevron: false,
+            children: trigger
+          }
+        ) : /* @__PURE__ */ jsxs(
+          SelectTrigger,
+          {
+            disabled: isDisabled,
+            variant: "ghost",
+            showChevron: false,
+            className: "p-0 bg-main-500 overflow-hidden hover:bg-none",
+            children: [
+              /* @__PURE__ */ jsx(
+                "img",
+                {
+                  src: getAppIcon("pace"),
+                  alt: "PACE",
+                  className: "absolute inset-0 size-full object-contain hover:hue-rotate-180 hover:invert transition-all"
+                }
+              ),
+              /* @__PURE__ */ jsx(SelectValue, { placeholder: "PACE", className: "opacity-0" })
+            ]
+          }
+        ),
+        hasApps && /* @__PURE__ */ jsx(SelectContent, { className: "grid grid-cols-[2rem_auto_auto] gap-1 auto-rows-min pt-2", children: processedApps.map((app) => /* @__PURE__ */ jsxs(SelectItem, { value: app.name, className: "col-span-3 grid grid-cols-subgrid items-center py-0", children: [
+          /* @__PURE__ */ jsx(
+            "img",
+            {
+              src: app.logoUrl,
+              alt: `${app.displayName} logo`,
+              className: "size-5 col-start-1"
+            }
+          ),
+          /* @__PURE__ */ jsx("h6", { className: " uppercase col-start-2 my-0", children: app.name }),
+          /* @__PURE__ */ jsx("small", { className: "col-start-3 whitespace-nowrap", children: app.displayName })
+        ] }, app.id)) })
+      ]
+    }
+  );
+}
 function ContextSelector({
   placeholder = "Select organisation or event",
   className,
@@ -2666,7 +2797,7 @@ function ContextSelector({
       return `org:${selectedOrganisation.id}`;
     }
     return "";
-  }, [showOrganisations, showEvents, selectedOrganisation?.id, selectedEvent]);
+  }, [showOrganisations, showEvents, selectedOrganisation, selectedEvent]);
   const displayValue = useMemo(() => {
     if (showEvents && selectedEvent) {
       return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -2727,7 +2858,7 @@ function ContextSelector({
   };
   if (isLoading && !hasItems) {
     const loadingText = compact ? "Loading..." : showOrganisations && showEvents ? "Loading organisations and events..." : showOrganisations ? "Loading organisations..." : "Loading events...";
-    return /* @__PURE__ */ jsxs("p", { className, children: [
+    return /* @__PURE__ */ jsxs("div", { className, children: [
       /* @__PURE__ */ jsx(LoadingSpinner, { size: "sm" }),
       /* @__PURE__ */ jsx("br", {}),
       /* @__PURE__ */ jsx("span", { className: "text-sm text-muted-foreground", children: loadingText })
@@ -2916,7 +3047,7 @@ function PasswordChangeForm({ onSubmit, onSuccess, className }) {
     )
   ] });
 }
-var UserMenu = React6__default.memo(function UserMenu2({
+var UserMenu = React__default.memo(function UserMenu2({
   user,
   onSignOut,
   onChangePassword,
@@ -2961,11 +3092,11 @@ var UserMenu = React6__default.memo(function UserMenu2({
         /* @__PURE__ */ jsx(ChevronDown, { className: "size-4" })
       ] }) }),
       /* @__PURE__ */ jsxs(SelectContent, { children: [
-        /* @__PURE__ */ jsx(SelectLabel, { className: "font-normal", children: /* @__PURE__ */ jsxs("li", { className: "pt-2", children: [
+        /* @__PURE__ */ jsxs(SelectLabel, { className: "font-normal pt-2", children: [
           userInfo.displayName,
           /* @__PURE__ */ jsx("br", {}),
           /* @__PURE__ */ jsx("small", { children: userInfo.email })
-        ] }) }),
+        ] }),
         /* @__PURE__ */ jsx(SelectSeparator, {}),
         /* @__PURE__ */ jsxs(
           SelectItem,
@@ -2998,7 +3129,7 @@ var UserMenu = React6__default.memo(function UserMenu2({
     ] }) })
   ] });
 });
-var UserMenuLoading = React6__default.memo(function UserMenuLoading2() {
+var UserMenuLoading = React__default.memo(function UserMenuLoading2() {
   return /* @__PURE__ */ jsxs(
     Button,
     {
@@ -3019,10 +3150,10 @@ UserMenu.Loading = UserMenuLoading;
 function useNavigationFiltering({
   items,
   itemsPreFiltered = false,
-  auditLog = true
+  auditLog: _auditLog = true
 }) {
-  const [resolvedAppId, setResolvedAppId] = React6.useState(void 0);
-  const previousFilteredItemsRef = React6.useRef([]);
+  const [resolvedAppId, setResolvedAppId] = React.useState(void 0);
+  const previousFilteredItemsRef = React.useRef([]);
   const authContext = useUnifiedAuth();
   const rbacContext = useRBAC();
   const eventLoadingRaw = authContext?.eventLoading;
@@ -3037,14 +3168,14 @@ function useNavigationFiltering({
     selectedEventId: itemsPreFiltered ? null : selectedEvent?.event_id || null,
     selectedEventOrganisationId: itemsPreFiltered ? null : selectedEvent?.organisation_id || null
   });
-  React6.useEffect(() => {
+  React.useEffect(() => {
     if (!scopeLoading && !resolvedScope?.appId && selectedOrganisation?.id && authContext?.appName && authContext?.user?.id && !resolvedAppId) {
       if (!authContext.user || !authContext.appName) {
         return;
       }
       const userId2 = authContext.user.id;
       const appName = authContext.appName;
-      import('./api-7P7DI652.js').then(({ resolveAppContext }) => {
+      import('./api-F47QJ7FX.js').then(({ resolveAppContext }) => {
         resolveAppContext({
           userId: userId2,
           appName
@@ -3062,10 +3193,10 @@ function useNavigationFiltering({
     resolvedScope?.appId,
     selectedOrganisation?.id,
     authContext?.appName,
-    authContext?.user?.id,
+    authContext?.user,
     resolvedAppId
   ]);
-  const effectiveScope = React6.useMemo(() => {
+  const effectiveScope = React.useMemo(() => {
     if (resolvedScope?.organisationId) {
       return resolvedScope;
     }
@@ -3079,8 +3210,7 @@ function useNavigationFiltering({
     }
     return null;
   }, [resolvedScope, selectedOrganisation?.id, selectedEvent?.event_id, resolvedAppId]);
-  const scopeKey = effectiveScope ? `${effectiveScope.organisationId || ""}-${effectiveScope.eventId || ""}-${effectiveScope.appId || ""}` : "empty";
-  const stableScope = React6.useMemo(() => {
+  const stableScope = React.useMemo(() => {
     if (effectiveScope?.organisationId) {
       return {
         organisationId: effectiveScope.organisationId,
@@ -3093,7 +3223,7 @@ function useNavigationFiltering({
       eventId: void 0,
       appId: void 0
     };
-  }, [scopeKey, effectiveScope]);
+  }, [effectiveScope]);
   const userId = authContext?.user?.id || "";
   const {
     permissions: permissionMap,
@@ -3106,7 +3236,7 @@ function useNavigationFiltering({
     itemsPreFiltered ? void 0 : stableScope.eventId,
     itemsPreFiltered ? void 0 : stableScope.appId
   );
-  const filteredItems = React6.useMemo(() => {
+  const filteredItems = React.useMemo(() => {
     if (itemsPreFiltered && items && items.length > 0) {
       const visibleItems = (items || []).filter((item) => !item.meta?.hidden);
       previousFilteredItemsRef.current = visibleItems;
@@ -3264,12 +3394,8 @@ function useNavigationFiltering({
     scopeLoading,
     scopeError,
     permissionsLoading,
-    resolvedScope,
-    effectiveScope,
-    auditLog,
     eventLoadingRaw,
     eventLoading,
-    selectedEvent,
     orgContextReady,
     selectedOrganisation?.id,
     permissionsError,
@@ -3285,7 +3411,7 @@ function useNavigationFiltering({
     hasAnyPermission: hasAnyPermission || null
   };
 }
-var NavigationMenu = React6.forwardRef(({
+var NavigationMenu = React.forwardRef(({
   items,
   mode = "dropdown",
   currentPath,
@@ -3293,7 +3419,7 @@ var NavigationMenu = React6.forwardRef(({
   className,
   disabled = false,
   buttonText = "Menu",
-  showIcons = true,
+  showIcons: _showIcons = true,
   navigationLabel = "Main navigation",
   // NEW: Phase 2 - Enhanced Security Features
   strictMode = true,
@@ -3303,8 +3429,8 @@ var NavigationMenu = React6.forwardRef(({
   itemsPreFiltered = false,
   ...props
 }, ref) => {
-  const [expandedItems, setExpandedItems] = React6.useState(/* @__PURE__ */ new Set());
-  const buttonRef = React6.useRef(null);
+  const [expandedItems, setExpandedItems] = React.useState(/* @__PURE__ */ new Set());
+  const buttonRef = React.useRef(null);
   const { authContext, rbacContext, filteredItems, permissionMap, hasAnyPermission } = useNavigationFiltering({ items, itemsPreFiltered, auditLog });
   const handleHierarchicalKeyDown = (event, item) => {
     switch (event.key) {
@@ -3446,7 +3572,7 @@ var NavigationMenu = React6.forwardRef(({
           id: `submenu-${item.id}`,
           role: "menu",
           "aria-label": `${item.label} submenu`,
-          children: item.children.map((child) => /* @__PURE__ */ jsx(React6.Fragment, { children: renderHierarchicalItem(child, level + 1) }, child.id))
+          children: item.children.map((child) => /* @__PURE__ */ jsx(React.Fragment, { children: renderHierarchicalItem(child, level + 1) }, child.id))
         }
       )
     ] }) : /* @__PURE__ */ jsx(
@@ -3508,15 +3634,15 @@ var NavigationMenu = React6.forwardRef(({
       className,
       "aria-label": navigationLabel,
       ...props,
-      children: /* @__PURE__ */ jsx("ul", { role: "menubar", children: filteredItems.map((item) => /* @__PURE__ */ jsx(React6.Fragment, { children: renderHierarchicalItem(item, 0) }, item.id)) })
+      children: /* @__PURE__ */ jsx("ul", { role: "menubar", children: filteredItems.map((item) => /* @__PURE__ */ jsx(React.Fragment, { children: renderHierarchicalItem(item, 0) }, item.id)) })
     }
   );
 });
 NavigationMenu.displayName = "NavigationMenu";
+var DEFAULT_LOGO_SRC = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIHZpZXdCb3g9IjAgMCAzMiAzMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIGZpbGw9IiNmZmYiLz48L3N2Zz4=";
 function Header({
   logoUrl,
   logoAlt = "Logo",
-  logo,
   navItems = [],
   user,
   onSignOut,
@@ -3535,39 +3661,54 @@ function Header({
   const shouldShowContextSelector = showContextSelector !== false;
   const { switchOrganisation } = useOrganisations();
   const { events, setSelectedEvent } = useEvents();
+  const authContext = useUnifiedAuth();
+  const isAuthenticated = authContext?.isAuthenticated ?? false;
+  const appName = authContext?.appName;
   return /* @__PURE__ */ jsx("header", { className: cn(
     "w-full border-b border-main-200 h-16 shadow-sm bg-main-100 ",
     className
-  ), role: "banner", children: /* @__PURE__ */ jsxs("nav", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto grid grid-cols-[auto_1fr_auto_auto_auto_auto] items-center gap-4 h-full", children: [
-    logo ? logoHref ? /* @__PURE__ */ jsx(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: logo }) : logo : logoUrl ? logoHref ? /* @__PURE__ */ jsx(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: /* @__PURE__ */ jsx(
+  ), role: "banner", children: /* @__PURE__ */ jsxs("nav", { className: cn(
+    "px-4 w-[min(var(--app-width),100%)] mx-auto grid items-center gap-4 h-full",
+    isAuthenticated && appName ? "grid-cols-[auto_auto_1fr_auto_auto]" : "grid-cols-[auto_1fr_auto_auto]"
+  ), children: [
+    isAuthenticated && appName && /* @__PURE__ */ jsx(
+      AppSwitcher,
+      {
+        currentAppName: appName,
+        className: "w-9"
+      }
+    ),
+    logoUrl && (logoHref ? /* @__PURE__ */ jsx(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity flex items-center", children: /* @__PURE__ */ jsx(
       "img",
       {
         src: logoUrl,
         alt: logoAlt || "Logo",
-        className: "h-[2.15rem] w-auto max-w-[200px] object-contain rounded-md shadow-md bg-transparent"
+        className: "h-9 w-auto shadow-md"
       }
     ) }) : /* @__PURE__ */ jsx(
       "img",
       {
         src: logoUrl,
         alt: logoAlt || "Logo",
-        className: "h-[2.15rem] w-auto max-w-[200px] object-contain rounded-md shadow-md bg-transparent"
+        className: "h-9 w-auto shadow-md"
       }
-    ) : logoHref ? /* @__PURE__ */ jsx(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: /* @__PURE__ */ jsx(
+    )),
+    !logoUrl && // Default logo when logoUrl is not provided
+    (logoHref ? /* @__PURE__ */ jsx(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity flex items-center", children: /* @__PURE__ */ jsx(
       "img",
       {
-        src: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Crect width='32' height='32' fill='%23000'/%3E%3Ctext x='16' y='20' text-anchor='middle' fill='white' font-family='Arial' font-size='14' font-weight='bold'%3EL%3C/text%3E%3C/svg%3E",
+        src: DEFAULT_LOGO_SRC,
         alt: logoAlt || "Logo",
-        className: "size-8 shadow-md"
+        className: "h-9 w-auto shadow-md"
       }
     ) }) : /* @__PURE__ */ jsx(
       "img",
       {
-        src: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Crect width='32' height='32' fill='%23000'/%3E%3Ctext x='16' y='20' text-anchor='middle' fill='white' font-family='Arial' font-size='14' font-weight='bold'%3EL%3C/text%3E%3C/svg%3E",
+        src: DEFAULT_LOGO_SRC,
         alt: logoAlt || "Logo",
-        className: "size-8 shadow-md"
+        className: "h-9 w-auto shadow-md"
       }
-    ),
+    )),
     navItems && navItems.length > 0 && /* @__PURE__ */ jsx(
       NavigationMenu,
       {
@@ -3583,11 +3724,7 @@ function Header({
       ContextSelector,
       {
         placeholder: "Select organisation or event",
-        className: cn(
-          "w-96",
-          // Adjust width based on whether actions exist
-          actions ? "col-span-1" : "col-span-2"
-        ),
+        className: "w-96",
         showOrganisations,
         showEvents,
         onOrganisationSelect: async (org) => {
@@ -3631,7 +3768,7 @@ var FooterComponent = ({
   ] }) });
 };
 FooterComponent.displayName = "Footer";
-var Footer = React6__default.memo(FooterComponent);
+var Footer = React__default.memo(FooterComponent);
 Footer.displayName = "Footer";
 var EMPTY_PAGE_ID_MAPPING = {};
 var EMPTY_ROUTE_PERMISSIONS = {};
@@ -3642,7 +3779,6 @@ function PaceAppLayout({
   showOrganisations = true,
   showEvents = true,
   headerActions,
-  customLogo,
   logoHref = "/dashboard",
   customUserMenu,
   headerClassName,
@@ -3669,9 +3805,9 @@ function PaceAppLayout({
   const { user, signOut, updatePassword, supabase, appId: contextAppId, selectedOrganisationId } = useUnifiedAuth();
   const {
     selectedOrganisation,
-    isContextReady,
-    hasValidOrganisationContext,
-    ensureOrganisationContext,
+    isContextReady: _isContextReady,
+    hasValidOrganisationContext: _hasValidOrganisationContext,
+    ensureOrganisationContext: _ensureOrganisationContext,
     isLoading: organisationLoading
   } = useOrganisations();
   const { isSuperAdmin: isSuperAdminFromRBAC, isLoading: rbacLoading } = useRBAC();
@@ -3709,7 +3845,7 @@ function PaceAppLayout({
   try {
     const eventsContext = useEvents();
     selectedEvent = eventsContext.selectedEvent;
-  } catch (error) {
+  } catch (_error) {
   }
   const { resolvedScope, isLoading: scopeLoading } = useResolvedScope({
     supabase: supabase || null,
@@ -3741,7 +3877,7 @@ function PaceAppLayout({
     { id: "ui-showcase", label: "UI Showcase", href: "/ui-showcase", icon: "Component" },
     { id: "data-table-showcase", label: "DataTable Showcase", href: "/data-table-showcase", icon: "Table" }
   ], []);
-  const baseMenuItems = useMemo(() => navItems || defaultNavItems, [navItems]);
+  const baseMenuItems = useMemo(() => navItems || defaultNavItems, [navItems, defaultNavItems]);
   const currentRoutePermission = useMemo(() => {
     const currentPath = location.pathname;
     return routePermissions[currentPath] || defaultPermission;
@@ -3833,7 +3969,7 @@ function PaceAppLayout({
         return;
       }
       try {
-        const { isSuperAdmin: checkSuperAdminDynamic } = await import('./api-7P7DI652.js');
+        const { isSuperAdmin: checkSuperAdminDynamic } = await import('./api-F47QJ7FX.js');
         const isSuper = await checkSuperAdminDynamic(user.id);
         if (isSuper) {
           if (isMounted) {
@@ -3847,7 +3983,7 @@ function PaceAppLayout({
         }
       }
       try {
-        const { getPermissionMap } = await import('./api-7P7DI652.js');
+        const { getPermissionMap } = await import('./api-F47QJ7FX.js');
         const permissionScope = {
           organisationId: currentScope.organisationId,
           eventId: currentScope.eventId,
@@ -3858,7 +3994,7 @@ function PaceAppLayout({
           userId: user.id,
           scope: permissionScope
         });
-        const { getPageScopeType } = await import('./api-7P7DI652.js');
+        const { getPageScopeType } = await import('./api-F47QJ7FX.js');
         const effectiveAppId = currentScope.appId || resolvedAppId;
         const effectiveAppName = appName;
         const hasEventContext = !!currentScope.eventId;
@@ -3944,7 +4080,7 @@ function PaceAppLayout({
     return () => {
       isMounted = false;
     };
-  }, [baseMenuItems, pageIdMapping, routePermissions, defaultPermission, can, user?.id, scope, scopeLoading, contextAppId, resolvedScope?.appId, selectedOrganisation?.id, selectedEvent?.event_id, appName]);
+  }, [baseMenuItems, pageIdMapping, routePermissions, defaultPermission, can, user?.id, scope, scopeLoading, contextAppId, resolvedScope?.appId, resolvedAppId, selectedOrganisation?.id, selectedEvent?.event_id, appName]);
   useEffect(() => {
     if (!roleBasedRouting || routeConfig.length === 0) return;
     let isMounted = true;
@@ -3967,7 +4103,7 @@ function PaceAppLayout({
       let hasAccess = true;
       if (currentRoute.pageId && currentRoute.permissions && currentRoute.permissions.length > 0) {
         try {
-          const { isPermittedCached } = await import('./api-7P7DI652.js');
+          const { isPermittedCached } = await import('./api-F47QJ7FX.js');
           const hasPagePermission = await isPermittedCached({
             userId: user?.id || "",
             scope,
@@ -3983,7 +4119,7 @@ function PaceAppLayout({
         }
       }
       if (hasAccess && currentRoute.roles && currentRoute.roles.length > 0 && user?.id) {
-        const { useUnifiedAuth: useUnifiedAuth2 } = await import('./UnifiedAuthProvider-7SNDOWYD.js');
+        const { useUnifiedAuth: useUnifiedAuth2 } = await import('./UnifiedAuthProvider-BBD2PS3Q.js');
         hasAccess = true;
       }
       if (!isMounted) return;
@@ -4020,7 +4156,7 @@ function PaceAppLayout({
       logger.error("PaceAppLayout", "Failed to sign out", { error: error instanceof Error ? error.message : String(error) });
     }
   };
-  const handleChangePassword = async (newPassword, confirmPassword) => {
+  const handleChangePassword = async (newPassword, _confirmPassword) => {
     try {
       const result = await updatePassword(newPassword);
       if (result?.error) {
@@ -4098,8 +4234,7 @@ function PaceAppLayout({
     /* @__PURE__ */ jsx(
       Header,
       {
-        logo: customLogo || void 0,
-        logoUrl: !customLogo ? `/${appName.toLowerCase()}_logo_wide.svg` : void 0,
+        logoUrl: `/${appName.toLowerCase()}_logo_wide.svg`,
         logoAlt: `${appName} Logo`,
         logoHref,
         navItems: filteredMenuItems,
@@ -4160,7 +4295,7 @@ var PaceLoginPage = ({
         if (isOnLoginPage && eventService) {
           await eventService.restorePersistedEvent();
         }
-      } catch (error) {
+      } catch (_error) {
       }
     };
     const timeoutId = setTimeout(() => {
@@ -4407,6 +4542,10 @@ function ProtectedRoute({
       });
       return /* @__PURE__ */ jsx(Navigate, { to: loginPath, replace: true });
     }
+    const restorationNotComplete = !sessionRestoration.restorationComplete && !sessionRestoration.hasTimedOut && !sessionRestoration.restorationError;
+    if (restorationNotComplete || sessionRestoration.isRestoring || isLoading) {
+      return loadingFallback || /* @__PURE__ */ jsx("main", { className: "grid place-items-center size-full", children: /* @__PURE__ */ jsx(LoadingSpinner, {}) });
+    }
     if (!wasAuthenticatedRef.current) {
       return /* @__PURE__ */ jsx(Navigate, { to: loginPath, replace: true });
     }
@@ -4436,6 +4575,168 @@ function ProtectedRoute({
   }
   return /* @__PURE__ */ jsx(Outlet, {});
 }
+var ErrorBoundaryContext = createContext(void 0);
+function ErrorBoundaryProvider({
+  children,
+  defaultErrorHandler
+}) {
+  const contextValue = {
+    defaultErrorHandler
+  };
+  return /* @__PURE__ */ jsx(ErrorBoundaryContext.Provider, { value: contextValue, children });
+}
+var ErrorBoundary = class extends Component {
+  constructor(props) {
+    super(props);
+    this.retryTimeoutId = null;
+    this.reportError = (errorId, componentName) => {
+      if (import.meta.env.MODE === "production") {
+        logger.warn("ErrorBoundary", "Error reporting would be triggered in production:", { errorId, componentName });
+      }
+    };
+    this.handleRetry = () => {
+      const { maxRetries = 3 } = this.props;
+      const { retryCount } = this.state;
+      if (retryCount < maxRetries) {
+        logger.debug("ErrorBoundary", `Retrying component render (attempt ${retryCount + 1}/${maxRetries})`);
+        this.setState((prevState) => ({
+          hasError: false,
+          error: void 0,
+          errorInfo: void 0,
+          errorId: void 0,
+          retryCount: prevState.retryCount + 1
+        }));
+      }
+    };
+    this.state = {
+      hasError: false,
+      retryCount: 0
+    };
+  }
+  static getDerivedStateFromError(error) {
+    const errorId = `error_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+    return {
+      hasError: true,
+      error,
+      errorId
+    };
+  }
+  componentDidCatch(error, errorInfo) {
+    const { componentName = "Unknown Component", onError, enableReporting = true } = this.props;
+    const errorId = this.state.errorId;
+    const componentNameForHandler = componentName || "Unknown Component";
+    this.setState({ errorInfo });
+    logger.error("ErrorBoundary", `[${componentNameForHandler}] Caught error ${errorId}:`, error, errorInfo);
+    performanceBudgetMonitor.measure("ERROR_BOUNDARY_TRIGGER", 1, {
+      componentName: componentNameForHandler,
+      errorId,
+      errorMessage: error.message,
+      stack: error.stack?.substring(0, 200)
+      // Truncated stack trace
+    });
+    if (enableReporting) {
+      this.reportError(errorId, componentNameForHandler);
+    }
+    if (onError) {
+      onError(error, errorInfo, errorId);
+    } else if (this.props._globalErrorHandler) {
+      this.props._globalErrorHandler(error, errorInfo, errorId, componentNameForHandler);
+    }
+  }
+  componentWillUnmount() {
+    if (this.retryTimeoutId) {
+      clearTimeout(this.retryTimeoutId);
+    }
+  }
+  render() {
+    if (this.state.hasError) {
+      const {
+        componentName = "Component",
+        fallback,
+        enableRetry = true,
+        maxRetries = 3
+      } = this.props;
+      const { retryCount, errorId } = this.state;
+      if (fallback) {
+        return fallback;
+      }
+      return /* @__PURE__ */ jsxs(
+        Card,
+        {
+          role: "alert",
+          className: "bg-destructive/10 border-destructive/20",
+          "data-error-boundary": errorId,
+          children: [
+            /* @__PURE__ */ jsxs(CardHeader, { className: "flex items-start gap-3", children: [
+              /* @__PURE__ */ jsx("svg", { className: "w-5 h-5 text-destructive flex-shrink-0", viewBox: "0 0 20 20", fill: "currentColor", children: /* @__PURE__ */ jsx("path", { fillRule: "evenodd", d: "M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7 4a1 1 0 11-2 0 1 1 0 012 0zm-1-9a1 1 0 00-1 1v4a1 1 0 102 0V6a1 1 0 00-1-1z", clipRule: "evenodd" }) }),
+              /* @__PURE__ */ jsxs(CardTitle, { className: "text-destructive", children: [
+                "Error in ",
+                componentName
+              ] }),
+              /* @__PURE__ */ jsx(CardDescription, { className: "text-destructive/80", children: this.state.error?.message || "An unexpected error occurred." })
+            ] }),
+            import.meta.env.MODE === "development" && this.state.error && /* @__PURE__ */ jsx(CardContent, { children: /* @__PURE__ */ jsxs("details", { className: "text-sm text-destructive/70", children: [
+              /* @__PURE__ */ jsx("summary", { className: "cursor-pointer font-medium mb-2", children: "Error Details (Development)" }),
+              /* @__PURE__ */ jsxs("pre", { children: [
+                "Error ID: ",
+                errorId,
+                /* @__PURE__ */ jsxs("code", { className: "overflow-auto max-h-32", children: [
+                  this.state.error.toString(),
+                  this.state.errorInfo?.componentStack
+                ] })
+              ] })
+            ] }) }),
+            enableRetry && retryCount < maxRetries && /* @__PURE__ */ jsxs(CardFooter, { className: "flex gap-3", children: [
+              /* @__PURE__ */ jsxs(
+                "button",
+                {
+                  onClick: this.handleRetry,
+                  className: "px-4 py-2 bg-destructive text-destructive-foreground rounded-md hover:bg-destructive/90 transition-colors text-sm font-medium",
+                  children: [
+                    "Retry (",
+                    retryCount + 1,
+                    "/",
+                    maxRetries,
+                    ")"
+                  ]
+                }
+              ),
+              /* @__PURE__ */ jsx(
+                "button",
+                {
+                  onClick: () => window.location.reload(),
+                  className: "px-4 py-2 bg-sec-600 text-main-50 rounded-md hover:bg-sec-700 transition-colors text-sm font-medium",
+                  children: "Reload Page"
+                }
+              )
+            ] }),
+            retryCount >= maxRetries && /* @__PURE__ */ jsxs(CardFooter, { className: "flex flex-col gap-3", children: [
+              /* @__PURE__ */ jsx("p", { className: "text-acc-800", children: "Maximum retry attempts reached. Please reload the page or contact support." }),
+              /* @__PURE__ */ jsx(
+                "button",
+                {
+                  onClick: () => window.location.reload(),
+                  className: "px-3 py-1 bg-acc-600 text-main-50 rounded text-sm hover:bg-acc-700",
+                  children: "Reload Page"
+                }
+              )
+            ] })
+          ]
+        }
+      );
+    }
+    return this.props.children;
+  }
+};
+function useErrorBoundaryContext() {
+  return useContext(ErrorBoundaryContext);
+}
+var ErrorBoundary2 = React__default.forwardRef((props, ref) => {
+  const context = useErrorBoundaryContext();
+  const globalErrorHandler = context?.defaultErrorHandler;
+  return React__default.createElement(ErrorBoundary, { ...props, ref, _globalErrorHandler: globalErrorHandler });
+});
+ErrorBoundary2.displayName = "ErrorBoundary";
 function FileUpload({
   supabase,
   table_name,
@@ -4461,11 +4762,10 @@ function FileUpload({
   onProgress,
   children
 }) {
+  const logger2 = createLogger("FileUpload");
   if (!pageContext) {
     const errorMsg = "pageContext is required for FileUpload component. This is used for permission checks.";
-    if (import.meta.env.MODE === "development") {
-      console.error("[FileUpload]", errorMsg);
-    }
+    logger2.error(errorMsg);
     throw new Error(errorMsg);
   }
   const [isDragging, setIsDragging] = useState(false);
@@ -4475,13 +4775,14 @@ function FileUpload({
   const [appIdError, setAppIdError] = useState(null);
   const fileInputRef = useRef(null);
   const progressIntervalsRef = useRef(/* @__PURE__ */ new Map());
-  const { uploadFile, isLoading, error } = useFileReference(supabase);
+  const { uploadFile, error } = useFileReference(supabase);
   useEffect(() => {
+    const intervals = progressIntervalsRef.current;
     return () => {
-      progressIntervalsRef.current.forEach((interval) => {
+      intervals.forEach((interval) => {
         clearInterval(interval);
       });
-      progressIntervalsRef.current.clear();
+      intervals.clear();
     };
   }, []);
   useEffect(() => {
@@ -4754,7 +5055,7 @@ function FileUpload({
         onUploadError?.(errorMessage, file);
       }
     }
-  }, [uploadFile, table_name, record_id, organisation_id, resolvedAppId, category, folder, isPublic, maxSize, onUploadSuccess, onUploadError, onProgress, validateFile, generatePreview, showPreview, appIdError, pageContext]);
+  }, [uploadFile, table_name, record_id, organisation_id, resolvedAppId, category, folder, isPublic, onUploadSuccess, onUploadError, onProgress, validateFile, generatePreview, showPreview, appIdError, pageContext, event_id, userId]);
   const handleDragOver = useCallback((e) => {
     e.preventDefault();
     e.stopPropagation();
@@ -4908,7 +5209,7 @@ function FileUpload({
 }
 function PublicPageHeader({
   event,
-  eventCode,
+  eventCode: _eventCode,
   title,
   description,
   showEventLogo = true,
@@ -4935,7 +5236,7 @@ function PublicPageHeader({
       showEventLogo && event && /* @__PURE__ */ jsx(Fragment, { children: customEventLogo || /* @__PURE__ */ jsx(
         FileDisplay,
         {
-          table_name: "event",
+          table_name: "core_events",
           record_id: event.event_id,
           organisation_id: event.organisation_id,
           category: "event_logos" /* EVENT_LOGOS */,
@@ -4943,7 +5244,7 @@ function PublicPageHeader({
           showFallback: true,
           fallbackSize: "md",
           className: "mr-4 max-w-36 row-span-2",
-          generateFallbackText: (fileName) => {
+          generateFallbackText: (_fileName) => {
             if (!event.event_name) return "EV";
             return event.event_name.split(/[\s\-_]+/).map((word) => word.charAt(0).toUpperCase()).join("").substring(0, 3);
           }
@@ -4959,7 +5260,7 @@ function PublicPageHeader({
   ] });
 }
 function PublicPageFooter({
-  event,
+  event: _event,
   companyName = "Solvera Solutions Pty Ltd",
   year = (/* @__PURE__ */ new Date()).getFullYear(),
   links,
@@ -4998,7 +5299,7 @@ function PublicPageLayout({
     if (LoadingFallback) {
       return /* @__PURE__ */ jsx(LoadingFallback, {});
     }
-    return /* @__PURE__ */ jsxs("p", { className: "grid place-items-center text-center size-full", children: [
+    return /* @__PURE__ */ jsxs("div", { className: "grid place-items-center text-center size-full", children: [
       /* @__PURE__ */ jsx(
         LoadingSpinner,
         {
@@ -5030,7 +5331,7 @@ function PublicPageLayout({
       handleRefetch && /* @__PURE__ */ jsx(Button, { onClick: handleRefetch, children: "Try Again" })
     ] });
   }
-  return /* @__PURE__ */ jsx(ErrorBoundary, { componentName: "PublicPageLayout", children: /* @__PURE__ */ jsxs(Fragment, { children: [
+  return /* @__PURE__ */ jsx(ErrorBoundary2, { componentName: "PublicPageLayout", children: /* @__PURE__ */ jsxs(Fragment, { children: [
     customHeader || /* @__PURE__ */ jsx(
       PublicPageHeader,
       {
@@ -5042,5 +5343,37 @@ function PublicPageLayout({
     showFooter && event && (customFooter || /* @__PURE__ */ jsx(PublicPageFooter, { event }))
   ] }) });
 }
+function PublicPageProvider({ children, appName }) {
+  const getEnvVar = (key) => {
+    if (typeof import.meta !== "undefined" && import.meta.env) {
+      const env = import.meta.env;
+      return env[key];
+    }
+    if (typeof process !== "undefined" && process.env) {
+      return process.env[key];
+    }
+    return void 0;
+  };
+  const supabaseUrl = getEnvVar("VITE_SUPABASE_URL") || getEnvVar("NEXT_PUBLIC_SUPABASE_URL") || null;
+  const supabaseKey = getEnvVar("VITE_SUPABASE_PUBLISHABLE_KEY") || getEnvVar("NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY") || getEnvVar("VITE_SUPABASE_ANON_KEY") || getEnvVar("NEXT_PUBLIC_SUPABASE_ANON_KEY") || null;
+  const supabase = useMemo(() => {
+    if (!supabaseUrl || !supabaseKey) {
+      logger.warn("PublicPageProvider", "Missing Supabase environment variables. Please ensure VITE_SUPABASE_URL and VITE_SUPABASE_PUBLISHABLE_KEY are set in your environment.");
+      return null;
+    }
+    const client = createClient(supabaseUrl, supabaseKey);
+    return client;
+  }, [supabaseUrl, supabaseKey]);
+  const contextValue = {
+    isPublicPage: true,
+    supabase,
+    appName: appName || null,
+    environment: {
+      supabaseUrl,
+      supabaseKey
+    }
+  };
+  return /* @__PURE__ */ jsx(PublicPageContext.Provider, { value: contextValue, children: /* @__PURE__ */ jsx(ErrorBoundary2, { componentName: "PublicPageProvider", children }) });
+}
 
-export { AddressField, Avatar, Badge, Calendar, ContextSelector, FileDisplay, FileUpload, Footer, Form, FormField, Header, LoginForm, NavigationMenu, PaceAppLayout, PaceLoginPage, PasswordChangeForm, ProtectedRoute, PublicPageFooter, PublicPageHeader, PublicPageLayout, SessionRestorationLoader, Switch, Tabs, TabsContent, TabsList, TabsTrigger, Textarea, Toast, ToastAction, ToastClose, ToastDescription, ToastProvider, ToastTitle, ToastViewport, Toaster, UserMenu, useFileReference, useFileReferenceById, useFileReferenceForRecord, useFilesByCategory };
+export { AddressField, AppSwitcher, Avatar, Badge, Calendar, ContextSelector, DEFAULT_APP_PORT_MAP, DatePickerWithTimezone, ErrorBoundary2 as ErrorBoundary, ErrorBoundaryProvider, FileDisplay, FileUpload, Footer, Form, FormField, Header, LoginForm, NavigationMenu, PaceAppLayout, PaceLoginPage, PasswordChangeForm, ProtectedRoute, PublicPageFooter, PublicPageHeader, PublicPageLayout, PublicPageProvider, SessionRestorationLoader, Switch, Tabs, TabsContent, TabsList, TabsTrigger, Textarea, Toast, ToastAction, ToastClose, ToastDescription, ToastProvider, ToastTitle, ToastViewport, Toaster, UserMenu, buildAppUrl, getAllAppPorts, getAppPort, useAccessibleApps, useFileReference, useFileReferenceById, useFileReferenceForRecord, useFilesByCategory };