Merge pull request #11 from Nickz22/terrytest

Terrytest
Nickz22 · Aug 25, 2024 · a0a2df0 · a0a2df0
2 parents 0ec57ac + 03fcae7
commit a0a2df0
Show file tree

Hide file tree

Showing 11 changed files with 974 additions and 602 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,9 @@ client/src/.DS_Store
 client/.env
 server/.env
 flask_session
+.vscode/launch.json
+server/.vscode/launch.json
+server/.vscode/settings.json
+supabase/.gitignore
+supabase/config.toml
+.vscode/launch.json
diff --git a/client/src/components/MainContent.js b/client/src/components/MainContent.js
@@ -2,16 +2,17 @@ import React from "react";
 import { Routes, Route } from "react-router-dom";
 import { Box } from "@mui/material";
 import Prospecting from "../pages/Prospecting/Prospecting";
-import Settings from "../pages/Settings";
+import Settings from "../pages/Settings/Settings";
 import Account from "../pages/Account";
 import TaskQueryCounter from "../components/TaskQueryCounter/TaskQueryCounter";
+import { SettingsProvider } from "src/pages/Settings/SettingProvider";
 
 const MainContent = () => {
   return (
     <Box flex={1} p={3}>
       <Routes>
         <Route path="prospecting" element={<Prospecting />} />
-        <Route path="settings" element={<Settings />} />
+        <Route path="settings" element={<SettingsProvider><Settings /></SettingsProvider>} />
         <Route path="account" element={<Account />} />
         <Route path="task-query-counter" element={<TaskQueryCounter />} />
       </Routes>