From a9e9e1483e8dda81b6797064e58b08f3bee2a957 Mon Sep 17 00:00:00 2001 From: Francisco Pessano Date: Mon, 20 Sep 2021 19:15:45 -0300 Subject: [PATCH] Style selector logic added --- public/css_styles/styles.css | 2 ++ public/css_styles/styles.css.map | 2 +- public/sass_styles/_styleSelector.scss | 2 ++ src/components/MainPomodoro.jsx | 4 +--- src/components/MainPomodoroTimer.jsx | 24 +++++++++++++++++++++++ src/components/StyleSelectionChildren.jsx | 19 ++++++++++++++++-- src/components/StyleSelector.jsx | 8 ++++---- 7 files changed, 51 insertions(+), 10 deletions(-) diff --git a/public/css_styles/styles.css b/public/css_styles/styles.css index 9db1a42..84a26a3 100644 --- a/public/css_styles/styles.css +++ b/public/css_styles/styles.css @@ -193,10 +193,12 @@ .style-selector-show { opacity: 100%; + pointer-events: auto; } .style-selector-hidden { opacity: 0%; + pointer-events: none; } .go-down { diff --git a/public/css_styles/styles.css.map b/public/css_styles/styles.css.map index 96d6e8b..aaa9d10 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"],"names":[],"mappings":"AACA;EACI,kBCqCS;EDnCT;EACA;EACA;EACA;EAEA;;AAEA;EACI;EAEA;ECXJ;EACA;EAQA;EACA;EACA;;ADKA;EACI;EAEA;ECnBJ;EACA;EAQA;EACA;EACA;;ADYI;EACI;;AAGA;AAAA;AAAA;AAAA;AAAA;EAKI;EACA;EACA;;AAKA;EACI;EACA;;;AE5CpB;EACI;EACA;EDMA;ECFA;EACA;EACA;EAEA;EAEA;;AAGA;EDGA;EACA;;ACAA;EAEI;EAEA;EACA;;AAEA;EDHJ;EACA;EACA;ECIQ;EACA;EACA;EAEA;;AAIJ;EACI;EACA;;AAGJ;EACI;EACA;;;AC5CZ;EAEI;EACA;EACA;EACA;EAEA;;AAEA;EAEI;EACA;EFJJ;EEOI;EACA;EAEA,OFsBO;;AEnBX;EAEI;EACA;EACA;EFjBJ;;AEqBI;EACI;EFZR;EACA;EEeQ,OFMG;;AEHP;EACI;EFpBR;EACA;EEuBQ,OFFG;EEIH;EACA;;AAIR;EF1BA;EACA;EACA;EAtBA;EACA;EEiDI;EACA;EACA;EAEA,YFjBO;EEkBP;EAEA;EACA;;;AC7DR;EAEI;EAEA;EACA;EAEA;EAEA;EACA;EAEA;EAEA;EAgFA;;AA9EA;EHRA;EGUI,OHsBO;EGrBP;EACA;EAEA;EAIA;EACA;;AAMA;EACI;EACA;EAEA;;AAEA;EACI;EACA;EACA;;AAEA;EHpCZ;EGsCgB;;AAGJ;EHzCZ;EG2CgB,OHXL;EGYK;;AAMZ;EACI;EACA;;AAGJ;EACI;EACA;;AAEA;EACI;;AAKR;EACI;EAEA;EACA;EAEA;EACA;EACA;EAEA;;AAGJ;EAEI,kBH/CE;;;AGwDN;EACI;;;AAGJ;EACI;;;ACtGZ;EACI;EACA;EAEA;EACA;;AAGA;EACI;EACA;EAEA;;AAEA;EACI;;;ACfZ;EACI;EAEA;EACA;;AAEA;EAEI;;AAEA;EACI;ELRR;EACA;EAQA;EACA;EACA;EKEQ;;AAEA;EACI;EACA;EACA;;AAKZ;EAEI;;AAEA;EACI;;AAGI;ELtBZ;EACA;EACA;EANA;EK6BgB;;AAGJ;ELtBZ;EACA;EAXA;EKmCgB;EACA;EACA;;;AC7CpB;ENuBI;EACA;EACA;EMtBA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EACA;EAEA;EAEA,kBNwBU;;AMtBV;ENUA;EMHI;EACA;;ANIJ;EACI;;AMVA;EACI;;AAQR;EACI;;AAIJ;EACI;IACI;;EAIJ;IACI;;;;ANSZ;EACI;EACA;;;AAGJ;EACI;EACA,kBAtBe","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"],"names":[],"mappings":"AACA;EACI,kBCqCS;EDnCT;EACA;EACA;EACA;EAEA;;AAEA;EACI;EAEA;ECXJ;EACA;EAQA;EACA;EACA;;ADKA;EACI;EAEA;ECnBJ;EACA;EAQA;EACA;EACA;;ADYI;EACI;;AAGA;AAAA;AAAA;AAAA;AAAA;EAKI;EACA;EACA;;AAKA;EACI;EACA;;;AE5CpB;EACI;EACA;EDMA;ECFA;EACA;EACA;EAEA;EAEA;;AAGA;EDGA;EACA;;ACAA;EAEI;EAEA;EACA;;AAEA;EDHJ;EACA;EACA;ECIQ;EACA;EACA;EAEA;;AAIJ;EACI;EACA;;AAGJ;EACI;EACA;;;AC5CZ;EAEI;EACA;EACA;EACA;EAEA;;AAEA;EAEI;EACA;EFJJ;EEOI;EACA;EAEA,OFsBO;;AEnBX;EAEI;EACA;EACA;EFjBJ;;AEqBI;EACI;EFZR;EACA;EEeQ,OFMG;;AEHP;EACI;EFpBR;EACA;EEuBQ,OFFG;EEIH;EACA;;AAIR;EF1BA;EACA;EACA;EAtBA;EACA;EEiDI;EACA;EACA;EAEA,YFjBO;EEkBP;EAEA;EACA;;;AC7DR;EAEI;EAEA;EACA;EAEA;EAEA;EACA;EAEA;EAEA;EAgFA;;AA9EA;EHRA;EGUI,OHsBO;EGrBP;EACA;EAEA;EAIA;EACA;;AAMA;EACI;EACA;EAEA;;AAEA;EACI;EACA;EACA;;AAEA;EHpCZ;EGsCgB;;AAGJ;EHzCZ;EG2CgB,OHXL;EGYK;;AAMZ;EACI;EACA;;AAGJ;EACI;EACA;;AAEA;EACI;;AAKR;EACI;EAEA;EACA;EAEA;EACA;EACA;EAEA;;AAGJ;EAEI,kBH/CE;;;AGwDN;EACI;EACA;;;AAGJ;EACI;EACA;;;ACxGZ;EACI;EACA;EAEA;EACA;;AAGA;EACI;EACA;EAEA;;AAEA;EACI;;;ACfZ;EACI;EAEA;EACA;;AAEA;EAEI;;AAEA;EACI;ELRR;EACA;EAQA;EACA;EACA;EKEQ;;AAEA;EACI;EACA;EACA;;AAKZ;EAEI;;AAEA;EACI;;AAGI;ELtBZ;EACA;EACA;EANA;EK6BgB;;AAGJ;ELtBZ;EACA;EAXA;EKmCgB;EACA;EACA;;;AC7CpB;ENuBI;EACA;EACA;EMtBA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EACA;EAEA;EAEA,kBNwBU;;AMtBV;ENUA;EMHI;EACA;;ANIJ;EACI;;AMVA;EACI;;AAQR;EACI;;AAIJ;EACI;IACI;;EAIJ;IACI;;;;ANSZ;EACI;EACA;;;AAGJ;EACI;EACA,kBAtBe","file":"styles.css"} \ No newline at end of file diff --git a/public/sass_styles/_styleSelector.scss b/public/sass_styles/_styleSelector.scss index bb71d2f..08fa53c 100644 --- a/public/sass_styles/_styleSelector.scss +++ b/public/sass_styles/_styleSelector.scss @@ -97,8 +97,10 @@ .style-selector-show { opacity: 100%; + pointer-events: auto; } .style-selector-hidden { opacity: 0%; + pointer-events: none; } \ No newline at end of file diff --git a/src/components/MainPomodoro.jsx b/src/components/MainPomodoro.jsx index 938f2ce..e1ab851 100644 --- a/src/components/MainPomodoro.jsx +++ b/src/components/MainPomodoro.jsx @@ -16,8 +16,6 @@ const MainPomodoro = () => { setDisplayHidden(!displayHidden) } - console.log(timerOn) - return ( <>
@@ -39,7 +37,7 @@ const MainPomodoro = () => { }
- + diff --git a/src/components/MainPomodoroTimer.jsx b/src/components/MainPomodoroTimer.jsx index 9a6b0d5..6a06f58 100644 --- a/src/components/MainPomodoroTimer.jsx +++ b/src/components/MainPomodoroTimer.jsx @@ -7,6 +7,14 @@ const MainPomodoroTimer = (props) => { const [seconds, setSeconds] = useState('60') const setTimeStyle = () => { + + if (props.style === 'Can I play, Daddy?') { + const minutes = 10 + const seconds = 0 + + setMinutes(minutes) + setSeconds(seconds) + } if (props.style === 'Regular'){ @@ -17,6 +25,22 @@ const MainPomodoroTimer = (props) => { setSeconds(seconds) } + + if (props.style === 'Creative work') { + const minutes = 50 + const seconds = 0 + + setMinutes(minutes) + setSeconds(seconds) + } + + if (props.style === 'Last minute delivery') { + const minutes = 90 + const seconds = 0 + + setMinutes(minutes) + setSeconds(seconds) + } } diff --git a/src/components/StyleSelectionChildren.jsx b/src/components/StyleSelectionChildren.jsx index e78645c..f148bef 100644 --- a/src/components/StyleSelectionChildren.jsx +++ b/src/components/StyleSelectionChildren.jsx @@ -2,9 +2,24 @@ import React from 'react' const StyleSelectionChildren = (props) => { return ( -
+
{ + props.setStyle(props.title) + }} + > + - + +
)