From 8a7b4ec1d25b26387e1ecd3e93144fc358fe8539 Mon Sep 17 00:00:00 2001 From: Francisco Pessano Date: Sat, 2 Oct 2021 18:54:55 -0300 Subject: [PATCH] Minor fixes --- .gitignore | 3 +- public/css_styles/styles.css | 22 ++- public/css_styles/styles.css.map | 2 +- public/sass_styles/_banner-login.scss | 4 +- .../sass_styles/_dark-mode_toogle-switch.scss | 10 +- public/sass_styles/_header.scss | 6 + public/sass_styles/_mainPomodoro.scss | 2 + public/sass_styles/styles.scss | 2 +- src/App.js | 9 + src/components/ClockifyTasksDisplay.jsx | 1 + src/components/Header.jsx | 3 + src/components/Identify.jsx | 2 +- .../MainPomodoroTimer.jsx | 47 ++++- .../Main Pomodoro Childrens/timer.js | 166 ++++++++++++++++++ src/components/MainPomodoro.jsx | 4 + src/components/Misc/detectKeys.js | 82 +++++++++ 16 files changed, 348 insertions(+), 17 deletions(-) create mode 100644 src/components/Main Pomodoro Childrens/timer.js create mode 100644 src/components/Misc/detectKeys.js diff --git a/.gitignore b/.gitignore index 886bc05..05b7a7b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,5 +24,4 @@ yarn-error.log* # firebase -/src/components/Firebase -/src/components/Clockify \ No newline at end of file +src/components/Firebase diff --git a/public/css_styles/styles.css b/public/css_styles/styles.css index 644d2e8..cc0daa7 100644 --- a/public/css_styles/styles.css +++ b/public/css_styles/styles.css @@ -44,6 +44,11 @@ background-color: #ffe83d; color: #000000; } +.header-main-page .konami-code { + font-family: "Raleway", sans-serif; + font-weight: 700; + color: #4c8ad5; +} @media (max-width: 991.98px) { .header-main-page { @@ -70,7 +75,7 @@ align-items: center; justify-content: space-between; padding: 0px 5vw; - height: 7vh; + height: 8vh; } .banner-login p { margin: 0; @@ -85,7 +90,7 @@ background: none; border: none; width: 8vw; - font-size: 2.6vh; + font-size: 12pt; font-weight: bold; color: #ffffff; height: 6vh; @@ -191,6 +196,9 @@ } @media (max-width: 576px) { + .main-pomodoro { + height: auto; + } .main-pomodoro .timer { font-size: 80pt; } @@ -335,7 +343,7 @@ color: #4c8ad5; } .style-selector-container.dark-mode-component .style-selector .style-selection-container .checkbox_control { - border: 3px solid #3e70ae; + border: 3px solid #eff3f8; } .style-selector-container.dark-mode-component .style-selector .style-selection-container .checkbox__input input:checked + .checkbox_control { background-color: #4c8ad5; @@ -672,6 +680,14 @@ html, body { .dark-mode { position: initial; } + .dark-mode label { + width: 50px; + height: 20px; + } + .dark-mode label::after { + width: 15px; + height: 15px; + } } @media (max-width: 576px) { .dark-mode { diff --git a/public/css_styles/styles.css.map b/public/css_styles/styles.css.map index ccd89f3..0f66a35 100644 --- a/public/css_styles/styles.css.map +++ b/public/css_styles/styles.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../sass_styles/_header.scss","../sass_styles/styles.scss","../sass_styles/_banner-login.scss","../sass_styles/_mainPomodoro.scss","../sass_styles/_styleSelector.scss","../sass_styles/_goDownArrow.scss","../sass_styles/_aboutThis.scss","../sass_styles/_historyButton.scss","../sass_styles/_pomodoro-counter.scss","../sass_styles/_identify.scss","../sass_styles/_dark-mode_toogle-switch.scss","../sass_styles/_account.scss","../sass_styles/_goToAccount.scss","../sass_styles/_clockify-tasks-display.scss","../sass_styles/_made-with-love.scss"],"names":[],"mappings":"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","file":"styles.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../sass_styles/_header.scss","../sass_styles/styles.scss","../sass_styles/_banner-login.scss","../sass_styles/_mainPomodoro.scss","../sass_styles/_styleSelector.scss","../sass_styles/_goDownArrow.scss","../sass_styles/_aboutThis.scss","../sass_styles/_historyButton.scss","../sass_styles/_pomodoro-counter.scss","../sass_styles/_identify.scss","../sass_styles/_dark-mode_toogle-switch.scss","../sass_styles/_account.scss","../sass_styles/_goToAccount.scss","../sass_styles/_clockify-tasks-display.scss","../sass_styles/_made-with-love.scss"],"names":[],"mappings":"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","file":"styles.css"} \ No newline at end of file diff --git a/public/sass_styles/_banner-login.scss b/public/sass_styles/_banner-login.scss index 30f5962..66e944c 100644 --- a/public/sass_styles/_banner-login.scss +++ b/public/sass_styles/_banner-login.scss @@ -10,7 +10,7 @@ padding: 0px 5vw; - height: 7vh; + height: 8vh; p { @@ -27,7 +27,7 @@ button { @include normalizeButton(); - font-size: 2.6vh; + font-size: 12pt; font-weight: bold; color: #ffffff; diff --git a/public/sass_styles/_dark-mode_toogle-switch.scss b/public/sass_styles/_dark-mode_toogle-switch.scss index 7608447..0530815 100644 --- a/public/sass_styles/_dark-mode_toogle-switch.scss +++ b/public/sass_styles/_dark-mode_toogle-switch.scss @@ -49,7 +49,15 @@ .dark-mode { position: initial; - + label { + width: 50px; + height: 20px; + } + + label::after { + width: 15px; + height: 15px; + } } } diff --git a/public/sass_styles/_header.scss b/public/sass_styles/_header.scss index 689ab62..409bc91 100644 --- a/public/sass_styles/_header.scss +++ b/public/sass_styles/_header.scss @@ -53,6 +53,12 @@ } } } + + .konami-code { + @include titleFont(); + + color: $lightest-color-dark; + } } diff --git a/public/sass_styles/_mainPomodoro.scss b/public/sass_styles/_mainPomodoro.scss index 096d433..e2bf429 100644 --- a/public/sass_styles/_mainPomodoro.scss +++ b/public/sass_styles/_mainPomodoro.scss @@ -69,6 +69,8 @@ @media (max-width: 576px) { .main-pomodoro { + + height: auto; .timer { font-size: 80pt; diff --git a/public/sass_styles/styles.scss b/public/sass_styles/styles.scss index 23297c3..a9e07e8 100644 --- a/public/sass_styles/styles.scss +++ b/public/sass_styles/styles.scss @@ -49,7 +49,7 @@ $second-color-dark: #3A4750; $light-color-dark: #D72323; $light-color-dark-darker: #7c1414; $lightest-color-dark: #4c8ad5; -$lightest-color-dark-darker: #3e70ae; +$lightest-color-dark-darker: #eff3f8; @import 'header'; @import 'banner-login'; diff --git a/src/App.js b/src/App.js index f86e6ac..10275da 100644 --- a/src/App.js +++ b/src/App.js @@ -3,6 +3,8 @@ import {firebase} from './components/Firebase/firebase' import {getAuth, onAuthStateChanged} from 'firebase/auth' import { doc, updateDoc, getFirestore, collection, getDoc } from "firebase/firestore"; +import detectKeys from './components/Misc/detectKeys'; + import AboutThis from "./components/AboutThis"; import BannerLogin from "./components/BannerLogin"; import GoDownArrow from "./components/GoDownArrow"; @@ -37,6 +39,8 @@ function App() { const [darkMode, setDarkmode] = useState(false) + const [KonamiCodeActive, setKonamiCodeActive] = useState(false) + const auth = getAuth() onAuthStateChanged(auth, (user) => { @@ -69,6 +73,8 @@ function App() { darkMode={darkMode} setDarkmode={setDarkmode} + + KonamiCodeActive= {KonamiCodeActive} /> @@ -129,6 +135,9 @@ function App() { setProjectID={setProjectID} darkMode={darkMode} + + setKonamiCodeActive = {setKonamiCodeActive} + KonamiCodeActive= {KonamiCodeActive} /> { diff --git a/src/components/Header.jsx b/src/components/Header.jsx index f2d723f..511c99c 100644 --- a/src/components/Header.jsx +++ b/src/components/Header.jsx @@ -18,6 +18,9 @@ const Header = (props) => { signIn={props.signIn} darkMode={props.darkMode} /> +
+ {props.KonamiCodeActive ? 'Konami Code ON' : null} +
) } diff --git a/src/components/Identify.jsx b/src/components/Identify.jsx index d151e3b..9add1e8 100644 --- a/src/components/Identify.jsx +++ b/src/components/Identify.jsx @@ -171,7 +171,7 @@ const Identify = (props) => { if (action === 'clss') { signOutFromApp() - props.history.push('/') + return } onAuthStateChanged(auth, (user) => { diff --git a/src/components/Main Pomodoro Childrens/MainPomodoroTimer.jsx b/src/components/Main Pomodoro Childrens/MainPomodoroTimer.jsx index 3728ff2..298f857 100644 --- a/src/components/Main Pomodoro Childrens/MainPomodoroTimer.jsx +++ b/src/components/Main Pomodoro Childrens/MainPomodoroTimer.jsx @@ -3,6 +3,7 @@ import React, {useState} from 'react' import uploadToClockifyTimer from '../Clockify/uploadToClockifyTimer' import getAndFormatCurrentTime from '../Clockify/getAndFormatCurrentTime' import randomText from '../Misc/randomText' +import detectKeys from '../Misc/detectKeys' import bell_x2 from '../sounds/bell-x2.mp3' import bell_x3 from '../sounds/bell-x3.mp3' @@ -19,11 +20,15 @@ const MainPomodoroTimer = (props) => { const [timerActivity, setTimerActivity] = useState(false) - const [actualStyle, setActualStyle] = useState('Regular') + const [actualStyle, setActualStyle] = useState('') 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 [controlKonamiCode, setControlKonamiCode] = useState(true) + + const [velocity, setVelocity] = useState(1) + const setTimeStyle = () => { if (props.style === 'Can I play, Daddy?') { @@ -141,14 +146,44 @@ const MainPomodoroTimer = (props) => { } + + + + React.useEffect (() => { if (actualStyle !== props.style) { setTimeStyle() } + + if (controlKonamiCode) { + + detectKeys(props.setKonamiCodeActive) + + setControlKonamiCode(false) + } + }) - const startTimer = (velocity = 1) => { + const startTimer = () => { + + document.title = minutes + ':' + seconds + + document.addEventListener('visibilitychange', () => { + + if (document.visibilityState === 'hidden') { + + setVelocity(2) + console.log(document.visibilityState) + } + + if (document.visibilityState === 'visible') { + + setVelocity(1) + console.log(document.visibilityState) + } + }); + return setTimeout(() => { if (seconds === 0) { @@ -238,7 +273,7 @@ const MainPomodoroTimer = (props) => { getFavicon().href = './img/working favicon.ico' if (!alreadyCountingStart) { - const time = getAndFormatCurrentTime() + const time = getAndFormatCurrentTime(props.KonamiCodeActive) props.setStartTime(time) setAlreadyCountingStart(true) @@ -278,7 +313,7 @@ const MainPomodoroTimer = (props) => { } if (!alreadyCountingEnd) { - const time = getAndFormatCurrentTime() + const time = getAndFormatCurrentTime(props.KonamiCodeActive) props.setEndTime(time) setAlreadyCountingEnd(true) @@ -292,7 +327,7 @@ const MainPomodoroTimer = (props) => { if (minutes >= 0 || seconds > 0) { - idTimeOut = startTimer() + idTimeOut = startTimer() } } @@ -350,7 +385,7 @@ const MainPomodoroTimer = (props) => { setRestCounter((restCounter + 1)) if (!alreadyCountingEnd) { - const time = getAndFormatCurrentTime() + const time = getAndFormatCurrentTime(props.KonamiCodeActive) props.setEndTime(time) setAlreadyCountingEnd(true) diff --git a/src/components/Main Pomodoro Childrens/timer.js b/src/components/Main Pomodoro Childrens/timer.js new file mode 100644 index 0000000..3dabe01 --- /dev/null +++ b/src/components/Main Pomodoro Childrens/timer.js @@ -0,0 +1,166 @@ +import React from 'react' + +const timer = (props, setTimerActivity, weAreInBreakTime, getFavicon, alreadyCountingStart, getAndFormatCurrentTime, setAlreadyCountingStart, minutes, seconds, playAudio, restCounter, setPomodoroCounter, setRestCounter, setBreak, setWeAreInBreakTime, randomText, alreadyCountingEnd, setAlreadyCountingEnd, idTimeOut, startTimer, setTimeStyle, timerActivity) => { + + if (props.timerOn) { + setTimerActivity(true) + + if (!weAreInBreakTime) { + + + getFavicon().href = './img/working favicon.ico' + + if (!alreadyCountingStart) { + const time = getAndFormatCurrentTime() + props.setStartTime(time) + + setAlreadyCountingStart(true) + + document.title = randomText('work') + } + + if (minutes === 0 && seconds === 0) { + setTimerActivity(false) + + playAudio('work') + + if (restCounter !== 3){ + + setTimeout( () => { + setPomodoroCounter('Pomodoros') + + setRestCounter((restCounter + 1)) + + setBreak(1, 0) + setWeAreInBreakTime(true) + + }, 1000) + + } + + if (restCounter === 3) { + + setTimeout( () => { + setPomodoroCounter('Pomodoros') + setRestCounter((restCounter + 1)) + + setBreak(0, 1) + setWeAreInBreakTime(true) + + }, 1000) + } + + if (!alreadyCountingEnd) { + const time = getAndFormatCurrentTime() + + props.setEndTime(time) + setAlreadyCountingEnd(true) + + props.setLetsUpload(true) + + document.title = randomText('rest') + } + } + + + if (minutes >= 0 || seconds > 0) { + + idTimeOut = startTimer() + } + } + + if(weAreInBreakTime) { + + getFavicon().href = './img/rest favicon.ico' + + if (minutes === 0 && seconds === 0) { + setTimerActivity(false) + + playAudio('rest') + + setTimeout( () => { + + if (restCounter === 4) { + setPomodoroCounter('Long Rest') + setRestCounter(0) + + } else { + setPomodoroCounter('Rest') + } + + setWeAreInBreakTime(false) + props.setTimerOn(false) + + setTimeStyle() + + }, 1000) + } + + if (minutes >= 0 || seconds > 0) { + + idTimeOut = startTimer() + + } + } + + return () => { + clearInterval(idTimeOut) + } + + } + + if (!props.timerOn) { + document.title = 'Clockify Pomodoro Timer' + + getFavicon().href = './img/favicon.ico' + + if ( timerActivity === true) { + + if (!weAreInBreakTime) { + + if (minutes <= ( setTimeStyle().minutes / 2) ) { + setPomodoroCounter('Pomodoros') + setRestCounter((restCounter + 1)) + + if (!alreadyCountingEnd) { + const time = getAndFormatCurrentTime() + + props.setEndTime(time) + setAlreadyCountingEnd(true) + + props.setLetsUpload(true) + } + } + } + + + + if (weAreInBreakTime) { + + + + if (restCounter === 4) { + + + setPomodoroCounter('Long Rest') + setRestCounter(0) + + } else { + + + setPomodoroCounter('Rest') + } + + setWeAreInBreakTime(false) + } + + setTimerActivity(false) + setTimeStyle() + } + + setAlreadyCountingStart(false) + setAlreadyCountingEnd(false) + } +} + +export default timer diff --git a/src/components/MainPomodoro.jsx b/src/components/MainPomodoro.jsx index e9ce551..45ac524 100644 --- a/src/components/MainPomodoro.jsx +++ b/src/components/MainPomodoro.jsx @@ -85,6 +85,10 @@ const MainPomodoro = (props) => { setEndTime={setEndTime} setLetsUpload={setLetsUpload} + + setKonamiCodeActive={props.setKonamiCodeActive} + KonamiCodeActive= {props.KonamiCodeActive} + /> diff --git a/src/components/Misc/detectKeys.js b/src/components/Misc/detectKeys.js new file mode 100644 index 0000000..9d0d706 --- /dev/null +++ b/src/components/Misc/detectKeys.js @@ -0,0 +1,82 @@ +import React from 'react' + +const detectKeys = (setKonamiCodeActive) => { + + let secuencie = [] + + window.addEventListener('keydown', (event) => { + + console.log(event.key) + + + let k = event.key + + secuencie.push(k) + + if ( + secuencie[0] === 'ArrowUp' && + secuencie[1] === 'ArrowUp' && + secuencie[2] === 'ArrowDown' && + secuencie[3] === 'ArrowDown' && + secuencie[4] === 'ArrowLeft' && + secuencie[5] === 'ArrowRight' && + secuencie[6] === 'ArrowLeft' && + secuencie[7] === 'ArrowRight' && + (secuencie[8] === 'b' || secuencie[8] === 'B') && + (secuencie[9] === 'a' || secuencie[9] === 'A') && + secuencie[10] === 'Enter' + ) { + + console.log('TODO BIEN') + secuencie = [] + + setKonamiCodeActive(true) + + return true + } + + if (secuencie.length >= 12) { + + secuencie = [] + } + + switch (k) { + case 'ArrowUp': + break; + + case 'ArrowDown': + break; + + case 'ArrowRight': + break; + + case 'ArrowLeft': + break; + + case 'b': + break; + + case 'B': + break; + + case 'a': + break; + + case 'A': + break; + + case 'Enter': + break; + + default: + + secuencie = [] + break; + } + + console.log(secuencie) + + }) +} + +export default detectKeys