From 5ad9a1581c8baba21a952ebba3d1aa8277fbae9c Mon Sep 17 00:00:00 2001 From: Francisco Pessano Date: Sun, 10 Oct 2021 16:00:37 -0300 Subject: [PATCH] BUG FIX --- public/css_styles/styles.css | 33 ++++- public/css_styles/styles.css.map | 2 +- public/sass_styles/_identify.scss | 42 +++++- src/App.js | 3 + .../Identify Childrens/LoginForm.jsx | 7 + .../Identify Childrens/ResetPassword.jsx | 19 +++ src/components/Identify.jsx | 94 ++++++++++++-- .../setTimeStyle.js | 117 +++++++++++++++++ .../MainPomodoroTimer.jsx | 122 +----------------- 9 files changed, 304 insertions(+), 135 deletions(-) create mode 100644 src/components/Identify Childrens/ResetPassword.jsx create mode 100644 src/components/Main Pomodoro Childrens/MainPomodoroTimer Children/setTimeStyle.js diff --git a/public/css_styles/styles.css b/public/css_styles/styles.css index cc0daa7..0c73417 100644 --- a/public/css_styles/styles.css +++ b/public/css_styles/styles.css @@ -553,14 +553,14 @@ html, body { .identify-container:has { height: 100%; } -.identify-container .error-message-container { +.identify-container .error-message-container, .identify-container .success-message-container { width: 70vw; background-color: #D17262; display: flex; justify-content: center; align-items: center; } -.identify-container .error-message-container p { +.identify-container .error-message-container p, .identify-container .success-message-container p { margin: 2vw; color: #ffffff; font-family: "Raleway", sans-serif; @@ -568,6 +568,12 @@ html, body { user-select: none; font-size: 22pt; } +.identify-container .success-message-container { + background-color: #D7FBE8; +} +.identify-container .success-message-container p { + color: #464646; +} .identify-container .identify { width: 70vw; } @@ -619,6 +625,29 @@ html, body { border: #969696 solid 1px; } +.loading-container { + width: 100%; + height: 83vh; + display: flex; + justify-content: center; + align-items: center; +} +.loading-container.dark-mode-component { + background-color: #303841; +} + +.reset-password { + height: 4vh; + width: 60%; + margin-bottom: 1vh; + border: none; + border-bottom: 1px solid #969696; + outline: none; + width: 50%; + border: #969696 solid 1px; + background-color: #62D2A2; +} + .identify-container.dark-mode-component { background-color: #3A4750; } diff --git a/public/css_styles/styles.css.map b/public/css_styles/styles.css.map index 0f66a35..0a53d0d 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/_identify.scss b/public/sass_styles/_identify.scss index cc08d8e..7273719 100644 --- a/public/sass_styles/_identify.scss +++ b/public/sass_styles/_identify.scss @@ -13,7 +13,7 @@ html, body { flex-grow: 1; - .error-message-container { + .error-message-container, .success-message-container { width: 70vw; background-color: #D17262; @@ -33,6 +33,17 @@ html, body { } + + } + + .success-message-container { + + background-color: $lightest-color; + + p { + + color: #464646; + } } .identify { @@ -106,6 +117,35 @@ html, body { } +.loading-container { + width: 100%; + height: 83vh; + + display: flex; + justify-content: center; + align-items: center; + + &.dark-mode-component { + background-color:$main-color-dark ; + } +} + +.reset-password { + height: 4vh; + width: 60%; + + margin-bottom: 1vh; + + border: none; + border-bottom: 1px solid $border-color; + outline: none; + + width: 50%; + border: $border-color solid 1px; + background-color: $main-color; + +} + .identify-container.dark-mode-component { background-color: $second-color-dark; diff --git a/src/App.js b/src/App.js index 10275da..bffafbe 100644 --- a/src/App.js +++ b/src/App.js @@ -24,6 +24,7 @@ import ClockifyTasksDisplay from './components/ClockifyTasksDisplay'; import Credits from './components/Credits'; import Footer from './components/Footer'; +import ResetPassword from './components/Identify Childrens/ResetPassword'; function App() { @@ -79,6 +80,8 @@ function App() { + + { return ( + <>
{ }} /> + +
+ + + + ) } diff --git a/src/components/Identify Childrens/ResetPassword.jsx b/src/components/Identify Childrens/ResetPassword.jsx new file mode 100644 index 0000000..10ca2af --- /dev/null +++ b/src/components/Identify Childrens/ResetPassword.jsx @@ -0,0 +1,19 @@ +import React from 'react' + +const ResetPassword = (props) => { + return ( +
+ { + props.setEmail(e.target.value) + }} + /> + + +
+ ) +} + +export default ResetPassword diff --git a/src/components/Identify.jsx b/src/components/Identify.jsx index 9add1e8..09ffde1 100644 --- a/src/components/Identify.jsx +++ b/src/components/Identify.jsx @@ -5,8 +5,12 @@ import RegisterForm from './Identify Childrens/RegisterForm' import {firebase} from './Firebase/firebase' import {withRouter} from 'react-router-dom' -import {getAuth, createUserWithEmailAndPassword, signInWithEmailAndPassword, signOut, onAuthStateChanged } from 'firebase/auth' +import {getAuth, createUserWithEmailAndPassword, signInWithEmailAndPassword, signOut, onAuthStateChanged, sendPasswordResetEmail } from 'firebase/auth' import { getFirestore, collection, doc, setDoc } from 'firebase/firestore' +import ResetPassword from './Identify Childrens/ResetPassword' + +import loadingGifLightTheme from './img/loading-light-theme.png' +import loadingGifDarkTheme from './img/loading-dark-theme.png' const Identify = (props) => { @@ -19,6 +23,8 @@ const Identify = (props) => { const [message, setMessage] = React.useState('') const [errorMessage, setErrorMessage] = React.useState(0) + const [successMessage, setSuccessMessage] = React.useState(0) + const [loading, setLoading] = useState(false) const auth = getAuth() @@ -39,10 +45,14 @@ const Identify = (props) => { addNewUserToFirebase(uid) props.history.push('/config-account') + setLoading(false) + } catch (error) { setMessage(error.message) + setLoading(false) + } } @@ -73,17 +83,35 @@ const Identify = (props) => { try { const response = await signInWithEmailAndPassword(auth, email, password) - - props.history.push('/config-account') + await setLoading(false) + } catch (error) { setErrorMessage('USER OR PASSWORD NOT VALID') + setLoading(false) + } } + const resetPasswordFirestore = async () => { + + try { + + const response = await sendPasswordResetEmail(auth, email) + + setSuccessMessage('Recovery email send') + setLoading(false) + + } catch (error) { + setErrorMessage('There was a problem sending the email.') + setLoading(false) + + } + } + const defineLogin = () => { if (act !== 'login') { setAct('login') @@ -99,30 +127,46 @@ const Identify = (props) => { const sendForm = (e) => { e.preventDefault() + setLoading(true) + if (!email.trim()) { setErrorMessage('EMAIL EMPTY') + setLoading(false) + return } - if (!password.trim()) { - setErrorMessage('PASSWORD EMPTY') - return - } + if (act !== 'i forgor') { + + if (!password.trim()) { + setErrorMessage('PASSWORD EMPTY') + setLoading(false) + + return + } + + if (password.trim().length < 8) { + setErrorMessage('PASSWORD TOO SHORT') + setLoading(false) + + return + } - if (password.trim().length < 8) { - setErrorMessage('PASSWORD TOO SHORT') - return } if (act === 'register') { if (!confirmPassword.trim()) { setErrorMessage('CONFIRM PASSWORD PLEASE') + setLoading(false) + return } if (password !== confirmPassword) { setErrorMessage("PASSWORDS DOESN'T MATCH") + setLoading(false) + return } register() @@ -143,6 +187,18 @@ const Identify = (props) => { e.target.reset() setEmail('') setPassword('') + + return + } + + if (act === 'i forgor') { + + resetPasswordFirestore() + + e.target.reset() + setEmail('') + setErrorMessage(0) + return } @@ -181,6 +237,14 @@ const Identify = (props) => { }) }, []) + if (loading) { + + return ( +
+ +
+ ) + } return (
@@ -189,6 +253,11 @@ const Identify = (props) => { errorMessage ?

{errorMessage}

: null }
+
+ { + successMessage ?

{successMessage}

: null + } +
diff --git a/src/components/Main Pomodoro Childrens/MainPomodoroTimer Children/setTimeStyle.js b/src/components/Main Pomodoro Childrens/MainPomodoroTimer Children/setTimeStyle.js new file mode 100644 index 0000000..9b0f1ae --- /dev/null +++ b/src/components/Main Pomodoro Childrens/MainPomodoroTimer Children/setTimeStyle.js @@ -0,0 +1,117 @@ +const setTimeStyleExternal = (props, setMinutes, setSeconds, setBreakTime, setActualStyle, breakTime) => { + + if (props.style === 'Can I play, Daddy?') { + const minutes = 10 + const seconds = 0 + + setMinutes(minutes) + setSeconds(seconds) + + setBreakTime( + { + normal: { + minutes: 5, + seconds: 0 + }, + extended: { + minutes: 15, + seconds: 0 + } + } + ) + + setActualStyle(props.style) + + return { + minutes, seconds, breakTime + } + + } + + if (props.style === 'Regular'){ + + const minutes = 25 + const seconds = 0 + + setMinutes(minutes) + setSeconds(seconds) + + setBreakTime( + { + normal: { + minutes: 5, + seconds: 0 + }, + extended: { + minutes: 15, + seconds: 0 + } + } + ) + + setActualStyle(props.style) + + return { + minutes, seconds, breakTime + } + + } + + if (props.style === 'Creative work') { + const minutes = 50 + const seconds = 0 + + setMinutes(minutes) + setSeconds(seconds) + + setBreakTime( + { + normal: { + minutes: 10, + seconds: 0 + }, + extended: { + minutes: 20, + seconds: 0 + } + } + ) + + setActualStyle(props.style) + + return { + minutes, seconds, breakTime + } + + } + + if (props.style === 'Last minute delivery') { + const minutes = 90 + const seconds = 0 + + setMinutes(minutes) + setSeconds(seconds) + + setBreakTime( + { + normal: { + minutes: 15, + seconds: 0 + }, + extended: { + minutes: 30, + seconds: 0 + } + } + ) + + setActualStyle(props.style) + + return { + minutes, seconds, breakTime + } + + } +} + +export default setTimeStyleExternal \ No newline at end of file diff --git a/src/components/Main Pomodoro Childrens/MainPomodoroTimer.jsx b/src/components/Main Pomodoro Childrens/MainPomodoroTimer.jsx index 6a86664..b4857f3 100644 --- a/src/components/Main Pomodoro Childrens/MainPomodoroTimer.jsx +++ b/src/components/Main Pomodoro Childrens/MainPomodoroTimer.jsx @@ -7,6 +7,7 @@ import detectKeys from '../Misc/detectKeys' import bell_x2 from '../sounds/bell-x2.mp3' import bell_x3 from '../sounds/bell-x3.mp3' +import setTimeStyleExternal from './MainPomodoroTimer Children/setTimeStyle' const MainPomodoroTimer = (props) => { @@ -29,126 +30,7 @@ const MainPomodoroTimer = (props) => { const [velocity, setVelocity] = useState(1) - const setTimeStyle = () => { - - if (props.style === 'Can I play, Daddy?') { - const minutes = 10 - const seconds = 0 - - setMinutes(minutes) - setSeconds(seconds) - - setBreakTime( - { - normal: { - minutes: 5, - seconds: 0 - }, - extended: { - minutes: 15, - seconds: 0 - } - } - ) - - setActualStyle(props.style) - - return { - minutes, seconds, breakTime - } - - } - - if (props.style === 'Regular'){ - - const minutes = 25 - const seconds = 0 - - setMinutes(minutes) - setSeconds(seconds) - - setBreakTime( - { - normal: { - minutes: 5, - seconds: 0 - }, - extended: { - minutes: 15, - seconds: 0 - } - } - ) - - setActualStyle(props.style) - - return { - minutes, seconds, breakTime - } - - } - - if (props.style === 'Creative work') { - const minutes = 50 - const seconds = 0 - - setMinutes(minutes) - setSeconds(seconds) - - setBreakTime( - { - normal: { - minutes: 10, - seconds: 0 - }, - extended: { - minutes: 20, - seconds: 0 - } - } - ) - - setActualStyle(props.style) - - return { - minutes, seconds, breakTime - } - - } - - if (props.style === 'Last minute delivery') { - const minutes = 90 - const seconds = 0 - - setMinutes(minutes) - setSeconds(seconds) - - setBreakTime( - { - normal: { - minutes: 15, - seconds: 0 - }, - extended: { - minutes: 30, - seconds: 0 - } - } - ) - - setActualStyle(props.style) - - return { - minutes, seconds, breakTime - } - - } - - } - - - - + const setTimeStyle = () => setTimeStyleExternal(props, setMinutes, setSeconds, setBreakTime, setActualStyle, breakTime) React.useEffect (() => { if (actualStyle !== props.style) {