Skip to content
This repository has been archived by the owner on Jun 1, 2023. It is now read-only.

component のディレクトリ構成を見直し #4016

Closed
wants to merge 30 commits into from
Closed

component のディレクトリ構成を見直し #4016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
cdbd6e6
Move ConfirmedCasesDetailsCard to components/index/cards
nard-tech May 6, 2020
007ad81
Move ConfirmedCasesDetailsTable to components/index/cards/charts
nard-tech May 6, 2020
118b6e6
Move ConfirmedCasesNumberCard to components/index/cards
nard-tech May 6, 2020
3614fad
Move ConfirmedCasesAttributesCard to components/index/cards
nard-tech May 6, 2020
ab4074f
Move ConfirmedCasesByMunicipalitiesCard to components/index/cards
nard-tech May 6, 2020
1843350
Move ConfirmedCasesByMunicipalitiesTable to components/index/cards/ch…
nard-tech May 6, 2020
9cc8561
Refactor pages/cards/_card.vue
nard-tech May 6, 2020
79402e2
Move TestedCasesDetailsCard to components/index/cards
nard-tech May 6, 2020
ea9a6af
Move TestedCasesDetailsTable to components/index/cards/charts
nard-tech May 6, 2020
db29254
Refactor pages/cards/_card.vue
nard-tech May 6, 2020
7f2129f
Move InspectionPersonsNumberCard to components/index/cards
nard-tech May 6, 2020
773830f
Move TestedNumberCard to components/index/cards
nard-tech May 6, 2020
3bc4053
Move TelephoneAdvisoryReportsNumberCard to components/index/cards
nard-tech May 6, 2020
d95e98e
Move ConsultationDeskReportsNumberCard to components/index/cards
nard-tech May 6, 2020
f1eb733
Move MetroCard to components/index/cards
nard-tech May 6, 2020
059cdc7
Move MetroBarChart to components/index/cards/charts
nard-tech May 6, 2020
5909871
Move AgencyCard to components/index/cards
nard-tech May 6, 2020
8be0102
Move AgencyBarChart to components/index/cards/charts
nard-tech May 6, 2020
9b2a82a
Clean pages/index.vue
nard-tech May 6, 2020
0d972c9
Move CardRow to components/index
nard-tech May 6, 2020
a1080da
Move StaticInfo to components/index
nard-tech May 6, 2020
8b16854
Move WhatsNew to components/index
nard-tech May 6, 2020
0dec863
Move DataTable to components/index/cards/charts
nard-tech May 6, 2020
7823a16
Remove SourceLink
nard-tech May 6, 2020
aa52732
Move TimeBarChart to components/index/cards/charts
nard-tech May 6, 2020
dce98c5
Move TimeStackedBarChart to components/index/cards/charts
nard-tech May 6, 2020
2385957
Move PrinterButton to components/flow
nard-tech May 6, 2020
76e5882
Move DataViewBasicInfoPanel to components/index/cards/charts
nard-tech May 6, 2020
997d8a2
Move DataSelector to components/index/cards/charts
nard-tech May 6, 2020
16c639a
Move DataView to components/index/cards/charts
nard-tech May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion auto-i18n/i18n_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
# Noneが混じっているので、取り除く
all_tags.pop(all_tags.index(None))
# 全角のハイフン、半角のハイフン、全角のダッシュが混じっているので、取り除く
# 理由は components/cards/ConfirmedCasesAttributesCard.vue の75行目辺りを参照。
# 理由は components/index/cards/ConfirmedCasesAttributesCard.vue の75行目辺りを参照。
for x in ["-", "‐", "―"]:
try:
all_tags.pop(all_tags.index(x))
Expand Down
50 changes: 0 additions & 50 deletions components/SourceLink.vue
View file
Open in desktop

This file was deleted.

0 components/PrinterButton.vue → components/flow/PrinterButton.vue
View file
Open in desktop
File renamed without changes.
0 components/cards/CardRow.vue → components/index/CardRow.vue
View file
Open in desktop
File renamed without changes.
0 components/StaticInfo.vue → components/index/StaticInfo.vue
View file
Open in desktop
File renamed without changes.
0 components/WhatsNew.vue → components/index/WhatsNew.vue
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion components/cards/AgencyCard.vue → components/index/cards/AgencyCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<script>
import agencyData from '@/data/agency.json'
import AgencyBarChart from '@/components/AgencyBarChart.vue'
import AgencyBarChart from '@/components/index/cards/charts/AgencyBarChart.vue'

