Bugfix events

Gin-n-Tonicc · Apr 21, 2024 · 7e38cc3 · 7e38cc3
1 parent 1c62af8
commit 7e38cc3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/client/src/pages/events-details/EventsDetails.tsx b/client/src/pages/events-details/EventsDetails.tsx
@@ -13,7 +13,7 @@ import { IEvent } from '../../types/interfaces/events/IEvent';
 
 function EventsDetails() {
   const { id } = useParams();
-  const { user } = useAuthContext();
+  const { user, isAuthenticated, hasFinishedOAuth2 } = useAuthContext();
   const [participatingUsers, setParticipatingUsers] = useState<IUser[]>([]);
 
   const eventId = Number(id || -1);
@@ -102,7 +102,7 @@ function EventsDetails() {
                     </span>
                     <span className="text-truncate me-0">
                       <i className="fas fa-user text-primary me-2" />
-                      People Going: {participatingUsers.length}
+                      People Participating: {participatingUsers.length}
                     </span>
                   </div>
                 </div>
@@ -113,7 +113,11 @@ function EventsDetails() {
                     <button
                       className="btn btn-primary w-100"
                       disabled={
-                        loadingEvent || loadingStatuses || participating
+                        loadingEvent ||
+                        loadingStatuses ||
+                        participating ||
+                        !isAuthenticated ||
+                        !hasFinishedOAuth2
                       }
                       onClick={handleParticipation}>
                       {!participating
@@ -134,7 +138,7 @@ function EventsDetails() {
               <div>
                 <div className="card-body">
                   <h5 className="d-flex align-items-center mb-3">
-                    People Participating
+                    People Participating: {participatingUsers.length}
                   </h5>
                   <div>
                     <div className="card d-flex row">

diff --git a/client/src/pages/events/events-item/EventsItem.tsx b/client/src/pages/events/events-item/EventsItem.tsx
@@ -9,7 +9,7 @@ import { IEvent } from '../../../types/interfaces/events/IEvent';
 export interface EventsItemProps extends IEvent {}
 
 function EventsItem(props: EventsItemProps) {
-  const { isAuthenticated, user } = useAuthContext();
+  const { isAuthenticated, user, hasFinishedOAuth2 } = useAuthContext();
 
   const [hasLiked, setHasLiked] = useState(
     props.liked_users.some((x) => x.id === user.id)
@@ -65,7 +65,7 @@ function EventsItem(props: EventsItemProps) {
         </div>
         <div className="col-sm-12 col-md-4 d-flex flex-column align-items-start align-items-md-end justify-content-center">
           <div className="d-flex mb-3">
-            {isAuthenticated && (
+            {isAuthenticated && hasFinishedOAuth2 && (
               <a
                 className="btn btn-light btn-square me-3"
                 onClick={likeHandler}>