Skip to content
Snippets Groups Projects
Commit 12ed628b authored by Romain CREY's avatar Romain CREY
Browse files

change generate timeline part

parent 75870bce
Branches
Tags
3 merge requests!28Merge fix from dev,!27Dev,!21Features/us158 review design
...@@ -98,10 +98,14 @@ const FollowChallengeTimeline: React.FC<FollowChallengeTimelineViewProps> = ({ ...@@ -98,10 +98,14 @@ const FollowChallengeTimeline: React.FC<FollowChallengeTimelineViewProps> = ({
} }
} }
const generateDayDash = (index: number, dayCount: number) => { const generateTimelinePart = (
index: number,
dayCount: number,
className: string
) => {
return ( return (
<div <div
className={`date-dash ${ className={`${className} ${
(index === 0 && dayCount > 0) || (index === 0 && dayCount > 0) ||
(index === getListOfWeeks().length - 1 && dayCount < 0) (index === getListOfWeeks().length - 1 && dayCount < 0)
? 'none' ? 'none'
...@@ -117,17 +121,13 @@ const FollowChallengeTimeline: React.FC<FollowChallengeTimelineViewProps> = ({ ...@@ -117,17 +121,13 @@ const FollowChallengeTimeline: React.FC<FollowChallengeTimelineViewProps> = ({
return getListOfWeeks().map((day, index) => ( return getListOfWeeks().map((day, index) => (
<div key={index} className="day-solo"> <div key={index} className="day-solo">
<div className="day-line-label"> <div className="day-line-label">
{generateDayDash(index, 3)} {generateTimelinePart(index, 3, 'date-dash')}
{generateDayDash(index, 2)} {generateTimelinePart(index, 2, 'date-dash')}
{generateDayDash(index, 1)} {generateTimelinePart(index, 1, 'date-dash')}
<div {generateTimelinePart(index, 0, 'date-label')}
className={`date-label ${ {generateTimelinePart(index, -1, 'date-dash')}
index * 7 < getListOfPastDays() ? 'past' : 'futur' {generateTimelinePart(index, -2, 'date-dash')}
}`} {generateTimelinePart(index, -3, 'date-dash')}
></div>
{generateDayDash(index, -1)}
{generateDayDash(index, -2)}
{generateDayDash(index, -3)}
</div> </div>
<div className="day-letter">{day.letter}</div> <div className="day-letter">{day.letter}</div>
<div className="day-date">{day.date}</div> <div className="day-date">{day.date}</div>
...@@ -139,21 +139,9 @@ const FollowChallengeTimeline: React.FC<FollowChallengeTimelineViewProps> = ({ ...@@ -139,21 +139,9 @@ const FollowChallengeTimeline: React.FC<FollowChallengeTimelineViewProps> = ({
return getListOfDays().map((day, index) => ( return getListOfDays().map((day, index) => (
<div key={index} className="day-solo"> <div key={index} className="day-solo">
<div className="day-line-label"> <div className="day-line-label">
<div {generateTimelinePart(index, 0, 'date-dash')}
className={`date-dash ${ {generateTimelinePart(index, 0, 'date-label')}
index < getListOfPastDays() ? 'past' : 'futur' {generateTimelinePart(index + 1, 0, 'date-dash')}
}`}
></div>
<div
className={`date-label ${
index < getListOfPastDays() ? 'past' : 'futur'
}`}
></div>
<div
className={`date-dash ${
index + 1 < getListOfPastDays() ? 'past' : 'futur'
}`}
></div>
</div> </div>
<div className="day-letter">{day.letter}</div> <div className="day-letter">{day.letter}</div>
<div className="day-date">{day.date}</div> <div className="day-date">{day.date}</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment