Merge pull request #43 from fabmob/adrien_ui_rework

V2.1 - Community edition
fabmob · Oct 31, 2023 · 89b1ef9 · 89b1ef9
2 parents 72b2f5c + c009b9a
commit 89b1ef9
Show file tree

Hide file tree

Showing 164 changed files with 4,832 additions and 2,787 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/backend/dbwrapper.ts b/backend/dbwrapper.ts
@@ -87,7 +87,7 @@ export function createProject(project: types.Project, owner: string): [string |
         ])
         return [null, res]
     } catch (error: any) {
-        return [error?.code, null]
+                return [error?.code, null]
     }
 }
 
@@ -266,14 +266,22 @@ export function updateProject(id: number, owner: string, project: types.Project,
     }
 }
 export function deleteProject(id: number, owner: string, isAdmin: boolean) {
-    let updateProjectStatusStmt
+    let deleteProjectStmt
     let res
     if (isAdmin) {
-        updateProjectStatusStmt = db.prepare("DELETE FROM Projects where id = ?")
-        res = updateProjectStatusStmt.run([id])
+        deleteProjectStmt = db.prepare("DELETE FROM ProjectSteps where projectId = ?")
+        res = deleteProjectStmt.run([id])
+        deleteProjectStmt = db.prepare("DELETE FROM ProjectSources where projectId = ?")
+        res = deleteProjectStmt.run([id])
+        deleteProjectStmt = db.prepare("DELETE FROM Projects where id = ?")
+        res = deleteProjectStmt.run([id])
     } else {
-        updateProjectStatusStmt = db.prepare("DELETE FROM Projects where id = ? and owner = ?")
-        res = updateProjectStatusStmt.run([id, owner])
+        deleteProjectStmt = db.prepare("DELETE FROM ProjectSteps where projectId = ? and owner = ?")
+        res = deleteProjectStmt.run([id, owner])
+        deleteProjectStmt = db.prepare("DELETE FROM ProjectSources where projectId = ? and owner = ?")
+        res = deleteProjectStmt.run([id, owner])
+        deleteProjectStmt = db.prepare("DELETE FROM Projects where id = ? and owner = ?")
+        res = deleteProjectStmt.run([id, owner])
     }
     return res
 }

diff --git a/backend/index.ts b/backend/index.ts
@@ -193,7 +193,7 @@ app.get('/api/project/:projectId/viz', keycloak.protect(), (req: Request, res: R
     });
 });
 
