From ae6d28132af167739d38985fecc0ea612641a26b Mon Sep 17 00:00:00 2001 From: Mysterious_Dev Date: Sun, 12 Nov 2023 14:53:13 +0100 Subject: [PATCH 1/7] Begin Work --- lib/components/base/Badge.vue | 23 ++++++++++++++++++++--- locales/en-US/index.json | 9 +++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/lib/components/base/Badge.vue b/lib/components/base/Badge.vue index 824c55a32..f93bc9a93 100644 --- a/lib/components/base/Badge.vue +++ b/lib/components/base/Badge.vue @@ -3,9 +3,9 @@ - - - + + + @@ -53,6 +53,23 @@ import { capitalizeString, } from '@' +import { useVIntl, defineMessages } from '@vintl/vintl' +const messages = defineMessages({ + modrinthTeamLabel: { + id: 'omorphia.component.badge.label.modrinth-team', + defaultMessage: 'Modrinth Team', + }, + moderatorLabel: { + id: 'omorphia.component.badge.label.moderator', + defaultMessage: 'Moderator', + }, + creatorLabel: { + id: 'omorphia.component.badge.label.creator', + defaultMessage: 'Creator', + } +}) +const { formatMessage } = useVIntl() + defineProps({ type: { type: String, diff --git a/locales/en-US/index.json b/locales/en-US/index.json index c0a3243bc..8b0a8a9d6 100644 --- a/locales/en-US/index.json +++ b/locales/en-US/index.json @@ -1,4 +1,13 @@ { + "omorphia.component.badge.label.modrinth-team": { + "defaultMessage": "Modrinth Team" + }, + "omorphia.component.badge.label.moderator": { + "defaultMessage": "Moderator" + }, + "omorphia.component.badge.label.creator": { + "defaultMessage": "Creator" + }, "omorphia.component.copy.action.copy": { "defaultMessage": "Copy code to clipboard" } From ea8fdeb7f99a67726e86c0e41cebc66d52b847aa Mon Sep 17 00:00:00 2001 From: Mysterious_Dev Date: Sun, 12 Nov 2023 14:55:10 +0100 Subject: [PATCH 2/7] Ordering --- locales/en-US/index.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locales/en-US/index.json b/locales/en-US/index.json index 8b0a8a9d6..d45b510db 100644 --- a/locales/en-US/index.json +++ b/locales/en-US/index.json @@ -1,12 +1,12 @@ { - "omorphia.component.badge.label.modrinth-team": { - "defaultMessage": "Modrinth Team" + "omorphia.component.badge.label.creator": { + "defaultMessage": "Creator" }, "omorphia.component.badge.label.moderator": { "defaultMessage": "Moderator" }, - "omorphia.component.badge.label.creator": { - "defaultMessage": "Creator" + "omorphia.component.badge.label.modrinth-team": { + "defaultMessage": "Modrinth Team" }, "omorphia.component.copy.action.copy": { "defaultMessage": "Copy code to clipboard" From ec6e4a74b2f912da70a44c96c08a8ef54fc57cfb Mon Sep 17 00:00:00 2001 From: Mysterious_Dev Date: Sun, 12 Nov 2023 15:00:02 +0100 Subject: [PATCH 3/7] Add all keys to JSON file --- locales/en-US/index.json | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/locales/en-US/index.json b/locales/en-US/index.json index d45b510db..a6629e385 100644 --- a/locales/en-US/index.json +++ b/locales/en-US/index.json @@ -1,13 +1,61 @@ { + "omorphia.component.badge.label.accepted": { + "defaultMessage": "Accepted" + }, + "omorphia.component.badge.label.approved": { + "defaultMessage": "Approved" + }, + "omorphia.component.badge.label.archived": { + "defaultMessage": "Archived" + }, + "omorphia.component.badge.label.closed": { + "defaultMessage": "Closed" + }, "omorphia.component.badge.label.creator": { "defaultMessage": "Creator" }, + "omorphia.component.badge.label.draft": { + "defaultMessage": "Draft" + }, + "omorphia.component.badge.label.failed": { + "defaultMessage": "Failed" + }, + "omorphia.component.badge.label.listed": { + "defaultMessage": "Listed" + }, "omorphia.component.badge.label.moderator": { "defaultMessage": "Moderator" }, "omorphia.component.badge.label.modrinth-team": { "defaultMessage": "Modrinth Team" }, + "omorphia.component.badge.label.pending": { + "defaultMessage": "Pending" + }, + "omorphia.component.badge.label.private": { + "defaultMessage": "Private" + }, + "omorphia.component.badge.label.processed": { + "defaultMessage": "Processed" + }, + "omorphia.component.badge.label.rejected": { + "defaultMessage": "Rejected" + }, + "omorphia.component.badge.label.returned": { + "defaultMessage": "Returned" + }, + "omorphia.component.badge.label.scheduled": { + "defaultMessage": "Scheduled" + }, + "omorphia.component.badge.label.under-review": { + "defaultMessage": "Under review" + }, + "omorphia.component.badge.label.unlisted": { + "defaultMessage": "Unlisted" + }, + "omorphia.component.badge.label.withheld": { + "defaultMessage": "Withheld" + }, "omorphia.component.copy.action.copy": { "defaultMessage": "Copy code to clipboard" } From d77a66a911ec4c3ce47e38935352c207ee59c101 Mon Sep 17 00:00:00 2001 From: Mysterious_Dev Date: Sun, 12 Nov 2023 16:28:05 +0100 Subject: [PATCH 4/7] Add accepted, approved, archived & closed keys to vue component --- lib/components/base/Badge.vue | 38 +++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/lib/components/base/Badge.vue b/lib/components/base/Badge.vue index f93bc9a93..71279a817 100644 --- a/lib/components/base/Badge.vue +++ b/lib/components/base/Badge.vue @@ -9,18 +9,18 @@ - + - + - + @@ -29,7 +29,7 @@ - + @@ -55,18 +55,34 @@ import { import { useVIntl, defineMessages } from '@vintl/vintl' const messages = defineMessages({ - modrinthTeamLabel: { - id: 'omorphia.component.badge.label.modrinth-team', - defaultMessage: 'Modrinth Team', + acceptedLabel: { + id: 'omorphia.component.badge.label.accepted', + defaultMessage: 'Accepted', }, - moderatorLabel: { - id: 'omorphia.component.badge.label.moderator', - defaultMessage: 'Moderator', + approvedLabel: { + id: 'omorphia.component.badge.label.approved', + defaultMessage: 'Approved', + }, + archivedLabel: { + id: 'omorphia.component.badge.label.archived', + defaultMessage: 'Closed', + }, + closedLabel: { + id: 'omorphia.component.badge.label.closed', + defaultMessage: 'Creator', }, creatorLabel: { id: 'omorphia.component.badge.label.creator', defaultMessage: 'Creator', - } + }, + moderatorLabel: { + id: 'omorphia.component.badge.label.moderator', + defaultMessage: 'Moderator', + }, + modrinthTeamLabel: { + id: 'omorphia.component.badge.label.modrinth-team', + defaultMessage: 'Modrinth Team', + }, }) const { formatMessage } = useVIntl() From c143ffe94c4529646190db92810e22b7baef6f2c Mon Sep 17 00:00:00 2001 From: Mysterious_Dev Date: Sun, 12 Nov 2023 16:30:55 +0100 Subject: [PATCH 5/7] Add draft, failed, listed keys to vue component --- lib/components/base/Badge.vue | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/components/base/Badge.vue b/lib/components/base/Badge.vue index 71279a817..414ab5a67 100644 --- a/lib/components/base/Badge.vue +++ b/lib/components/base/Badge.vue @@ -8,13 +8,13 @@ - + - + @@ -25,7 +25,7 @@ - + @@ -75,6 +75,18 @@ const messages = defineMessages({ id: 'omorphia.component.badge.label.creator', defaultMessage: 'Creator', }, + draftLabel: { + id: 'omorphia.component.badge.label.draft', + defaultMessage: 'Draft', + }, + failedLabel: { + id: 'omorphia.component.badge.label.failed', + defaultMessage: 'Failed', + }, + listedLabel: { + id: 'omorphia.component.badge.label.listed', + defaultMessage: 'Listed', + }, moderatorLabel: { id: 'omorphia.component.badge.label.moderator', defaultMessage: 'Moderator', From 3804432536aed1404fa61483cbb7e2bde3c4f318 Mon Sep 17 00:00:00 2001 From: Mysterious_Dev Date: Sun, 12 Nov 2023 16:40:11 +0100 Subject: [PATCH 6/7] Format (fix lint) & improve documentation --- docs/components/badge.md | 57 +++++++++++++++++++++++++++++++++++ lib/components/base/Badge.vue | 40 ++++++++++++++++++------ 2 files changed, 87 insertions(+), 10 deletions(-) diff --git a/docs/components/badge.md b/docs/components/badge.md index 95f91289f..171c64d19 100644 --- a/docs/components/badge.md +++ b/docs/components/badge.md @@ -1,5 +1,7 @@ # Badge +## Colored badge + @@ -13,3 +15,58 @@ ``` + +## Badge with icon + + + + + + + + + + + + + + + + + + + + + + + + + + + +```vue + + + + + + + + + + + + + + + + + + + + + + + +``` + diff --git a/lib/components/base/Badge.vue b/lib/components/base/Badge.vue index 414ab5a67..ef275a3e1 100644 --- a/lib/components/base/Badge.vue +++ b/lib/components/base/Badge.vue @@ -3,33 +3,53 @@ - - - + + + - - + + - - + + - + - + - + From f31de6b442651e187b2d47aeab6aa38636aeb698 Mon Sep 17 00:00:00 2001 From: Mysterious_Dev Date: Sun, 12 Nov 2023 16:48:35 +0100 Subject: [PATCH 7/7] Finish the work --- lib/components/base/Badge.vue | 76 ++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 11 deletions(-) diff --git a/lib/components/base/Badge.vue b/lib/components/base/Badge.vue index ef275a3e1..371d45c70 100644 --- a/lib/components/base/Badge.vue +++ b/lib/components/base/Badge.vue @@ -20,31 +20,49 @@ - - - - + + + + - - + + - + - + - +