From 65e271de30e345f181109217d8e77d6507528cd1 Mon Sep 17 00:00:00 2001 From: Francisco Pessano Date: Mon, 27 Sep 2021 18:55:08 -0300 Subject: [PATCH] Added folders and disabled login banner when the user is identificated --- public/css_styles/styles.css | 4 ++ public/css_styles/styles.css.map | 2 +- public/sass_styles/_banner-login.scss | 4 ++ src/components/BannerLogin.jsx | 43 +++++++++++++++---- .../{ => Header Childrens}/DarkMode.jsx | 0 src/components/Header.jsx | 4 +- src/components/HeaderButton.jsx | 11 ----- .../MainPomodoroTimer.jsx | 0 .../PomodoroCounter.jsx | 0 .../StyleSelectionChildren.jsx | 0 .../StyleSelector.jsx | 2 +- src/components/MainPomodoro.jsx | 6 +-- 12 files changed, 49 insertions(+), 27 deletions(-) rename src/components/{ => Header Childrens}/DarkMode.jsx (100%) delete mode 100644 src/components/HeaderButton.jsx rename src/components/{ => Main Pomodoro Childrens}/MainPomodoroTimer.jsx (100%) rename src/components/{ => Main Pomodoro Childrens}/PomodoroCounter.jsx (100%) rename src/components/{ => Main Pomodoro Childrens/Style Selector Children}/StyleSelectionChildren.jsx (100%) rename src/components/{ => Main Pomodoro Childrens}/StyleSelector.jsx (92%) diff --git a/public/css_styles/styles.css b/public/css_styles/styles.css index 8c2c8d8..3593139 100644 --- a/public/css_styles/styles.css +++ b/public/css_styles/styles.css @@ -82,6 +82,10 @@ border-radius: 24px; } +.blank { + opacity: 0%; +} + .main-pomodoro { display: flex; flex-direction: column; diff --git a/public/css_styles/styles.css.map b/public/css_styles/styles.css.map index 808b483..0864513 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"],"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"],"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 e37f7f9..5608a0e 100644 --- a/public/sass_styles/_banner-login.scss +++ b/public/sass_styles/_banner-login.scss @@ -47,4 +47,8 @@ } +} + +.blank { + opacity: 0%; } \ No newline at end of file diff --git a/src/components/BannerLogin.jsx b/src/components/BannerLogin.jsx index e955025..59d8d6f 100644 --- a/src/components/BannerLogin.jsx +++ b/src/components/BannerLogin.jsx @@ -1,17 +1,44 @@ -import React from 'react' +import React, {useState} from 'react' +import {firebase} from './Firebase/firebase' +import {getAuth, onAuthStateChanged} from 'firebase/auth' +import { doc, updateDoc, getFirestore, collection, getDoc } from "firebase/firestore"; const BannerLogin = () => { console.log('BANNER LOGIN DEPLOYED') + const [signIn, setSignIn] = useState('') + + const auth = getAuth() + + onAuthStateChanged(auth, (user) => { + + if (user) { + setSignIn(true) + } else { + setSignIn(false) + } + + }) + + return ( -
-

Access to integrate and save your progress with Clockify!

-
- - -
-
+ <> + { + !signIn ? + +
+

Access to integrate and save your progress with Clockify!

+
+ + +
+
+ :
+ +
+ } + ) } diff --git a/src/components/DarkMode.jsx b/src/components/Header Childrens/DarkMode.jsx similarity index 100% rename from src/components/DarkMode.jsx rename to src/components/Header Childrens/DarkMode.jsx diff --git a/src/components/Header.jsx b/src/components/Header.jsx index 0882419..ffebea2 100644 --- a/src/components/Header.jsx +++ b/src/components/Header.jsx @@ -1,9 +1,7 @@ import React, {useState} from 'react' -import DarkMode from './DarkMode' -import HeaderButton from './HeaderButton' +import DarkMode from './Header Childrens/DarkMode' const Header = () => { - // console.log("HEADER DEPLOYED") diff --git a/src/components/HeaderButton.jsx b/src/components/HeaderButton.jsx deleted file mode 100644 index 6bf63dc..0000000 --- a/src/components/HeaderButton.jsx +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react' - -const HeaderButton = () => { - return ( - - ) -} - -export default HeaderButton diff --git a/src/components/MainPomodoroTimer.jsx b/src/components/Main Pomodoro Childrens/MainPomodoroTimer.jsx similarity index 100% rename from src/components/MainPomodoroTimer.jsx rename to src/components/Main Pomodoro Childrens/MainPomodoroTimer.jsx diff --git a/src/components/PomodoroCounter.jsx b/src/components/Main Pomodoro Childrens/PomodoroCounter.jsx similarity index 100% rename from src/components/PomodoroCounter.jsx rename to src/components/Main Pomodoro Childrens/PomodoroCounter.jsx diff --git a/src/components/StyleSelectionChildren.jsx b/src/components/Main Pomodoro Childrens/Style Selector Children/StyleSelectionChildren.jsx similarity index 100% rename from src/components/StyleSelectionChildren.jsx rename to src/components/Main Pomodoro Childrens/Style Selector Children/StyleSelectionChildren.jsx diff --git a/src/components/StyleSelector.jsx b/src/components/Main Pomodoro Childrens/StyleSelector.jsx similarity index 92% rename from src/components/StyleSelector.jsx rename to src/components/Main Pomodoro Childrens/StyleSelector.jsx index 9038d2b..074e2cb 100644 --- a/src/components/StyleSelector.jsx +++ b/src/components/Main Pomodoro Childrens/StyleSelector.jsx @@ -1,5 +1,5 @@ import React from 'react' -import StyleSelectionChildren from './StyleSelectionChildren' +import StyleSelectionChildren from './Style Selector Children/StyleSelectionChildren' const StyleSelector = (props) => { return ( diff --git a/src/components/MainPomodoro.jsx b/src/components/MainPomodoro.jsx index 1d29b63..1902f0b 100644 --- a/src/components/MainPomodoro.jsx +++ b/src/components/MainPomodoro.jsx @@ -1,7 +1,7 @@ import React, {useState} from 'react' -import MainPomodoroTimer, {setTim} from './MainPomodoroTimer' -import PomodoroCounter from './PomodoroCounter' -import StyleSelector from './StyleSelector' +import MainPomodoroTimer, {setTim} from './Main Pomodoro Childrens/MainPomodoroTimer' +import PomodoroCounter from './Main Pomodoro Childrens/PomodoroCounter' +import StyleSelector from './Main Pomodoro Childrens/StyleSelector' const MainPomodoro = () => {