Merge pull request #57 from ITPNYU/riho/loading

Add loading component
ITPNYU · Nov 7, 2023 · dec3b9f · dec3b9f
2 parents 2b670df + 3dac395
commit dec3b9f
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 1 deletion.
diff --git a/media_commons_booking_app/src/client/admin-page/components/AdminUsers.tsx b/media_commons_booking_app/src/client/admin-page/components/AdminUsers.tsx
@@ -3,6 +3,7 @@ import React, { useState, useEffect } from 'react';
 // This is a wrapper for google.script.run that lets us use promises.
 import { serverFunctions } from '../../utils/serverFunctions';
 import { formatDate } from '../../utils/date';
+import { Loading } from '../../utils/Loading';
 
 const ADMIN_USER_SHEET_NAME = 'admin_users';
 
@@ -50,6 +51,8 @@ export const AdminUsers = () => {
   };
 
   const addAdminUser = async () => {
+    setLoading(true);
+
     if (adminEmails.includes(email)) {
       alert('This user is already registered');
       return;
@@ -61,8 +64,13 @@ export const AdminUsers = () => {
     ]);
 
     alert('User has been registered successfully!');
+    setLoading(false);
     fetchAdminUsers();
   };
+  const [loading, setLoading] = useState(false);
+  if (loading) {
+    return <Loading />;
+  }
   return (
     <div className="m-10">
       <form className="flex items-center">
@@ -125,12 +133,14 @@ export const AdminUsers = () => {
                     <button
                       className="font-medium text-blue-600 dark:text-blue-500 hover:underline"
                       onClick={async () => {
+                        setLoading(true);
                         await serverFunctions.removeFromList(
                           ADMIN_USER_SHEET_NAME,
                           adminUser.email
                         );
                         alert('Successfully removed');
                         fetchAdminUsers();
+                        setLoading(false);
                       }}
                     >
                       Remove

diff --git a/media_commons_booking_app/src/client/admin-page/components/Ban.tsx b/media_commons_booking_app/src/client/admin-page/components/Ban.tsx
@@ -3,6 +3,7 @@ import React, { useState, useEffect } from 'react';
 // This is a wrapper for google.script.run that lets us use promises.
 import { serverFunctions } from '../../utils/serverFunctions';
 import { formatDate } from '../../utils/date';
+import { Loading } from '../../utils/Loading';
 const BAN_SHEET_NAME = 'banned_users';
 
 type Ban = {
@@ -50,6 +51,7 @@ export const Ban = () => {
 
   console.log('trainedEmails', trainedEmails);
   const addBanUser = async () => {
+    setLoading(true);
     if (trainedEmails.includes(email)) {
       alert('This user is already registered');
       return;
@@ -61,8 +63,13 @@ export const Ban = () => {
     ]);
 
     alert('User has been registered successfully!');
+    setLoading(false);
     fetchBans();
   };
+  const [loading, setLoading] = useState(false);
+  if (loading) {
+    return <Loading />;
+  }
   return (
     <div className="m-10">
       <form className="flex items-center">
@@ -125,11 +132,13 @@ export const Ban = () => {
                     <button
                       className="font-medium text-blue-600 dark:text-blue-500 hover:underline"
                       onClick={async () => {
+                        setLoading(true);
                         await serverFunctions.removeFromList(
                           BAN_SHEET_NAME,
                           ban.email
                         );
                         alert('Successfully removed');
+                        setLoading(false);
                         fetchBans();
                       }}
                     >

diff --git a/media_commons_booking_app/src/client/admin-page/components/Liaisons.tsx b/media_commons_booking_app/src/client/admin-page/components/Liaisons.tsx
@@ -3,6 +3,7 @@ import React, { useState, useEffect } from 'react';
 // This is a wrapper for google.script.run that lets us use promises.
 import { serverFunctions } from '../../utils/serverFunctions';
 import { formatDate } from '../../utils/date';
+import { Loading } from '../../utils/Loading';
 
 const LIAISON_SHEET_NAME = 'liaisons';
 
@@ -54,6 +55,7 @@ export const Liaisons = () => {
 
   console.log('liaisonEmails', liaisonEmails);
   const addLiaisonUser = async () => {
+    setLoading(true);
     if (email === '' || department === '') {
       alert('Please fill in all the fields');
       return;
@@ -71,8 +73,13 @@ export const Liaisons = () => {
     ]);
 
     alert('User has been registered successfully!');
+    setLoading(false);
     fetchLiaisonUsers();
   };
+  const [loading, setLoading] = useState(false);
+  if (loading) {
+    return <Loading />;
+  }
   return (
     <div className="m-10">
       <form className="flex items-center">
@@ -161,11 +168,13 @@ export const Liaisons = () => {
                     <button
                       className="font-medium text-blue-600 dark:text-blue-500 hover:underline"
                       onClick={async () => {
+                        setLoading(true);
                         await serverFunctions.removeFromList(
                           LIAISON_SHEET_NAME,
                           liaison.email
                         );
                         alert('Successfully removed');
+                        setLoading(false);
                         fetchLiaisonUsers();
                       }}
                     >

diff --git a/media_commons_booking_app/src/client/admin-page/components/SafetyTraining.tsx b/media_commons_booking_app/src/client/admin-page/components/SafetyTraining.tsx
@@ -3,6 +3,7 @@ import React, { useState, useEffect } from 'react';
 // This is a wrapper for google.script.run that lets us use promises.
 import { serverFunctions } from '../../utils/serverFunctions';
 import { formatDate } from '../../utils/date';
+import { Loading } from '../../utils/Loading';
 
 const SAFETY_TRAINING_SHEET_NAME = 'safety_training_users';
 
@@ -51,6 +52,7 @@ export const SafetyTraining = () => {
 
   console.log('trainedEmails', trainedEmails);
   const addSafetyTrainingUser = async () => {
+    setLoading(true);
     if (trainedEmails.includes(email)) {
       alert('This user is already registered');
       return;
@@ -62,8 +64,13 @@ export const SafetyTraining = () => {
     ]);
 
     alert('User has been registered successfully!');
+    setLoading(false);
     fetchSafetyTrainings();
   };
+  const [loading, setLoading] = useState(false);
+  if (loading) {
+    return <Loading />;
+  }
   return (
     <div className="m-10">
       <form className="flex items-center">
@@ -126,11 +133,13 @@ export const SafetyTraining = () => {
                     <button
                       className="font-medium text-blue-600 dark:text-blue-500 hover:underline"
                       onClick={async () => {
+                        setLoading(true);
                         await serverFunctions.removeFromList(
                           SAFETY_TRAINING_SHEET_NAME,
                           safetyTraining.email
                         );
                         alert('Successfully removed');
+                        setLoading(false);
                         fetchSafetyTrainings();
                       }}
                     >

diff --git a/media_commons_booking_app/src/client/booking/components/FormInput.tsx b/media_commons_booking_app/src/client/booking/components/FormInput.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useForm, SubmitHandler } from 'react-hook-form';
+import { Loading } from '../../utils/Loading';
 export type Inputs = {
   firstName: string;
   lastName: string;
@@ -535,6 +536,7 @@ const FormInput = ({ hasEmail, roomNumber, handleParentSubmit }) => {
             placeholder=""
             {...register('setupDetails', {
               required: watch('roomSetup') === 'yes',
+              validate: (value) => value !== '',
             })}
           />
         </div>

diff --git a/media_commons_booking_app/src/client/booking/components/SheetEditor.tsx b/media_commons_booking_app/src/client/booking/components/SheetEditor.tsx
@@ -9,6 +9,7 @@ import { Header } from './Header';
 import { MultipleCalendars } from './MultipleCalendars';
 import { Modal } from 'react-bootstrap';
 import { InitialModal } from './InitialModal';
+import { Loading } from '../../utils/Loading';
 export type RoomSetting = {
   roomId: string;
   name: string;
@@ -199,10 +200,12 @@ const SheetEditor = () => {
       alert(
         "Your request has been sent.\n Please check the calendar to verify that your submitted event has been registered.\n If you don't see the event, please contact us."
       );
+      setLoading(false);
       setSection('selectRoom');
     });
   };
   const handleSubmit = async (data) => {
+    setLoading(true);
     if (!bookInfo) return;
     if (!userEmail && data.missingEmail) {
       setUserEmail(data.missingEmail);
@@ -273,7 +276,7 @@ const SheetEditor = () => {
   };
 
   if (loading) {
-    return <div>Loading...</div>;
+    return <Loading />;
   }
 
   const handleModalClick = () => {

diff --git a/media_commons_booking_app/src/client/utils/Loading.tsx b/media_commons_booking_app/src/client/utils/Loading.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+
+export const Loading = () => (
+  <div role="status">
+    <svg
+      aria-hidden="true"
+      className="w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
+      viewBox="0 0 100 101"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+        fill="currentColor"
+      />
+      <path
+        d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+        fill="currentFill"
+      />
+    </svg>
+    <span className="sr-only">Loading...</span>
+  </div>
+);