Compare commits
3 Commits
8942bcc9da
...
6bcf9bbfbd
| Author | SHA1 | Date | |
|---|---|---|---|
|
6bcf9bbfbd
|
|||
|
2e4ca34f5c
|
|||
|
d76b16781d
|
@@ -84,13 +84,22 @@ export const EventContainer = ({
|
||||
.filter((x) => typeof x === "string" && x !== "")
|
||||
);
|
||||
const filterableOrganizers = uniqueOrganizers
|
||||
.map((slug) =>
|
||||
eventOrganizers.find(
|
||||
(haystack) => haystack.slug === slug || haystack.slug == organizer
|
||||
)
|
||||
)
|
||||
.map((slug) => eventOrganizers.find((haystack) => haystack.slug === slug))
|
||||
.filter((x) => x !== undefined) as EventOrganizer[];
|
||||
|
||||
// If an organizer is selected that's not in the upcoming list, add it
|
||||
if (
|
||||
organizer &&
|
||||
!filterableOrganizers.some((org) => org.slug === organizer)
|
||||
) {
|
||||
const selectedOrganizer = eventOrganizers.find(
|
||||
(org) => org.slug === organizer,
|
||||
);
|
||||
if (selectedOrganizer) {
|
||||
filterableOrganizers.push(selectedOrganizer);
|
||||
}
|
||||
}
|
||||
|
||||
/* Reset organizer if slug is invalid */
|
||||
useEffect(() => {
|
||||
if (!eventOrganizers.find((haystack) => haystack.slug === organizer)) {
|
||||
|
||||
@@ -87,8 +87,13 @@ export const Header = () => {
|
||||
</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link href="/medlem" data-active={pathname === "/medlem"}>
|
||||
Bli medlem
|
||||
<Link href="/frivillig" data-active={pathname === "/frivillig"}>
|
||||
Bli frivillig
|
||||
</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link href="/foreninger" data-active={pathname === "/foreninger"}>
|
||||
Foreninger
|
||||
</Link>
|
||||
</li>
|
||||
</ul>
|
||||
@@ -120,8 +125,16 @@ export const Header = () => {
|
||||
</Link>
|
||||
</li>
|
||||
<li className={styles.menuItemLarge}>
|
||||
<Link href="/medlem" data-active={pathname === "/medlem"}>
|
||||
Bli medlem
|
||||
<Link href="/frivillig" data-active={pathname === "/frivillig"}>
|
||||
Bli frivillig
|
||||
</Link>
|
||||
</li>
|
||||
<li className={styles.menuItemLarge}>
|
||||
<Link
|
||||
href="/foreninger"
|
||||
data-active={pathname === "/foreninger"}
|
||||
>
|
||||
Foreninger
|
||||
</Link>
|
||||
</li>
|
||||
<li className={styles.divider}>
|
||||
@@ -140,16 +153,8 @@ export const Header = () => {
|
||||
</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link href="/frivillig" data-active={pathname === "/frivillig"}>
|
||||
Bli frivillig
|
||||
</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link
|
||||
href="/foreninger"
|
||||
data-active={pathname === "/foreninger"}
|
||||
>
|
||||
Foreninger
|
||||
<Link href="/medlem" data-active={pathname === "/medlem"}>
|
||||
Bli medlem
|
||||
</Link>
|
||||
</li>
|
||||
<li>
|
||||
@@ -209,8 +214,16 @@ export const Header = () => {
|
||||
</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link href="/medlem" data-active={pathname === "/medlem"}>
|
||||
Bli medlem
|
||||
<Link href="/frivillig" data-active={pathname === "/frivillig"}>
|
||||
Bli frivillig
|
||||
</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link
|
||||
href="/foreninger"
|
||||
data-active={pathname === "/foreninger"}
|
||||
>
|
||||
Foreninger
|
||||
</Link>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
Reference in New Issue
Block a user