diff --git a/frontend/components/card/CardTopicSelection.vue b/frontend/components/card/CardTopicSelection.vue index dcabdbb73..d5d5105a4 100644 --- a/frontend/components/card/CardTopicSelection.vue +++ b/frontend/components/card/CardTopicSelection.vue @@ -5,47 +5,74 @@

- + + + + +
+ {{ $t("components.card-topic-selection.view-all-topics") }} +
+
+ {{ $t("components.card-topic-selection.hide-all-topics") }} +
+
diff --git a/frontend/components/combobox/ComboboxTopics.vue b/frontend/components/combobox/ComboboxTopics.vue index e5150b8a2..e9bbcb7a1 100644 --- a/frontend/components/combobox/ComboboxTopics.vue +++ b/frontend/components/combobox/ComboboxTopics.vue @@ -13,7 +13,7 @@ @focus="handleInputFocus" @blur="inputFocussed = false" class="py-2 pl-4 border rounded-lg style-cta selection:bg-light-highlight dark:selection:bg-white/20" - :displayValue="(_) => displayValue()" + :displayValue="(_) => $t(displayValue())" />
- {{ topic.name }} + {{ $t(topic.name) }}
- -

- {{ topic }} -

+
+ +

+ {{ $t(topic) }} +

+
+
diff --git a/frontend/i18n/en-US.json b/frontend/i18n/en-US.json index 957f8a5b4..6bdb0e778 100644 --- a/frontend/i18n/en-US.json +++ b/frontend/i18n/en-US.json @@ -41,10 +41,28 @@ "_global.tasks_lower": "tasks", "_global.team": "Team", "_global.team_lower": "team", - "_global.topics.activism": "Activism", + "_global.topics.accessibility": "Accessibility", + "_global.topics.all-topics": "All Topics", + "_global.topics.animal-rights": "Animal Rights", + "_global.topics.children-rights": "Children's Rights", + "_global.topics.democracy": "Democracy", "_global.topics.education": "Education", + "_global.topics.elders": "Elder Rights", + "_global.topics.emergency-relief": "Emergency Relief", "_global.topics.environment": "Environment", - "_global.topics.justice": "Justice", + "_global.topics.expression": "Expression", + "_global.topics.health": "Health", + "_global.topics.housing": "Housing", + "_global.topics.labor": "Labor Rights", + "_global.topics.lgbtqia": "LGBTQIA+", + "_global.topics.migration": "Migration", + "_global.topics.mobility": "Mobility", + "_global.topics.nutrition": "Nutrition", + "_global.topics.peace-resolution": "Peace and Resolution", + "_global.topics.racial-justice": "Racial Justice", + "_global.topics.technology-privacy": "Technology and Privacy", + "_global.topics.transparency": "Transparency", + "_global.topics.women": "Women's Rights", "_global.trademark-policy": "Trademark policy", "components._global.connect": "Connect", "components._global.copyright": "Copyright \u00a9 2023 activist.", @@ -173,6 +191,8 @@ "components.card-search-result-resource.img-alt-text": "The resource logo of", "components.card-topic-selection.header": "Topics", "components.card-topic-selection.selector-placeholder": "Type to filter topics", + "components.card-topic-selection.view-all-topics": "View all topics", + "components.card-topic-selection.hide-all-topics": "Hide all topics", "components.combobox-topics.no-matching-topics": "No matching topics.", "components.feed-item.img-alt-text": "A social media post's image.", "components.footer._global.activist-tagline": "Open-source, nonprofit activism platform.", diff --git a/frontend/pages/organizations/create.vue b/frontend/pages/organizations/create.vue index a554e112c..a62c56b34 100644 --- a/frontend/pages/organizations/create.vue +++ b/frontend/pages/organizations/create.vue @@ -120,7 +120,7 @@ const formData = ref({ description: "", tagline: "", social_accounts: [], - topics: ["justice", "activism"], + topics: [], }); const submit = async () => { diff --git a/frontend/types/topics.ts b/frontend/types/topics.ts index d88e67099..1c970b8d8 100644 --- a/frontend/types/topics.ts +++ b/frontend/types/topics.ts @@ -1,8 +1,25 @@ export enum Topic { - JUSTICE = "justice", - ACTIVISM = "activism", + ACCESSIBILITY = "accessibility", + ANIMALS = "animal rights", + CHILDREN = "children's rights", + DEMOCRACY = "democracy", EDUCATION = "education", + ELDERS = "elder rights", + EMERGENCY_RELIEF = "emergency relief", ENVIRONMENT = "environment", + EXPRESSION = "freedom of expression", + HEALTH = "health", + HOUSING = "housing", + LABOR = "labor rights", + LGTBQIA = "lgbtqi+", + MIGRATION = "migration", + MOBILITY = "mobility", + NUTRITION = "nutrition", + PEACE_RESOLUTION = "peace and resolution", + RACIAL_JUSTICE = "racial justice", + TECHNOLOGY_PRIVACY = "technology and privacy", + TRANSPARENCY = "transparency", + WOMEN = "women's rights", } export interface TopicsTag { @@ -13,23 +30,108 @@ export interface TopicsTag { export const GLOBAL_TOPICS: TopicsTag[] = [ { - icon: "material-symbols:volunteer-activism", - value: Topic.ACTIVISM, - label: `_global.topics.activism`, + icon: "bi:globe", + value: Topic.ACCESSIBILITY, + label: `_global.topics.accessibility`, }, { - icon: "mdi:justice", - value: Topic.JUSTICE, - label: `_global.topics.justice`, + icon: "bi:globe", + value: Topic.ANIMALS, + label: `_global.topics.animal-rights`, }, { - icon: "mdi:environment", - value: Topic.ENVIRONMENT, - label: `_global.topics.environment`, + icon: "bi:globe", + value: Topic.CHILDREN, + label: `_global.topics.children-rights`, }, { - icon: "bi:book", + icon: "bi:globe", + value: Topic.DEMOCRACY, + label: `_global.topics.democracy`, + }, + { + icon: "bi:globe", value: Topic.EDUCATION, label: `_global.topics.education`, }, + { + icon: "bi:globe", + value: Topic.ELDERS, + label: `_global.topics.elders`, + }, + { + icon: "bi:globe", + value: Topic.EMERGENCY_RELIEF, + label: `_global.topics.emergency-relief`, + }, + { + icon: "bi:globe", + value: Topic.ENVIRONMENT, + label: `_global.topics.environment`, + }, + { + icon: "bi:globe", + value: Topic.EXPRESSION, + label: `_global.topics.expression`, + }, + { + icon: "bi:globe", + value: Topic.HEALTH, + label: `_global.topics.health`, + }, + { + icon: "bi:globe", + value: Topic.HOUSING, + label: `_global.topics.housing`, + }, + { + icon: "bi:globe", + value: Topic.LABOR, + label: `_global.topics.labor`, + }, + { + icon: "bi:globe", + value: Topic.LGTBQIA, + label: `_global.topics.lgbtqia`, + }, + { + icon: "bi:globe", + value: Topic.MIGRATION, + label: `_global.topics.migration`, + }, + { + icon: "bi:globe", + value: Topic.MOBILITY, + label: `_global.topics.mobility`, + }, + { + icon: "bi:globe", + value: Topic.NUTRITION, + label: `_global.topics.nutrition`, + }, + { + icon: "bi:globe", + value: Topic.PEACE_RESOLUTION, + label: `_global.topics.peace-resolution`, + }, + { + icon: "bi:globe", + value: Topic.RACIAL_JUSTICE, + label: `_global.topics.racial-justice`, + }, + { + icon: "bi:globe", + value: Topic.TECHNOLOGY_PRIVACY, + label: `_global.topics.technology-privacy`, + }, + { + icon: "bi:globe", + value: Topic.TRANSPARENCY, + label: `_global.topics.transparency`, + }, + { + icon: "bi:globe", + value: Topic.WOMEN, + label: `_global.topics.women`, + }, ];