export default {
components: {
Expand Down
3 changes: 2 additions & 1 deletion ...ts/cards/ConfirmedCasesAttributesCard.vue → ...ex/cards/ConfirmedCasesAttributesCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
import Data from '@/data/data.json'
import formatGraph from '@/utils/formatGraph'
import formatTable from '@/utils/formatTable'
import DataTable from '@/components/DataTable.vue'

import DataTable from '@/components/index/cards/charts/DataTable.vue'

export default {
components: {
Expand Down
2 changes: 1 addition & 1 deletion ...ds/ConfirmedCasesByMunicipalitiesCard.vue → ...ds/ConfirmedCasesByMunicipalitiesCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<script>
import dayjs from 'dayjs'
import Data from '@/data/patient.json'
import ConfirmedCasesByMunicipalitiesTable from '~/components/ConfirmedCasesByMunicipalitiesTable.vue'
import ConfirmedCasesByMunicipalitiesTable from '@/components/index/cards/charts/ConfirmedCasesByMunicipalitiesTable.vue'

export default {
components: {
Expand Down
4 changes: 2 additions & 2 deletions ...nents/cards/ConfirmedCasesDetailsCard.vue → ...index/cards/ConfirmedCasesDetailsCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
import dayjs from 'dayjs'
import Data from '@/data/data.json'
import formatConfirmedCases from '@/utils/formatConfirmedCases'
import DataView from '@/components/DataView.vue'
import ConfirmedCasesDetailsTable from '@/components/ConfirmedCasesDetailsTable.vue'
import DataView from '@/components/index/cards/charts/DataView.vue'
import ConfirmedCasesDetailsTable from '@/components/index/cards/charts/ConfirmedCasesDetailsTable.vue'

export default {
components: {
Expand Down
2 changes: 1 addition & 1 deletion ...onents/cards/ConfirmedCasesNumberCard.vue → .../index/cards/ConfirmedCasesNumberCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<script>
import Data from '@/data/data.json'
import formatGraph from '@/utils/formatGraph'
import TimeBarChart from '@/components/TimeBarChart.vue'
import TimeBarChart from '@/components/index/cards/charts/TimeBarChart.vue'

export default {
components: {
Expand Down
2 changes: 1 addition & 1 deletion ...rds/ConsultationDeskReportsNumberCard.vue → ...rds/ConsultationDeskReportsNumberCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<script>
import Data from '@/data/data.json'
import formatGraph from '@/utils/formatGraph'
import TimeBarChart from '@/components/TimeBarChart.vue'
import TimeBarChart from '@/components/index/cards/charts/TimeBarChart.vue'

export default {
components: {
Expand Down
2 changes: 1 addition & 1 deletion ...nts/cards/InspectionPersonsNumberCard.vue → ...dex/cards/InspectionPersonsNumberCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<script>
import Data from '@/data/data.json'
import formatGraph from '@/utils/formatGraph'
import TimeBarChart from '@/components/TimeBarChart.vue'
import TimeBarChart from '@/components/index/cards/charts/TimeBarChart.vue'

export default {
components: {
Expand Down
2 changes: 1 addition & 1 deletion components/cards/MetroCard.vue → components/index/cards/MetroCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<script>
import Data from '@/data/data.json'
import MetroData from '@/data/metro.json'
import MetroBarChart from '@/components/MetroBarChart.vue'
import MetroBarChart from '@/components/index/cards/charts/MetroBarChart.vue'

export default {
components: {
Expand Down
2 changes: 1 addition & 1 deletion ...ds/TelephoneAdvisoryReportsNumberCard.vue → ...ds/TelephoneAdvisoryReportsNumberCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<script>
import Data from '@/data/data.json'
import formatGraph from '@/utils/formatGraph'
import TimeBarChart from '@/components/TimeBarChart.vue'
import TimeBarChart from '@/components/index/cards/charts/TimeBarChart.vue'

export default {
components: {
Expand Down
4 changes: 2 additions & 2 deletions components/cards/TestedCasesDetailsCard.vue → ...ts/index/cards/TestedCasesDetailsCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ ul.notes {
<script>
import Data from '@/data/data.json'
import formatTestedCases from '@/utils/formatTestedCases'
import DataView from '@/components/DataView.vue'
import TestedCasesDetailsTable from '@/components/TestedCasesDetailsTable.vue'
import DataView from '@/components/index/cards/charts/DataView.vue'
import TestedCasesDetailsTable from '@/components/index/cards/charts/TestedCasesDetailsTable.vue'

export default {
components: {
Expand Down
2 changes: 1 addition & 1 deletion components/cards/TestedNumberCard.vue → components/index/cards/TestedNumberCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
import Data from '@/data/data.json'
import TimeStackedBarChart from '@/components/TimeStackedBarChart.vue'
import TimeStackedBarChart from '@/components/index/cards/charts/TimeStackedBarChart.vue'
dayjs.extend(duration)

export default {
Expand Down
2 changes: 1 addition & 1 deletion components/AgencyBarChart.vue → ...nts/index/cards/charts/AgencyBarChart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import VueI18n from 'vue-i18n'
import { ChartOptions } from 'chart.js'
import { ThisTypedComponentOptionsWithRecordProps } from 'vue/types/options'
import agencyData from '@/data/agency.json'
import DataView from '@/components/DataView.vue'
import DataView from '@/components/index/cards/charts/DataView.vue'
import { getGraphSeriesStyle } from '@/utils/colors'
import { DisplayData, DataSets } from '@/plugins/vue-chart'

Expand Down
4 changes: 2 additions & 2 deletions ...s/ConfirmedCasesByMunicipalitiesTable.vue → ...s/ConfirmedCasesByMunicipalitiesTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@

<script lang="ts">
import Vue from 'vue'
import DataView from '@/components/DataView.vue'
import DataViewBasicInfoPanel from '@/components/DataViewBasicInfoPanel.vue'
import DataView from '@/components/index/cards/charts/DataView.vue'
import DataViewBasicInfoPanel from '@/components/index/cards/charts/DataViewBasicInfoPanel.vue'

export default Vue.extend({
components: { DataView, DataViewBasicInfoPanel },
Expand Down
0 components/ConfirmedCasesDetailsTable.vue → ...rds/charts/ConfirmedCasesDetailsTable.vue
View file
Open in desktop
File renamed without changes.
0 components/DataSelector.vue → ...nents/index/cards/charts/DataSelector.vue
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions components/DataTable.vue → components/index/cards/charts/DataTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@

<script lang="ts">
import Vue from 'vue'
import DataView from '@/components/DataView.vue'
import DataViewBasicInfoPanel from '@/components/DataViewBasicInfoPanel.vue'
import DataView from '@/components/index/cards/charts/DataView.vue'
import DataViewBasicInfoPanel from '@/components/index/cards/charts/DataViewBasicInfoPanel.vue'
import OpenDataLink from '@/components/OpenDataLink.vue'

export default Vue.extend({
Expand Down
0 components/DataView.vue → components/index/cards/charts/DataView.vue
View file
Open in desktop
File renamed without changes.
0 components/DataViewBasicInfoPanel.vue → ...x/cards/charts/DataViewBasicInfoPanel.vue
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion components/MetroBarChart.vue → ...ents/index/cards/charts/MetroBarChart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import Vue from 'vue'
import { TranslateResult } from 'vue-i18n'
import { ChartOptions, ChartData, Chart } from 'chart.js'
import { ThisTypedComponentOptionsWithRecordProps } from 'vue/types/options'
import DataView from '@/components/DataView.vue'
import DataView from '@/components/index/cards/charts/DataView.vue'
import { getGraphSeriesStyle } from '@/utils/colors'
import ExternalLink from '@/components/ExternalLink.vue'
import { DisplayData } from '@/plugins/vue-chart'
Expand Down
0 components/TestedCasesDetailsTable.vue → .../cards/charts/TestedCasesDetailsTable.vue
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions components/TimeBarChart.vue → ...nents/index/cards/charts/TimeBarChart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ import { ThisTypedComponentOptionsWithRecordProps } from 'vue/types/options'
import { Chart } from 'chart.js'
import dayjs from 'dayjs'
import { GraphDataType } from '@/utils/formatGraph'
import DataView from '@/components/DataView.vue'
import DataSelector from '@/components/DataSelector.vue'
import DataViewBasicInfoPanel from '@/components/DataViewBasicInfoPanel.vue'
import DataView from '@/components/index/cards/charts/DataView.vue'
import DataSelector from '@/components/index/cards/charts/DataSelector.vue'
import DataViewBasicInfoPanel from '@/components/index/cards/charts/DataViewBasicInfoPanel.vue'
import OpenDataLink from '@/components/OpenDataLink.vue'
import { DisplayData, yAxesBgPlugin, scrollPlugin } from '@/plugins/vue-chart'

Expand Down
6 changes: 3 additions & 3 deletions components/TimeStackedBarChart.vue → ...ndex/cards/charts/TimeStackedBarChart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ import { ThisTypedComponentOptionsWithRecordProps } from 'vue/types/options'
import { TranslateResult } from 'vue-i18n'
import { Chart } from 'chart.js'
import dayjs from 'dayjs'
import DataView from '@/components/DataView.vue'
import DataSelector from '@/components/DataSelector.vue'
import DataViewBasicInfoPanel from '@/components/DataViewBasicInfoPanel.vue'
import DataView from '@/components/index/cards/charts/DataView.vue'
import DataSelector from '@/components/index/cards/charts/DataSelector.vue'
import DataViewBasicInfoPanel from '@/components/index/cards/charts/DataViewBasicInfoPanel.vue'
import { DisplayData, yAxesBgPlugin, scrollPlugin } from '@/plugins/vue-chart'
import { getGraphSeriesStyle, SurfaceStyle } from '@/utils/colors'

Expand Down
33 changes: 17 additions & 16 deletions pages/cards/_card.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
<confirmed-cases-details-card
v-if="this.$route.params.card == 'details-of-confirmed-cases'"
/>
<tested-cases-details-card
v-else-if="this.$route.params.card == 'details-of-tested-cases'"
/>
<confirmed-cases-number-card
v-else-if="this.$route.params.card == 'number-of-confirmed-cases'"
/>
Expand All @@ -17,12 +14,15 @@
<confirmed-cases-attributes-card
v-else-if="this.$route.params.card == 'attributes-of-confirmed-cases'"
/>
<tested-number-card
v-else-if="this.$route.params.card == 'number-of-tested'"
<tested-cases-details-card
v-else-if="this.$route.params.card == 'details-of-tested-cases'"
/>
<inspection-persons-number-card
v-else-if="this.$route.params.card == 'number-of-inspection-persons'"
/>
<tested-number-card
v-else-if="this.$route.params.card == 'number-of-tested'"
/>
Comment on lines +17 to +25
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pages/index.vue での順序に合わせて変更

<telephone-advisory-reports-number-card
v-else-if="
this.$route.params.card ==
Expand All @@ -49,17 +49,18 @@ import Data from '@/data/data.json'
import MetroData from '@/data/metro.json'
import agencyData from '@/data/agency.json'
import patientData from '@/data/patient.json'
import ConfirmedCasesDetailsCard from '@/components/cards/ConfirmedCasesDetailsCard.vue'
import TestedCasesDetailsCard from '@/components/cards/TestedCasesDetailsCard.vue'
import ConfirmedCasesNumberCard from '@/components/cards/ConfirmedCasesNumberCard.vue'
import ConfirmedCasesAttributesCard from '@/components/cards/ConfirmedCasesAttributesCard.vue'
import ConfirmedCasesByMunicipalitiesCard from '@/components/cards/ConfirmedCasesByMunicipalitiesCard.vue'
import TestedNumberCard from '@/components/cards/TestedNumberCard.vue'
import InspectionPersonsNumberCard from '@/components/cards/InspectionPersonsNumberCard.vue'
import TelephoneAdvisoryReportsNumberCard from '@/components/cards/TelephoneAdvisoryReportsNumberCard.vue'
import ConsultationDeskReportsNumberCard from '@/components/cards/ConsultationDeskReportsNumberCard.vue'
import MetroCard from '@/components/cards/MetroCard.vue'
import AgencyCard from '@/components/cards/AgencyCard.vue'

import ConfirmedCasesDetailsCard from '@/components/index/cards/ConfirmedCasesDetailsCard.vue'
import ConfirmedCasesNumberCard from '@/components/index/cards/ConfirmedCasesNumberCard.vue'
import ConfirmedCasesAttributesCard from '@/components/index/cards/ConfirmedCasesAttributesCard.vue'
import ConfirmedCasesByMunicipalitiesCard from '@/components/index/cards/ConfirmedCasesByMunicipalitiesCard.vue'
import TestedCasesDetailsCard from '@/components/index/cards/TestedCasesDetailsCard.vue'
import InspectionPersonsNumberCard from '@/components/index/cards/InspectionPersonsNumberCard.vue'
import TestedNumberCard from '@/components/index/cards/TestedNumberCard.vue'
import TelephoneAdvisoryReportsNumberCard from '@/components/index/cards/TelephoneAdvisoryReportsNumberCard.vue'
import ConsultationDeskReportsNumberCard from '@/components/index/cards/ConsultationDeskReportsNumberCard.vue'
import MetroCard from '@/components/index/cards/MetroCard.vue'
import AgencyCard from '@/components/index/cards/AgencyCard.vue'

export default {
components: {
Expand Down
2 changes: 1 addition & 1 deletion pages/flow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ import Vue from 'vue'
import { TranslateResult } from 'vue-i18n'
import VueScrollTo from 'vue-scrollto'
import CovidIcon from '@/static/covid.svg'
import PrinterButton from '@/components/PrinterButton.vue'
import PrinterButton from '@/components/flow/PrinterButton.vue'
import PageHeader from '@/components/PageHeader.vue'
import ExternalLink from '@/components/ExternalLink.vue'
import FigCondSyDr from '@/static/flow/cond_sydr.svg'
Expand Down
33 changes: 19 additions & 14 deletions pages/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,28 @@
<script lang="ts">
import Vue from 'vue'
import { MetaInfo } from 'vue-meta'

import PageHeader from '@/components/PageHeader.vue'
import WhatsNew from '@/components/WhatsNew.vue'
import StaticInfo from '@/components/StaticInfo.vue'
import CardRow from '@/components/cards/CardRow.vue'

import WhatsNew from '@/components/index/WhatsNew.vue'
import StaticInfo from '@/components/index/StaticInfo.vue'
import CardRow from '@/components/index/CardRow.vue'

import ConfirmedCasesDetailsCard from '@/components/index/cards/ConfirmedCasesDetailsCard.vue'
import ConfirmedCasesNumberCard from '@/components/index/cards/ConfirmedCasesNumberCard.vue'
import ConfirmedCasesAttributesCard from '@/components/index/cards/ConfirmedCasesAttributesCard.vue'
import ConfirmedCasesByMunicipalitiesCard from '@/components/index/cards/ConfirmedCasesByMunicipalitiesCard.vue'
import TestedCasesDetailsCard from '@/components/index/cards/TestedCasesDetailsCard.vue'
import InspectionPersonsNumberCard from '@/components/index/cards/InspectionPersonsNumberCard.vue'
import TestedNumberCard from '@/components/index/cards/TestedNumberCard.vue'
import TelephoneAdvisoryReportsNumberCard from '@/components/index/cards/TelephoneAdvisoryReportsNumberCard.vue'
import ConsultationDeskReportsNumberCard from '@/components/index/cards/ConsultationDeskReportsNumberCard.vue'
import MetroCard from '@/components/index/cards/MetroCard.vue'
import AgencyCard from '@/components/index/cards/AgencyCard.vue'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

component の import が分散していたため，一箇所にまとめた

import Data from '@/data/data.json'
import News from '@/data/news.json'
import ConfirmedCasesDetailsCard from '@/components/cards/ConfirmedCasesDetailsCard.vue'
import ConfirmedCasesNumberCard from '@/components/cards/ConfirmedCasesNumberCard.vue'
import ConfirmedCasesAttributesCard from '@/components/cards/ConfirmedCasesAttributesCard.vue'
import ConfirmedCasesByMunicipalitiesCard from '@/components/cards/ConfirmedCasesByMunicipalitiesCard.vue'
import TestedCasesDetailsCard from '@/components/cards/TestedCasesDetailsCard.vue'
import InspectionPersonsNumberCard from '@/components/cards/InspectionPersonsNumberCard.vue'
import TestedNumberCard from '@/components/cards/TestedNumberCard.vue'
import TelephoneAdvisoryReportsNumberCard from '@/components/cards/TelephoneAdvisoryReportsNumberCard.vue'
import ConsultationDeskReportsNumberCard from '@/components/cards/ConsultationDeskReportsNumberCard.vue'
import MetroCard from '@/components/cards/MetroCard.vue'
import AgencyCard from '@/components/cards/AgencyCard.vue'

import { convertDatetimeToISO8601Format } from '@/utils/formatDate'

export default Vue.extend({
Expand Down