completed jwt token login with refresh token, reduced db calls

5 files changed, 9 insertions, 5 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' && (
diff --git a/client/src/login/api/login.js b/client/src/login/api/login.js
index 4ed36a7..576f16e 100644
--- a/client/src/login/api/login.js
+++ b/client/src/login/api/login.js
@@ -1,10 +1,10 @@
-export default (email, password) => (
+export default (loginData) => (
   fetch('/api/user/login', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json;charset=utf-8'
     },
-    body: JSON.stringify({ email, password }),
+    body: JSON.stringify(loginData),
   })
     .then(() => window.location.href = "/admin")
     .catch(() => {})
diff --git a/client/src/login/jsx/LoginPanel.jsx b/client/src/login/jsx/LoginPanel.jsx
index e90a5c4..96b118f 100644
--- a/client/src/login/jsx/LoginPanel.jsx
+++ b/client/src/login/jsx/LoginPanel.jsx
@@ -16,7 +16,7 @@ const LoginPanel = ({setUser}) => {
 
   const submit = (e) => {
     e.preventDefault();
-    login(email, password);
+    login({email, password});
   }
 
   return (