Loading...
;
+
+ const Delayed = ({ children, waitBeforeShow = 500 }) => {
+ const [isShown, setIsShown] = useState(false);
+ useEffect(() => {
+ const timer = setTimeout(() => {
+ setIsShown(true);
+ }, waitBeforeShow);
+
+ return () => clearTimeout(timer);
+ }, [waitBeforeShow]);
+
+ return isShown ? children : null;
+ };
- if(!isLoaded)
- return (
- Loading...
- );
+ let loginRedirect = '';
if (auth?.user) {
- const loginRedirect = authLevelRedirect(auth.user);
- return (
-
-
Sorry, the link is not valid anymore.
+
+ Sorry, the link is not valid anymore.
+
+ {auth?.user &&
/* Redirect to /welcome */}
@@ -67,6 +74,15 @@ const EditUsers = ({ userToEdit, backToSearch, updateUserDb, projects }) => {
Email:
{userEmail}
+
+
Is Active:
+
+ {isActive.toString()}
+
+ } onClick={() => handleSetIsActive()} />
+
+
+
Projects:
diff --git a/client/src/pages/Home.js b/client/src/pages/Home.js
index e64a6f4bd..48e1df04e 100644
--- a/client/src/pages/Home.js
+++ b/client/src/pages/Home.js
@@ -49,7 +49,7 @@ const Home = () => {
Volunteer Relationship Management System
- {events && events.length >= 1 && (
+ {events && events.length > 0 ? (
- )}
+ ):(
{/* If no events with checkInReady: true */}
- {events.length === 0 && }
-
+ {/* If no meetings available*/}
+
No meetings available
+
+
+ )}
{/* If any events with checkInReady: true */}
{events.length > 0 && (
-
+
+
+
)}
-
);
};
diff --git a/client/src/pages/ManageProjects.js b/client/src/pages/ManageProjects.js
index 577a7a495..add89f591 100644
--- a/client/src/pages/ManageProjects.js
+++ b/client/src/pages/ManageProjects.js
@@ -7,6 +7,7 @@ import ProjectApiService from '../api/ProjectApiService';
import RecurringEventsApiService from '../api/RecurringEventsApiService';
import Loading from '../svg/22.gif';
import '../sass/ManageProjects.scss';
+import EventsApiService_ from '../api/EventsApiService';
const PAGES = Object.freeze({
selectProject: 'selectProject',
@@ -20,21 +21,30 @@ const ManageProjects = () => {
const [projects, setProjects] = useState();
const [projectToEdit, setProjectToEdit] = useState();
const [recurringEvents, setRecurringEvents] = useState();
+ const [regularEvents, setRegularEvents] = useState([]);
const [componentToDisplay, setComponentToDisplay] = useState('');
const [projectApiService] = useState(new ProjectApiService());
const [recurringEventsApiService] = useState(new RecurringEventsApiService());
+ const [EventsApiService] = useState(new EventsApiService_());
const [projectsLoading, setProjectsLoading] = useState(false);
const [eventsLoading, setEventsLoading] = useState(false);
const user = auth?.user;
- const fetchProjects = useCallback(async () => {
+ const fetchProjects = useCallback(async () => {
setProjectsLoading(true);
const projectRes = await projectApiService.fetchProjects();
setProjects(projectRes);
setProjectsLoading(false);
}, [projectApiService]);
+ const fetchRegularEvents = useCallback(async () => {
+ setEventsLoading(true);
+ const eventsRes = await EventsApiService.fetchEvents();
+ setRegularEvents(eventsRes);
+ setEventsLoading(false);
+ }, [recurringEventsApiService]);
+
const fetchRecurringEvents = useCallback(async () => {
setEventsLoading(true);
const eventsRes = await recurringEventsApiService.fetchRecurringEvents();
@@ -82,6 +92,17 @@ const ManageProjects = () => {
[recurringEventsApiService, fetchRecurringEvents]
);
+ const updateRegularEvent = useCallback(
+ async (eventToUpdate, eventId) => {
+ await EventsApiService.updateEvent(
+ eventToUpdate,
+ eventId
+ );
+ fetchRegularEvents();
+ },
+ [recurringEventsApiService, fetchRegularEvents]
+ );
+
useEffect(() => {
// Refresh project to edit, if projects have been refreshed
if (projectId && projects) {
@@ -98,7 +119,8 @@ const ManageProjects = () => {
useEffect(() => {
fetchProjects();
fetchRecurringEvents();
- }, [fetchProjects, fetchRecurringEvents]);
+ fetchRegularEvents();
+ }, [fetchProjects, fetchRecurringEvents, fetchRegularEvents]);
// If not logged in, redirect to login page
if (!auth && !auth?.user) {
@@ -118,6 +140,8 @@ const ManageProjects = () => {
createNewRecurringEvent={createNewRecurringEvent}
deleteRecurringEvent={deleteRecurringEvent}
updateRecurringEvent={updateRecurringEvent}
+ regularEvents={regularEvents}
+ updateRegularEvent={updateRegularEvent}
/>
);
break;
diff --git a/client/src/pages/ProjectList.js b/client/src/pages/ProjectList.js
index fb14d1593..79e731f07 100644
--- a/client/src/pages/ProjectList.js
+++ b/client/src/pages/ProjectList.js
@@ -8,10 +8,10 @@ import {
Box,
CircularProgress,
Typography,
- Divider,
Button,
} from '@mui/material';
import { Link } from 'react-router-dom';
+import TitledBox from '../components/parts/boxes/TitledBox';
const StyledTypography = styled(Typography)({
textTransform: 'uppercase',
@@ -98,12 +98,7 @@ export default function ProjectList() {
)}
-