config app.jsx

LL08-MathematicalModelling-dowell · Dec 5, 2023 · e775530 · e775530
1 parent d180c2f
commit e775530
Show file tree

Hide file tree

Showing 8 changed files with 399 additions and 273 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -46,7 +46,6 @@ jobs:
         with:
           # Upload dist repository
           path: './dist'
-      - name: Build
-        run: npm run build
-      - name: Add 404.html
-        run: cp 404.html dist/404.html
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1
diff --git a/404.html b/404.html
diff --git a/index.html b/index.html
@@ -12,13 +12,5 @@
   <body>
     <div id="root"></div>
     <script type="module" src="/src/main.jsx"></script>
-    <!-- <script>
-      (function(){
-        if (sessionStorage.redirect) {
-          history.replaceState(null, null, sessionStorage.redirect);
-          delete sessionStorage.redirect;
-        }
-      })();
-    </script> -->
   </body>
 </html>
diff --git a/src/App.jsx b/src/App.jsx
@@ -1,4 +1,176 @@
 
+// // import { Suspense } from 'react';
+// // import 'react-toastify/dist/ReactToastify.min.css';
+// // import Navbar from './components/Navbar';
+// // import Fallback from './components/Fallback';
+// // import { Outlet } from "react-router";
+
+
+
+// // function App() {
+// //   return (
+// //     <>
+// //       <div>
+// //         <Suspense fallback={<Fallback />}>
+// //           <Navbar />
+// //          <Outlet/>
+// //         </Suspense>
+// //       </div>
+// //     </>
+// //   );
+// // }
+
+// // export default App;
+// import { Routes, Route } from 'react-router-dom';
+// import { Suspense } from 'react';
+// import { ToastContainer } from 'react-toastify';
+// import 'react-toastify/dist/ReactToastify.min.css';
+
+// import Home from './pages/Home';
+// import Navbar from './components/Navbar';
+// import Fallback from './components/Fallback';
+// import { RankingScale, CreateRankingScale, UpdateRankingScale, RankingScaleSettings } from './pages/scales/ranking-scale';
+// import {
+//   NPSScale,
+//   CreateNPSScale,
+//   NPSScaleSettings,
+//   UpdateNPSScale,
+// } from './pages/scales/nps-scale';
+// import {
+//   PairedScale,
+//   CreatePCScaleSettings,
+//   UpdatePCScaleSettings,
+//   SinglePCScaleSettings,
+//   CreatePCResponse,
+// } from './pages/scales/pc-scale';
+// import {
+//   PerceptualScale,
+//   CreatePerceptualScaleSettings,
+//   SinglePerceptualScaleSettings,
+//   UpdatePMSSettings,
+// } from './pages/scales/pm-scale';
+
+// import { StapleScale, CreateStapleScale, StapleScaleSettings, UpdateStapleScale } from './pages/scales/staple-scale';
+// import { NPSLiteScale, CreateNpsLiteScale, NpsLiteSettings, UpdateNpsLite } from './pages/scales/nps-lite-scale';
+
+// function App() {
+//   return (
+//     <>
+//       <div>
+//         <ToastContainer />
+//         <Suspense fallback={<Fallback />}>
+//           <Navbar />
+//           <FetchUserContextProvider>
+//             <Routes>
+//                 <Route exact path="/" element={<Home />} />
+//                 {/* <Route path="/available-scales" element={<AvailableScales />} /> */}
+//                 <Route exact path="/pc-scale" element={<PairedScale />} />
+//                 <Route
+//                   path="/pm-scale"
+//                   element={<PerceptualScale />}
+//                 />
+//                 <Route path="/ranking-scale" element={<RankingScale />} />
+//                 <Route path="/nps-scale" element={<NPSScale />} />
+
+//                 <Route path="/create-scale" element={<CreateRankingScale />} />
+//                 <Route
+//                   path="/create-paired-scale-settings"
+//                   element={<CreatePCScaleSettings />}
+//                 />
+
+//                 {/* staple scale start */}
+
+//                 <Route
+//                   path="/staple-scale"
+//                   element={<StapleScale />}
+//                 />
+//                 <Route
+//                   path="/create-staple-scale"
+//                   element={<CreateStapleScale />}
+//                 />
+//                 <Route
+//                   path="/staple-scale-settings/:slug"
+//                   element={<StapleScaleSettings />}
+//                 />
+
+
+//                 {/* staple scale end */}
+
+//                 {/* nps lite scale start */}
+//                   <Route
+//                     path="/nps-lite-scale"
+//                     element={<NPSLiteScale />}
+//                   />
+//                   <Route
+//                     path="/create-nps-lite-scale"
+//                     element={<CreateNpsLiteScale />}
+//                   />
+//                   <Route
+//                     path="/update-nps-lite-scale/:slug"
+//                     element={<UpdateNpsLite />}
+//                   />
+//                   <Route
+//                     path="/nps-lite-scale-settings/:slug"
+//                     element={<NpsLiteSettings />}
+//                   />
+//                 {/* nps lite scale end */}
+//                 <Route
+//                   path="/create-perceptual-scale-settings"
+//                   element={<CreatePerceptualScaleSettings />}
+//                 />
+//                 <Route path="/create-nps-scale" element={<CreateNPSScale />} />
+//                 <Route
+//                   path="/ranking-scale-settings/:slug"
+//                   element={<RankingScaleSettings />}
+//                 />
+//                 <Route
+//                   path="/create-scale-response/:id"
+//                   element={<CreatePCResponse />}
+//                 />
+//                 <Route
+//                   path="/single-scale-settings/:id"
+//                   element={<SinglePCScaleSettings />}
+//                 />
+//                 <Route
+//                   path="/single-perceptual-scale-settings/:id"
+//                   element={<SinglePerceptualScaleSettings />}
+//                 />
+//                 <Route
+//                   path="/nps-scale-settings/:slug"
+//                   element={<NPSScaleSettings />}
+//                 />
+//                 <Route
+//                   path="/update-paired-scale-settings/:id"
+//                   element={<UpdatePCScaleSettings />}
+//                 />
+//                 <Route
+//                   path="/update-perceptual-scale-settings/:id"
+//                   element={<UpdatePMSSettings />}
+//                 />
+//                 <Route
+//                   path="/update-ranking-scale/:slug"
+//                   element={<UpdateRankingScale />}
+//                 />
+//                 <Route
+//                   path="/update-nps-scale/:slug"
+//                   element={<UpdateNPSScale />}
+//                 />
+//                 <Route
+//                   path="/update-staple-scale/:slug"
+//                   element={<UpdateStapleScale />}
+//                 />
+//               </Routes>
+//           </FetchUserContextProvider>
+//         </Suspense>
+//       </div>
+//     </>
+//   );
+// }
+
+// export default App;
+
+
+
 // import { Suspense } from 'react';
 // import 'react-toastify/dist/ReactToastify.min.css';
 // import Navbar from './components/Navbar';
