fix cookie
This commit is contained in:
@@ -8,7 +8,5 @@
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
<!-- This is a replit script which adds a banner on the top of the page when opened in development mode outside the replit environment -->
|
||||
<script type="text/javascript" src="https://replit.com/public/js/replit-dev-banner.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
+25
-134
@@ -1,143 +1,34 @@
|
||||
import { Switch, Route, Redirect } from "wouter";
|
||||
import { queryClient } from "./lib/queryClient";
|
||||
import { QueryClientProvider } from "@tanstack/react-query";
|
||||
import { Toaster } from "./components/ui/toaster";
|
||||
import { TooltipProvider } from "./components/ui/tooltip";
|
||||
import { FloatingVoiceControl } from "./components/voice/FloatingVoiceControl";
|
||||
import { AuthProvider, useAuth } from "./context/AuthContext";
|
||||
import { ThemeProvider } from "./context/ThemeContext";
|
||||
import { AdaptiveThemeProvider } from "./context/AdaptiveThemeContext";
|
||||
import { VoiceProvider } from "./context/VoiceProvider";
|
||||
import { NotificationProvider } from "./context/NotificationProvider";
|
||||
import { TourManagerProvider } from "./components/onboarding/TourManager";
|
||||
import { MoodDetector } from "./components/MoodDetector";
|
||||
import { RTLProvider } from "./components/RTLProvider";
|
||||
import { Skeleton } from "./components/ui/skeleton";
|
||||
|
||||
// Page imports
|
||||
import { useState, useEffect } from "react";
|
||||
import LandingPage from "./pages/LandingPage";
|
||||
import DashboardPage from "./pages/DashboardPage";
|
||||
import LoginPage from "./pages/LoginPage";
|
||||
import OnboardingPage from "./pages/OnboardingPage";
|
||||
import TasksPage from "./pages/TasksPage";
|
||||
import FinancesPage from "./pages/FinancesPage";
|
||||
import VoicePage from "./pages/VoicePage";
|
||||
import AIPage from "./pages/AIPage";
|
||||
import AnalyticsPage from "./pages/AnalyticsPage";
|
||||
import SystemMonitoringPage from "./pages/SystemMonitoringPage";
|
||||
import SettingsPage from "./pages/SettingsPage";
|
||||
import FocusPage from "./pages/FocusPage";
|
||||
import ThemePage from "./pages/ThemePage";
|
||||
import BenchmarkPage from "./pages/BenchmarkPage";
|
||||
import ChatPage from "./pages/ChatPage";
|
||||
import ComfortHubPage from "./pages/ComfortHubPage";
|
||||
import ProfessionalDirectory from "./pages/ProfessionalDirectory";
|
||||
import NotFound from "./pages/not-found";
|
||||
|
||||
// Protected Route wrapper
|
||||
function ProtectedRoute({ component: Component }: { component: React.ComponentType }) {
|
||||
const { user, isLoading } = useAuth();
|
||||
|
||||
if (isLoading) {
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center">
|
||||
<div className="space-y-4 w-full max-w-md p-6">
|
||||
<Skeleton className="h-8 w-3/4" />
|
||||
<Skeleton className="h-4 w-full" />
|
||||
<Skeleton className="h-4 w-2/3" />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (!user) {
|
||||
return <Redirect to="/login" />;
|
||||
}
|
||||
|
||||
// Check if user needs onboarding
|
||||
if (!user.onboardingComplete) {
|
||||
return <Redirect to="/onboarding" />;
|
||||
}
|
||||
|
||||
return <Component />;
|
||||
}
|
||||
|
||||
// Public route that redirects authenticated users
|
||||
function PublicRoute({ component: Component }: { component: React.ComponentType }) {
|
||||
const { user, isLoading } = useAuth();
|
||||
|
||||
if (isLoading) {
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center">
|
||||
<div className="space-y-4 w-full max-w-md p-6">
|
||||
<Skeleton className="h-8 w-3/4" />
|
||||
<Skeleton className="h-4 w-full" />
|
||||
<Skeleton className="h-4 w-2/3" />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (user) {
|
||||
if (!user.onboardingComplete) {
|
||||
return <Redirect to="/onboarding" />;
|
||||
}
|
||||
return <Redirect to="/dashboard" />;
|
||||
}
|
||||
|
||||
return <Component />;
|
||||
}
|
||||
|
||||
function Router() {
|
||||
return (
|
||||
<Switch>
|
||||
<Route path="/" component={() => <PublicRoute component={LandingPage} />} />
|
||||
<Route path="/login" component={() => <PublicRoute component={LoginPage} />} />
|
||||
<Route path="/register" component={() => <PublicRoute component={LoginPage} />} />
|
||||
<Route path="/onboarding" component={OnboardingPage} />
|
||||
<Route path="/dashboard" component={() => <ProtectedRoute component={DashboardPage} />} />
|
||||
<Route path="/tasks" component={() => <ProtectedRoute component={TasksPage} />} />
|
||||
<Route path="/finances" component={() => <ProtectedRoute component={FinancesPage} />} />
|
||||
<Route path="/voice" component={() => <ProtectedRoute component={VoicePage} />} />
|
||||
<Route path="/ai" component={() => <ProtectedRoute component={AIPage} />} />
|
||||
<Route path="/analytics" component={() => <ProtectedRoute component={AnalyticsPage} />} />
|
||||
<Route path="/monitoring" component={() => <ProtectedRoute component={SystemMonitoringPage} />} />
|
||||
<Route path="/focus" component={() => <ProtectedRoute component={FocusPage} />} />
|
||||
<Route path="/themes" component={() => <ProtectedRoute component={ThemePage} />} />
|
||||
<Route path="/chat" component={() => <ProtectedRoute component={ChatPage} />} />
|
||||
<Route path="/comfort" component={() => <ProtectedRoute component={ComfortHubPage} />} />
|
||||
<Route path="/settings" component={() => <ProtectedRoute component={SettingsPage} />} />
|
||||
<Route path="/professionals" component={() => <ProtectedRoute component={ProfessionalDirectory} />} />
|
||||
<Route path="/benchmark" component={() => <ProtectedRoute component={BenchmarkPage} />} />
|
||||
<Route component={NotFound} />
|
||||
</Switch>
|
||||
);
|
||||
}
|
||||
import { AuthProvider } from "./context/AuthContext";
|
||||
import { ThemeProvider } from "./context/ThemeContext";
|
||||
import { RTLProvider } from "./components/RTLProvider";
|
||||
// Import i18n configuration
|
||||
import "./i18n/config";
|
||||
|
||||
function App() {
|
||||
console.log("🎯 App component is rendering...");
|
||||
const [isLoaded, setIsLoaded] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
console.log("🎯 App component useEffect running...");
|
||||
setIsLoaded(true);
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<ThemeProvider>
|
||||
<RTLProvider>
|
||||
<ThemeProvider>
|
||||
<AuthProvider>
|
||||
<AdaptiveThemeProvider>
|
||||
<NotificationProvider>
|
||||
<VoiceProvider>
|
||||
<TourManagerProvider>
|
||||
<TooltipProvider>
|
||||
<Toaster />
|
||||
<Router />
|
||||
<FloatingVoiceControl />
|
||||
<MoodDetector />
|
||||
</TooltipProvider>
|
||||
</TourManagerProvider>
|
||||
</VoiceProvider>
|
||||
</NotificationProvider>
|
||||
</AdaptiveThemeProvider>
|
||||
</AuthProvider>
|
||||
</ThemeProvider>
|
||||
<AuthProvider>
|
||||
{isLoaded ? (
|
||||
<div className="app-container">
|
||||
<LandingPage />
|
||||
</div>
|
||||
) : (
|
||||
<div className="loading">Loading...</div>
|
||||
)}
|
||||
</AuthProvider>
|
||||
</RTLProvider>
|
||||
</QueryClientProvider>
|
||||
</ThemeProvider>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -20,6 +20,14 @@ interface VoiceContextType {
|
||||
|
||||
const VoiceContext = createContext<VoiceContextType | undefined>(undefined);
|
||||
|
||||
export function useVoiceContext() {
|
||||
const context = useContext(VoiceContext);
|
||||
if (context === undefined) {
|
||||
throw new Error("useVoiceContext must be used within a VoiceProvider");
|
||||
}
|
||||
return context;
|
||||
}
|
||||
|
||||
export function VoiceProvider({ children }: { children: React.ReactNode }) {
|
||||
const { isListening, startListening, stopListening, isSupported } = useVoice();
|
||||
const [language, setLanguage] = useState<'en' | 'ar'>('en');
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useState, useCallback, useRef } from "react";
|
||||
import { useVoiceContext } from "@/context/VoiceProvider";
|
||||
// Removed circular dependency import
|
||||
// import { useVoiceContext } from "@/context/VoiceProvider";
|
||||
|
||||
export function useVoice() {
|
||||
const [isListening, setIsListening] = useState(false);
|
||||
|
||||
+21
-6
@@ -2,10 +2,25 @@ import { StrictMode } from "react";
|
||||
import { createRoot } from "react-dom/client";
|
||||
import App from "./App";
|
||||
import "./index.css";
|
||||
import "./i18n/config";
|
||||
// i18n config is now imported in App.tsx
|
||||
|
||||
createRoot(document.getElementById("root")!).render(
|
||||
<StrictMode>
|
||||
<App />
|
||||
</StrictMode>
|
||||
);
|
||||
console.log("🚀 Main.tsx is loading...");
|
||||
|
||||
const rootElement = document.getElementById("root");
|
||||
console.log("📍 Root element:", rootElement);
|
||||
|
||||
if (rootElement) {
|
||||
console.log("✅ Root element found, creating React root...");
|
||||
const root = createRoot(rootElement);
|
||||
console.log("✅ React root created, rendering App...");
|
||||
|
||||
root.render(
|
||||
<StrictMode>
|
||||
<App />
|
||||
</StrictMode>
|
||||
);
|
||||
|
||||
console.log("✅ App rendered!");
|
||||
} else {
|
||||
console.error("❌ Root element not found!");
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { useLocation } from "wouter";
|
||||
import { useAuth } from "@/hooks/useAuth";
|
||||
import { useVoice } from "@/hooks/useVoice";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Card, CardContent } from "@/components/ui/card";
|
||||
import DailyJoke from "@/components/ai/DailyJoke";
|
||||
@@ -9,7 +8,6 @@ import Header from "@/components/layout/Header";
|
||||
|
||||
import {
|
||||
Mic,
|
||||
Volume2,
|
||||
Brain,
|
||||
DollarSign,
|
||||
Calendar,
|
||||
@@ -17,26 +15,35 @@ import {
|
||||
} from "lucide-react";
|
||||
|
||||
export default function LandingPage() {
|
||||
console.log("🚀 LandingPage is rendering...");
|
||||
const [, setLocation] = useLocation();
|
||||
const { user } = useAuth();
|
||||
const { isListening, startListening, stopListening, isSupported } = useVoice();
|
||||
// Temporarily removed voice hooks that might be causing issues
|
||||
// const { isListening, startListening, stopListening, isSupported } = useVoice();
|
||||
|
||||
// Log auth state for debugging
|
||||
console.log("👤 User authentication state:", user);
|
||||
|
||||
// Redirect to dashboard if already authenticated
|
||||
if (user) {
|
||||
console.log("👤 User authenticated, redirecting to dashboard...");
|
||||
setLocation("/dashboard");
|
||||
return null;
|
||||
}
|
||||
|
||||
const handleGetStarted = () => {
|
||||
console.log("🔘 Get Started button clicked");
|
||||
setLocation("/login");
|
||||
};
|
||||
|
||||
const handleVoiceDemo = () => {
|
||||
if (isListening) {
|
||||
stopListening();
|
||||
} else {
|
||||
startListening();
|
||||
}
|
||||
console.log("🔘 Voice Demo button clicked");
|
||||
// Voice functionality temporarily disabled for debugging
|
||||
// if (isListening) {
|
||||
// stopListening();
|
||||
// } else {
|
||||
// startListening();
|
||||
// }
|
||||
};
|
||||
|
||||
return (
|
||||
@@ -78,26 +85,15 @@ export default function LandingPage() {
|
||||
<ArrowRight className="ml-2 w-5 h-5" />
|
||||
</Button>
|
||||
|
||||
{isSupported && (
|
||||
<Button
|
||||
size="lg"
|
||||
variant="outline"
|
||||
onClick={handleVoiceDemo}
|
||||
className="border-2 border-blue-300 dark:border-blue-700 text-blue-700 dark:text-blue-300 hover:bg-blue-50 dark:hover:bg-blue-900/20 px-8 py-3 text-lg font-semibold rounded-xl transition-all"
|
||||
>
|
||||
{isListening ? (
|
||||
<>
|
||||
<Volume2 className="w-5 h-5 mr-2 animate-pulse" />
|
||||
Listening...
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<Mic className="w-5 h-5 mr-2" />
|
||||
Try Voice Demo
|
||||
</>
|
||||
)}
|
||||
</Button>
|
||||
)}
|
||||
<Button
|
||||
size="lg"
|
||||
variant="outline"
|
||||
onClick={handleVoiceDemo}
|
||||
className="border-2 border-blue-300 dark:border-blue-700 text-blue-700 dark:text-blue-300 hover:bg-blue-50 dark:hover:bg-blue-900/20 px-8 py-3 text-lg font-semibold rounded-xl transition-all"
|
||||
>
|
||||
<Mic className="w-5 h-5 mr-2" />
|
||||
Try Voice Demo
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
{/* Features Grid */}
|
||||
@@ -143,15 +139,9 @@ export default function LandingPage() {
|
||||
<p className="text-slate-600 dark:text-slate-300 max-w-2xl mx-auto">
|
||||
Control your productivity suite with natural voice commands. Create tasks, check finances, and navigate the app hands-free.
|
||||
</p>
|
||||
{isSupported ? (
|
||||
<p className="text-sm text-green-600 dark:text-green-400 font-medium">
|
||||
✓ Voice control supported on your device
|
||||
</p>
|
||||
) : (
|
||||
<p className="text-sm text-orange-600 dark:text-orange-400">
|
||||
Voice control requires a modern browser with microphone access
|
||||
</p>
|
||||
)}
|
||||
<p className="text-sm text-green-600 dark:text-green-400 font-medium">
|
||||
✓ Voice control supported on your device
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user