Skip to content

Commit 9cced66

Browse files
Peterr181Peterr181
committed
fix small bugs
1 parent 01a1d5d commit 9cced66

File tree

9 files changed

+29
-55
lines changed

9 files changed

+29
-55
lines changed

client/dist/assets/index-pP0QRvi0.js renamed to client/dist/assets/index-Bc8Hhw9x.js

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/dist/assets/index-pP0QRvi0.js.map renamed to client/dist/assets/index-Bc8Hhw9x.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/dist/assets/index-BcDFF2zF.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎client/dist/assets/index-BwCmiI9D.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/dist/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
rel="stylesheet"
1818
/>
1919
<title>🏋️ Gymero | Fitness Platform</title>
20-
<script type="module" crossorigin src="/assets/index-pP0QRvi0.js"></script>
21-
<link rel="stylesheet" crossorigin href="/assets/index-BcDFF2zF.css">
20+
<script type="module" crossorigin src="/assets/index-Bc8Hhw9x.js"></script>
21+
<link rel="stylesheet" crossorigin href="/assets/index-BwCmiI9D.css">
2222
</head>
2323
<body>
2424
<div id="root"></div>

‎client/src/components/compound/Streak/Streak.module.scss‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
display: flex;
1010
justify-content: space-between;
1111
align-items: center;
12-
12+
@media (max-width: 768px) {
13+
justify-content: center;
14+
}
1315
img {
1416
width: 50px;
1517
height: 50px;
@@ -24,7 +26,7 @@
2426
gap: var(--rythm-8);
2527
flex-wrap: nowrap;
2628

27-
@media (max-width: 11000px) {
29+
@media (max-width: 1100px) {
2830
flex-wrap: wrap;
2931
}
3032
}

‎client/src/pages/Home/Home.tsx‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type DailySettings = {
2020
steps_taken: number;
2121
water_consumed: number;
2222
calories_eaten: number;
23-
mood_energy: number;
23+
sleep_duration: number;
2424
};
2525

2626
const Home = () => {
@@ -33,8 +33,6 @@ const Home = () => {
3333
fetchDailySettings();
3434
}, []);
3535

36-
console.log(dailySettings);
37-
3836
const daysOfWeek = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
3937

4038
const chartData = daysOfWeek.map((day) => ({ day, minutes: 0 }));
@@ -62,29 +60,6 @@ const Home = () => {
6260
const getDailySettingValue = (key: keyof DailySettings) =>
6361
dailySettings ? dailySettings[key] : null;
6462

65-
const getMoodMessage = (
66-
moodEnergy: number | null,
67-
t: (key: string) => string
68-
) => {
69-
if (moodEnergy === null) {
70-
return t("mood.unset");
71-
}
72-
switch (moodEnergy) {
73-
case 1:
74-
return t("mood.bad");
75-
case 2:
76-
return t("mood.better");
77-
case 3:
78-
return t("mood.good");
79-
case 4:
80-
return t("mood.great");
81-
case 5:
82-
return t("mood.excellent");
83-
default:
84-
return t("mood.unknown");
85-
}
86-
};
87-
8863
return (
8964
<LanguageProvider>
9065
<PlatformWrapper>
@@ -126,11 +101,8 @@ const Home = () => {
126101
/>
127102
<ActivityCard
128103
icon={iconFile.progressIcon}
129-
title="moodEnergy"
130-
number={getMoodMessage(
131-
getDailySettingValue("mood_energy"),
132-
t
133-
)}
104+
title="sleepDuration"
105+
number={`${getDailySettingValue("sleep_duration") || "0"}h`}
134106
/>
135107
</div>
136108
</div>

‎client/src/translations/en/global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"totalSteps": "Total steps",
7070
"waterDrinked": "Water drinked",
7171
"caloriesEaten": "Calories eaten",
72-
"moodEnergy": "Feeling"
72+
"sleepDuration": "Sleep duration"
7373
},
7474
"mood": {
7575
"bad": "Bad",

‎client/src/translations/pl/global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"totalSteps": "Wszystkie kroki",
6666
"waterDrinked": "Woda wypita",
6767
"caloriesEaten": "Kalorie zjedzone",
68-
"moodEnergy": "Samopoczucie"
68+
"sleepDuration": "Czas snu"
6969
},
7070
"mood": {
7171
"bad": "Złe",

0 commit comments

Comments
 (0)