Merge branch 'main' into feature/edit-streak-date

Author: Awnder

.github/workflows/greetings.yml

@@ -0,0 +1,16 @@
+name: Greetings
+
+on: [pull_request_target, issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        issue-message: "Welcome to the repo! Thanks for stopping by 🚀🚀🚀"
+        pr-message: "Almost at your first merged PR here! Super exciting 🥳🥳🥳"

README.md

@@ -25,10 +25,21 @@ This project is built with modern web technologies:
 
 - 🔒 **Secure Authentication**: User account creation and login
 - 📊 **Progress Analytics**: Track your journey with visual analytics
-- 🧘 **Guided Meditations**: Access specialized meditations
+- 🧘 **Guided Meditations**: Access specialized meditations and journal prompts 
 - 🆘 **Emergency Support**: Panic button for immediate help
 - 🌍 **Global Community**: Connect with others on the same journey
-- 🔐 **Privacy-Focused**: All data is private and anonymized
+
+
+## Contributing
+
+Contributions are welcome! Please feel free to submit a Pull Request.
+
+1. Fork the repository
+2. Create your feature branch (`git checkout -b feature/amazing-feature`)
+3. Commit your changes (`git commit -m 'Add some amazing feature'`)
+4. Push to the branch (`git push origin feature/amazing-feature`)
+5. Open a Pull Request
+
 
 ## Getting Started
 
@@ -72,8 +83,10 @@ This project is built with modern web technologies:
    ```
 
    You can use the `.env.sample` file as a template.
+**Note: Enable email/pwd authentication in your firebase console.**
 
-5. Start the development server:
+
+6. Start the development server:
    ```bash
    npm run dev
    # or
@@ -82,7 +95,7 @@ This project is built with modern web technologies:
    pnpm dev
    ```
 
-6. Open your browser and navigate to `http://localhost:8080`
+7. Open your browser and navigate to `http://localhost:8080`
 
 ### Building for Production
 
@@ -119,13 +132,3 @@ This application uses Firebase Authentication for user management. Users can:
 - Log in with existing credentials
 - Access protected routes (dashboard, profile, etc.)
 - Admin users have access to additional 
-
-## Contributing
-
-Contributions are welcome! Please feel free to submit a Pull Request.
-
-1. Fork the repository
-2. Create your feature branch (`git checkout -b feature/amazing-feature`)
-3. Commit your changes (`git commit -m 'Add some amazing feature'`)
-4. Push to the branch (`git push origin feature/amazing-feature`)
-5. Open a Pull Request

package-lock.json

@@ -42,6 +42,7 @@
     "@tanstack/react-query": "^5.56.2",
     "@types/leaflet": "^1.9.8",
     "@vercel/analytics": "^1.5.0",
+    "@vercel/speed-insights": "^1.2.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",
@@ -72,7 +73,7 @@
     "@eslint/js": "^9.9.0",
     "@tailwindcss/typography": "^0.5.15",
     "@types/node": "^22.5.5",
-    "@types/react": "^18.3.3",
+    "@types/react": "^18.3.19",
     "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "autoprefixer": "^10.4.20",

package.json

@@ -3,14 +3,15 @@ import { Toaster } from "@/components/ui/toaster";
 import { Toaster as Sonner } from "@/components/ui/sonner";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom";
+import { BrowserRouter, Routes, Route } from "react-router-dom";
 import { AuthProvider } from "./utils/auth";
 import AuthWrapper from "./components/AuthWrapper";
 
 // Pages
 import Index from "./pages/Index";
 import Login from "./pages/Login";
 import Register from "./pages/Register";
+import ForgotPassword from "./pages/ForgotPassword";
 import Dashboard from "./pages/Dashboard";
 import Community from "./pages/Community";
 import Meditations from "./pages/Meditations";
@@ -21,6 +22,8 @@ import NotFound from "./pages/NotFound";
 import Navbar from "./components/Navbar";
 import Profile from "./pages/Profile";
 import Goodbye from "./pages/Goodbye";
+import Journal from "./pages/Journal";
+import JournalEntries from "./pages/JournalEntries";
 
 const queryClient = new QueryClient();
 
@@ -39,76 +42,93 @@ const App = () => (
                 <Route path="/" element={<Index />} />
                 <Route path="/login" element={<Login />} />
                 <Route path="/register" element={<Register />} />
+                <Route path="/forgot-password" element={<ForgotPassword />} />
 
                 {/* Protected member routes */}
-                <Route 
-                  path="/dashboard" 
+                <Route
+                  path="/dashboard"
                   element={
                     <AuthWrapper requireAuth>
                       <Dashboard />
                     </AuthWrapper>
-                  } 
+                  }
                 />
-                <Route 
-                  path="/profile" 
+                <Route
+                  path="/profile"
                   element={
                     <AuthWrapper requireAuth>
                       <Profile />
                     </AuthWrapper>
-                  } 
+                  }
                 />
-                <Route 
-                  path="/community" 
+                <Route
+                  path="/community"
                   element={
                     <AuthWrapper requireAuth>
                       <Community />
                     </AuthWrapper>
-                  } 
+                  }
                 />
-                <Route 
-                  path="/meditations" 
+                <Route
+                  path="/meditations"
                   element={
                     <AuthWrapper requireAuth>
                       <Meditations />
                     </AuthWrapper>
-                  } 
+                  }
                 />
-                <Route 
-                  path="/analytics" 
+                <Route
+                  path="/analytics"
                   element={
                     <AuthWrapper requireAuth>
                       <Analytics />
                     </AuthWrapper>
-                  } 
+                  }
                 />
-                <Route 
-                  path="/map" 
+                <Route
+                  path="/map"
                   element={
                     <AuthWrapper requireAuth>
                       <Map />
                     </AuthWrapper>
-                  } 
+                  }
+                />
+                <Route
+                  path="/journal"
+                  element={
+                    <AuthWrapper requireAuth>
+                      <Journal />
+                    </AuthWrapper>
+                  }
+                />
+                <Route
+                  path="/journal-entries"
+                  element={
+                    <AuthWrapper requireAuth>
+                      <JournalEntries />
+                    </AuthWrapper>
+                  }
                 />
 
                 {/* Admin routes */}
-                <Route 
-                  path="/admin" 
+                <Route
+                  path="/admin"
                   element={
                     <AuthWrapper requireAuth requireAdmin>
                       <Admin />
                     </AuthWrapper>
-                  } 
+                  }
                 />
 
-<Route 
-                  path="/goodbye" 
+                <Route
+                  path="/goodbye"
                   element={
                     <AuthWrapper requireAuth>
                       <Goodbye />
                     </AuthWrapper>
-                  } 
+                  }
                 />
-                
+
                 {/* Catch-all route */}
                 <Route path="*" element={<NotFound />} />
               </Routes>
@@ -120,4 +140,4 @@ const App = () => (
   </QueryClientProvider>
 );
 
-export default App;
+export default App;