Merge branch 'trunk' - complete

Zen-cronic · Nov 28, 2023 · c4f2770 · c4f2770
2 parents 7e49593 + 24d4f9a
commit c4f2770
Show file tree

Hide file tree

Showing 21 changed files with 4,798 additions and 1,380 deletions.
diff --git a/client/src/App.jsx b/client/src/App.jsx
@@ -35,13 +35,12 @@ import PublicEvents from "./components/PublicEvents";
 const App = () => {
   return (
     <Routes>
-      <Route path="/" element={<Layout /> }>
-        <Route index={true} element={<PublicPage />} />
-
+      <Route path="/" element={<Layout />}>
         <Route element={<PrefetchEvents />}>
+          <Route index={true} element={<PublicPage />} />
 
           {/* browse events as a guest */}
-          <Route path="/events/*" element={<PublicEvents/>}/>
+          <Route path="/events/*" element={<PublicEvents />} />
 
           <Route path="/login" element={<Login />} />
 

diff --git a/client/src/app/api/apiSlice.js b/client/src/app/api/apiSlice.js
@@ -22,12 +22,6 @@ const baseQuery = fetchBaseQuery({
 
 const baseQueryWithRefreshAuth = async (args, api, extraOptions) => {
 
-    const publicEndpoints = ['/events/search','/events/sort']
-
-    if (publicEndpoints.includes(args.endpoint) ) {
-
-        return baseQuery(args, api, extraOptions);
-    }
 
     let originalResult = await baseQuery(args, api, extraOptions)
 

diff --git a/client/src/features/event/EventList.jsx b/client/src/features/event/EventList.jsx
@@ -15,8 +15,9 @@ const EventList = () => {
     isError,
     error,
   } = useGetEventsQuery("eventsList", {
-    //15min
-    pollingInterval: 900000,
+
+    //15min 90000
+    pollingInterval: 2000,
     refetchOnFocus: true,
     refetchOnMountOrArgChange: true,
   });
@@ -44,7 +45,7 @@ const EventList = () => {
       {role === "ADMIN" && isAdmin ? (
         <Container className="my-2">
           <LinkContainer to={"/dash/events/new"}>
-            <Button variant="warning">Add New Event</Button>
+            <Button variant="success">Add New Event</Button>
           </LinkContainer>
         </Container>
       ) : null}

diff --git a/client/src/hooks/usePublicOrPrivateNavigate.jsx b/client/src/hooks/usePublicOrPrivateNavigate.jsx
@@ -5,7 +5,7 @@ const usePublicOrPrivateNavigate = () => {
 
   const authObj = useAuth();
 
-  console.log('authObj from customHook: ', authObj);
+  // console.log('authObj from customHook: ', authObj);
   const navigate = useNavigate();
 
   const navigateFn =  (publicPathname) => {

diff --git a/server/jest.config.json b/server/jest.config.json
@@ -0,0 +1,9 @@
+{
+
+    "verbose": true,
+
+    "forceExit": true,
+    "clearMocks":true,
+    "resetMocks": true,
+    "restoreMocks":true
+}