From b951a208caac7e2c814f5c1434404d2e402370fa Mon Sep 17 00:00:00 2001
From: ja0911 <ja0911@gmail.com>
Date: Sun, 27 Jun 2021 11:49:21 -0700
Subject: [PATCH 1/9] add private description field to create/edit event forms
 and display private descriptions for events that have them

---
 src/components/EventsForm.tsx                 | 19 +++++++++++++++----
 src/components/event-details/EventDetails.tsx |  8 +++++++-
 src/containers/createEvent/ducks/types.ts     |  1 +
 src/containers/createEvent/index.tsx          |  1 +
 src/containers/editEvent/index.tsx            |  2 ++
 src/containers/upcoming-events/ducks/types.ts |  1 +
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/components/EventsForm.tsx b/src/components/EventsForm.tsx
index 386bef5e..3aedd4c1 100644
--- a/src/components/EventsForm.tsx
+++ b/src/components/EventsForm.tsx
@@ -51,12 +51,14 @@ export interface EventsForm {
 
 export interface EventsFormData extends EventsForm {
   thumbnail?: FileField;
+  privateDescription?: string;
   start: Date;
   end: Date;
 }
 
 export interface EventsFormInitialValues extends EventsForm {
   thumbnail?: string;
+  privateDescription?: string;
   start: Moment;
   end: Moment;
 }
@@ -177,10 +179,19 @@ const EventsForm: React.FC<EventsFormProps> = ({
           <TextArea rows={3} placeholder="Description" />
         </Form.Item>
 
-        {/* TODO: come back to this in a second PR because it requires backend changes too :)
-        <Form.Item label="Meeting Link" name="meetingLink">
-          <Input placeholder="Meeting Link" />
-        </Form.Item> */}
+        <Form.Item
+          label="Private Description"
+          name="privateDescription"
+          rules={[
+            {
+              required: false,
+              message:
+                'Input an event description intended only for registered members (i.e. Zoom meeting link)',
+            },
+          ]}
+        >
+          <TextArea rows={3} placeholder="Private Description" />
+        </Form.Item>
 
         <Form.Item label="Add Image" name="thumbnail">
           <Dragger multiple={false} beforeUpload={() => false}>
diff --git a/src/components/event-details/EventDetails.tsx b/src/components/event-details/EventDetails.tsx
index 721768d0..079bff33 100644
--- a/src/components/event-details/EventDetails.tsx
+++ b/src/components/event-details/EventDetails.tsx
@@ -92,7 +92,7 @@ const EventDetails: React.FC<EventDetailsProps> = ({
     setDisplayEventRegistrationModal,
   ] = useState<boolean>(false);
 
-  const { description, location, start, end } = details;
+  const { description, privateDescription, location, start, end } = details;
 
   const computeDateString = () => {
     const startDate = dateFormat(start, 'longDate');
@@ -150,6 +150,12 @@ const EventDetails: React.FC<EventDetailsProps> = ({
         <Col span={14}>
           <Title level={5}>Description</Title>
           <Typography>{description}</Typography>
+          {privateDescription !== undefined && (
+            <>
+              <Title level={5}>Private Description</Title>
+              <Typography>{privateDescription}</Typography>
+            </>
+          )}
         </Col>
         <Col span={10}>
           {announcements && (
diff --git a/src/containers/createEvent/ducks/types.ts b/src/containers/createEvent/ducks/types.ts
index 3f82f367..95b49847 100644
--- a/src/containers/createEvent/ducks/types.ts
+++ b/src/containers/createEvent/ducks/types.ts
@@ -5,6 +5,7 @@ export interface NewEventInformation {
   price: number;
   details: {
     description: string;
+    privateDescription?: string;
     location: string;
     start: Date;
     end: Date;
diff --git a/src/containers/createEvent/index.tsx b/src/containers/createEvent/index.tsx
index 8c25c34e..f17fc739 100644
--- a/src/containers/createEvent/index.tsx
+++ b/src/containers/createEvent/index.tsx
@@ -44,6 +44,7 @@ const CreateEventContainer: React.FC = () => {
         price: data.price,
         details: {
           description: data.description,
+          privateDescription: data.privateDescription,
           location: data.location,
           start: data.start,
           end: data.end,
diff --git a/src/containers/editEvent/index.tsx b/src/containers/editEvent/index.tsx
index 90bb31c9..fc3a496a 100644
--- a/src/containers/editEvent/index.tsx
+++ b/src/containers/editEvent/index.tsx
@@ -74,6 +74,7 @@ const EditEventContainer: React.FC = () => {
         price: data.price,
         details: {
           description: data.description,
+          privateDescription: data.privateDescription,
           location: data.location,
           start: data.start,
           end: data.end,
@@ -94,6 +95,7 @@ const EditEventContainer: React.FC = () => {
       thumbnail: info.thumbnail,
       price: info.price,
       description: info.details.description,
+      privateDescription: info.details.privateDescription,
       location: info.details.location,
       start: moment(info.details.start),
       end: moment(info.details.end),
diff --git a/src/containers/upcoming-events/ducks/types.ts b/src/containers/upcoming-events/ducks/types.ts
index 473148f9..eabf75aa 100644
--- a/src/containers/upcoming-events/ducks/types.ts
+++ b/src/containers/upcoming-events/ducks/types.ts
@@ -23,6 +23,7 @@ export interface EventInformation {
   thumbnail?: string;
   details: {
     description: string;
+    privateDescription?: string;
     location: string;
     start: Date;
     end: Date;

From 521cd724839d73e83008461109c0ef83a8eec8aa Mon Sep 17 00:00:00 2001
From: ja0911 <ja0911@gmail.com>
Date: Thu, 15 Jul 2021 18:52:12 -0700
Subject: [PATCH 2/9] Changed private description condition

---
 src/components/event-details/EventDetails.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/event-details/EventDetails.tsx b/src/components/event-details/EventDetails.tsx
index 079bff33..e68b7065 100644
--- a/src/components/event-details/EventDetails.tsx
+++ b/src/components/event-details/EventDetails.tsx
@@ -150,7 +150,7 @@ const EventDetails: React.FC<EventDetailsProps> = ({
         <Col span={14}>
           <Title level={5}>Description</Title>
           <Typography>{description}</Typography>
-          {privateDescription !== undefined && (
+          {privateDescription !== null && (
             <>
               <Title level={5}>Private Description</Title>
               <Typography>{privateDescription}</Typography>

From 71f73909b922acc98a9f471cf799fd9b86c2480f Mon Sep 17 00:00:00 2001
From: Varun Thakkar <varunthakkar2013@gmail.com>
Date: Mon, 2 Aug 2021 14:44:28 -0400
Subject: [PATCH 3/9] updated styling

---
 src/components/event-details/EventDetails.tsx | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/components/event-details/EventDetails.tsx b/src/components/event-details/EventDetails.tsx
index d28c00c0..cd578c9d 100644
--- a/src/components/event-details/EventDetails.tsx
+++ b/src/components/event-details/EventDetails.tsx
@@ -23,20 +23,22 @@ const BottomWrapper = styled.div`
 const DescriptionWrapper = styled.div`
   display: flex;
   flex-wrap: wrap;
-  width: 50%;
+  width: 47%;
   text-align: left;
   margin-bottom: 16px;
+  margin-right: 32px;
   height: min-content;
 
   @media screen and (max-width: ${PRIMARY_BREAKPOINT}) {
     width: 100%;
+    margin-right: 0px;
   }
 `;
 
 const AnnouncementsWrapper = styled.div`
   display: flex;
   flex-wrap: wrap;
-  width: 50%;
+  width: 47%;
 
   @media screen and (max-width: ${PRIMARY_BREAKPOINT}) {
     width: 100%;
@@ -137,9 +139,10 @@ const AnnouncementsTitle = styled(Title)`
   width: 100%;
 `;
 
-const AnnouncementBox = styled.div``;
-
-const AnnouncementNoContent = styled(AnnouncementBox)``;
+const AnnouncementBox = styled.div`
+  height: min-content;
+  width: 100%;
+`;
 
 export interface EventDetailsProps extends EventInformation {
   announcements?: EventAnnouncement[];
@@ -223,7 +226,7 @@ const EventDetails: React.FC<EventDetailsProps> = ({
           <Typography>{description}</Typography>
           {privateDescription !== null && (
             <>
-              <Title level={5}>Private Description</Title>
+              <DescriptionTitle level={5}>Private Description</DescriptionTitle>
               <Typography>{privateDescription}</Typography>
             </>
           )}
@@ -233,7 +236,7 @@ const EventDetails: React.FC<EventDetailsProps> = ({
             <>
               {announcements.length ? (
                 <AnnouncementBox>
-                  <Title level={5}>Updates for this Event</Title>
+                  <AnnouncementsTitle level={5}>Updates for this Event</AnnouncementsTitle>
                   {announcements.map((announcement, i) => {
                     return (
                       <AnnouncementCard {...announcement} key={i} condensed />
@@ -241,14 +244,14 @@ const EventDetails: React.FC<EventDetailsProps> = ({
                   })}
                 </AnnouncementBox>
               ) : (
-                <>
+                <AnnouncementBox>
                   <AnnouncementsTitle level={5}>
                     Updates for this Event
                   </AnnouncementsTitle>
-                  <AnnouncementNoContent>
+                  <Typography>
                     There are no announcements for this event
-                  </AnnouncementNoContent>
-                </>
+                  </Typography>
+                </AnnouncementBox>
               )}
             </>
           )}

From 2b2e39da38043c002f2744e2d141e45e851a4f40 Mon Sep 17 00:00:00 2001
From: Varun Thakkar <varunthakkar2013@gmail.com>
Date: Mon, 2 Aug 2021 14:49:33 -0400
Subject: [PATCH 4/9] styling update

---
 src/components/event-details/EventDetails.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/event-details/EventDetails.tsx b/src/components/event-details/EventDetails.tsx
index cd578c9d..92ef2c3d 100644
--- a/src/components/event-details/EventDetails.tsx
+++ b/src/components/event-details/EventDetails.tsx
@@ -107,8 +107,8 @@ const ThumbnailWrapper = styled.div`
   display: flex;
   max-width: 65%;
   width: 55%;
-  min-height: 400px;
-  max-height: 500px;
+  min-height: 300px;
+  max-height: 400px;
   justify-content: left;
   overflow: hidden;
 
@@ -236,7 +236,9 @@ const EventDetails: React.FC<EventDetailsProps> = ({
             <>
               {announcements.length ? (
                 <AnnouncementBox>
-                  <AnnouncementsTitle level={5}>Updates for this Event</AnnouncementsTitle>
+                  <AnnouncementsTitle level={5}>
+                    Updates for this Event
+                  </AnnouncementsTitle>
                   {announcements.map((announcement, i) => {
                     return (
                       <AnnouncementCard {...announcement} key={i} condensed />

From 3a697c21c3a4cebd281042026c09734a434245ef Mon Sep 17 00:00:00 2001
From: Varun Thakkar <varunthakkar2013@gmail.com>
Date: Mon, 2 Aug 2021 14:54:51 -0400
Subject: [PATCH 5/9] revert

---
 src/components/event-details/EventDetails.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/event-details/EventDetails.tsx b/src/components/event-details/EventDetails.tsx
index 92ef2c3d..b1bcf379 100644
--- a/src/components/event-details/EventDetails.tsx
+++ b/src/components/event-details/EventDetails.tsx
@@ -107,8 +107,8 @@ const ThumbnailWrapper = styled.div`
   display: flex;
   max-width: 65%;
   width: 55%;
-  min-height: 300px;
-  max-height: 400px;
+  min-height: 400px;
+  max-height: 500px;
   justify-content: left;
   overflow: hidden;
 

From e47bcbc62ef7384e65fe85ee46b45ab6a41e489b Mon Sep 17 00:00:00 2001
From: Ryan Jung <ryan.matthew.jung@gmail.com>
Date: Wed, 18 Aug 2021 22:27:48 -0400
Subject: [PATCH 6/9] it works

---
 src/api/protectedApiClient.ts                  |  8 ++++++++
 src/components/event-details/EventDetails.tsx  |  2 +-
 src/components/event-listing/EventListing.tsx  |  2 +-
 src/containers/singleEvent/index.tsx           |  3 +--
 src/containers/upcoming-events/ducks/thunks.ts | 15 +++++++++++----
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/api/protectedApiClient.ts b/src/api/protectedApiClient.ts
index 57b8104e..95db8b15 100644
--- a/src/api/protectedApiClient.ts
+++ b/src/api/protectedApiClient.ts
@@ -52,6 +52,7 @@ export interface ProtectedApiClient {
     eventId: number,
     request: UpdateTicketsRequest,
   ) => Promise<void>;
+  readonly getProtectedEvents: () => Promise<EventInformation[]>;
   readonly getMyEvents: () => Promise<EventInformation[]>;
   readonly getRequestStatuses: () => Promise<PersonalRequest[]>;
   readonly makePFRequest: () => Promise<void>;
@@ -132,6 +133,12 @@ const updateTickets = (eventId: number, request: UpdateTicketsRequest) => {
   });
 };
 
+const getProtectedEvents = (): Promise<EventInformation[]> => {
+  return AppAxiosInstance.get(`${ProtectedApiClientRoutes.EVENTS}`).then(
+    (res) => res.data.events,
+  );
+};
+
 const getMyEvents = (): Promise<EventInformation[]> => {
   return AppAxiosInstance.get(
     `${ProtectedApiClientRoutes.EVENTS}/signed_up`,
@@ -309,6 +316,7 @@ const Client: ProtectedApiClient = Object.freeze({
   getAllUsersContactInfo,
   createAnnouncement,
   deleteAnnouncement,
+  getProtectedEvents
 });
 
 export default Client;
diff --git a/src/components/event-details/EventDetails.tsx b/src/components/event-details/EventDetails.tsx
index b1bcf379..51bed89f 100644
--- a/src/components/event-details/EventDetails.tsx
+++ b/src/components/event-details/EventDetails.tsx
@@ -201,7 +201,7 @@ const EventDetails: React.FC<EventDetailsProps> = ({
           <InfoWrapper>
             <Info>
               <StyledTitle level={3}>{title}</StyledTitle>
-              {ticketCount && (
+              {ticketCount !== undefined && ticketCount > 0 && (
                 <EventsTag color={'green'}>
                   Registered {ticketCount} tickets
                 </EventsTag>
diff --git a/src/components/event-listing/EventListing.tsx b/src/components/event-listing/EventListing.tsx
index 7ae3516b..bc718f56 100644
--- a/src/components/event-listing/EventListing.tsx
+++ b/src/components/event-listing/EventListing.tsx
@@ -99,7 +99,7 @@ const EventListing: React.FC<EventListingProps> = ({
         <Thumbnail src={thumbnail || DEFAULT_IMAGE} />
         <Info>
           <InlineTitle level={3}>{title}</InlineTitle>
-          {ticketCount && (
+          {ticketCount !== undefined && ticketCount > 0 && (
             <>
               <EventTag color="green">
                 Registered {ticketCount} tickets
diff --git a/src/containers/singleEvent/index.tsx b/src/containers/singleEvent/index.tsx
index 3ddf4ad7..06c9efa4 100644
--- a/src/containers/singleEvent/index.tsx
+++ b/src/containers/singleEvent/index.tsx
@@ -132,8 +132,7 @@ const SingleEvent: React.FC<SingleEventProps> = ({
       if (!event) {
         event = events.result.find((e) => e.id === id);
       }
-      const hasRegistered =
-        (event && event.ticketCount && event.ticketCount > 0) !== undefined;
+      const hasRegistered = event && event.ticketCount && event.ticketCount > 0;
       if (event) {
         return (
           <>
diff --git a/src/containers/upcoming-events/ducks/thunks.ts b/src/containers/upcoming-events/ducks/thunks.ts
index 15b317d8..792c978e 100644
--- a/src/containers/upcoming-events/ducks/thunks.ts
+++ b/src/containers/upcoming-events/ducks/thunks.ts
@@ -1,11 +1,18 @@
-import { EventInformation, EventsThunkAction } from './types';
+import { getPrivilegeLevel } from '../../../auth/ducks/selectors';
+import { PrivilegeLevel } from '../../../auth/ducks/types';
 import { upcomingEvents } from './actions';
+import { EventInformation, EventsThunkAction } from './types';
 
 export const getUpcomingEvents = (): EventsThunkAction<void> => {
-  return (dispatch, getState, { publicApiClient }) => {
+  return (dispatch, getState, { publicApiClient, protectedApiClient }) => {
+    const eventsFetcher: () => Promise<EventInformation[]> =
+      getPrivilegeLevel(getState().authenticationState.tokens) ===
+      PrivilegeLevel.NONE
+        ? publicApiClient.getUpcomingEvents
+        : protectedApiClient.getProtectedEvents;
+
     dispatch(upcomingEvents.loading());
-    return publicApiClient
-      .getUpcomingEvents()
+    return eventsFetcher()
       .then((response: EventInformation[]) => {
         dispatch(upcomingEvents.loaded(response));
       })

From 618b0db3cb56662b4377fd48a24ac014c889d133 Mon Sep 17 00:00:00 2001
From: Ryan Jung <ryan.matthew.jung@gmail.com>
Date: Wed, 18 Aug 2021 22:28:10 -0400
Subject: [PATCH 7/9] linting

---
 src/api/protectedApiClient.ts | 2 +-
 src/utils/breakpoints.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/protectedApiClient.ts b/src/api/protectedApiClient.ts
index 95db8b15..c2cb9ca0 100644
--- a/src/api/protectedApiClient.ts
+++ b/src/api/protectedApiClient.ts
@@ -316,7 +316,7 @@ const Client: ProtectedApiClient = Object.freeze({
   getAllUsersContactInfo,
   createAnnouncement,
   deleteAnnouncement,
-  getProtectedEvents
+  getProtectedEvents,
 });
 
 export default Client;
diff --git a/src/utils/breakpoints.ts b/src/utils/breakpoints.ts
index ea36a909..a5f9d79d 100644
--- a/src/utils/breakpoints.ts
+++ b/src/utils/breakpoints.ts
@@ -1 +1 @@
-export const PRIMARY_BREAKPOINT = '900px';
\ No newline at end of file
+export const PRIMARY_BREAKPOINT = '900px';

From 59471e4994b0b963c8daa2d5d5908e451853d347 Mon Sep 17 00:00:00 2001
From: Ryan Jung <ryan.matthew.jung@gmail.com>
Date: Wed, 18 Aug 2021 22:33:02 -0400
Subject: [PATCH 8/9] explicitly cast to boolean

---
 src/containers/singleEvent/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/containers/singleEvent/index.tsx b/src/containers/singleEvent/index.tsx
index 06c9efa4..0737ec85 100644
--- a/src/containers/singleEvent/index.tsx
+++ b/src/containers/singleEvent/index.tsx
@@ -132,7 +132,9 @@ const SingleEvent: React.FC<SingleEventProps> = ({
       if (!event) {
         event = events.result.find((e) => e.id === id);
       }
-      const hasRegistered = event && event.ticketCount && event.ticketCount > 0;
+      const hasRegistered = Boolean(
+        event && event.ticketCount && event.ticketCount > 0,
+      );
       if (event) {
         return (
           <>

From 3bfe3483c38a484a91c5f6ba8ccf1be3f9e72a8a Mon Sep 17 00:00:00 2001
From: Ryan Jung <ryan.matthew.jung@gmail.com>
Date: Wed, 18 Aug 2021 22:44:58 -0400
Subject: [PATCH 9/9] use thunk extra args

---
 src/containers/upcoming-events/ducks/types.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/containers/upcoming-events/ducks/types.ts b/src/containers/upcoming-events/ducks/types.ts
index eabf75aa..4b32a379 100644
--- a/src/containers/upcoming-events/ducks/types.ts
+++ b/src/containers/upcoming-events/ducks/types.ts
@@ -1,6 +1,6 @@
 import { ThunkAction } from 'redux-thunk';
 import { PublicApiExtraArgs } from '../../../api/publicApiClient';
-import { C4CState } from '../../../store';
+import { C4CState, ThunkExtraArgs } from '../../../store';
 import { AsyncRequest } from '../../../utils/asyncRequest';
 import { EventsActions } from './actions';
 
@@ -11,7 +11,7 @@ export interface EventsReducerState {
 export type EventsThunkAction<R> = ThunkAction<
   R,
   C4CState,
-  PublicApiExtraArgs,
+  ThunkExtraArgs,
   EventsActions
 >;