From 7748c4096829725d9993b7fb9b4e049ee4b2bfe8 Mon Sep 17 00:00:00 2001 From: camilovegag Date: Fri, 2 Aug 2024 08:50:23 -0500 Subject: [PATCH 1/6] Fix mobile card --- packages/berlin/src/pages/Events.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/berlin/src/pages/Events.tsx b/packages/berlin/src/pages/Events.tsx index f796d4d6..01923e4f 100644 --- a/packages/berlin/src/pages/Events.tsx +++ b/packages/berlin/src/pages/Events.tsx @@ -41,7 +41,7 @@ function Events() { Events -
+
From 6bd303e370503c5b7df7be5fd4e53e0aad7062e7 Mon Sep 17 00:00:00 2001 From: camilovegag Date: Fri, 2 Aug 2024 08:52:15 -0500 Subject: [PATCH 2/6] Add cursor pointer to cycles card --- packages/berlin/src/components/cycles/Cycles.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/berlin/src/components/cycles/Cycles.tsx b/packages/berlin/src/components/cycles/Cycles.tsx index a8b138b1..926b5f9f 100644 --- a/packages/berlin/src/components/cycles/Cycles.tsx +++ b/packages/berlin/src/components/cycles/Cycles.tsx @@ -25,7 +25,7 @@ function Cycles({ cycles, errorMessage, eventId }: CyclesProps) { {cycles?.length ? ( cycles.map((cycle) => (
handleCycleClick(cycle.id)} > From 69265ecc4b7dab3fa98cdd1acdf9468df48dcb39 Mon Sep 17 00:00:00 2001 From: camilovegag Date: Fri, 2 Aug 2024 10:04:50 -0500 Subject: [PATCH 3/6] Remove description from Events cards --- .../berlin/src/components/events/Events.tsx | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/packages/berlin/src/components/events/Events.tsx b/packages/berlin/src/components/events/Events.tsx index e95c794d..1e11699b 100644 --- a/packages/berlin/src/components/events/Events.tsx +++ b/packages/berlin/src/components/events/Events.tsx @@ -1,11 +1,12 @@ -import Markdown from 'react-markdown'; +// React and third-party libraries +import { useNavigate } from 'react-router-dom'; +// API import { GetEventResponse } from 'api'; +// Components import { Body } from '../typography/Body.styled'; import { Subtitle } from '../typography/Subtitle.styled'; -import Link from '../link'; -import { useNavigate } from 'react-router-dom'; type EventsProps = { events: GetEventResponse[] | undefined; @@ -29,20 +30,6 @@ export default function Events({ events, errorMessage }: EventsProps) { >
{event.name} - {event.description && ( - {props.children}, - p: ({ node, ...props }) => ( - - {props.children} - - ), - }} - > - {event.description} - - )}
{event.imageUrl && (
From ee9d280f978138e7a86120ec1c7a1a3ab203885f Mon Sep 17 00:00:00 2001 From: camilovegag Date: Fri, 2 Aug 2024 10:30:40 -0500 Subject: [PATCH 4/6] Add image to event page --- packages/berlin/src/pages/Event.tsx | 37 +++++++++++++++++++---------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/packages/berlin/src/pages/Event.tsx b/packages/berlin/src/pages/Event.tsx index 0179b01c..35c7dfb3 100644 --- a/packages/berlin/src/pages/Event.tsx +++ b/packages/berlin/src/pages/Event.tsx @@ -56,18 +56,31 @@ function Event() { <> - -
- {event?.name} - {event?.description && ( - {props.children}, - p: ({ node, ...props }) => {props.children}, - }} - > - {event.description} - +
+
+ + {event?.name} + {event?.description && ( +
+ {props.children}, + p: ({ node, ...props }) => {props.children}, + }} + > + {event.description} + +
+ )} +
+ {event?.imageUrl && ( +
+ {`${event.name} +
)}
From 354700a9ccb9d1659115224428a87532ba2f986e Mon Sep 17 00:00:00 2001 From: camilovegag Date: Fri, 2 Aug 2024 10:32:27 -0500 Subject: [PATCH 5/6] Change my proposals to registration --- packages/berlin/src/components/header/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/berlin/src/components/header/Header.tsx b/packages/berlin/src/components/header/Header.tsx index bd2f3b63..d7e4b6fe 100644 --- a/packages/berlin/src/components/header/Header.tsx +++ b/packages/berlin/src/components/header/Header.tsx @@ -121,7 +121,7 @@ const HeaderLinks = ({ user }: { user: GetUserResponse }) => { const eventBaseLinks = [ { - title: 'My Proposals', + title: 'Registration', link: `/events/${eventId}/register`, }, { From 7849fdf7afa7f6d8c80048acd74f4efa32121091 Mon Sep 17 00:00:00 2001 From: camilovegag Date: Fri, 2 Aug 2024 10:49:34 -0500 Subject: [PATCH 6/6] Add tw check for no event.imageUrl --- packages/berlin/src/pages/Event.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/berlin/src/pages/Event.tsx b/packages/berlin/src/pages/Event.tsx index 35c7dfb3..1e3300f4 100644 --- a/packages/berlin/src/pages/Event.tsx +++ b/packages/berlin/src/pages/Event.tsx @@ -57,7 +57,7 @@ function Event() {
-
+
{event?.name} {event?.description && (