@@ -21,49 +193,53 @@
 // }
 
 // export default App;
-import { Routes, Route } from 'react-router-dom';
-import { Suspense } from 'react';
+// import { Routes, Route } from 'react-router-dom';
+// import { Suspense } from 'react';
 import { ToastContainer } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.min.css';
 import { FetchUserContextProvider } from './contexts/fetchUserContext';
-import Home from './pages/Home';
+// import Home from './pages/Home';
 import Navbar from './components/Navbar';
-import Fallback from './components/Fallback';
-import { RankingScale, CreateRankingScale, UpdateRankingScale, RankingScaleSettings } from './pages/scales/ranking-scale';
+// import Fallback from './components/Fallback';
+// import { RankingScale, CreateRankingScale, UpdateRankingScale, RankingScaleSettings } from './pages/scales/ranking-scale';
 import {
-  NPSScale,
-  CreateNPSScale,
-  NPSScaleSettings,
-  UpdateNPSScale,
+  // NPSScale,
+  // CreateNPSScale,
+  // NPSScaleSettings,
+  // UpdateNPSScale,
 } from './pages/scales/nps-scale';
 import {
-  PairedScale,
-  CreatePCScaleSettings,
-  UpdatePCScaleSettings,
-  SinglePCScaleSettings,
-  CreatePCResponse,
+  // PairedScale,
+  // CreatePCScaleSettings,
+  // UpdatePCScaleSettings,
+  // SinglePCScaleSettings,
+  // CreatePCResponse,
 } from './pages/scales/pc-scale';
 import {
-  PerceptualScale,
-  CreatePerceptualScaleSettings,
-  SinglePerceptualScaleSettings,
-  UpdatePMSSettings,
+  // PerceptualScale,
+//   CreatePerceptualScaleSettings,
+//   SinglePerceptualScaleSettings,
+//   UpdatePMSSettings,
 } from './pages/scales/pm-scale';
 
