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..42e220e7 100644 --- a/frontend/src/views/DataForms/DataFormView.tsx +++ b/frontend/src/views/DataForms/DataFormView.tsx @@ -23,7 +23,7 @@ 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)=>{ @@ -52,13 +52,13 @@ export default function DataFormView(){ return {showAllTabs && ( - <> - - - + )} - - + {showAllTabs && ( + + )} + + { tabContents.map((content, index) => {