Skip to content

Commit

Permalink
Merge branch 'main' into web
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert27 committed Dec 15, 2024
2 parents cccbef0 + 4e543c1 commit 71c3a04
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
3 changes: 0 additions & 3 deletions src/components/Map/MapScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -708,9 +708,6 @@ const MapScreen = (): JSX.Element => {
)
}, [availableFilteredGeoJSON])

// get is ipados using react native dvice info

console.log('isIpadOS', isIpadOS)
return (
<View
// eslint-disable-next-line react-native/no-inline-styles
Expand Down
9 changes: 2 additions & 7 deletions src/utils/events-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,8 @@ export async function loadCampusLifeEvents(): Promise<
begin: x.startDateTime != null ? new Date(x.startDateTime) : null,
end: x.endDateTime != null ? new Date(x.endDateTime) : null,
}))
.filter(
(x) =>
x.end === null ||
x.end > new Date() ||
x.titles.de !== '' ||
x.titles.en !== ''
)
.filter((x) => x.end == null || x.end > new Date())
.filter((x) => x.titles.de !== '' || x.titles.en !== '')
return newEvents
}

Expand Down

0 comments on commit 71c3a04

Please sign in to comment.