Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(clubList): show dissolved clubs at the end of clubList #537

Merged
merged 4 commits into from
Mar 21, 2024
Merged

feat(clubList): show dissolved clubs at the end of clubList #537

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ef0e86
feat(clubList): show dissolved clubs at the end of the list
at-wr Mar 19, 2024
91d9f45
refactor: use `sortClub` and pre-arrange the club lsit
at-wr Mar 19, 2024
802ebfe
style: fix ESLint issue
at-wr Mar 19, 2024
c46fa31
style: simplify code
qwerzl Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions pages/cas/clubs/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ import Tabs from '@/components/ui/tabs/Tabs.vue'
import TabsContent from '@/components/ui/tabs/TabsContent.vue'
import TabsTrigger from '@/components/ui/tabs/TabsTrigger.vue'
import json from '@/content/clubs.json'

import type { ClubCategoryKey, Clubs, Groups } from '@/content/clubs'
import ClubCard from '@/components/custom/club-card.vue'

const clubs: Clubs = json as Clubs
import type { Club, ClubCategoryKey, Clubs, Groups } from '@/content/clubs'

// This page requires login
definePageMeta({
Expand All @@ -19,28 +17,31 @@ definePageMeta({
const categories = (['Sports', 'Service', 'Arts', 'Life', 'Academic'] as const).map(c => c as ClubCategoryKey)

const searchTerm = ref('')

// sort the club
const clubs = Object.entries(json as Clubs).reduce((acc, [category, clubsInCategory]) => {
acc[category as ClubCategoryKey] = clubsInCategory.sort(
(a: Club, b: Club) => (a.gmember.length === 0) === (b.gmember.length === 0) ? 0 : (a.gmember.length === 0) ? 1 : -1,
)
return acc
}, {} as Clubs)

const allClubs = computed(() => Object.values(clubs).flat())
const isSearchActive = computed(() => searchTerm.value !== '')

const filteredClubs = computed(() => {
// return all clubs if no search term
if (!searchTerm.value)
return clubs

// ignore capitalization
const lowerCaseSearchTerm = searchTerm.value.toLowerCase()

// return zh/en name match the search term
return Object.entries(clubs).reduce((acc, [category]) => {
acc[category as ClubCategoryKey] = allClubs.value.filter(club =>
club.groups.some((group: Groups) =>
(group.C_NameC as string).toLowerCase().includes(lowerCaseSearchTerm) || (group.C_NameE as string).toLowerCase().includes(lowerCaseSearchTerm),
group.C_NameC.toLowerCase().includes(searchTerm.value.toLowerCase()) || group.C_NameE.toLowerCase().includes(searchTerm.value.toLowerCase()),
),
)
return acc
}, {} as Clubs)
})

const isSearchActive = computed(() => searchTerm.value !== '')
</script>

<template>
Expand Down