From acd767c00a5ae13a66e05d3717518208a40eea95 Mon Sep 17 00:00:00 2001 From: KannoStanfoot Date: Fri, 10 May 2024 08:53:12 +0900 Subject: [PATCH 1/5] fix: Localize the duration in sponsor section --- .../web/app/components/SponsorPageSection.vue | 22 ++++--- apps/web/app/lang/en.json | 16 +++-- apps/web/app/lang/ja.json | 16 +++-- packages/ui/.storybook/main.js | 1 + packages/ui/.storybook/preview.js | 58 +++++++++++++++++ packages/ui/components/date/Date.stories.ts | 62 +++++++++++++------ packages/ui/components/date/Date.vue | 33 +++++++--- .../ui/components/date/DatePeriod.stories.ts | 62 ++++++++++++------- packages/ui/components/date/DatePeriod.vue | 3 +- 9 files changed, 200 insertions(+), 73 deletions(-) diff --git a/apps/web/app/components/SponsorPageSection.vue b/apps/web/app/components/SponsorPageSection.vue index 75f3a7c8..5d53a527 100644 --- a/apps/web/app/components/SponsorPageSection.vue +++ b/apps/web/app/components/SponsorPageSection.vue @@ -1,10 +1,8 @@ @@ -38,8 +36,16 @@ const { color } = useColor() {{ $t('sponsor.apply_period') }} @@ -65,13 +71,12 @@ const { color } = useColor() - diff --git a/packages/ui/components/date/DatePeriod.stories.ts b/packages/ui/components/date/DatePeriod.stories.ts index b6005da7..6b102389 100644 --- a/packages/ui/components/date/DatePeriod.stories.ts +++ b/packages/ui/components/date/DatePeriod.stories.ts @@ -1,20 +1,10 @@ -import { StoryFn } from '@storybook/vue3' +import { Meta, StoryObj } from '@storybook/vue3' import DatePeriod from './DatePeriod.vue' -export default { +const meta: Meta = { title: 'date/DatePeriod', + tags: ['autodocs'], component: DatePeriod, - args: { - start: { - year: 2024, - date: '4.1', - dayOfWeek: '月', - }, - end: { - date: '4.30', - dayOfWeek: '火', - }, - }, argTypes: { start: { description: 'The start property', @@ -31,13 +21,43 @@ export default { }, } -const Template: StoryFn = (args, { argTypes }) => ({ - props: Object.keys(argTypes), - components: { DatePeriod }, - setup() { - return { args } +export default meta + +type Story = StoryObj + + +/** + * Controlでpropsを切り替えると、日付と曜日表記が変わる + */ +export const PropsControls: Story = { + name: 'propsControls', + args: { + start: { + prefixYear: '2024', + date: '4.1', + dayOfWeek: '月', + }, + end: { + date: '4.30', + dayOfWeek: '火', + }, }, - template: '', -}) + render: (args) => ({ + components: { DatePeriod }, + setup() { + return { args } + }, + template: '', + }) +} -export const Default = Template.bind({}) +/** + * ツールバーで言語を切り替えると、日付と曜日表記が変わる + */ +export const I18n: Story = { + name: 'i18n', + render: () => ({ + components: { DatePeriod }, + template: '' + }) +} diff --git a/packages/ui/components/date/DatePeriod.vue b/packages/ui/components/date/DatePeriod.vue index 50b9bbc6..91d311c8 100644 --- a/packages/ui/components/date/DatePeriod.vue +++ b/packages/ui/components/date/DatePeriod.vue @@ -8,8 +8,7 @@ type DatePeriodProps = { end: DateProps } -// eslint-disable-next-line no-unused-vars -const props = defineProps() +defineProps() const { fontSize } = useTypography() const { color } = useColor() From 4d2a34eac3ad40ccc7ae2a270a4a38df5fd5f644 Mon Sep 17 00:00:00 2001 From: KannoStanfoot Date: Fri, 10 May 2024 09:21:35 +0900 Subject: [PATCH 2/5] chore: fix chromatic action --- .github/workflows/chromatic.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 7866f685..dce0fbc6 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -33,6 +33,7 @@ jobs: with: projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} workingDir: ./packages/ui + storybookBaseDir: ./packages/ui exitZeroOnChanges: true exitOnceUploaded: true onlyChanged: true From 2ccd077c4adb178a2220ecc1e8d5d5bf06694697 Mon Sep 17 00:00:00 2001 From: KannoStanfoot Date: Sat, 11 May 2024 04:17:56 +0900 Subject: [PATCH 3/5] fix: remove unused CSS import statement --- apps/web/app/components/SponsorPageSection.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/web/app/components/SponsorPageSection.vue b/apps/web/app/components/SponsorPageSection.vue index 5d53a527..c7a31bb0 100644 --- a/apps/web/app/components/SponsorPageSection.vue +++ b/apps/web/app/components/SponsorPageSection.vue @@ -76,7 +76,6 @@ const { color } = useColor()