From b473b2fab1b6df2da85d09573fe41d0e27bcabd1 Mon Sep 17 00:00:00 2001
From: Yoan VALLET <ext.sopra.yvallet@grandlyon.com>
Date: Mon, 5 Oct 2020 11:46:33 +0200
Subject: [PATCH] feat: create report view
---
src/components/Navbar/Navbar.tsx | 11 +++++++++++
src/components/Report/MonthlyReport.tsx | 7 +++++++
src/components/Report/ReportView.tsx | 26 +++++++++++++++++++++++++
src/components/Routes/Routes.tsx | 2 ++
src/locales/fr.json | 6 +++++-
5 files changed, 51 insertions(+), 1 deletion(-)
create mode 100644 src/components/Report/MonthlyReport.tsx
create mode 100644 src/components/Report/ReportView.tsx
diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx
index 7850d048e..8be689b1e 100644
--- a/src/components/Navbar/Navbar.tsx
+++ b/src/components/Navbar/Navbar.tsx
@@ -60,6 +60,17 @@ export const Navbar = () => {
{t('Nav.ECOGESTURES')}
</NavLink>
</li>
+ <li className="c-nav-item">
+ <NavLink
+ to="/report"
+ className="c-nav-link"
+ activeClassName="is-active"
+ >
+ <StyledIcon className="c-nav-icon off" icon={ParameterIconOff} />
+ <StyledIcon className="c-nav-icon on" icon={ParameterIconOn} />
+ {t('Nav.report')}
+ </NavLink>
+ </li>
<li className="c-nav-item">
<NavLink
to="/options"
diff --git a/src/components/Report/MonthlyReport.tsx b/src/components/Report/MonthlyReport.tsx
new file mode 100644
index 000000000..1f948fa63
--- /dev/null
+++ b/src/components/Report/MonthlyReport.tsx
@@ -0,0 +1,7 @@
+import React from 'react'
+
+const MonthlyReport = () => {
+ return <div>Votre bilan mensuel</div>
+}
+
+export default MonthlyReport
diff --git a/src/components/Report/ReportView.tsx b/src/components/Report/ReportView.tsx
new file mode 100644
index 000000000..bc2b81ba7
--- /dev/null
+++ b/src/components/Report/ReportView.tsx
@@ -0,0 +1,26 @@
+import React, { useState } from 'react'
+import CozyBar from 'components/Header/CozyBar'
+import Header from 'components/Header/Header'
+import Content from 'components/Content/Content'
+import MonthlyReport from 'components/Report/MonthlyReport'
+
+const ReportView: React.FC = () => {
+ const [headerHeight, setHeaderHeight] = useState<number>(0)
+ const defineHeaderHeight = (height: number) => {
+ setHeaderHeight(height)
+ }
+ return (
+ <>
+ <CozyBar titleKey={'report.viewTitle'} />
+ <Header
+ setHeaderHeight={defineHeaderHeight}
+ desktopTitleKey={'report.viewTitle'}
+ ></Header>
+ <Content height={headerHeight}>
+ <MonthlyReport />
+ </Content>
+ </>
+ )
+}
+
+export default ReportView
diff --git a/src/components/Routes/Routes.tsx b/src/components/Routes/Routes.tsx
index 7b9cf70c6..3e7383783 100644
--- a/src/components/Routes/Routes.tsx
+++ b/src/components/Routes/Routes.tsx
@@ -13,6 +13,7 @@ import EcogestureView from 'components/Ecogesture/EcogestureView'
import OptionsView from 'components/Options/OptionsView'
import FAQView from 'components/FAQ/FAQView'
import LegalNoticeView from 'components/LegalNotice/LegalNoticeView'
+import ReportView from 'components/Report/ReportView'
const Routes = () => {
return (
@@ -76,6 +77,7 @@ const Routes = () => {
</>
)}
/>
+ <Route path="/report" component={ReportView} />
<Redirect from="/" to="/consumption" />
<Redirect from="*" to="/consumption" />
</Switch>
diff --git a/src/locales/fr.json b/src/locales/fr.json
index a4931fb5b..2f2e55999 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -15,7 +15,8 @@
"options": "Options",
"profile": "Profil",
"connectors": "connecteurs",
- "graphs": "graphes"
+ "graphs": "graphes",
+ "report": "Bilan"
},
"COMMON": {
"APP_TITLE": "Ecolyo",
@@ -305,5 +306,8 @@
"contact": "Veuillez prendre contact directement avec eux.",
"accessButton": "Accéder aux connecteurs",
"later": "Plus tard"
+ },
+ "report": {
+ "viewTitle": "Votre bilan"
}
}
--
GitLab