-// emissions and energy computed for top down checking
+// emissions and energy computed for top-down checking
 app.get('/api/project/:projectId/Inventory/0/emissions', keycloak.protect(), (req: Request, res: Response) => {
     const owner = (req as any).kauth.grant.access_token.content.email
     const isAdmin = (req as any).kauth.grant.access_token.content.realm_access.roles.indexOf("app-admin") !== -1

diff --git a/backend/keycloak-config.ts b/backend/keycloak-config.ts
@@ -6,7 +6,7 @@ let keycloak = <Keycloak.Keycloak><unknown>undefined
 const keycloakConfig = {
   "realm": "myc-convert",
   "bearer-only": true,
-  "auth-server-url": "http://0.0.0.0:8080/",
+  "auth-server-url": "https://idpmyc.fabmob.io:8443/",
   "ssl-required": "external",
   "resource": "node-microservice",
   "confidential-port": 0

diff --git a/data.db b/data.db
diff --git a/frontend/.DS_Store b/frontend/.DS_Store
diff --git a/frontend/public/.DS_Store b/frontend/public/.DS_Store
diff --git a/frontend/public/GitHub-Mark-32px.png → frontend/public/_bin/GitHub-Mark-32px.png b/frontend/public/GitHub-Mark-32px.png → frontend/public/_bin/GitHub-Mark-32px.png
diff --git a/frontend/public/afd.png → frontend/public/_bin/afd.png b/frontend/public/afd.png → frontend/public/_bin/afd.png
diff --git a/frontend/public/duplicate.svg → frontend/public/_bin/duplicate.svg b/frontend/public/duplicate.svg → frontend/public/_bin/duplicate.svg
diff --git a/frontend/public/giz.svg → frontend/public/_bin/giz.svg b/frontend/public/giz.svg → frontend/public/_bin/giz.svg
diff --git a/frontend/public/icon_dl_csv.svg → frontend/public/_bin/icon_dl_csv.svg b/frontend/public/icon_dl_csv.svg → frontend/public/_bin/icon_dl_csv.svg
diff --git a/frontend/public/icon_dl_image.svg → frontend/public/_bin/icon_dl_image.svg b/frontend/public/icon_dl_image.svg → frontend/public/_bin/icon_dl_image.svg
diff --git a/frontend/public/icon_spinner.svg → frontend/public/_bin/icon_spinner.svg b/frontend/public/icon_spinner.svg → frontend/public/_bin/icon_spinner.svg
diff --git a/frontend/public/partners/ADB_logo.png → frontend/public/_bin/partners/ADB_logo.png b/frontend/public/partners/ADB_logo.png → frontend/public/_bin/partners/ADB_logo.png
diff --git a/frontend/public/partners/AFD_logo.png → frontend/public/_bin/partners/AFD_logo.png b/frontend/public/partners/AFD_logo.png → frontend/public/_bin/partners/AFD_logo.png
diff --git a/...tend/public/partners/Ademe2020_GB_RVB.jpg → ...public/_bin/partners/Ademe2020_GB_RVB.jpg b/...tend/public/partners/Ademe2020_GB_RVB.jpg → ...public/_bin/partners/Ademe2020_GB_RVB.jpg
diff --git a/...end/public/partners/BMUV-Logo_en_2022.jpg → ...ublic/_bin/partners/BMUV-Logo_en_2022.jpg b/...end/public/partners/BMUV-Logo_en_2022.jpg → ...ublic/_bin/partners/BMUV-Logo_en_2022.jpg
diff --git a/frontend/public/partners/BMZ-Logo_en.png → ...tend/public/_bin/partners/BMZ-Logo_en.png b/frontend/public/partners/BMZ-Logo_en.png → ...tend/public/_bin/partners/BMZ-Logo_en.png
diff --git a/...ic/partners/Cerema_horizontal_ENG_RVB.jpg → ...in/partners/Cerema_horizontal_ENG_RVB.jpg b/...ic/partners/Cerema_horizontal_ENG_RVB.jpg → ...in/partners/Cerema_horizontal_ENG_RVB.jpg
diff --git a/frontend/public/partners/Codatu_logo.png → ...tend/public/_bin/partners/Codatu_logo.png b/frontend/public/partners/Codatu_logo.png → ...tend/public/_bin/partners/Codatu_logo.png
diff --git a/frontend/public/partners/DT4A_logo.png → frontend/public/_bin/partners/DT4A_logo.png b/frontend/public/partners/DT4A_logo.png → frontend/public/_bin/partners/DT4A_logo.png
diff --git a/frontend/public/partners/ECF_logo.jpg → frontend/public/_bin/partners/ECF_logo.jpg b/frontend/public/partners/ECF_logo.jpg → frontend/public/_bin/partners/ECF_logo.jpg
diff --git a/frontend/public/partners/EUROMED 11.2017.png → .../public/_bin/partners/EUROMED 11.2017.png b/frontend/public/partners/EUROMED 11.2017.png → .../public/_bin/partners/EUROMED 11.2017.png
diff --git a/frontend/public/partners/Euroclima+_logo.jpg → .../public/_bin/partners/Euroclima+_logo.jpg b/frontend/public/partners/Euroclima+_logo.jpg → .../public/_bin/partners/Euroclima+_logo.jpg
diff --git a/...velopment-ebrd-vector-logo-horizontal.png → ...velopment-ebrd-vector-logo-horizontal.png b/...velopment-ebrd-vector-logo-horizontal.png → ...velopment-ebrd-vector-logo-horizontal.png
diff --git a/...blic/partners/EuropeanCommission_logo.jpg → ..._bin/partners/EuropeanCommission_logo.jpg b/...blic/partners/EuropeanCommission_logo.jpg → ..._bin/partners/EuropeanCommission_logo.jpg
diff --git a/...European_Cyclists_Federation_logo.svg.png → ...European_Cyclists_Federation_logo.svg.png b/...European_Cyclists_Federation_logo.svg.png → ...European_Cyclists_Federation_logo.svg.png
diff --git a/frontend/public/partners/FFEM_logo.jpg → frontend/public/_bin/partners/FFEM_logo.jpg b/frontend/public/partners/FFEM_logo.jpg → frontend/public/_bin/partners/FFEM_logo.jpg
diff --git a/frontend/public/partners/GIZ_logo.jpg → frontend/public/_bin/partners/GIZ_logo.jpg b/frontend/public/partners/GIZ_logo.jpg → frontend/public/_bin/partners/GIZ_logo.jpg
diff --git a/frontend/public/partners/GPIT_logo.png → frontend/public/_bin/partners/GPIT_logo.png b/frontend/public/partners/GPIT_logo.png → frontend/public/_bin/partners/GPIT_logo.png
diff --git a/frontend/public/partners/ITDP_logo.png → frontend/public/_bin/partners/ITDP_logo.png b/frontend/public/partners/ITDP_logo.png → frontend/public/_bin/partners/ITDP_logo.png
diff --git a/frontend/public/partners/KfW_logo.png → frontend/public/_bin/partners/KfW_logo.png b/frontend/public/partners/KfW_logo.png → frontend/public/_bin/partners/KfW_logo.png
diff --git a/...public/partners/Marrakech_Partnership.png → ...c/_bin/partners/Marrakech_Partnership.png b/...public/partners/Marrakech_Partnership.png → ...c/_bin/partners/Marrakech_Partnership.png
diff --git a/...rtners/Min_transition_ecologique_logo.jpg → ...rtners/Min_transition_ecologique_logo.jpg b/...rtners/Min_transition_ecologique_logo.jpg → ...rtners/Min_transition_ecologique_logo.jpg
diff --git a/frontend/public/partners/Platforma_logo.png → ...d/public/_bin/partners/Platforma_logo.png b/frontend/public/partners/Platforma_logo.png → ...d/public/_bin/partners/Platforma_logo.png
diff --git a/frontend/public/partners/Ssatp_logo.jpg → frontend/public/_bin/partners/Ssatp_logo.jpg b/frontend/public/partners/Ssatp_logo.jpg → frontend/public/_bin/partners/Ssatp_logo.jpg
diff --git a/frontend/public/partners/SuM4All_logo.png → ...end/public/_bin/partners/SuM4All_logo.png b/frontend/public/partners/SuM4All_logo.png → ...end/public/_bin/partners/SuM4All_logo.png
diff --git a/frontend/public/partners/TUMI_logo.jpg → frontend/public/_bin/partners/TUMI_logo.jpg b/frontend/public/partners/TUMI_logo.jpg → frontend/public/_bin/partners/TUMI_logo.jpg
diff --git a/...ublic/partners/Trufi_association_logo.png → .../_bin/partners/Trufi_association_logo.png b/...ublic/partners/Trufi_association_logo.png → .../_bin/partners/Trufi_association_logo.png
diff --git a/frontend/public/partners/UCLG_logo.jpg → frontend/public/_bin/partners/UCLG_logo.jpg b/frontend/public/partners/UCLG_logo.jpg → frontend/public/_bin/partners/UCLG_logo.jpg
diff --git a/frontend/public/partners/UNHABITAT_logo.jpg → ...d/public/_bin/partners/UNHABITAT_logo.jpg b/frontend/public/partners/UNHABITAT_logo.jpg → ...d/public/_bin/partners/UNHABITAT_logo.jpg
diff --git a/frontend/public/partners/WUPPERTAL_logo.png → ...d/public/_bin/partners/WUPPERTAL_logo.png b/frontend/public/partners/WUPPERTAL_logo.png → ...d/public/_bin/partners/WUPPERTAL_logo.png
diff --git a/frontend/public/asi-approach-diagram.png b/frontend/public/asi-approach-diagram.png
diff --git a/frontend/public/asif-framework-diagram.png b/frontend/public/asif-framework-diagram.png
diff --git a/frontend/public/fonts/.DS_Store b/frontend/public/fonts/.DS_Store
diff --git a/frontend/public/fonts/GravurCondensed/GravurCondensed-Black.otf b/frontend/public/fonts/GravurCondensed/GravurCondensed-Black.otf
diff --git a/frontend/public/fonts/GravurCondensed/GravurCondensed-Bold.otf b/frontend/public/fonts/GravurCondensed/GravurCondensed-Bold.otf
diff --git a/frontend/public/fonts/GravurCondensed/GravurCondensed-Light.otf b/frontend/public/fonts/GravurCondensed/GravurCondensed-Light.otf
diff --git a/frontend/public/fonts/GravurCondensed/GravurCondensed-Regular.otf b/frontend/public/fonts/GravurCondensed/GravurCondensed-Regular.otf
diff --git a/frontend/public/fonts/GravurCondensed/GravurCondensed-Thin.otf b/frontend/public/fonts/GravurCondensed/GravurCondensed-Thin.otf
diff --git a/frontend/public/icons.svg b/frontend/public/icons.svg
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -13,7 +13,7 @@
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mono:300,400,600,700&amp;lang=fr" />
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,600,700&amp;lang=fr" />
-    <title>Mobilise Your City GHG calculator</title>
+    <title>MYC GHG emissions calculator</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/frontend/public/logos/logo-ADB.png b/frontend/public/logos/logo-ADB.png
diff --git a/frontend/public/logos/logo-ADEME.png b/frontend/public/logos/logo-ADEME.png
diff --git a/frontend/public/logos/logo-AFD.png b/frontend/public/logos/logo-AFD.png
diff --git a/frontend/public/logos/logo-Cerema.png b/frontend/public/logos/logo-Cerema.png
diff --git a/frontend/public/logos/logo-Codatu.png b/frontend/public/logos/logo-Codatu.png
diff --git a/frontend/public/logos/logo-DTFA.png b/frontend/public/logos/logo-DTFA.png
diff --git a/frontend/public/logos/logo-EB.png b/frontend/public/logos/logo-EB.png
diff --git a/frontend/public/logos/logo-ECF.png b/frontend/public/logos/logo-ECF.png
diff --git a/frontend/public/logos/logo-EU.png b/frontend/public/logos/logo-EU.png
diff --git a/frontend/public/logos/logo-Euroclima.png b/frontend/public/logos/logo-Euroclima.png
diff --git a/frontend/public/logos/logo-FFEM.png b/frontend/public/logos/logo-FFEM.png
diff --git a/frontend/public/logos/logo-FMECD.png b/frontend/public/logos/logo-FMECD.png
diff --git a/frontend/public/logos/logo-FMENCNSCP.png b/frontend/public/logos/logo-FMENCNSCP.png
diff --git a/frontend/public/logos/logo-GIZ.png b/frontend/public/logos/logo-GIZ.png
diff --git a/frontend/public/logos/logo-GPIT.png b/frontend/public/logos/logo-GPIT.png
diff --git a/frontend/public/ifeu.gif → frontend/public/logos/logo-IFEU.gif b/frontend/public/ifeu.gif → frontend/public/logos/logo-IFEU.gif
diff --git a/frontend/public/logos/logo-ITDP.png b/frontend/public/logos/logo-ITDP.png
diff --git a/frontend/public/logos/logo-KFW.png b/frontend/public/logos/logo-KFW.png
diff --git a/frontend/public/logos/logo-MP.png b/frontend/public/logos/logo-MP.png
diff --git a/frontend/public/logos/logo-MTE.png b/frontend/public/logos/logo-MTE.png
diff --git a/frontend/public/mobiliseyourcity.png → frontend/public/logos/logo-MYC.png b/frontend/public/mobiliseyourcity.png → frontend/public/logos/logo-MYC.png
diff --git a/frontend/public/logos/logo-Platforma.png b/frontend/public/logos/logo-Platforma.png
diff --git a/frontend/public/logos/logo-SMFA.png b/frontend/public/logos/logo-SMFA.png
diff --git a/frontend/public/logos/logo-SSATP.png b/frontend/public/logos/logo-SSATP.png
diff --git a/frontend/public/logos/logo-TRUFI.png b/frontend/public/logos/logo-TRUFI.png
diff --git a/frontend/public/logos/logo-TUMI.png b/frontend/public/logos/logo-TUMI.png
diff --git a/frontend/public/logos/logo-UCLG.png b/frontend/public/logos/logo-UCLG.png
diff --git a/frontend/public/logos/logo-UNH.png b/frontend/public/logos/logo-UNH.png
diff --git a/frontend/public/logos/logo-WI.png b/frontend/public/logos/logo-WI.png
diff --git a/frontend/public/fabmob.png → frontend/public/logos/logo-fabmob.png b/frontend/public/fabmob.png → frontend/public/logos/logo-fabmob.png
diff --git a/frontend/public/logos/logo-github.svg b/frontend/public/logos/logo-github.svg
diff --git a/frontend/public/navbar-toggler-icon.svg b/frontend/public/navbar-toggler-icon.svg
diff --git a/frontend/public/pictures/.DS_Store b/frontend/public/pictures/.DS_Store
diff --git a/frontend/public/pictures/asi-approach-diagram.png b/frontend/public/pictures/asi-approach-diagram.png
diff --git a/frontend/public/pictures/asif-framework-diagram.png b/frontend/public/pictures/asif-framework-diagram.png
diff --git a/frontend/public/pictures/frame-364-1.png b/frontend/public/pictures/frame-364-1.png
diff --git a/frontend/public/pictures/frame-364-2.png b/frontend/public/pictures/frame-364-2.png
diff --git a/frontend/public/pictures/frame-364-3.png b/frontend/public/pictures/frame-364-3.png
diff --git a/frontend/public/pictures/homepage-hero-bg.svg b/frontend/public/pictures/homepage-hero-bg.svg
diff --git a/frontend/public/pictures/homepage-hero-illu-1.png b/frontend/public/pictures/homepage-hero-illu-1.png
diff --git a/frontend/public/pictures/homepage-hero-illu-2.png b/frontend/public/pictures/homepage-hero-illu-2.png
diff --git a/frontend/public/methodology.svg → frontend/public/pictures/methodology.svg b/frontend/public/methodology.svg → frontend/public/pictures/methodology.svg
diff --git a/frontend/public/myc_map.png → frontend/public/pictures/myc_map.png b/frontend/public/myc_map.png → frontend/public/pictures/myc_map.png
diff --git a/frontend/public/myc_map_transparent.png → ...d/public/pictures/myc_map_transparent.png b/frontend/public/myc_map_transparent.png → ...d/public/pictures/myc_map_transparent.png
diff --git a/frontend/public/myc_partners.pdf → frontend/public/pictures/myc_partners.pdf b/frontend/public/myc_partners.pdf → frontend/public/pictures/myc_partners.pdf
diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -1,7 +1,3 @@
-/* .App {
-  text-align: center;
-} */
-
 .App-logo {
   height: 40vmin;
   pointer-events: none;
@@ -26,8 +22,4 @@
 
 .App-link {
   color: #61dafb;
-}
-
-.nav-link {
-  margin: 0 10px 0 10px
 }
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -1,7 +1,6 @@
 import React from 'react'
 import './App.css'
 import Projects from './pages/Projects'
-import CreateProject from './pages/CreateProject'
 import WelcomePage from './pages/WelcomePage'
 import InventoryIntro from './pages/Inventory/InventoryIntro'
 import InventoryStep1 from './pages/Inventory/InventoryStep1'
@@ -38,23 +37,28 @@ import Nav from "./components/Nav"
 import { BrowserRouter, Route, Routes } from "react-router-dom"
 import { ReactKeycloakProvider } from "@react-keycloak/web"
 import keycloak from "./Keycloak"
-import ProjectSummary from './pages/ProjectSummary'
-import ProjectCompare from './pages/ProjectCompare'
+import Project from './pages/Project'
+// import Footer from "./components/Footer"
+
+// adrien test 231021 to reset scroll on every page change
+import ScrollToTop from "./scrollToTop";
+
 
 function App() {
   return (
     <div className="App">
         <ReactKeycloakProvider authClient={keycloak} initOptions={{onLoad: 'check-sso', silentCheckSsoRedirectUri: window.location.origin + '/silent-check-sso.html'}}>
             <BrowserRouter>
+              <ScrollToTop />
                 <Nav />
                 <Routes>
                     <Route path="/" element={<WelcomePage />} />
                     <Route path="/Projects" element={<Projects />} />
-                    <Route path="/createProject" element={<CreateProject />} />
-                    {/* config also using createproject page, as a way of editing project info */}
-                    <Route path="/project/:projectId/config" element={<CreateProject />} />
-                    <Route path="/project/:projectId/edit" element={<ProjectSummary />} />
-                    <Route path="/project/:projectId/viz" element={<ProjectCompare />} />
+                    <Route path="/createProject" element={<Project page="config" />} />
+                    {/* config also using project config page, as a way of editing project info */}
+                    <Route path="/project/:projectId/config" element={<Project page="config" />} />
+                    <Route path="/project/:projectId/edit" element={<Project page="edit" />} />
+                    <Route path="/project/:projectId/viz" element={<Project page="viz" />} />
 
                     <Route path="/project/:projectId/Inventory/intro" element={<InventoryIntro />} />
                     <Route path="/project/:projectId/Inventory/step/1" element={<InventoryStep1 />} />
@@ -87,6 +91,7 @@ function App() {
                     <Route path="/project/:projectId/Climate/:climateScenarioId/Without/step/6" element={<ClimateWithoutUpstreamStep6 />} />
                     <Route path="/project/:projectId/Climate/:climateScenarioId/Without/step/7" element={<ClimateWithoutUpstreamStep7 />} />
                 </Routes>
+                {/* <Footer /> */}
             </BrowserRouter>
         </ReactKeycloakProvider>
     </div>