From e2618e1c3102d954028500f7ae060bfc1201acc8 Mon Sep 17 00:00:00 2001 From: Francisco Pessano Date: Thu, 23 Sep 2021 16:48:46 -0300 Subject: [PATCH] Added some functions --- src/components/MainPomodoroTimer.jsx | 62 ++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 13 deletions(-) diff --git a/src/components/MainPomodoroTimer.jsx b/src/components/MainPomodoroTimer.jsx index 729f65b..5cc314c 100644 --- a/src/components/MainPomodoroTimer.jsx +++ b/src/components/MainPomodoroTimer.jsx @@ -1,5 +1,4 @@ import React, {useState} from 'react' -import Countdown from 'react-countdown' const MainPomodoroTimer = (props) => { @@ -103,7 +102,6 @@ const MainPomodoroTimer = (props) => { React.useEffect ( setTimeStyle, [] - ) const startTimer = (velocity = 1) => { @@ -123,6 +121,48 @@ const MainPomodoroTimer = (props) => { }, (1000 / velocity)) } + const setBreak = (normal = 0, extended = 0) => { + if (normal && extended) { + console.error('FATAL ERROR, 2 TRUE VALUES SENDED IN THE SETBREAK FUNCTION') + return + } + + if (normal) { + setMinutes(breakTime.normal.minutes) + setSeconds(breakTime.normal.seconds) + } + + if (extended) { + setMinutes(breakTime.extended.minutes) + setSeconds(breakTime.extended.seconds) + } + } + + const setPomodoroCounter = (counter = false) => { + if (!counter) { + console.error('NOT PARAMETER PASSED') + } + + if (counter === "Pomodoros") { + props.setPomodoros(props.pomodoros + 1) + return + } + + if (counter === "Rest") { + props.setRests(props.rests + 1) + return + } + + if (counter === "Long Rest") { + props.setLongRests(props.longRests + 1) + return + } + + if (counter) { + console.error('PARAMETER NOT VALID'); + } + } + React.useEffect ( () => { let idTimeOut @@ -135,13 +175,11 @@ const MainPomodoroTimer = (props) => { if (restCounter !== 3){ setTimeout( () => { - props.setPomodoros(props.pomodoros + 1) + setPomodoroCounter('Pomodoros') setRestCounter((restCounter + 1)) - - setMinutes(breakTime.normal.minutes) - setSeconds(breakTime.normal.seconds) + setBreak(1, 0) setWeAreInBreakTime(true) }, 1000) @@ -151,12 +189,9 @@ const MainPomodoroTimer = (props) => { if (restCounter === 3) { setTimeout( () => { + setPomodoroCounter('Pomodoros') - props.setPomodoros(props.pomodoros + 1) - - setMinutes(breakTime.extended.minutes) - setSeconds(breakTime.extended.seconds) - + setBreak(0, 1) setWeAreInBreakTime(true) }, 1000) @@ -178,12 +213,13 @@ const MainPomodoroTimer = (props) => { setTimeout( () => { if (restCounter === 4) { - props.setLongRests(props.longRests + 1) + setPomodoroCounter('Long rest') setRestCounter(0) } else { - props.setRests(props.rests + 1) + setPomodoroCounter('Rest') } + setWeAreInBreakTime(false) props.setTimerOn(false) setTimeStyle()