From 198be3cb5bb97e0ddacef5700cb45d6123dbd46a Mon Sep 17 00:00:00 2001 From: tahmid-saj Date: Tue, 18 Jun 2024 23:11:40 -0400 Subject: [PATCH] adding calendars to dashboard --- .../schedule-calendar.component.jsx | 68 +++++++++++ .../schedule-calendar.styles.scss | 26 +++++ .../schedule-day-info.component.jsx | 42 +++++++ .../schedule-day-info.styles.scss | 6 + .../schedule-calendar.component.jsx | 107 ++++++++++++++++++ .../schedule-calendar.styles.scss | 27 +++++ .../schedule-day-info.component.jsx | 82 ++++++++++++++ .../schedule-day-info.styles.scss | 15 +++ .../schedule-calendar.component.jsx | 70 ++++++++++++ .../schedule-calendar.styles.scss | 26 +++++ .../schedule-day-info.component.jsx | 53 +++++++++ .../schedule-day-info.styles.scss | 6 + .../dashboard/dashboard.component.jsx | 44 ++++++- .../signed-in/dashboard/dashboard.styles.scss | 4 +- .../dashboard/dashboard.component.jsx | 6 +- 15 files changed, 576 insertions(+), 6 deletions(-) create mode 100644 src/components/signed-in/dashboard/calories-burned/schedule/schedule-calendar/schedule-calendar.component.jsx create mode 100644 src/components/signed-in/dashboard/calories-burned/schedule/schedule-calendar/schedule-calendar.styles.scss create mode 100644 src/components/signed-in/dashboard/calories-burned/schedule/schedule-day-info/schedule-day-info.component.jsx create mode 100644 src/components/signed-in/dashboard/calories-burned/schedule/schedule-day-info/schedule-day-info.styles.scss create mode 100644 src/components/signed-in/dashboard/fitness/schedule/schedule-calendar/schedule-calendar.component.jsx create mode 100644 src/components/signed-in/dashboard/fitness/schedule/schedule-calendar/schedule-calendar.styles.scss create mode 100644 src/components/signed-in/dashboard/fitness/schedule/schedule-day-info/schedule-day-info.component.jsx create mode 100644 src/components/signed-in/dashboard/fitness/schedule/schedule-day-info/schedule-day-info.styles.scss create mode 100644 src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-calendar/schedule-calendar.component.jsx create mode 100644 src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-calendar/schedule-calendar.styles.scss create mode 100644 src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-day-info/schedule-day-info.component.jsx create mode 100644 src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-day-info/schedule-day-info.styles.scss diff --git a/src/components/signed-in/dashboard/calories-burned/schedule/schedule-calendar/schedule-calendar.component.jsx b/src/components/signed-in/dashboard/calories-burned/schedule/schedule-calendar/schedule-calendar.component.jsx new file mode 100644 index 0000000..58898a8 --- /dev/null +++ b/src/components/signed-in/dashboard/calories-burned/schedule/schedule-calendar/schedule-calendar.component.jsx @@ -0,0 +1,68 @@ +import "./schedule-calendar.styles.scss" +import 'rsuite/Calendar/styles/index.css'; +import { Fragment, useContext, useState } from "react"; +import { Calendar, Whisper, Popover, Badge } from 'rsuite'; +import { Typography } from "@mui/material"; +import { COLOR_CODES } from "../../../../../../utils/constants/shared.constants"; + +import { CaloriesBurnedContext } from "../../../../../../contexts/signed-in/calories-burned/calories-burned.context"; + +function getScheduledData(date, trackedCaloriesBurned) { + date = date.toISOString().split('T')[0] + + let scheduledTrackedCaloriesBurnedForDate = [] + trackedCaloriesBurned.map((trackedDay) => { + if (trackedDay.dateTracked === date) { + scheduledTrackedCaloriesBurnedForDate.push({ + caloriesBurned: trackedDay.totalCaloriesBurned + }) + } + }) + + return scheduledTrackedCaloriesBurnedForDate +} + +const ScheduleCalendar = () => { + const { trackedCaloriesBurned, selectScheduledTrackedCaloriesBurned } = useContext(CaloriesBurnedContext) + + function renderCell(date) { + const list = getScheduledData(date, trackedCaloriesBurned); + const displayList = list.filter((item, index) => index < 1); + + if (list.length) { + const moreCount = list.length - displayList.length; + + return ( + + + {/* {moreCount} more */} + + ); + } + + return null; + } + + const onSelectDate = (date) => { + const selectedDate = date.toISOString().split('T')[0] + console.log(selectedDate) + selectScheduledTrackedCaloriesBurned(selectedDate) + } + + return ( +
+ {`Calories burned calendar`} + +
+ ) +} + +export default ScheduleCalendar \ No newline at end of file diff --git a/src/components/signed-in/dashboard/calories-burned/schedule/schedule-calendar/schedule-calendar.styles.scss b/src/components/signed-in/dashboard/calories-burned/schedule/schedule-calendar/schedule-calendar.styles.scss new file mode 100644 index 0000000..4abd345 --- /dev/null +++ b/src/components/signed-in/dashboard/calories-burned/schedule/schedule-calendar/schedule-calendar.styles.scss @@ -0,0 +1,26 @@ +.calendar-todo-list { + text-align: left; + padding: 0; + list-style: none; +} + +.calendar-todo-list li { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.calendar-todo-item-badge { + vertical-align: top; + margin-top: 8px; + width: 6px; + height: 6px; +} + +.calories-burned-calendar-container { + display: block; + justify-content: center; + align-items: center; + margin: 2%; + padding: 1%; +} \ No newline at end of file diff --git a/src/components/signed-in/dashboard/calories-burned/schedule/schedule-day-info/schedule-day-info.component.jsx b/src/components/signed-in/dashboard/calories-burned/schedule/schedule-day-info/schedule-day-info.component.jsx new file mode 100644 index 0000000..dd2ebe8 --- /dev/null +++ b/src/components/signed-in/dashboard/calories-burned/schedule/schedule-day-info/schedule-day-info.component.jsx @@ -0,0 +1,42 @@ +import "./schedule-day-info.styles.scss" +import { Typography, Divider } from "@mui/material" +import { Fragment, useContext } from "react" +import SimplePaper from "../../../../../shared/mui/paper/paper.component" +import { COLOR_CODES } from "../../../../../../utils/constants/shared.constants" +import { CaloriesBurnedContext } from "../../../../../../contexts/signed-in/calories-burned/calories-burned.context" + +const paperStyles = { + backgroundColor: COLOR_CODES.general["1"], + width: 400 +} + +const ScheduleDayInfo = () => { + const { scheduledTrackedCaloriesBurnedView } = useContext(CaloriesBurnedContext) + + if (!scheduledTrackedCaloriesBurnedView.length) return + + return ( +
+ { + scheduledTrackedCaloriesBurnedView.map((trackedCaloriesBurned) => { + return ( + + {`${trackedCaloriesBurned.dateTracked}`} + {`Activity - ${trackedCaloriesBurned.activity}`} + {`Total calories burned - ${trackedCaloriesBurned.totalCaloriesBurned}`} + +
+ +
+ + {`Duration (mins) - ${trackedCaloriesBurned.durationMinutes}`} + {`Calories burned / hr - ${trackedCaloriesBurned.caloriesBurnedPerHour}`} +
+ ) + }) + } +
+ ) +} + +export default ScheduleDayInfo \ No newline at end of file diff --git a/src/components/signed-in/dashboard/calories-burned/schedule/schedule-day-info/schedule-day-info.styles.scss b/src/components/signed-in/dashboard/calories-burned/schedule/schedule-day-info/schedule-day-info.styles.scss new file mode 100644 index 0000000..b55704d --- /dev/null +++ b/src/components/signed-in/dashboard/calories-burned/schedule/schedule-day-info/schedule-day-info.styles.scss @@ -0,0 +1,6 @@ +.calories-burned-schedule-day-info { + display: flex; + justify-content: center; + align-items: center; + padding: 2% 2% 2% 2%; +} \ No newline at end of file diff --git a/src/components/signed-in/dashboard/fitness/schedule/schedule-calendar/schedule-calendar.component.jsx b/src/components/signed-in/dashboard/fitness/schedule/schedule-calendar/schedule-calendar.component.jsx new file mode 100644 index 0000000..39b94ad --- /dev/null +++ b/src/components/signed-in/dashboard/fitness/schedule/schedule-calendar/schedule-calendar.component.jsx @@ -0,0 +1,107 @@ +import "./schedule-calendar.styles.scss" +import 'rsuite/Calendar/styles/index.css'; +import { Fragment, useContext, useState } from "react"; +import { Calendar, Whisper, Popover, Badge } from 'rsuite'; +import { Typography } from "@mui/material"; +import { FitnessContext } from "../../../../../../contexts/signed-in/fitness/fitness.context"; +import { COLOR_CODES } from "../../../../../../utils/constants/shared.constants"; + +function getScheduledData(date, exercises) { + // const day = date.getDate(); + date = date.toISOString().split('T')[0] + + // switch (day) { + // case 10: + // return [ + // { time: '10:30 am', title: 'Meeting' }, + // { time: '12:00 pm', title: 'Lunch' } + // ]; + // case 15: + // return [ + // { time: '09:30 pm', title: 'Products Introduction Meeting' }, + // { time: '12:30 pm', title: 'Client entertaining' }, + // { time: '02:00 pm', title: 'Product design discussion' }, + // { time: '05:00 pm', title: 'Product test and acceptance' }, + // { time: '06:30 pm', title: 'Reporting' }, + // { time: '10:00 pm', title: 'Going home to walk the dog' } + // ]; + // default: + // return []; + // } + + let scheduledExercisesForDate = [] + exercises.map((exercise) => { + if (exercise.exerciseDate === date) { + scheduledExercisesForDate.push({ + type: exercise.exerciseType, + name: exercise.exerciseName + }) + } + }) + + return scheduledExercisesForDate +} + +const ScheduleCalendar = () => { + const { exercises, selectScheduledExercise } = useContext(FitnessContext) + + function renderCell(date) { + const list = getScheduledData(date, exercises); + const displayList = list.filter((item, index) => index < 1); + + if (list.length) { + const moreCount = list.length - displayList.length; + // const moreItem = ( + //
  • + // + // {list.map((item, index) => ( + //

    + // {item.time} - {item.title} + //

    + // ))} + // + // } + // > + // {moreCount} more + //
    + //
  • + // ); + + return ( + +
      + {displayList.map((item, index) => ( +
    • + {item.type} - {item.name} +
    • + ))} + {moreCount ? `${moreCount} more` : null} +
    + {/* {moreCount} more */} +
    + ); + } + + return null; + } + + const onSelectDate = (date) => { + const selectedDate = date.toISOString().split('T')[0] + console.log(selectedDate) + selectScheduledExercise(selectedDate) + } + + return ( +
    + {`Exercises calendar`} + +
    + ) +} + +export default ScheduleCalendar \ No newline at end of file diff --git a/src/components/signed-in/dashboard/fitness/schedule/schedule-calendar/schedule-calendar.styles.scss b/src/components/signed-in/dashboard/fitness/schedule/schedule-calendar/schedule-calendar.styles.scss new file mode 100644 index 0000000..679c602 --- /dev/null +++ b/src/components/signed-in/dashboard/fitness/schedule/schedule-calendar/schedule-calendar.styles.scss @@ -0,0 +1,27 @@ +.calendar-todo-list { + text-align: left; + padding: 0; + list-style: none; +} + +.calendar-todo-list li { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.calendar-todo-item-badge { + vertical-align: top; + margin-top: 8px; + width: 6px; + height: 6px; +} + +.fitness-schedule-calendar-container { + display: block; + justify-content: center; + align-items: center; + background-color: lightblue; + margin: 2%; + padding: 1%; +} \ No newline at end of file diff --git a/src/components/signed-in/dashboard/fitness/schedule/schedule-day-info/schedule-day-info.component.jsx b/src/components/signed-in/dashboard/fitness/schedule/schedule-day-info/schedule-day-info.component.jsx new file mode 100644 index 0000000..29a1a7f --- /dev/null +++ b/src/components/signed-in/dashboard/fitness/schedule/schedule-day-info/schedule-day-info.component.jsx @@ -0,0 +1,82 @@ +import "./schedule-day-info.styles.scss" +import { useState, useContext, Fragment } from "react" +import { Typography } from "@mui/material"; + +import { AgGridReact } from 'ag-grid-react'; // React Data Grid Component +import "ag-grid-community/styles/ag-grid.css"; // Mandatory CSS required by the grid +import "ag-grid-community/styles/ag-theme-quartz.css"; // Optional Theme applied to the grid + +import SimplePaper from "../../../../../shared/mui/paper/paper.component"; +import { COLOR_CODES } from "../../../../../../utils/constants/shared.constants"; +import { FitnessContext } from "../../../../../../contexts/signed-in/fitness/fitness.context"; +import Button from "../../../../../shared/button/button.component"; +import { ButtonsContainer } from "../../../../../shared/button/button.styles"; + +const paperStyles = { + backgroundColor: COLOR_CODES.general["8"], + height: 600 +} + +const ScheduleDayInfo = () => { + const { exercisesView, removeExercise, unselectScheduledExercise } = useContext(FitnessContext) + console.log(exercisesView) + + const rowData = exercisesView.map((exercise) => { + return { + // AddToExpenses: "", + Date: exercise.exerciseDate, + Exercise: exercise.exerciseName, + Sets: exercise.exerciseSets, + Reps: exercise.exerciseReps, + Type: exercise.exerciseType, + Muscle: exercise.exerciseMuscle, + Equipment: exercise.exerciseEquipment, + Difficulty: exercise.exerciseDifficulty, + Instructions: exercise.exerciseInstructions, + Tag: exercise.exerciseTag + } + }) + + // column definitions + const [columnDefs, setColumnDefs] = useState([ + { field: "Date" }, + { field: "Exercise" }, + { field: "Sets" }, + { field: "Reps" }, + { field: "Type" }, + { field: "Muscle" }, + { field: "Equipment" }, + { field: "Difficulty" }, + { field: "Instructions" }, + { field: "Tag" }, + ]) + + const handleUnselect = (event) => { + event.preventDefault() + unselectScheduledExercise() + } + + return ( +
    + {`Exercises planned`} + + +
    + + +
    + +
    +
    +
    +
    +
    + ) +} + +export default ScheduleDayInfo \ No newline at end of file diff --git a/src/components/signed-in/dashboard/fitness/schedule/schedule-day-info/schedule-day-info.styles.scss b/src/components/signed-in/dashboard/fitness/schedule/schedule-day-info/schedule-day-info.styles.scss new file mode 100644 index 0000000..a10dff1 --- /dev/null +++ b/src/components/signed-in/dashboard/fitness/schedule/schedule-day-info/schedule-day-info.styles.scss @@ -0,0 +1,15 @@ +.fitness-schedule-day-info-container { + margin-bottom: 2%; +} + +.fitness-schedule-day-info { + display: block; + justify-content: center; + align-items: center; + padding: 1% 1% 0% 1%; +} + +.remove-exercise-selected-button, +.unselect-exercise-button { + margin: 1%; +} \ No newline at end of file diff --git a/src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-calendar/schedule-calendar.component.jsx b/src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-calendar/schedule-calendar.component.jsx new file mode 100644 index 0000000..f972d85 --- /dev/null +++ b/src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-calendar/schedule-calendar.component.jsx @@ -0,0 +1,70 @@ +import "./schedule-calendar.styles.scss" +import 'rsuite/Calendar/styles/index.css'; +import { Fragment, useContext, useState } from "react"; +import { Calendar, Whisper, Popover, Badge } from 'rsuite'; +import { Typography } from "@mui/material"; +import { COLOR_CODES } from "../../../../../../utils/constants/shared.constants"; + +import { NutritionTrackerContext } from "../../../../../../contexts/signed-in/nutrition-tracker/nutrition-tracker.context"; + +function getScheduledData(date, nutritionTrackedDays) { + date = date.toISOString().split('T')[0] + + let scheduledNutritionTrackedDaysForDate = [] + nutritionTrackedDays.map((nutritionTrackedDay) => { + if (nutritionTrackedDay.dateTracked === date) { + scheduledNutritionTrackedDaysForDate.push({ + calories: nutritionTrackedDay.calories + }) + } + }) + + return scheduledNutritionTrackedDaysForDate +} + +const ScheduleCalendar = () => { + const { nutritionTrackedDays, selectScheduledNutritionTrackedDay } = useContext(NutritionTrackerContext) + + // console.log(nutritionTrackedDays) + + function renderCell(date) { + const list = getScheduledData(date, nutritionTrackedDays); + const displayList = list.filter((item, index) => index < 1); + + if (list.length) { + const moreCount = list.length - displayList.length; + + return ( + +
      + {displayList.map((item, index) => ( +
    • + {`Calories: ${item.calories}`} +
    • + ))} + {moreCount ? `${moreCount} more` : null} +
    + {/* {moreCount} more */} +
    + ); + } + + return null; + } + + const onSelectDate = (date) => { + const selectedDate = date.toISOString().split('T')[0] + console.log(selectedDate) + selectScheduledNutritionTrackedDay(selectedDate) + } + + return ( +
    + {`Nutrition tracker calendar`} + +
    + ) +} + +export default ScheduleCalendar \ No newline at end of file diff --git a/src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-calendar/schedule-calendar.styles.scss b/src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-calendar/schedule-calendar.styles.scss new file mode 100644 index 0000000..2fc760b --- /dev/null +++ b/src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-calendar/schedule-calendar.styles.scss @@ -0,0 +1,26 @@ +.calendar-todo-list { + text-align: left; + padding: 0; + list-style: none; +} + +.calendar-todo-list li { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.calendar-todo-item-badge { + vertical-align: top; + margin-top: 8px; + width: 6px; + height: 6px; +} + +.nutrition-tracker-calendar-container { + display: block; + justify-content: center; + align-items: center; + margin: 2%; + padding: 1%; +} \ No newline at end of file diff --git a/src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-day-info/schedule-day-info.component.jsx b/src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-day-info/schedule-day-info.component.jsx new file mode 100644 index 0000000..e5a4a8e --- /dev/null +++ b/src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-day-info/schedule-day-info.component.jsx @@ -0,0 +1,53 @@ +import "./schedule-day-info.styles.scss" +import { Typography, Divider } from "@mui/material" +import { Fragment, useContext } from "react" +import SimplePaper from "../../../../../shared/mui/paper/paper.component" +import { COLOR_CODES } from "../../../../../../utils/constants/shared.constants" +import { NutritionTrackerContext } from "../../../../../../contexts/signed-in/nutrition-tracker/nutrition-tracker.context" + +const paperStyles = { + backgroundColor: COLOR_CODES.general["1"], + width: 400 +} + +const ScheduleDayInfo = () => { + const { scheduledNutritionTrackedDaysView } = useContext(NutritionTrackerContext) + + return ( +
    + + {`${scheduledNutritionTrackedDaysView.dateTracked}`} + {`Calories - ${scheduledNutritionTrackedDaysView.calories}`} + +
    + +
    + +

    Macronutrients

    + {`Carbohydrates - ${scheduledNutritionTrackedDaysView.macronutrients.carbohydrates} g`} + {`Protein - ${scheduledNutritionTrackedDaysView.macronutrients.protein} g`} + {`Fat - ${scheduledNutritionTrackedDaysView.macronutrients.fat} g`} + + { + scheduledNutritionTrackedDaysView.micronutrients && scheduledNutritionTrackedDaysView.micronutrients.length !== 0 ? + +
    + +
    + +

    Micronutrients

    + { + scheduledNutritionTrackedDaysView.micronutrients.map((micronutrient) => { + return ( + {`${micronutrient.name} - ${micronutrient.amount} ${micronutrient.unit}`} + ) + }) + } +
    : null + } +
    +
    + ) +} + +export default ScheduleDayInfo \ No newline at end of file diff --git a/src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-day-info/schedule-day-info.styles.scss b/src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-day-info/schedule-day-info.styles.scss new file mode 100644 index 0000000..26594f3 --- /dev/null +++ b/src/components/signed-in/dashboard/nutrition-tracker/schedule/schedule-day-info/schedule-day-info.styles.scss @@ -0,0 +1,6 @@ +.nutrition-tracker-schedule-day-info { + display: flex; + justify-content: center; + align-items: center; + padding: 2% 2% 2% 2%; +} \ No newline at end of file diff --git a/src/pages/signed-in/dashboard/dashboard.component.jsx b/src/pages/signed-in/dashboard/dashboard.component.jsx index e12b14f..65a1c1a 100644 --- a/src/pages/signed-in/dashboard/dashboard.component.jsx +++ b/src/pages/signed-in/dashboard/dashboard.component.jsx @@ -9,11 +9,21 @@ import NutritionTrackerSummary from "../../../components/signed-in/dashboard/nut import { useContext, Fragment } from "react" import { NutritionTrackerContext } from "../../../contexts/signed-in/nutrition-tracker/nutrition-tracker.context" import { CaloriesBurnedContext } from "../../../contexts/signed-in/calories-burned/calories-burned.context" +import { FitnessContext } from "../../../contexts/signed-in/fitness/fitness.context" import ChatBot from "../../shared/chatbot/chatbot.component" +import { Divider } from "@mui/material" + +import ScheduleCalendarNutritionTracker from "../../../components/signed-in/dashboard/nutrition-tracker/schedule/schedule-calendar/schedule-calendar.component" +import ScheduleDayInfoNutritionTracker from "../../../components/signed-in/dashboard/nutrition-tracker/schedule/schedule-day-info/schedule-day-info.component" +import ScheduleCalendarCaloriesBurned from "../../../components/signed-in/dashboard/calories-burned/schedule/schedule-calendar/schedule-calendar.component" +import ScheduleDayInfoCaloriesBurned from "../../../components/signed-in/dashboard/calories-burned/schedule/schedule-day-info/schedule-day-info.component" +import ScheduleCalendarFitness from "../../../components/signed-in/dashboard/fitness/schedule/schedule-calendar/schedule-calendar.component" +import ScheduleDayInfoFitness from "../../../components/signed-in/dashboard/fitness/schedule/schedule-day-info/schedule-day-info.component" const Dashboard = () => { - const { nutritionTrackedDays } = useContext(NutritionTrackerContext) - const { trackedCaloriesBurned } = useContext(CaloriesBurnedContext) + const { nutritionTrackedDays, scheduledNutritionTrackedDaysView } = useContext(NutritionTrackerContext) + const { trackedCaloriesBurned, scheduledTrackedCaloriesBurnedView } = useContext(CaloriesBurnedContext) + const { exercises, selectedSearchedExercise } = useContext(FitnessContext) if (nutritionTrackedDays.length === 0 && trackedCaloriesBurned.length === 0) { return ( @@ -31,6 +41,12 @@ const Dashboard = () => { nutritionTrackedDays.length !== 0 &&

    Nutrition Tracker

    + + { + scheduledNutritionTrackedDaysView ? + : null + } + @@ -46,6 +62,11 @@ const Dashboard = () => {

    Calories Burned

    + + { + scheduledTrackedCaloriesBurnedView ? + : null + }
    @@ -54,6 +75,25 @@ const Dashboard = () => {
    } + + { + exercises.length !== 0 && + +
    +
    +
    +
    +

    Fitness

    + + +
    + +
    + + +
    +
    + }
    ) } diff --git a/src/pages/signed-in/dashboard/dashboard.styles.scss b/src/pages/signed-in/dashboard/dashboard.styles.scss index 94933b6..b51ecbb 100644 --- a/src/pages/signed-in/dashboard/dashboard.styles.scss +++ b/src/pages/signed-in/dashboard/dashboard.styles.scss @@ -1,4 +1,6 @@ -.nutrition-tracker-dashboard-container, .calories-burned-dashboard-container { +.nutrition-tracker-dashboard-container, +.calories-burned-dashboard-container, +.fitness-dashboard-container { h3 { display: flex; align-items: center; diff --git a/src/pages/signed-out/dashboard/dashboard.component.jsx b/src/pages/signed-out/dashboard/dashboard.component.jsx index bf9d71e..d65aa1a 100644 --- a/src/pages/signed-out/dashboard/dashboard.component.jsx +++ b/src/pages/signed-out/dashboard/dashboard.component.jsx @@ -76,14 +76,14 @@ const Dashboard = () => {

    Calories Burned

    -
    - -
    { scheduledTrackedCaloriesBurnedView ? : null } +
    + +