Merge pull request #362 from dump-hr/schedule-section-images-fix

bartole ostavi me na miru
dump-hr · May 19, 2024 · 324933a · 324933a
2 parents 592c807 + a5cb815
commit 324933a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/apps/api/db/schema.ts b/apps/api/db/schema.ts
@@ -131,6 +131,7 @@ export const eventType = pgEnum('event_type', [
   'workshop',
   'flyTalk',
   'campfireTalk',
+  'panel',
   'other',
 ]);
 

diff --git a/apps/api/src/event/event.service.ts b/apps/api/src/event/event.service.ts
@@ -86,7 +86,8 @@ export class EventService {
 
         const speakers = result
           .filter((r) => r.event.id === id)
-          .map((r) => r.speaker);
+          .map((r) => r.speaker)
+          .filter((s) => s !== null);
 
         const speakersWithCompany = speakers.map((speaker) => {
           const company =

diff --git a/apps/web/src/components/ScheduleSection/ScheduleCard.tsx b/apps/web/src/components/ScheduleSection/ScheduleCard.tsx
@@ -97,9 +97,13 @@ const ScheduleCard: React.FC<ScheduleCardProps> = ({ event }) => {
           </div>
           <div className={c.scheduleCardCenterWrapper}>
             <div className={c.scheduleCardCenter}>
-              <div className={c.themeBadge}>
-                <p className={c.themeBadgeText}>{getThemeShort(event.theme)}</p>
-              </div>
+              {event.type !== 'other' && (
+                <div className={c.themeBadge}>
+                  <p className={c.themeBadgeText}>
+                    {getThemeShort(event.theme)}
+                  </p>
+                </div>
+              )}
               <div className={c.scheduleCardTitleWrapper}>
                 <h3
                   className={c.scheduleCardTitle}

diff --git a/apps/web/src/components/ScheduleSection/utils.ts b/apps/web/src/components/ScheduleSection/utils.ts
@@ -26,8 +26,10 @@ export const getEventTypeTranslation = (type: string) => {
       return 'FLY TALK';
     case 'campfireTalk':
       return 'CAMPFIRE TALK';
+    case 'panel':
+      return 'PANEL';
     case 'other':
-      return 'OSTALO';
+      return null;
   }
 };
 

diff --git a/packages/types/src/enum.ts b/packages/types/src/enum.ts
@@ -18,6 +18,7 @@ export enum EventType {
   Workshop = 'workshop',
   FlyTalk = 'flyTalk',
   CampfireTalk = 'campfireTalk',
+  Panel = 'panel',
   Other = 'other',
 }