Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Habit Page Done #23

Merged
merged 1 commit into from
Oct 10, 2023
Merged

Habit Page Done #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 43 additions & 26 deletions src/client/components/habit-page/habit-info.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ background-color: ${COLOR_THEME.SECTION};
color: white;
padding: 10px;
margin: 10px;
// width: 80%
`

const HabitTitleStyle = styled.h1
Expand All @@ -40,7 +39,7 @@ transform: translateY(-2px);
const HabitStreakTextStyle = styled.p<{isHighStreak: boolean}>
`
display: inline-block;
transform: translate(-21px,-1px);
transform: translate(-22px, -1px);

${(props) =>
props.isHighStreak &&
Expand All @@ -55,6 +54,8 @@ cursor: pointer;
width: fit-content;
padding: 10px;
transition: background-color 0.3s;
max-width: 100%
white-space: normal;

&:hover {
background-color: ${COLOR_THEME.SUBSECTION}
Expand All @@ -66,22 +67,27 @@ const EditableDescription = styled.textarea
width: 100%;
resize: none;
margin-left: 8px;
max-width: 100%;
`
const LoggedDaysStyle = styled.div
`
padding: 10px;
display: flex;
justify-content: center;
transform: translateY(-17px)
`

const HabitInfoRightSide = styled.div
`
padding: 15px;
margin: 20px 20px 0 0;
display: flex;
align-items: center;
`

const HabitInfoLeftSide = styled.div
`
padding: 15px;
padding: 10px;
max-width: 50%
`

const PercentSuccessTextStyle = styled.div
Expand All @@ -92,11 +98,22 @@ font-size: 14px;

const CalendarImgStyle = styled.img
`
width: 40px;
height: 40px;
width: 35px;
height: 35px;
margin-right: 10px;
`

const PercentWidgetStyle = styled.div
`
margin-left: 60px;

`

const LoggedDaysTextStyle = styled.h3
`
margin-top: 30px;
`

const HabitInfoComponent: FC<HabitInfoProps> = ({ habitInfo }) => {
const [isDescriptionEditing, setDescriptionEditing] = useState(false);
const [description, setDescription] = useState(habitInfo.description);
Expand Down Expand Up @@ -146,28 +163,28 @@ const HabitInfoComponent: FC<HabitInfoProps> = ({ habitInfo }) => {

<HabitInfoRightSide>
<LoggedDaysStyle className="h3">
<CalendarImgStyle src="/calendaricon.png"></CalendarImgStyle>
{habitInfo.numLoggedDays} days
<div className="text-center">
Time Logged
<LoggedDaysTextStyle>
<CalendarImgStyle src="/calendaricon.png"></CalendarImgStyle>
{habitInfo.numLoggedDays} days
</LoggedDaysTextStyle>
</div>
</LoggedDaysStyle>
<div>
<div className="row">
<div className="col-6">
<h4 className="d-flex justify-content-center">Week</h4>
<div className="d-flex justify-content-center">
<PercentIcon percent={habitInfo.percentSuccessWeek}/>
</div>
<PercentSuccessTextStyle className="d-flex justify-content-center">{habitInfo.percentSuccessWeek}%</PercentSuccessTextStyle>
</div>
<div className="col-6">
<h4 className="d-flex justify-content-center">Lifetime</h4>
<div className="d-flex justify-content-center">
<PercentIcon percent={habitInfo.percentSuccessLifetime}/>
</div>
<PercentSuccessTextStyle className="d-flex justify-content-center">{habitInfo.percentSuccessLifetime}%</PercentSuccessTextStyle>
</div>
<PercentWidgetStyle className="d-flex flex-column align-items-center">
<h3 className="text-center">Week</h3>
<div className="d-flex justify-content-center">
<PercentIcon percent={habitInfo.percentSuccessWeek}/>
</div>
</div>

<PercentSuccessTextStyle className="text-center">{habitInfo.percentSuccessWeek}%</PercentSuccessTextStyle>
</PercentWidgetStyle>
<PercentWidgetStyle className="d-flex flex-column align-items-center">
<h3 className="text-center">Lifetime</h3>
<div className="d-flex justify-content-center">
<PercentIcon percent={habitInfo.percentSuccessLifetime}/>
</div>
<PercentSuccessTextStyle className="text-center">{habitInfo.percentSuccessLifetime}%</PercentSuccessTextStyle>
</PercentWidgetStyle>
</HabitInfoRightSide>
</MainDivStyle>
)
Expand Down