Revize ebfe6347

re #58 client part(especially rebuilt api.js, all fetches, little edits in YourRequests/UpcomingRequests and fixed bugs in calendar and overview (add event, save, post, numbers)

client/src/App.js

@@ -16 +16 @@
 
   useEffect(() => {
     api_fetch.getCurrentProfile().then(currentProfile => {
-    setUserName(currentProfile);
+      setUserName(currentProfile);
     }).catch(reason => {
-      alert(reason)
+        alert(reason)
     });
   }, []);
 
-
   const [userName, setUserName] = useState([
-    {
-    name: 'Golstoj Hyhrenciv'
-  }
-]);
+    { name: 'Golstoj Hyhrenciv' }
+  ]);
+
+
 
   return (
     <BrowserRouter>
@@ -35 +34 @@
         <Nav userName={userName} />
         <div className="container">
         <Switch>
-          <Route path="/" exact component={() => <Home userName={userName}/>}/>
-          
-          <Route path="/setting">{userName.role === 'EMPLOYER' ? <Setting/>:
-           <div className="permissionText column">
-             <p>You don't have permission to access on this server.</p>
-            </div>}</Route> 
-
+          <Route path="/" exact component={() => <Home userName={userName} setUserName={setUserName}/>}/>
+          <Route path="/setting">
+            {userName.role === 'EMPLOYER'
+            ?
+              <Setting/> 
+            :
+              <div className="permissionText column">
+                <p>You don't have permission to access on this server.</p>
+              </div>
+            }
+          </Route> 
           <Route path="/logout"><LogOut/></Route>
           <Route path="/login"><Login/></Route>
         </Switch>  
@@ -61 +64 @@
     setUser(dataUserRequest);
   }, []);
 
+  // OverviewAdmin state 
+  const [employees, setEmployees] = useState([
+    {
+       name: 'Sadam',
+       id: 0,
+       sickday: 10,
+       holiday: 10,
+       takenSickday: 2
+    }
+ ]);
+
   function getDataUserRequest() {
     return ([]);
   }
   
   return (
-  <div className="container">
-    <div className="main-content">
-      {props.userName.role === 'EMPLOYER' ? <UpcomingRequests userRequest={userRequest} setUser={setUser} acceptedRequest={acceptedRequest} setRequest={setRequest} /> : <YourRequests userRequest={userRequest} setUser={setUser} acceptedRequest={acceptedRequest} setRequest={setRequest} userName={props.userName}/>}
-      <Calendar setUser={setUser} userRequest={userRequest} acceptedRequest={acceptedRequest} setRequest={setRequest} userName={props.userName}/> 
+    <div className="container">
+      <div className="main-content">
+        {props.userName.role === 'EMPLOYER'
+        ? 
+          <UpcomingRequests userRequest={userRequest} setUser={setUser} acceptedRequest={acceptedRequest} setRequest={setRequest} setEmployees={setEmployees}/>
+        : 
+          <YourRequests userRequest={userRequest} setUser={setUser} acceptedRequest={acceptedRequest} setRequest={setRequest} userName={props.userName}/>
+        }
+        <Calendar setUser={setUser} userRequest={userRequest} acceptedRequest={acceptedRequest} setRequest={setRequest} userName={props.userName} setEmployees={setEmployees} setUserName={props.setUserName}/> 
+      </div>
+      {props.userName.role === 'EMPLOYER'
+      ?
+        <OverviewAdmin employees={employees} setEmployees={setEmployees} />
+      :
+        <Overview userName={props.userName} employees={employees}  />
+      }
     </div>
-    {props.userName.role === 'EMPLOYER' ? <OverviewAdmin /> : <Overview userName={props.userName} />}
-  </div>
   )
 };