Merge pull request #8 from GabrielaTiago/hot-fixes

Hot fixes

Author: GabrielaTiago

public/favicon.ico

@@ -14,18 +14,18 @@ import { getHabits } from "../../shared/services/habits/habitsApi";
 
 export function Habits() {
   const { getItemFromLocalStorage } = useLocalStorage();
-  const userData = getItemFromLocalStorage("userData");
+  const { token } = getItemFromLocalStorage("userData");
   const { toggleDivNewHabit, lisOfUserHabits, setListOfUserHabits } =
     useUserHabitsContext();
 
   const GetHabits = useCallback(async () => {
     try {
-      const response = await getHabits(userData.token);
+      const response = await getHabits(token);
       setListOfUserHabits(response);
     } catch (err) {
       alert(`Erro ao listar seus hábitos - ${err.data.message}`);
     }
-  }, [userData.token, setListOfUserHabits]);
+  }, [token, setListOfUserHabits]);
 
   useEffect(() => {
     GetHabits();

src/pages/Habits/Habits.jsx

@@ -4,14 +4,14 @@ import { deleteHabit } from "../../../../shared/services/habits/habitsApi";
 
 export function Delete({ id, GetHabits }) {
   const { getItemFromLocalStorage } = useLocalStorage();
-  const userData = getItemFromLocalStorage("userData");
+  const { token } = getItemFromLocalStorage("userData");
 
   async function deleteThisHabit(id) {
     const confirmDelete = window.confirm("Deseja mesmo deletar este hábito?");
 
     if (confirmDelete) {
       try {
-        await deleteHabit(id, userData.token);
+        await deleteHabit(id, token);
         GetHabits();
       } catch (err) {
         alert(`Erro ao deletar seu hábito - ${err.data.message}`);

src/pages/Habits/components/Buttons/Delete.jsx

@@ -7,7 +7,7 @@ import { createHabit } from "../../../../shared/services/habits/habitsApi";
 
 export function Save() {
   const { getItemFromLocalStorage } = useLocalStorage();
-  const userData = getItemFromLocalStorage("userData");
+  const { token } = getItemFromLocalStorage("userData");
   const [loading, setLoading] = useState(false);
   const {
     toggleDivNewHabit,
@@ -34,7 +34,7 @@ export function Save() {
       try {
         const response = await createHabit(
           { name: habitName, days: daysSelection },
-          userData.token
+          token
         );
 
         if (response) {

src/pages/Habits/components/Buttons/Save.jsx

@@ -2,7 +2,7 @@ import styled from "styled-components";
 
 const Container = styled.div`
   width: 100%;
-  margin-bottom: 12px;
+  margin-bottom: 7%;
   display: flex;
   flex-direction: column;
   gap: 8px;

src/pages/Habits/components/ListOfHabits/Styles.js

@@ -1,28 +1,29 @@
 import { useCallback, useEffect } from "react";
-import { ListOfTodayHabits, PageTitleWrapper, TodayProgress } from "./components";
 import {
-  Footer,
-  Header,
-  Main,
-  PageTitle,
-} from "../../shared/components";
-import {  useHabitsContext } from "../../shared/contexts";
+  ListOfTodayHabits,
+  PageTitleWrapper,
+  TodayProgress,
+} from "./components";
+import { Footer, Header, Main, PageTitle } from "../../shared/components";
+import { useHabitsContext } from "../../shared/contexts";
+import { useLocalStorage } from "../../shared/hooks";
 import { getTodayHabits } from "../../shared/services/habits/habitsApi";
 import { formatWeekday } from "../../shared/utils";
 
 export function Today() {
-  const userData = JSON.parse(localStorage.getItem("userData"));
+  const { getItemFromLocalStorage } = useLocalStorage();
+  const { token } = getItemFromLocalStorage("userData");
   const { setTodayHabits } = useHabitsContext();
   const weekDay = formatWeekday();
 
   const GetTodayHabits = useCallback(async () => {
     try {
-      const response = await getTodayHabits(userData.token);
+      const response = await getTodayHabits(token);
       setTodayHabits(response);
     } catch (err) {
       alert(`Erro ao listar seus hábitos de hoje - ${err.data.message}`);
     }
-  }, [userData.token, setTodayHabits]);
+  }, [token, setTodayHabits]);
 
   useEffect(() => {
     GetTodayHabits();
@@ -36,7 +37,7 @@ export function Today() {
           <PageTitle>{weekDay}</PageTitle>
           <TodayProgress />
         </PageTitleWrapper>
-        
+
         <ListOfTodayHabits />
       </Main>
       <Footer />

src/pages/Today/Today.jsx

@@ -9,24 +9,24 @@ import {
 
 export function Check({ id, index, done }) {
   const { getItemFromLocalStorage } = useLocalStorage();
-  const userData = getItemFromLocalStorage("userData");
+  const { token } = getItemFromLocalStorage("userData");
   const { todayHabits, setTodayHabits } = useHabitsContext();
 
   function checkAsDone(id, index) {
     const localValue = todayHabits[index];
 
-    if (localValue.done === true) {
+    if (done) {
       localValue.done = !localValue.done;
       localValue.currentSequence = localValue.currentSequence - 1;
       localValue.highestSequence = localValue.highestSequence - 1;
 
-      markAsUndone(id, userData.token);
+      markAsUndone(id, token);
     } else {
       localValue.done = !localValue.done;
       localValue.currentSequence = localValue.currentSequence + 1;
       localValue.highestSequence = localValue.highestSequence + 1;
 
-      markAsDone(id, userData.token);
+      markAsDone(id, token);
     }
   }
 
@@ -44,7 +44,7 @@ export function Check({ id, index, done }) {
       await uncheckHabit(id, token);
       setTodayHabits([...todayHabits]);
     } catch (err) {
-      alert(`Erro ao marcar seu hábito como feito - ${err.data.message}`);
+      alert(`Erro ao marcar seu hábito como não feito - ${err.data.message}`);
     }
   }
 

src/pages/Today/components/Check/Check.jsx

@@ -7,7 +7,6 @@ export function ListOfTodayHabits() {
   return (
     <Container>
       {todayHabits.map((habit, index) => {
-        console.log(habit);
         const { id, name, done, currentSequence, highestSequence } = habit;
         return (
           <Habit

src/pages/Today/components/ListOfTodayHabits/ListOfTodayHabits.jsx

@@ -3,7 +3,7 @@ import styled from "styled-components";
 const Container = styled.div`
   width: 100%;
   display: flex;
-  margin-bottom: 12px;
+  margin-bottom: 7%;
   flex-direction: column;
   align-items: center;
   gap: 8px;

src/pages/Today/components/ListOfTodayHabits/Styles.js

@@ -1,8 +1,8 @@
 import { useCallback, useEffect } from "react";
 import { Container } from "./Styles";
+import { ProgressBar } from "./ProgressBar";
 import { GoTo } from "../GoTo/GoTo";
 import { useHabitsContext, useProgressContext } from "../../contexts";
-import { ProgressBar } from "./ProgressBar";
 
 export function Footer() {
   const { setProgress } = useProgressContext();
@@ -17,7 +17,11 @@ export function Footer() {
       );
     }
 
-    setProgress(Math.round((progressValue * 100) / todayHabits.length));
+    const progressPercentage = (progressValue * 100) / todayHabits.length;
+    const roundedProgress = Math.round(progressPercentage);
+
+    setProgress(roundedProgress);
+
   }, [todayHabits, setProgress]);
 
   useEffect(() => {