diff --git a/src/components/ContainerComponents/ViewContainer/ParametersViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/ParametersViewContainer.tsx
index 8a324f27c932302802c4c0faddacffa6b2d21031..a8cb1fc4e17b834630b811936762a19e59d60b04 100644
--- a/src/components/ContainerComponents/ViewContainer/ParametersViewContainer.tsx
+++ b/src/components/ContainerComponents/ViewContainer/ParametersViewContainer.tsx
@@ -5,6 +5,8 @@ import Content from 'components/ContainerComponents/Content/Content'
import FAQContainer from 'components/ContainerComponents/FAQContainer/FAQContainer'
import LegalNoticeContainer from 'components/ContainerComponents/LegalNoticeContainer/LegalNoticeContainer'
import Version from 'components/ContentComponents/Version/Version'
+import KonnectorViewerContainer from '../KonnectorViewerContainer/KonnectorViewerContainer'
+import Report from 'components/ContentComponents/Report/Report'
const ParametersViewContainer: React.FC = () => {
const [headerHeight, setHeaderHeight] = useState<number>(0)
@@ -19,6 +21,8 @@ const ParametersViewContainer: React.FC = () => {
desktopTitleKey={'COMMON.APP_PARAMETERS_TITLE'}
></Header>
<Content height={headerHeight}>
+ <KonnectorViewerContainer isParam={true} />
+ <Report />
<FAQContainer />
<LegalNoticeContainer />
<Version />
diff --git a/src/components/ContentComponents/Navbar/Navbar.tsx b/src/components/ContentComponents/Navbar/Navbar.tsx
index c9f4086a5b58f21ee3381b55955e857157291e8d..b745c3dc012736aee523ac7c1b5f9ea23b34137a 100644
--- a/src/components/ContentComponents/Navbar/Navbar.tsx
+++ b/src/components/ContentComponents/Navbar/Navbar.tsx
@@ -12,8 +12,8 @@ import ConsoIconOn from 'assets/icons/tabbar/conso/on.svg'
import ParameterIconOn from 'assets/icons/tabbar/parametre/on.svg'
import EcogestesIconOn from 'assets/icons/tabbar/ecogeste/on.svg'
import EcogestesIconOff from 'assets/icons/tabbar/ecogeste/off.svg'
-import ProfileIconOn from 'assets/icons/tabbar/profile/on.svg'
-import ProfileIconOff from 'assets/icons/tabbar/profile/off.svg'
+// import ProfileIconOn from 'assets/icons/tabbar/profile/on.svg'
+// import ProfileIconOff from 'assets/icons/tabbar/profile/off.svg'
import logoGrandLyon from 'assets/icons/tabbar/grand-lyon.svg'
interface NavbarProps {
@@ -62,7 +62,7 @@ export const Navbar = ({ t }: NavbarProps) => {
{t('Nav.ECOGESTURES')}
</NavLink>
</li>
- <li className="c-nav-item">
+ {/* <li className="c-nav-item">
<NavLink
to="/profile"
className="c-nav-link"
@@ -72,7 +72,7 @@ export const Navbar = ({ t }: NavbarProps) => {
<Icon className="c-nav-icon on" icon={ProfileIconOn} />
{t('Nav.profile')}
</NavLink>
- </li>
+ </li> */}
<li className="c-nav-item">
<NavLink
to="/parameters"
diff --git a/src/components/ContentComponents/Report/Report.tsx b/src/components/ContentComponents/Report/Report.tsx
index c5e5656d663488cd35b3573f55a0f11cee99d17c..ed65ba4410f01c4d0e0159d6f6bbda5f8104869b 100644
--- a/src/components/ContentComponents/Report/Report.tsx
+++ b/src/components/ContentComponents/Report/Report.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react'
+import React, { useContext, useEffect } from 'react'
import { translate } from 'cozy-ui/react/I18n'
import { AppContext } from 'components/Contexts/AppContextProvider'
import UserProfileManager from 'services/userProfileDataManagerService'
@@ -13,15 +13,22 @@ const Report: React.FC<ReportProps> = ({ t, client }: ReportProps) => {
const { userProfile, setUserProfile } = useContext(AppContext)
const upm = new UserProfileManager(client)
- const updatedUserProfile = async (value: string) => {
+ const updateUserProfileReport = async (value: boolean) => {
const updatedProfile = await upm.updateUserProfile({ report: value })
if (updatedProfile) {
setUserProfile(updatedProfile)
}
}
+ useEffect(() => {
+ //init report to true
+ if (userProfile && userProfile.report === undefined)
+ updateUserProfileReport(true)
+ }, [userProfile])
const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
- updatedUserProfile(e.target.value)
+ e.target.value === 'true'
+ ? updateUserProfileReport(true)
+ : updateUserProfileReport(false)
}
return (
@@ -31,28 +38,15 @@ const Report: React.FC<ReportProps> = ({ t, client }: ReportProps) => {
{t('PROFILE.REPORT.TITLE')}
</div>
<form action="" className="radios">
- <div className="input">
- <input
- id="weekly"
- name="report"
- type="radio"
- value="weekly"
- onChange={handleChange}
- checked={
- userProfile && userProfile.report === 'weekly' ? true : false
- }
- ></input>
- <label htmlFor="weekly"> {t('PROFILE.REPORT.WEEKLY')}</label>
- </div>
<div className="input">
<input
id="monthly"
name="report"
type="radio"
- value="monthly"
+ value="true"
onChange={handleChange}
checked={
- userProfile && userProfile.report === 'monthly' ? true : false
+ userProfile && userProfile.report === true ? true : false
}
></input>
<label htmlFor="monthly"> {t('PROFILE.REPORT.MONTHLY')}</label>
@@ -62,10 +56,10 @@ const Report: React.FC<ReportProps> = ({ t, client }: ReportProps) => {
id="never"
name="report"
type="radio"
- value="never"
+ value="false"
onChange={handleChange}
checked={
- userProfile && userProfile.report === 'never' ? true : false
+ userProfile && userProfile.report === false ? true : false
}
></input>
<label htmlFor="never"> {t('PROFILE.REPORT.NEVER')}</label>
diff --git a/src/db/userProfileData.json b/src/db/userProfileData.json
index c6c09dabefa0f1c01399fb3da6cfffae6d935b62..82ef873e213761b098e807d3439c90a8937be89f 100644
--- a/src/db/userProfileData.json
+++ b/src/db/userProfileData.json
@@ -3,6 +3,7 @@
"level": 1,
"challengeTypeHash": "",
"ecogestureHash": "",
- "haveSeenWelcomeModal": false
+ "haveSeenWelcomeModal": false,
+ "report": true
}
]
diff --git a/src/services/dataChallengeContracts.ts b/src/services/dataChallengeContracts.ts
index 61b0ee344d54edd2a14ffaadb313d5fef18876aa..49c0a0f9221ff9e80e654c46047403d74ae5ff94 100644
--- a/src/services/dataChallengeContracts.ts
+++ b/src/services/dataChallengeContracts.ts
@@ -141,7 +141,7 @@ export class UserProfile {
challengeTypeHash: string
ecogestureHash: string
haveSeenWelcomeModal: boolean
- report: string
+ report: boolean
constructor(
id: string,
@@ -149,7 +149,7 @@ export class UserProfile {
challengeTypeHash: string,
ecogestureHash: string,
haveSeenWelcomeModal: boolean,
- report: string
+ report: boolean
) {
this.id = id
this.level = level
diff --git a/src/styles/components/_report.scss b/src/styles/components/_report.scss
index 3d1c5e0340c3d2a827af6e14ed8c0624b14c927a..f8dc392d92937a0d0aafec045744f073b29a5f68 100644
--- a/src/styles/components/_report.scss
+++ b/src/styles/components/_report.scss
@@ -27,7 +27,7 @@
top: 0.3rem;
width: 1.3rem;
height: 1.3rem;
- border: 2px solid $google-text-1;
+ border: 2px solid $text-dark;
background: transparent;
&:after {
transition: all 300ms ease;
@@ -35,6 +35,9 @@
border-radius: 50%;
}
&:checked {
+ & ~ label {
+ color: $google-text-1;
+ }
&:after {
content: '';
position: absolute;
@@ -49,9 +52,6 @@
}
}
}
- input:checked label {
- color: $google-text-1;
- }
}
label {
color: $text-dark;