Merge branch 'dev' of...

Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into fix-issues-22-et-1-syntaxe-et-date-fausse

src/components/ContainerComponents/ViewContainer/HomeViewContainer.tsx

@@ -16,7 +16,9 @@ const HomeViewContainer: React.FC = () => {
     AppContext
   )
   const [timeStep, setTimeStep] = useState<TimeStep>(
-    previousTimeStep ? previousTimeStep : 20
+    previousTimeStep && previousTimeStep !== TimeStep.HALF_AN_HOUR
+      ? previousTimeStep
+      : TimeStep.DAY
   )
   const [resetRefenceDate, setResetReferenceDate] = useState<boolean>(false)
   const [headerHeight, setHeaderHeight] = useState<number>(0)

src/components/ContainerComponents/ViewContainer/SingleFluidViewContainer.tsx

@@ -19,7 +19,9 @@ const SingleFluidViewContainer: React.FC<SingleFluidViewContainerProps> = ({
   const { setPreviousTimeStep, previousTimeStep } = useContext(AppContext)
 
   const [timeStep, setTimeStep] = useState<TimeStep | null>(
-    previousTimeStep ? previousTimeStep : 20
+    previousTimeStep && previousTimeStep !== TimeStep.HALF_AN_HOUR
+      ? previousTimeStep
+      : TimeStep.DAY
   )
   const [resetRefenceDate, setResetReferenceDate] = useState<boolean>(false)
   const [headerHeight, setHeaderHeight] = useState<number>(0)

src/components/ContentComponents/Challenge/FollowChallengeTimeline.tsx

@@ -98,7 +98,7 @@ const FollowChallengeTimeline: React.FC<FollowChallengeTimelineViewProps> = ({
     }
   }
 
-  const generateTimelinePart = (
+  const generateMonthTimelinePart = (
     index: number,
     dayCount: number,
     className: string
@@ -117,17 +117,27 @@ const FollowChallengeTimeline: React.FC<FollowChallengeTimelineViewProps> = ({
     )
   }
 
+  const generateWeekTimelinePart = (index: number, className: string) => {
+    return (
+      <div
+        className={`${className} ${
+          index < getListOfPastDays() ? 'past' : 'futur'
+        }`}
+      ></div>
+    )
+  }
+
   const monthChallenge = () => {
     return getListOfWeeks().map((day, index) => (
       <div key={index} className="day-solo">
         <div className="day-line-label">
-          {generateTimelinePart(index, 3, 'date-dash')}
-          {generateTimelinePart(index, 2, 'date-dash')}
-          {generateTimelinePart(index, 1, 'date-dash')}
-          {generateTimelinePart(index, 0, 'date-label')}
-          {generateTimelinePart(index, -1, 'date-dash')}
-          {generateTimelinePart(index, -2, 'date-dash')}
-          {generateTimelinePart(index, -3, 'date-dash')}
+          {generateMonthTimelinePart(index, 3, 'date-dash')}
+          {generateMonthTimelinePart(index, 2, 'date-dash')}
+          {generateMonthTimelinePart(index, 1, 'date-dash')}
+          {generateMonthTimelinePart(index, 0, 'date-label')}
+          {generateMonthTimelinePart(index, -1, 'date-dash')}
+          {generateMonthTimelinePart(index, -2, 'date-dash')}
+          {generateMonthTimelinePart(index, -3, 'date-dash')}
         </div>
         <div className="day-letter">{day.letter}</div>
         <div className="day-date">{day.date}</div>
@@ -139,9 +149,9 @@ const FollowChallengeTimeline: React.FC<FollowChallengeTimelineViewProps> = ({
     return getListOfDays().map((day, index) => (
       <div key={index} className="day-solo">
         <div className="day-line-label">
-          {generateTimelinePart(index, 0, 'date-dash')}
-          {generateTimelinePart(index, 0, 'date-label')}
-          {generateTimelinePart(index + 1, 0, 'date-dash')}
+          {generateWeekTimelinePart(index, 'date-dash')}
+          {generateWeekTimelinePart(index, 'date-label')}
+          {generateWeekTimelinePart(index + 1, 'date-dash')}
         </div>
         <div className="day-letter">{day.letter}</div>
         <div className="day-date">{day.date}</div>

src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx

@@ -60,7 +60,7 @@ const EcogestureModal: React.FC<EcogestureModalProps> = ({
               <div className="em-content-box-text-header">
                 {(ecogesture.unlocked || unlockedEcogesture) && ecogestureIcon && (
                   <div>
-                    <Icon className="icon" icon={ecogestureIcon} size={100} />
+                    <Icon className="icon" icon={ecogestureIcon} size={140} />
                   </div>
                 )}
                 <div className="em-title text-24-bold ">

src/services/triggersService.ts

@@ -48,7 +48,7 @@ export class TriggerService {
     }
     const triggerAttributes: TriggerAttributes = {
       type: '@cron',
-      arguments: '0 47 0 * * *',
+      arguments: '0 10 2 * * *',
       worker: 'konnector',
       message: {
         account: this._account._id,