mirror of
https://github.com/FranP-code/Pomodoro-Timer-with-Clockify-integration.git
synced 2025-10-12 23:52:30 +00:00
Added the date register
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
import React, {useState} from 'react'
|
import React, {useState} from 'react'
|
||||||
|
|
||||||
import uploadToClockifyTimer from '../Clockify/uploadToClockifyTimer'
|
import uploadToClockifyTimer from '../Clockify/uploadToClockifyTimer'
|
||||||
|
import getAndFormatCurrentTime from '../Clockify/getAndFormatCurrentTime'
|
||||||
|
|
||||||
const MainPomodoroTimer = (props) => {
|
const MainPomodoroTimer = (props) => {
|
||||||
|
|
||||||
@@ -16,6 +17,11 @@ const MainPomodoroTimer = (props) => {
|
|||||||
|
|
||||||
const [actualStyle, setActualStyle] = useState('Regular')
|
const [actualStyle, setActualStyle] = useState('Regular')
|
||||||
|
|
||||||
|
const [alreadyCountingStart, setAlreadyCountingStart] = useState(false) /* TOO MUCH FUCKING STATES https://pbs.twimg.com/media/EoM2rXuW8AMRxZh?format=png&name=large*/
|
||||||
|
const [alreadyCountingEnd, setAlreadyCountingEnd] = useState(false)
|
||||||
|
|
||||||
|
const [startTime, setStartTime] = useState('')
|
||||||
|
|
||||||
const setTimeStyle = () => {
|
const setTimeStyle = () => {
|
||||||
|
|
||||||
if (props.style === 'Can I play, Daddy?') {
|
if (props.style === 'Can I play, Daddy?') {
|
||||||
@@ -199,13 +205,32 @@ const MainPomodoroTimer = (props) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*React.useEffect( () => {
|
||||||
|
|
||||||
|
if (props.timerOn) {
|
||||||
|
getAndFormatCurrentTime()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!props.timerOn){
|
||||||
|
getAndFormatCurrentTime()
|
||||||
|
//uploadToClockifyTimer( props.workspaceID, props.projectID, '2021-10-02T13:00:14Z', '2021-10-02T15:00:14Z', props.apiKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
})*/
|
||||||
|
|
||||||
React.useEffect ( () => {
|
React.useEffect ( () => {
|
||||||
let idTimeOut
|
let idTimeOut
|
||||||
|
|
||||||
if (props.timerOn) {
|
if (props.timerOn) {
|
||||||
setTimerActivity(true)
|
setTimerActivity(true)
|
||||||
|
|
||||||
if(!weAreInBreakTime) {
|
if (!weAreInBreakTime) {
|
||||||
|
|
||||||
|
if (!alreadyCountingStart) {
|
||||||
|
getAndFormatCurrentTime()
|
||||||
|
|
||||||
|
setAlreadyCountingStart(true)
|
||||||
|
}
|
||||||
|
|
||||||
if (minutes === 0 && seconds === 0) {
|
if (minutes === 0 && seconds === 0) {
|
||||||
setTimerActivity(false)
|
setTimerActivity(false)
|
||||||
@@ -236,14 +261,17 @@ const MainPomodoroTimer = (props) => {
|
|||||||
}, 1000)
|
}, 1000)
|
||||||
}
|
}
|
||||||
|
|
||||||
uploadToClockifyTimer( props.workspaceID, props.projectID, '2021-10-02T13:00:14Z', '2021-10-02T15:00:14Z', props.apiKey)
|
if (!alreadyCountingEnd) {
|
||||||
|
getAndFormatCurrentTime()
|
||||||
|
|
||||||
|
setAlreadyCountingEnd(true)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (minutes >= 0 || seconds > 0) {
|
if (minutes >= 0 || seconds > 0) {
|
||||||
|
|
||||||
idTimeOut = startTimer()
|
idTimeOut = startTimer()
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -281,45 +309,52 @@ const MainPomodoroTimer = (props) => {
|
|||||||
clearInterval(idTimeOut)
|
clearInterval(idTimeOut)
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (props.timerOn === false && timerActivity === true){
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!weAreInBreakTime) {
|
if (!props.timerOn) {
|
||||||
|
|
||||||
|
if ( timerActivity === true) {
|
||||||
|
|
||||||
|
if (!weAreInBreakTime) {
|
||||||
|
|
||||||
if (minutes <= ( setTimeStyle().minutes / 2) ) {
|
if (minutes <= ( setTimeStyle().minutes / 2) ) {
|
||||||
setPomodoroCounter('Pomodoros')
|
setPomodoroCounter('Pomodoros')
|
||||||
setRestCounter((restCounter + 1))
|
setRestCounter((restCounter + 1))
|
||||||
|
|
||||||
|
if (!alreadyCountingEnd) {
|
||||||
|
getAndFormatCurrentTime()
|
||||||
|
|
||||||
|
setAlreadyCountingEnd(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if (weAreInBreakTime) {
|
if (weAreInBreakTime) {
|
||||||
|
|
||||||
console.log(restCounter)
|
console.log(restCounter)
|
||||||
|
|
||||||
if (restCounter === 4) {
|
if (restCounter === 4) {
|
||||||
console.log('AA3')
|
console.log('AA3')
|
||||||
|
|
||||||
setPomodoroCounter('Long Rest')
|
setPomodoroCounter('Long Rest')
|
||||||
setRestCounter(0)
|
setRestCounter(0)
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
console.log('AA2')
|
console.log('AA2')
|
||||||
|
|
||||||
setPomodoroCounter('Rest')
|
setPomodoroCounter('Rest')
|
||||||
|
}
|
||||||
|
|
||||||
|
setWeAreInBreakTime(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
setWeAreInBreakTime(false)
|
setTimerActivity(false)
|
||||||
|
setTimeStyle()
|
||||||
}
|
}
|
||||||
|
|
||||||
setTimerActivity(false)
|
|
||||||
setTimeStyle()
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
}, [props.timerOn, minutes, seconds, breakTime, setMinutes, setSeconds, getAndFormatCurrentTime, setAlreadyCountingEnd, setAlreadyCountingStart, alreadyCountingEnd, alreadyCountingStart]
|
||||||
}, [props.timerOn, minutes, seconds, breakTime, setMinutes, setSeconds]
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const formatMinutes = () => {
|
const formatMinutes = () => {
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import React, {useState} from 'react'
|
import React, {useState} from 'react'
|
||||||
import MainPomodoroTimer, {setTim} from './Main Pomodoro Childrens/MainPomodoroTimer'
|
import MainPomodoroTimer from './Main Pomodoro Childrens/MainPomodoroTimer'
|
||||||
import PomodoroCounter from './Main Pomodoro Childrens/PomodoroCounter'
|
import PomodoroCounter from './Main Pomodoro Childrens/PomodoroCounter'
|
||||||
import StyleSelector from './Main Pomodoro Childrens/StyleSelector'
|
import StyleSelector from './Main Pomodoro Childrens/StyleSelector'
|
||||||
import { makeRequest } from './Clockify/clockify'
|
|
||||||
import ClockifyTasksDisplay from './ClockifyTasksDisplay'
|
|
||||||
|
|
||||||
const MainPomodoro = (props) => {
|
const MainPomodoro = (props) => {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user