From be8b94e2aebed1c130d435101c33055a53e29abf Mon Sep 17 00:00:00 2001
From: codingfabi <fabian.kneissl@gmx.de>
Date: Mon, 3 Jul 2023 08:03:27 +0200
Subject: [PATCH 1/2] add dataforms entry to menu

---
 backend/Dockerfile                            |  2 +-
 frontend/src/data/routes.tsx                  |  6 ++++--
 frontend/src/views/DataForms/DataFormView.tsx | 15 ++++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 39c4e4df..1c4a4674 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -9,7 +9,7 @@ RUN addgroup --gid 1006 developers \
 USER python
 RUN mkdir ~/app && mkdir ~/.vscode-server
 WORKDIR /home/python/app
-COPY ./assets/requirements.txt ./
+COPY ./requirements.txt ./
 COPY ./src/co2calculator/requirements.txt ./requirements_co2calculator.txt
 ENV PATH="/home/python/.local/bin:${PATH}"
 RUN pip install -r requirements.txt
diff --git a/frontend/src/data/routes.tsx b/frontend/src/data/routes.tsx
index 4ebc99b4..6b0add96 100644
--- a/frontend/src/data/routes.tsx
+++ b/frontend/src/data/routes.tsx
@@ -18,7 +18,8 @@ const routes = {
   travelPlanner:  { name: "Travel Planner",   link: "/travel-planner"},
   contact:        { name: "Contact",          link: "/contact" },
   impressum:      { name: "Impressum",        link: "/impressum" },
-  privacyPolicy:  { name: "Privacy Policy",   link: "/privacy-policy" }
+  privacyPolicy:  { name: "Privacy Policy",   link: "/privacy-policy" },
+  addEmissions:   { name: "Add Emissions",    link: "/dataforms"}
 }
 
 export const prodRoutes: Route[] = [
@@ -38,7 +39,8 @@ export const unauthenticatedRoutes: Route[] = [
 export const authenticatedRoutes: Route[] = [
   routes.dashboard,
   routes.travelPlanner,
+  routes.addEmissions,
   routes.workingGroup,
   routes.methodology,
-  routes.aboutUs
+  routes.aboutUs,
 ]
\ No newline at end of file
diff --git a/frontend/src/views/DataForms/DataFormView.tsx b/frontend/src/views/DataForms/DataFormView.tsx
index 70267770..8e59e274 100644
--- a/frontend/src/views/DataForms/DataFormView.tsx
+++ b/frontend/src/views/DataForms/DataFormView.tsx
@@ -23,10 +23,11 @@ export default function DataFormView(){
   
   const authContext = useContext(AuthContext);
   const { data } = useQuery(getUserProfile);
-  const showAllTabs = !authContext.isAuthenticated|| data?.me?.isRepresentative
+  const showAllTabs = !authContext.isAuthenticated || data?.me?.isRepresentative
   const [value, setValue] = useState(showAllTabs ? 0 : 2)
 
   const handleChange = (_event: React.ChangeEvent<{}>, newValue: number)=>{
+    console.log(newValue);
     setValue(newValue);
   }
 
@@ -52,13 +53,13 @@ export default function DataFormView(){
   return <React.Fragment>
     <Tabs value={value} onChange={handleChange} aria-label="forms tabs">
       {showAllTabs && (
-        <>
-        <Tab label="Electricity" {...a11yProps(0)} />
-        <Tab label="Heating" {...a11yProps(1)} />
-        </>
+        <Tab label="Electricity" {...a11yProps(0)} value={0}/>
       )}
-      <Tab label="Commuting" {...a11yProps(2)} />
-      <Tab label="Business Trip" {...a11yProps(3)} />
+      {showAllTabs && (
+        <Tab label="Heating" {...a11yProps(1)}  value={1}/>
+      )}
+      <Tab label="Commuting" {...a11yProps(2)} value={2}/>
+      <Tab label="Business Trip" {...a11yProps(3)} value={3}/>
     </Tabs>
     {
       tabContents.map((content, index) => {

From 48d23a97a9d9db2c6ce67d1aeafd31ba3f102682 Mon Sep 17 00:00:00 2001
From: codingfabi <fabian.kneissl@gmx.de>
Date: Mon, 3 Jul 2023 08:03:36 +0200
Subject: [PATCH 2/2] remove console log

---
 frontend/src/views/DataForms/DataFormView.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/views/DataForms/DataFormView.tsx b/frontend/src/views/DataForms/DataFormView.tsx
index 8e59e274..42e220e7 100644
--- a/frontend/src/views/DataForms/DataFormView.tsx
+++ b/frontend/src/views/DataForms/DataFormView.tsx
@@ -27,7 +27,6 @@ export default function DataFormView(){
   const [value, setValue] = useState(showAllTabs ? 0 : 2)
 
   const handleChange = (_event: React.ChangeEvent<{}>, newValue: number)=>{
-    console.log(newValue);
     setValue(newValue);
   }