Merge pull request #156 from COS301-SE-2024/develop

Develop
COS301-SE-2024 · Oct 18, 2024 · 22f5df6 · 22f5df6
2 parents 31e15b3 + e1f28ca
commit 22f5df6
Show file tree

Hide file tree

Showing 9 changed files with 3,915 additions and 1,047 deletions.
diff --git a/ai-trip-creator/package-lock.json b/ai-trip-creator/package-lock.json
diff --git a/ai-trip-creator/package.json b/ai-trip-creator/package.json
@@ -10,7 +10,7 @@
     "@nextui-org/react": "^2.4.1",
     "axios": "^1.7.2",
     "chart.js": "^4.4.3",
-    "firebase": "^10.12.2",
+    "firebase": "^10.14.1",
     "mongoose": "^8.4.1",
     "openai": "^4.65.0",
     "qs": "^6.13.0",

diff --git a/ai-trip-creator/src/App.js b/ai-trip-creator/src/App.js
@@ -159,6 +159,7 @@ import Settings from './components/dashboard/settings';
 import Flights from './components/dashboard/flights';
 import Accommodation from './components/dashboard/accommodation';
 import Help from './components/dashboard/help';
+import SavedItineraries from './components/dashboard/SavedItineraries';
 import Analytics from './components/dashboard/analytics';
 import Itinerary from './components/dashboard/Itinerary';
 import ItineraryForm from './components/dashboard/ItineraryForm';
@@ -213,6 +214,7 @@ const App = () => {
                 <Route path="/activities" element={<Activities />} />
                 <Route path="/help" element={<Help />} />
                 <Route path="/analytics" element={<Analytics />} />
+                <Route path="/SavedItineraries" element={<SavedItineraries/>}/>
                 <Route
                   path="/Itinerary"
                   element={