From 1870f3fdf43707a15fda0f609a021f516f45eb63 Mon Sep 17 00:00:00 2001 From: Piotr Russ Date: Wed, 18 Nov 2020 23:15:38 +0100 Subject: finish auth routes, create cookie token, fix folder structure, add context to FE --- client/src/common/jsx/Info.jsx | 9 -------- client/src/common/jsx/LangSwitch.jsx | 43 ------------------------------------ client/src/common/jsx/TopBar.jsx | 38 ------------------------------- client/src/common/jsx/User.jsx | 38 ------------------------------- client/src/common/jsx/WithHover.jsx | 13 ----------- 5 files changed, 141 deletions(-) delete mode 100644 client/src/common/jsx/Info.jsx delete mode 100644 client/src/common/jsx/LangSwitch.jsx delete mode 100644 client/src/common/jsx/TopBar.jsx delete mode 100644 client/src/common/jsx/User.jsx delete mode 100644 client/src/common/jsx/WithHover.jsx (limited to 'client/src/common/jsx') diff --git a/client/src/common/jsx/Info.jsx b/client/src/common/jsx/Info.jsx deleted file mode 100644 index 00d04b3..0000000 --- a/client/src/common/jsx/Info.jsx +++ /dev/null @@ -1,9 +0,0 @@ -import React from 'react'; - -const Info = ({info, hover, t}) => ( -

- { hover ? t(hover) : t(info) } -

-); - -export default Info; diff --git a/client/src/common/jsx/LangSwitch.jsx b/client/src/common/jsx/LangSwitch.jsx deleted file mode 100644 index eba1b27..0000000 --- a/client/src/common/jsx/LangSwitch.jsx +++ /dev/null @@ -1,43 +0,0 @@ -import React from 'react'; -import WithHover from './WithHover.jsx'; -import texts from '../data/texts.js'; - -const LangSwitch = ({ lang, setLang, setHover, opened, setOpened}) => { - - const handleSetLang = (key) => { - setLang(key); - setOpened(false); - }; - - return ( -
- - setOpened(opened !== 'lang' ? 'lang' : false)} - > - {lang} - - { - opened === 'lang' && ( -
- { - Object.keys(texts).map(key => key !== lang && ( - handleSetLang(key)} - > - {key} - - )) - } -
- ) - } -
-
- ); -}; - -export default LangSwitch; diff --git a/client/src/common/jsx/TopBar.jsx b/client/src/common/jsx/TopBar.jsx deleted file mode 100644 index 6e5ad6a..0000000 --- a/client/src/common/jsx/TopBar.jsx +++ /dev/null @@ -1,38 +0,0 @@ -import React, {useState} from 'react'; -import LangSwitch from './LangSwitch.jsx'; -import User from './User.jsx'; - -const TopBar = ({user, setUser, setHover, lang, setLang, t={t}}) => { - const [opened, setOpened] = useState(false); - - return ( -
- { opened !== false && ( -
setOpened(false)} - /> - )} - - { user && ( - - ) - } -
- ); -}; - -export default TopBar; diff --git a/client/src/common/jsx/User.jsx b/client/src/common/jsx/User.jsx deleted file mode 100644 index 8b05d44..0000000 --- a/client/src/common/jsx/User.jsx +++ /dev/null @@ -1,38 +0,0 @@ -import React from 'react'; -import WithHover from './WithHover.jsx'; - -const User = ({user, setUser, setHover, t, opened, setOpened}) => { - const handleLogout = () => { - setOpened(false); - setUser(null); - }; - const handleChangePass = () => { setOpened(false) }; - const handleRemoveUser = () => { setOpened(false) }; - - return ( -
- - setOpened(opened !== 'user' ? 'user' : false)} - > - {user} - - { - opened === 'user' && ( -
- - {t('logout')} - - - {t('user-settings')} - -
- ) - } -
-
- ); -}; - -export default User; diff --git a/client/src/common/jsx/WithHover.jsx b/client/src/common/jsx/WithHover.jsx deleted file mode 100644 index bb1a7f4..0000000 --- a/client/src/common/jsx/WithHover.jsx +++ /dev/null @@ -1,13 +0,0 @@ -import React from 'react'; - -const WithHover = ({ children, setHover, message, classes }) => ( -
setHover(message)} - onMouseLeave={()=>setHover(null)} - className={classes} - > - {children} -
-); - -export default WithHover; -- cgit v1.2.3