Revize 1a58c244

re #58 names edited

client/src/App.js

@@ -57 +57 @@
 }
 
 const Home = (props) => {
-  const [userRequest, setUser] = useState([]);
+  const [user, setUser] = useState([]);
 
-  const [acceptedRequest, setRequest] = useState([]);
+  const [acceptedRequest, setAcceptedRequest] = useState([]);
 
   useEffect(() => {
-    const dataUserRequest = getDataUserRequest();
-    setUser(dataUserRequest);
+    const datauser = getDatauser();
+    setUser(datauser);
   }, []);
 
   // OverviewAdmin state 
@@ -77 +77 @@
     }
  ]);
 
-  function getDataUserRequest() {
+  function getDatauser() {
     return ([]);
   }
   
@@ -86 +86 @@
       <div className="main-content">
         {props.userName.role === 'EMPLOYER'
         ? 
-          <UpcomingRequests userRequest={userRequest} setUser={setUser} acceptedRequest={acceptedRequest} setRequest={setRequest} setEmployees={setEmployees}/>
+          <UpcomingRequests user={user} setUser={setUser} acceptedRequest={acceptedRequest} setAcceptedRequest={setAcceptedRequest} setEmployees={setEmployees}/>
         : 
-          <YourRequests userRequest={userRequest} setUser={setUser} acceptedRequest={acceptedRequest} setRequest={setRequest} userName={props.userName}/>
+          <YourRequests user={user} setUser={setUser} acceptedRequest={acceptedRequest} setAcceptedRequest={setAcceptedRequest} userName={props.userName}/>
         }
-        <Calendar setUser={setUser} userRequest={userRequest} acceptedRequest={acceptedRequest} setRequest={setRequest} userName={props.userName} setEmployees={setEmployees} setUserName={props.setUserName}/> 
+        <Calendar setUser={setUser} user={user} acceptedRequest={acceptedRequest} setAcceptedRequest={setAcceptedRequest} userName={props.userName} setEmployees={setEmployees} setUserName={props.setUserName}/> 
       </div>
       {props.userName.role === 'EMPLOYER'
       ?

client/src/Calendar.js

@@ -17 +17 @@
       props.userName.role === 'EMPLOYER'
         ?
           api_fetch.getAdminCalendar().then(adminCalendar => { 
-            props.setRequest(adminCalendar);
+            props.setAcceptedRequest(adminCalendar);
           }).catch(reason => {
             alert(reason)
           })
         :
           api_fetch.getUserCalendar(props.userName, todayTwo).then(userCalendar => {
-            props.setRequest(userCalendar);
+            props.setAcceptedRequest(userCalendar);
           }).catch(reason => {
             alert(reason)
           });
@@ -104 +104 @@
       start: whatDate      
   }
   //concat new request to current ones
-      props.setRequest((acceptedRequest) => acceptedRequest.concat(userProps))
+      props.setAcceptedRequest((acceptedRequest) => acceptedRequest.concat(userProps))
   }).catch(reason => {
       alert(reason)
   });

client/src/UpcomingRequests.js

@@ -64 +64 @@
               start: user.start
         }
         //concat new request to current ones
-          props.setRequest((acceptedRequest) => acceptedRequest.concat(userProps))
+          props.setAcceptedRequest((acceptedRequest) => acceptedRequest.concat(userProps))
         //request accept button
           props.setUser((pendingRequest) => pendingRequest.filter((item) => item !== user));
       })
@@ -102 +102 @@
       <div className="offs-items column">
         <div className="offs-item row">
           <table>
-            {/* {props.userRequest.length > 0 
+            {/* {props.user.length > 0 
             ? */}
             <tbody>
               <tr>
@@ -110 +110 @@
                 <th>Type</th>
                 <th>Date</th>    
               </tr>
-              {props.userRequest.map(user => (
+              {props.user.map(user => (
               <tr>
                 <td>{user.title}</td>
                 <td>{user.type}</td>    

client/src/YourRequests.js

@@ -50 +50 @@
       <div className="offs-items column">
         <div className="offs-item row">
           <table>
-            {props.userRequest.length > 0 ?
+            {props.user.length > 0 ?
             
             <tbody>
               <tr>
@@ -59 +59 @@
                 <th>Date</th>    
                 <th>Status</th>    
               </tr>
-              {props.userRequest.map(user => (
+              {props.user.map(user => (
                 <tr key={user.id}>
                 <td>{user.title}</td>
                 <td>{user.type}</td>