Skip to content

Commit 7348408

Browse files
authored
Merge pull request #197 from c4dt/194
fix broken display of support options in filter box
2 parents 2218613 + 2f38f2f commit 7348408

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

components/homepage/DropdownList.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ defineProps<{
1515
v-for="name in filteredList"
1616
:key="name"
1717
class="epfl-option"
18-
:title="name"
1918
@mousedown.prevent="selectFunc(name)"
20-
>
21-
{{ name }}
22-
</li>
19+
v-html="name"
20+
/>
2321
</ul>
2422
</div>
2523
</template>

pages/index.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script setup lang="ts">
22
import type Combobox from "~/components/homepage/Combobox.vue";
33
import type MutliSelectCombobox from "~/components/homepage/mutliSelectCombobox.vue";
4+
import { icon } from "@fortawesome/fontawesome-svg-core";
45
56
const selectedStatus = ref("");
67
const selectedLab = ref("");
@@ -22,9 +23,9 @@ provide("addTag", addTag);
2223
const searchQuery = useSearchQuery();
2324
2425
const pprintStatus = [
25-
`${PROJECT_STATUS_DESC.C4DT_STATUS} ${PROJECT_C4DT_STATUS.ACTIVE} (${PROJECT_STATUS_ICONS[PROJECT_C4DT_STATUS.ACTIVE]})`,
26-
`${PROJECT_STATUS_DESC.C4DT_STATUS} ${PROJECT_C4DT_STATUS.RETIRED} (${PROJECT_STATUS_ICONS[PROJECT_C4DT_STATUS.RETIRED]})`,
27-
`${PROJECT_STATUS_DESC.LAB_STATUS} ${PROJECT_LAB_STATUS.ACTIVE} (${PROJECT_STATUS_ICONS[PROJECT_LAB_STATUS.ACTIVE]})`
26+
`${PROJECT_C4DT_STATUS.ACTIVE} (<span class='text-[#b51f1f]'>${icon(PROJECT_STATUS_ICONS[PROJECT_C4DT_STATUS.ACTIVE]).html[0]}</span>) ${PROJECT_STATUS_DESC.C4DT_STATUS}`,
27+
`${PROJECT_C4DT_STATUS.RETIRED} (<span class='text-[#707070]'>${icon(PROJECT_STATUS_ICONS[PROJECT_C4DT_STATUS.RETIRED]).html[0]}</span>) ${PROJECT_STATUS_DESC.C4DT_STATUS}`,
28+
`${PROJECT_LAB_STATUS.ACTIVE} (<span class='text-[#b51f1f]'>${icon(PROJECT_STATUS_ICONS[PROJECT_LAB_STATUS.ACTIVE]).html[0]}</span>) ${PROJECT_STATUS_DESC.LAB_STATUS}`
2829
];
2930
3031
const labsFilter = ref<InstanceType<typeof Combobox>>();
@@ -118,7 +119,7 @@ watch(filteredProjects, () => {
118119
:item-list="projectTags"
119120
/>
120121
<homepageCombobox ref="labsFilter" v-model="selectedLab" title="Lab" :item-list="labs" />
121-
<homepageCombobox ref="statusFilter" v-model="selectedStatus" title="Status" :item-list="pprintStatus" />
122+
<homepageCombobox ref="statusFilter" v-model="selectedStatus" title="Support" :item-list="pprintStatus" />
122123
<homepageCombobox
123124
ref="categoriesFilter"
124125
v-model="selectedCategory"

0 commit comments

Comments
 (0)