Skip to content

Commit

Permalink
Merge pull request #100 from ChangePlusPlusVandy/program-tag-display
Browse files Browse the repository at this point in the history
Fix display of programs
  • Loading branch information
JiashuHarryHuang committed May 10, 2024
2 parents e528db3 + 68c560c commit b2d0bd8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion components/Event/Event.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ const Event = ({ event }: { event: QueriedVolunteerEventDTO }) => {
}
};

console.log('event: ', event);
return (
<>
<EventBox>
Expand Down
2 changes: 1 addition & 1 deletion components/Event/EventApplication/ApplicationPopup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const processChoices = (choices: String[] | undefined) => {
let showNoneItem = false;
let showOtherItem = false;
let showSelectAllItem = false;

choices.forEach(choice => {
switch (choice) {
case constants.NONE:
Expand Down
5 changes: 3 additions & 2 deletions components/Event/EventName.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const EventName = ({
<Media greaterThanOrEqual="sm">
<NameAndSpot>
<b>{event.name}</b>
{event.tags.length > 0 && <p>({event.program?.name})</p>}
{event.program && <p>({event.program?.name})</p>}
<br />
{getEventLength(event)}/{event.maxSpot} spots filled
</NameAndSpot>
Expand All @@ -79,7 +79,8 @@ const EventName = ({
{/* Mobile */}
<Media lessThan="sm">
<NameAndSpot>
<b>{event.name}</b> <span>({event.program?.name}) </span>
<b>{event.name}</b>
{event.program && <span>({event.program.name}) </span>}
<br />
{event.applicationId && (
<ApplicationStatusDisplay
Expand Down
1 change: 0 additions & 1 deletion utils/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ export const EVENT_CONTACT_ICON_WIDTH = 23;
*/
export const EVENT_CONTACT_ICON_HEIGHT = 23;


/**
* Constants for application form choices
*/
Expand Down

0 comments on commit b2d0bd8

Please sign in to comment.