Revize 1865a0be

re #58 massive code formatting

client/src/UpcomingRequests.js

@@ -1 @@
-import React, { useState, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import './App.css';
 import moment from 'moment';
-import * as api_fetch from './api'
-import convertVacationType from './convertVacationType'
+import * as api from './api';
+import convertVacationType from './convertVacationType';
 
-function UpcomingRequests(props) {
+export default function UpcomingRequests(props) {
 
-  useEffect( () => {
+  useEffect(() => {
     getData();
-  }, []);
+  }, []); // eslint-disable-line
 
   // get requests from server
-  const getData = async () => {
-   
-    api_fetch.loadAdminRequests().then((data) => {
+  async function getData() {
+    api.loadAdminRequests().then((data) => {
       props.setUser(data.map(request => {
+        const convertedStartDate = request.date.split('/').join('-');
 
-        const convertedStartDate = request.date.split("/").join("-");
-  
-        return (
-          {
-            title: request.firstName + ' ' + request.lastName,
-            id: request.id,
-            type: convertVacationType(request.type),
-            start: moment(convertedStartDate).format("D.M.YYYY"),
-            end: null,
-            status: request.status.toLowerCase()
-        })
-      }))
+        return ({
+          title: request.firstName + ' ' + request.lastName,
+          id: request.id,
+          type: convertVacationType(request.type),
+          start: moment(convertedStartDate).format('D.M.YYYY'),
+          end: null,
+          status: request.status.toLowerCase(),
+        });
+      }));
     }).catch(reason => {
-      alert(reason)
+      alert(reason);
     });
-}
-
+  }
 
   // send accepted request to server
-  const acceptRequest = async (user) => {
+  async function acceptRequest(user) {
     try {
-
       const acceptedRequests = {
         id: user.id,
         status: 'ACCEPTED',
-      }
-    
-      await api_fetch.sendAcceptedRequest(acceptedRequests).then(() => {
-        
+      };
+
+      await api.sendAcceptedRequest(acceptedRequests).then(() => {
         const userProps = {
-              title: user.title,
-              type: user.type, 
-              start: user.start
-        }
+          title: user.title,
+          type: user.type,
+          start: user.start,
+        };
         //concat new request to current ones
-          props.setAcceptedRequest((acceptedRequest) => acceptedRequest.concat(userProps))
+        props.setAcceptedRequest((acceptedRequest) => acceptedRequest.concat(userProps));
         //request accept button
-          props.setUser((pendingRequest) => pendingRequest.filter((item) => item !== user));
-      })
+        props.setUser((pendingRequest) => pendingRequest.filter((item) => item !== user));
+      });
     } catch (e) {
-      alert(e)
+      alert(e);
     }
   }
 
-
   //send rejected request to server
-  const declineRequest = async (user) => {
-    try{
-
+  async function declineRequest(user) {
+    try {
       const rejectedRequest = {
         id: user.id,
         status: 'REJECTED',
-      }
+      };
+
+      await api.sendRejectedRequest(rejectedRequest);
 
-      await api_fetch.sendRejectedRequest(rejectedRequest);
-      
-      props.setUser((acceptedRequest) => acceptedRequest.filter((item) => item !== user))
+      props.setUser((acceptedRequest) => acceptedRequest.filter((item) => item !== user));
 
-      const usersOverview = await api_fetch.getUsersOverview();
+      const usersOverview = await api.getUsersOverview();
       props.setEmployees(usersOverview);
 
-  } catch (e) {
-    alert(e)
+    } catch (e) {
+      alert(e);
     }
   }
 
@@ -89 +81 @@
       <div className="offs-items column">
         <div className="offs-item row">
           <table>
-          {props.user.length > 0 ?
-            <tbody>
-              <tr>
-                <th>Name</th>
-                <th>Type</th>
-                <th>Date</th>    
-              </tr>
-              {props.user.map(user => (
-              <tr>
-                <td>{user.title}</td>
-                <td>{user.type}</td>    
-                <td>{user.end ? user.start + " - " + user.end : user.start}</td>
-                <div className="offs-btn row">
-                  <button onClick={() => acceptRequest(user)} type="submit" className="btn btn-submit">Accept</button>
-                  <button onClick={() => declineRequest(user)} type="submit" className="btn btn-cancel">Decline</button>     
-              </div>
-              </tr>
-              ))}
-            </tbody>
-            :
-            <tbody>
-              <p>There are no requests.</p>
-            </tbody>}   
-            </table>
+            {props.user.length > 0 ? (
+              <tbody>
+                <tr>
+                  <th>Name</th>
+                  <th>Type</th>
+                  <th>Date</th>
+                </tr>
+                {props.user.map(user => (
+                  <tr key={user.id}>
+                    <td>{user.title}</td>
+                    <td>{user.type}</td>
+                    <td>{user.end ? user.start + ' - ' + user.end : user.start}</td>
+                    <div className="offs-btn row">
+                      <button onClick={() => acceptRequest(user)} type="submit" className="btn btn-submit">Accept</button>
+                      <button onClick={() => declineRequest(user)} type="submit" className="btn btn-cancel">Decline</button>
+                    </div>
+                  </tr>
+                ))}
+              </tbody>
+            ) : (
+              <tbody>
+                <p>There are no requests.</p>
+              </tbody>
+            )}
+          </table>
         </div>
       </div>
     </div>
-    )
-  }
-
-export default UpcomingRequests;
+  );
+}