summaryrefslogtreecommitdiffstats
path: root/client/src/admin
diff options
context:
space:
mode:
authorGravatar Piotr Russ <mail@pruss.it> 2020-11-26 22:20:54 +0100
committerGravatar Piotr Russ <mail@pruss.it> 2020-11-26 22:20:54 +0100
commitf2fcc41cb17ece1fc5acf57809c5e3d61c236133 (patch)
treea103a0dd371c5f7fd5d7e3105fef0730c8594827 /client/src/admin
parent627239499c7c9fb5e7af68b2e79e01d0523f5d8f (diff)
downloadwebsite_creator-f2fcc41cb17ece1fc5acf57809c5e3d61c236133.tar.gz
website_creator-f2fcc41cb17ece1fc5acf57809c5e3d61c236133.tar.bz2
website_creator-f2fcc41cb17ece1fc5acf57809c5e3d61c236133.zip
completed jwt token login with refresh token, reduced db calls
Diffstat (limited to 'client/src/admin')
-rw-r--r--client/src/admin/api/getUser.js2
-rw-r--r--client/src/admin/jsx/App.jsx4
-rw-r--r--client/src/admin/jsx/User.jsx2
3 files changed, 6 insertions, 2 deletions
diff --git a/client/src/admin/api/getUser.js b/client/src/admin/api/getUser.js
index 930ed3b..697702d 100644
--- a/client/src/admin/api/getUser.js
+++ b/client/src/admin/api/getUser.js
@@ -1,6 +1,6 @@
export default (setUser) => (
fetch('/api/user/me')
.then(res => res.json())
- .then(data => setUser(data.email))
+ .then(data => setUser(data))
.catch(() => {})
);
diff --git a/client/src/admin/jsx/App.jsx b/client/src/admin/jsx/App.jsx
index 93b6a33..3a4da84 100644
--- a/client/src/admin/jsx/App.jsx
+++ b/client/src/admin/jsx/App.jsx
@@ -23,6 +23,10 @@ const App = () => {
setInfo('no-saved-websites');
}, []);
+ useEffect(() => {
+ user && setLang(user.language);
+ }, [user]);
+
return (
<Context.Provider value={{ lang, setHover, setInfo }}>
<div className="main">
diff --git a/client/src/admin/jsx/User.jsx b/client/src/admin/jsx/User.jsx
index 131251e..eb596bf 100644
--- a/client/src/admin/jsx/User.jsx
+++ b/client/src/admin/jsx/User.jsx
@@ -17,7 +17,7 @@ const User = ({ user, setUser, opened, setOpened }) => {
className={`user__main-item${opened === 'user' ? ' user__main-item--active' : ''}`}
onClick={() => setOpened(opened !== 'user' ? 'user' : false)}
>
- {user}
+ {user.email}
</span>
{
opened === 'user' && (