-import { StapleScale, CreateStapleScale, StapleScaleSettings, UpdateStapleScale } from './pages/scales/staple-scale';
-import { NPSLiteScale, CreateNpsLiteScale, NpsLiteSettings, UpdateNpsLite } from './pages/scales/nps-lite-scale';
+// import { StapleScale, CreateStapleScale, StapleScaleSettings, UpdateStapleScale } from './pages/scales/staple-scale';
+// import { NPSLiteScale, CreateNpsLiteScale, NpsLiteSettings, UpdateNpsLite } from './pages/scales/nps-lite-scale';
+import { Outlet } from "react-router-dom";
 
 function App() {
   return (
     <>
       <div>
         <ToastContainer />
-        <Suspense fallback={<Fallback />}>
+        {/* <Suspense fallback={<Fallback />}> */}
           <Navbar />
+          {/* <Home /> */}
           <FetchUserContextProvider>
-            <Routes>
-                <Route exact path="/" element={<Home />} />
-                {/* <Route path="/available-scales" element={<AvailableScales />} /> */}
+          <Outlet />
+          </FetchUserContextProvider>
+
+            {/* <Routes> */}
+                {/* <Route exact path="/" element={<Home />} />
                 <Route exact path="/pc-scale" element={<PairedScale />} />
                 <Route
                   path="/pm-scale"
@@ -76,11 +252,11 @@ function App() {
                 <Route
                   path="/create-paired-scale-settings"
                   element={<CreatePCScaleSettings />}
-                />
+                /> */}
 
                 {/* staple scale start */}
 
-                <Route
+                {/* <Route
                   path="/staple-scale"
                   element={<StapleScale />}
                 />
@@ -91,13 +267,13 @@ function App() {
                 <Route
                   path="/staple-scale-settings/:slug"
                   element={<StapleScaleSettings />}
-                />
+                /> */}
 
 
                 {/* staple scale end */}
 
                 {/* nps lite scale start */}
-                  <Route
+                  {/* <Route
                     path="/nps-lite-scale"
                     element={<NPSLiteScale />}
                   />
@@ -112,9 +288,9 @@ function App() {
                   <Route
                     path="/nps-lite-scale-settings/:slug"
                     element={<NpsLiteSettings />}
-                  />
+                  /> */}
                 {/* nps lite scale end */}
-                <Route
+                {/* <Route
                   path="/create-perceptual-scale-settings"
                   element={<CreatePerceptualScaleSettings />}
                 />
@@ -159,9 +335,10 @@ function App() {
                   path="/update-staple-scale/:slug"
                   element={<UpdateStapleScale />}
                 />
-              </Routes>
-          </FetchUserContextProvider>
-        </Suspense>
+               */}
+              {/* </Routes> */}
+
+        {/* </Suspense> */}
       </div>
     </>
   );

diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx
@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
 import dowellLogo from '../assets/dowell-logo.png';
 import { useSearchParams } from 'react-router-dom';
+
 const Navbar = () => {
   const [searchParams] = useSearchParams();
   const [sessionId, setSessionId] = useState('');
@@ -10,15 +11,17 @@ const Navbar = () => {
       searchParams.get('session_id') || sessionStorage.getItem('session_id');
     setSessionId(session_id);
   }, [searchParams]);
+
   return (
     <nav className="flex items-center justify-between w-full p-4 bg-[#1A8753] md:justify-center">
       <div className="md:flex-[0.5] flex-initial justify-center items-center">
         <Link
-          to={
-            import.meta.env.DEV
-              ? `http://localhost:3000/?session_id=${sessionId}`
-              : `https://ll08-mathematicalmodelling-dowell.github.io/100035-DowellScale-Function/?session_id=${sessionId}`
-          }
+          to={`/100035-DowellScale-Function/?session_id=${sessionId}`}
+          // to={
+          //   import.meta.env.DEV
+          //     ? `http://localhost:3000/?session_id=${sessionId}`
+          //     : `https://ll08-mathematicalmodelling-dowell.github.io/100035-DowellScale-Function/?session_id=${sessionId}`
+          // }
           className="inline"
         >
           <img