Revert "Add carousel (#622)" (#674)

This reverts commit fcab615.

frontend/components/ClubPage/Events.tsx

@@ -6,6 +6,8 @@ import { DARK_BLUE, HOVER_GRAY, PURPLE, WHITE } from '../../constants/colors'
 import { M2, M3 } from '../../constants/measurements'
 import { ClubEvent, ClubEventType } from '../../types'
 import { Card, Icon, StrongText } from '../common'
+import Modal from '../common/Modal'
+import EventModal from '../EventPage/EventModal'
 
 type EventsProps = {
   data: ClubEvent[]
@@ -29,8 +31,7 @@ const Wrapper = styled.div`
   margin-bottom: 0.5rem;
   display: flex;
   cursor: pointer;
-  border-radius: 8px;
-  padding: 2px;
+  border-radius: 3px;
 
   &:hover {
     background-color: ${HOVER_GRAY};
@@ -69,6 +70,11 @@ const Event = ({ entry }: { entry: ClubEvent }): ReactElement => {
           </SmallParagraph>
         </div>
       </Wrapper>
+      {show && (
+        <Modal show={show} closeModal={hideModal} marginBottom={false}>
+          <EventModal event={entry} showDetailsButton={false} />
+        </Modal>
+      )}
     </>
   )
 }

frontend/components/EventPage/EventCard.tsx

@@ -92,14 +92,14 @@ const EventCard = (props: {
               {clipLink(url)}
             </EventLink>
           ))}
-        {(badges?.length > 0 || pinned) && (
+        {(badges.length > 0 || pinned) && (
           <div className="tags mt-2">
             {pinned && (
               <span className="tag is-primary">
                 <Icon name="map-pin" className="mr-1" /> Pinned
               </span>
             )}
-            {badges?.map(({ id, label }) => (
+            {badges.map(({ id, label }) => (
               <span key={id} className="tag is-info">
                 {label}
               </span>

frontend/package.json

@@ -44,7 +44,6 @@
     "react-ga": "^3.3.1",
     "react-lazy-load": "^4.0.1",
     "react-linkify": "^1.0.0-alpha",
-    "react-multi-carousel": "^2.8.5",
     "react-places-autocomplete": "^7.3.0",
     "react-select": "^5.8.0",
     "react-table": "^7.8.0",

frontend/pages/club/[club]/index.tsx

@@ -3,6 +3,7 @@ import { DesktopActions, MobileActions } from 'components/ClubPage/Actions'
 import AdvisorList from 'components/ClubPage/AdvisorList'
 import ClubApprovalDialog from 'components/ClubPage/ClubApprovalDialog'
 import Description from 'components/ClubPage/Description'
+import Events from 'components/ClubPage/Events'
 import FilesList from 'components/ClubPage/FilesList'
 import Header from 'components/ClubPage/Header'
 import InfoBox from 'components/ClubPage/InfoBox'
@@ -42,7 +43,6 @@ import {
   SITE_NAME,
 } from 'utils/branding'
 
-import EventCarousel from '~/components/ClubPage/EventCarousel'
 import { CLUB_ALUMNI_ROUTE, CLUB_ORG_ROUTE } from '~/constants'
 import { CLUBS_RED, SNOW, WHITE } from '~/constants/colors'
 import { M0, M2, M3 } from '~/constants/measurements'
@@ -268,7 +268,6 @@ const ClubPage = ({
               <MemberList club={club} />
             </>
           )}
-          {events.length > 0 && <EventCarousel data={events} />}
         </div>
         <div className="column is-one-third">
           {userInfo && (
@@ -297,6 +296,7 @@ const ClubPage = ({
               <div dangerouslySetInnerHTML={{ __html: involvement }} />
             </StyledCard>
           )}
+          <Events data={events} />
           {isClubFieldShown('signature_events') &&
             signatureEvents &&
             !!signatureEvents.length && (

frontend/yarn.lock

@@ -8949,11 +8949,6 @@ react-motion@^0.5.2:
     prop-types "^15.5.8"
     raf "^3.1.0"
 
-react-multi-carousel@^2.8.5:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/react-multi-carousel/-/react-multi-carousel-2.8.5.tgz#033e35426ee2d2ddd46a5b3967a654cd901a80d1"
-  integrity sha512-C5DAvJkfzR2JK9YixZ3oyF9x6R4LW6nzTpIXrl9Oujxi4uqP9SzVVCjl+JLM3tSdqdjAx/oWZK3dTVBSR73Q+w==
-
 react-onclickoutside@^6.10.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz#e165ea4e5157f3da94f4376a3ab3e22a565f4ffc"