From d342f8e4eb2a081ce8f5ab2e55c45973e2391217 Mon Sep 17 00:00:00 2001 From: toshi/pono000 Date: Thu, 17 Dec 2020 22:19:48 +0900 Subject: [PATCH 1/7] =?UTF-8?q?Events=E3=81=A7=E3=81=AEstore=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/actions.ts | 13 ++++++++++++- src/store/mutations.ts | 5 ++++- src/store/state.ts | 6 ++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/store/actions.ts b/src/store/actions.ts index 8daf120..28edc87 100644 --- a/src/store/actions.ts +++ b/src/store/actions.ts @@ -1,6 +1,6 @@ import { defineActions } from 'direct-vuex' import { rootActionContext } from '.' -import apis, { Group } from '/@/lib/apis' +import apis, { Group, Event } from '/@/lib/apis' export const actions = defineActions({ async fetchGroups(context): Promise { @@ -13,5 +13,16 @@ export const actions = defineActions({ const res = await apis.getGroups() commit.setGroups(res.data) return res.data + }, + async fetchEvents(context): Promise { + const { state, commit } = rootActionContext(context) + + if (state.events !== null) { + return state.events + } + + const res = await apis.getEvents() + commit.setEvents(res.data) + return res.data } }) diff --git a/src/store/mutations.ts b/src/store/mutations.ts index 91eef68..3aa705d 100644 --- a/src/store/mutations.ts +++ b/src/store/mutations.ts @@ -1,9 +1,12 @@ import { defineMutations } from 'direct-vuex' import { S } from './state' -import { Group } from '/@/lib/apis' +import { Group, Event } from '/@/lib/apis' export const mutations = defineMutations()({ setGroups(state: S, groups: Group[]) { state.groups = groups + }, + setEvents(state: S, events: Event[]) { + state.events = events } }) diff --git a/src/store/state.ts b/src/store/state.ts index eb7b80a..b03bbe5 100644 --- a/src/store/state.ts +++ b/src/store/state.ts @@ -1,9 +1,11 @@ -import { Group } from '/@/lib/apis' +import { Group, Event } from '/@/lib/apis' export interface S { groups: Group[] | null + events: Event[] | null } export const state: S = { - groups: null + groups: null, + events: null } From 8cb87527f033f9e5fc09e4a54db05c2f72948321 Mon Sep 17 00:00:00 2001 From: toshi/pono000 Date: Thu, 17 Dec 2020 22:20:24 +0900 Subject: [PATCH 2/7] =?UTF-8?q?events=E3=81=AE=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Events/EventList.vue | 32 ++++++++++++++++++++++ src/components/Events/EventListItem.vue | 32 ++++++++++++++++++++++ src/pages/Events.vue | 36 ++++++++++++++++++++++--- 3 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 src/components/Events/EventList.vue create mode 100644 src/components/Events/EventListItem.vue diff --git a/src/components/Events/EventList.vue b/src/components/Events/EventList.vue new file mode 100644 index 0000000..389f3f7 --- /dev/null +++ b/src/components/Events/EventList.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/src/components/Events/EventListItem.vue b/src/components/Events/EventListItem.vue new file mode 100644 index 0000000..062230a --- /dev/null +++ b/src/components/Events/EventListItem.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/src/pages/Events.vue b/src/pages/Events.vue index db7a7c0..e49cd05 100644 --- a/src/pages/Events.vue +++ b/src/pages/Events.vue @@ -1,11 +1,41 @@ + + From d0f551f7f8f3665170446ed0ea8b866e783dd4c5 Mon Sep 17 00:00:00 2001 From: toshi/pono000 Date: Thu, 17 Dec 2020 23:18:11 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E6=97=A5=E4=BB=98=E3=82=92=E5=88=87?= =?UTF-8?q?=E3=82=8A=E5=87=BA=E3=81=99=E9=96=A2=E6=95=B0getSinceDate?= =?UTF-8?q?=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/date.ts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/lib/date.ts diff --git a/src/lib/date.ts b/src/lib/date.ts new file mode 100644 index 0000000..793bdd1 --- /dev/null +++ b/src/lib/date.ts @@ -0,0 +1,20 @@ +export const getTimeString = (date: Date): string => + date.getHours().toString().padStart(2, '0') + + ':' + + date.getMinutes().toString().padStart(2, '0') + +export const getDayString = (date: Date): string => + (date.getMonth() + 1).toString().padStart(2, '0') + + '/' + + date.getDate().toString().padStart(2, '0') + +export const getFullDayString = (date: Date): string => + date.getFullYear() + '/' + getDayString(date) + +export const getFullDayWithTimeString = (date: Date): string => + getFullDayString(date) + ' ' + getTimeString(date) + +export const getSinceDate = (since: string): string => { + const sinceDate = new Date(since) + return getFullDayString(sinceDate) +} From e8ed6acb27dbbba0ca628f930c2a150f05b0b05a Mon Sep 17 00:00:00 2001 From: toshi/pono000 Date: Thu, 17 Dec 2020 23:18:28 +0900 Subject: [PATCH 4/7] =?UTF-8?q?events=E3=81=AB=E6=97=A5=E4=BB=98=E3=81=AE?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Events/EventListItem.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/components/Events/EventListItem.vue b/src/components/Events/EventListItem.vue index 062230a..5363eb2 100644 --- a/src/components/Events/EventListItem.vue +++ b/src/components/Events/EventListItem.vue @@ -2,13 +2,15 @@
{{ event.name }} + ({{ state.date }})
@@ -29,4 +37,8 @@ export default defineComponent({ color: $color-text; font-size: 3rem; } +.date { + color: $color-text; + font-size: 1.5rem; +} From 67a5e1f04249c6ca9d05c9313386da680d5e8a02 Mon Sep 17 00:00:00 2001 From: toshi/pono000 Date: Tue, 22 Dec 2020 22:00:01 +0900 Subject: [PATCH 5/7] =?UTF-8?q?events=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 日付と名前の間に隙間を入れる・コードの修正 --- src/components/Events/EventListItem.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/components/Events/EventListItem.vue b/src/components/Events/EventListItem.vue index 5363eb2..565e8f5 100644 --- a/src/components/Events/EventListItem.vue +++ b/src/components/Events/EventListItem.vue @@ -2,7 +2,7 @@
{{ event.name }} - ({{ state.date }}) + ({{ date }})
@@ -10,7 +10,7 @@ @@ -40,5 +38,6 @@ export default defineComponent({ .date { color: $color-text; font-size: 1.5rem; + margin: 0 0.5em; } From 25b187baee98528fd1c0ee0badeb941905a26ffb Mon Sep 17 00:00:00 2001 From: toshi/pono000 Date: Tue, 22 Dec 2020 22:00:13 +0900 Subject: [PATCH 6/7] =?UTF-8?q?getSinceDate=E3=81=AE=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/date.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/lib/date.ts b/src/lib/date.ts index 793bdd1..bd4015f 100644 --- a/src/lib/date.ts +++ b/src/lib/date.ts @@ -13,8 +13,3 @@ export const getFullDayString = (date: Date): string => export const getFullDayWithTimeString = (date: Date): string => getFullDayString(date) + ' ' + getTimeString(date) - -export const getSinceDate = (since: string): string => { - const sinceDate = new Date(since) - return getFullDayString(sinceDate) -} From e9395b14f02851b2442127ed065dc829b0a59984 Mon Sep 17 00:00:00 2001 From: toshi/pono000 Date: Tue, 22 Dec 2020 22:05:13 +0900 Subject: [PATCH 7/7] lint --- src/components/Events/EventListItem.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/Events/EventListItem.vue b/src/components/Events/EventListItem.vue index 565e8f5..ea3cc06 100644 --- a/src/components/Events/EventListItem.vue +++ b/src/components/Events/EventListItem.vue @@ -8,7 +8,7 @@