Update: 東京都版に追従してcomponentsディレクトリを整理

a01sa01to · Jun 6, 2021 · 127d702 · 127d702
1 parent 8aa46fb
commit 127d702
Show file tree

Hide file tree

Showing 71 changed files with 301 additions and 342 deletions.
diff --git a/components/CardsReferenceInfection.vue b/components/CardsReferenceInfection.vue
diff --git a/components/PrinterButton.vue b/components/PrinterButton.vue
diff --git a/components/SimpleMixedChart.vue b/components/SimpleMixedChart.vue
diff --git a/components/AppLink.vue → components/_shared/AppLink.vue b/components/AppLink.vue → components/_shared/AppLink.vue
diff --git a/components/DevelopmentModeMark.vue → components/_shared/DevelopmentModeMark.vue b/components/DevelopmentModeMark.vue → components/_shared/DevelopmentModeMark.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import AppLink from '@/components/AppLink.vue'
+import AppLink from '@/components/_shared/AppLink.vue'
 
 export default {
   name: 'DevelopmentModeMark',

diff --git a/components/NoScript.vue → components/_shared/NoScript.vue b/components/NoScript.vue → components/_shared/NoScript.vue
diff --git a/components/PageHeader.vue → components/_shared/PageHeader.vue b/components/PageHeader.vue → components/_shared/PageHeader.vue
diff --git a/components/SideNavigation.vue → components/_shared/SideNavigation.vue b/components/SideNavigation.vue → components/_shared/SideNavigation.vue
@@ -157,9 +157,9 @@ import {
 import Vue from 'vue'
 import { TranslateResult } from 'vue-i18n'
 
-import AppLink from '@/components/AppLink.vue'
-import LanguageSelector from '@/components/LanguageSelector.vue'
-import MenuList from '@/components/MenuList.vue'
+import AppLink from '@/components/_shared/AppLink.vue'
+import LanguageSelector from '@/components/_shared/SideNavigation/LanguageSelector.vue'
+import MenuList from '@/components/_shared/SideNavigation/MenuList.vue'
 
 type Item = {
   iconPath?: string

diff --git a/components/LanguageSelector.vue → ...hared/SideNavigation/LanguageSelector.vue b/components/LanguageSelector.vue → ...hared/SideNavigation/LanguageSelector.vue
diff --git a/components/MenuList.vue → ...nents/_shared/SideNavigation/MenuList.vue b/components/MenuList.vue → ...nents/_shared/SideNavigation/MenuList.vue
@@ -27,7 +27,7 @@
 <script lang="ts">
 import Vue, { PropType } from 'vue'
 
-import AppLink from '@/components/AppLink.vue'
+import AppLink from '@/components/_shared/AppLink.vue'
 import CovidIcon from '@/static/covid.svg'
 import MaskTrashIcon from '@/static/masktrash.svg'
 import ParentIcon from '@/static/parent.svg'

diff --git a/components/StaticCard.vue → components/_shared/StaticCard.vue b/components/StaticCard.vue → components/_shared/StaticCard.vue
diff --git a/components/cards/CocoaCard.vue → components/index/CardsApps/CocoaCard.vue b/components/cards/CocoaCard.vue → components/index/CardsApps/CocoaCard.vue
diff --git a/components/cards/IbarakiAmabieCard.vue → ...nts/index/CardsApps/IbarakiAmabieCard.vue b/components/cards/IbarakiAmabieCard.vue → ...nts/index/CardsApps/IbarakiAmabieCard.vue
diff --git a/...ts/cards/ConfirmedCasesAttributesCard.vue → ...fection/ConfirmedCasesAttributes/Card.vue b/...ts/cards/ConfirmedCasesAttributesCard.vue → ...fection/ConfirmedCasesAttributes/Card.vue
@@ -58,7 +58,7 @@ import Vue from 'vue'
 import { ThisTypedComponentOptionsWithRecordProps } from 'vue/types/options'
 import VueI18n from 'vue-i18n'
 
-import DataTable from '@/components/DataTable.vue'
+import DataTable from '@/components/index/CardsInfection/ConfirmedCasesAttributes/DataTable.vue'
 import Data from '@/data/data.json'
 import formatGraph from '@/utils/formatGraph'
 import { DataType, formatTable, TableDateType } from '@/utils/formatTable'

diff --git a/components/DataTable.vue → ...on/ConfirmedCasesAttributes/DataTable.vue b/components/DataTable.vue → ...on/ConfirmedCasesAttributes/DataTable.vue
@@ -79,9 +79,6 @@
     </template>
     <template #footer>
       <open-data-link :url="url" />
-      <p class="FooterNote">
-        {{ $t('下記更新日時はオープンデータAPIの反映日時に準じています') }}
-      </p>
     </template>
   </data-view>
 </template>
@@ -91,9 +88,9 @@ import { mdiAlert } from '@mdi/js'
 import Vue from 'vue'
 import ScaleLoader from 'vue-spinner/src/ScaleLoader.vue'
 
-import DataView from '@/components/DataView.vue'
-import DataViewDataSetPanel from '@/components/DataViewDataSetPanel.vue'
-import OpenDataLink from '@/components/OpenDataLink.vue'
+import DataView from '@/components/index/_shared/DataView.vue'
+import DataViewDataSetPanel from '@/components/index/_shared/DataViewDataSetPanel.vue'
+import OpenDataLink from '@/components/index/_shared/OpenDataLink.vue'
 
 export default Vue.extend({
   components: { DataView, DataViewDataSetPanel, OpenDataLink, ScaleLoader },

diff --git a/components/cards/ConfirmedCasesByAgeCard.vue → ...rdsInfection/ConfirmedCasesByAge/Card.vue b/components/cards/ConfirmedCasesByAgeCard.vue → ...rdsInfection/ConfirmedCasesByAge/Card.vue
@@ -1,7 +1,7 @@
 <template>
   <v-col cols="12" md="6" class="DataCard">
     <client-only>
-      <confirmed-cases-by-age
+      <chart
         :title="$t('年代別の感染状況')"
         :title-id="'number-of-confirmed-cases-by-age'"
         :chart-data="ageTable"
@@ -27,23 +27,23 @@
             </li>
           </ul>
         </template>
-      </confirmed-cases-by-age>
+      </chart>
     </client-only>
   </v-col>
 </template>
 
 <script>
 import dayjs from 'dayjs'
 
-import ConfirmedCasesByAge from '@/components/ConfirmedCasesByAge.vue'
+import Chart from '@/components/index/CardsInfection/ConfirmedCasesByAge/Chart.vue'
 import Data from '@/data/data.json'
-import { getCommaSeparatedNumberToFixedFunction } from '~/utils/valueFormatter'
+import { getCommaSeparatedNumberToFixedFunction } from '@/utils/valueFormatter'
 
 const countFormatter = getCommaSeparatedNumberToFixedFunction()
 
 export default {
   components: {
-    ConfirmedCasesByAge,
+    Chart,
   },
   data() {
     const { data, date } = Data.patients_age

diff --git a/components/ConfirmedCasesByAge.vue → ...dsInfection/ConfirmedCasesByAge/Chart.vue b/components/ConfirmedCasesByAge.vue → ...dsInfection/ConfirmedCasesByAge/Chart.vue
@@ -31,9 +31,9 @@
 <script lang="ts">
 import Vue from 'vue'
 
-import DataView from '@/components/DataView.vue'
-import DataViewDataSetPanel from '@/components/DataViewDataSetPanel.vue'
-import OpenDataLink from '@/components/OpenDataLink.vue'
+import DataView from '@/components/index/_shared/DataView.vue'
+import DataViewDataSetPanel from '@/components/index/_shared/DataViewDataSetPanel.vue'
+import OpenDataLink from '@/components/index/_shared/OpenDataLink.vue'
 
 export default Vue.extend({
   components: { DataView, DataViewDataSetPanel, OpenDataLink },

diff --git a/...ds/ConfirmedCasesByMunicipalitiesCard.vue → ...n/ConfirmedCasesByMunicipalities/Card.vue b/...ds/ConfirmedCasesByMunicipalitiesCard.vue → ...n/ConfirmedCasesByMunicipalities/Card.vue
@@ -1,7 +1,7 @@
 <template>
   <v-col cols="12" md="6" class="DataCard ConfirmedCasesByMunicipalitiesCard">
     <client-only>
-      <confirmed-cases-by-municipalities-table
+      <chart
         :title="$t('陽性者数（市町村別）')"
         :title-id="'number-of-confirmed-cases-by-municipalities'"
         :chart-data="municipalitiesTable"
@@ -20,15 +20,15 @@
             </li>
           </ul>
         </template>
-      </confirmed-cases-by-municipalities-table>
+      </chart>
     </client-only>
   </v-col>
 </template>
 
 <script>
 import dayjs from 'dayjs'
 
-import ConfirmedCasesByMunicipalitiesTable from '@/components/ConfirmedCasesByMunicipalitiesTable.vue'
+import Chart from '@/components/index/CardsInfection/ConfirmedCasesByMunicipalities/Chart.vue'
 import CityData from '@/data/cities.json'
 import Data from '@/data/data.json'
 import { getCommaSeparatedNumberToFixedFunction } from '@/utils/valueFormatter'
@@ -37,7 +37,7 @@ const countFormatter = getCommaSeparatedNumberToFixedFunction()
 
 export default {
   components: {
-    ConfirmedCasesByMunicipalitiesTable,
+    Chart,
   },
   data() {
     const { data, date } = Data.patients_city

diff --git a/...s/ConfirmedCasesByMunicipalitiesTable.vue → .../ConfirmedCasesByMunicipalities/Chart.vue b/...s/ConfirmedCasesByMunicipalitiesTable.vue → .../ConfirmedCasesByMunicipalities/Chart.vue
@@ -34,9 +34,9 @@
 <script lang="ts">
 import Vue from 'vue'
 
-import DataView from '@/components/DataView.vue'
-import DataViewDataSetPanel from '@/components/DataViewDataSetPanel.vue'
-import OpenDataLink from '@/components/OpenDataLink.vue'
+import DataView from '@/components/index/_shared/DataView.vue'
+import DataViewDataSetPanel from '@/components/index/_shared/DataViewDataSetPanel.vue'
+import OpenDataLink from '@/components/index/_shared/OpenDataLink.vue'
 
 export default Vue.extend({
   components: { DataView, DataViewDataSetPanel, OpenDataLink },

diff --git a/...nents/cards/ConfirmedCasesDetailsCard.vue → ...sInfection/ConfirmedCasesDetails/Card.vue b/...nents/cards/ConfirmedCasesDetailsCard.vue → ...sInfection/ConfirmedCasesDetails/Card.vue
@@ -31,10 +31,7 @@
             </li>
           </ul>
         </template>
-        <confirmed-cases-details-table
-          :aria-label="$t('検査陽性者の状況')"
-          v-bind="confirmedCases"
-        />
+        <chart :aria-label="$t('検査陽性者の状況')" v-bind="confirmedCases" />
         <horizontal-bar-chart
           :chart-id="'horizontal-bar-chart-details'"
           :chart-data="confirmedDetailCases"
@@ -55,19 +52,19 @@
 <script>
 import dayjs from 'dayjs'
 
-import ConfirmedCasesDetailsTable from '@/components/ConfirmedCasesDetailsTable.vue'
-import DataView from '@/components/DataView.vue'
-import DataViewDataSetPanel from '@/components/DataViewDataSetPanel.vue'
-import HorizontalBarChart from '@/components/HorizontalBarChart.vue'
-import OpenDataLink from '@/components/OpenDataLink.vue'
+import DataView from '@/components/index/_shared/DataView.vue'
+import DataViewDataSetPanel from '@/components/index/_shared/DataViewDataSetPanel.vue'
+import HorizontalBarChart from '@/components/index/_shared/HorizontalBarChart.vue'
+import OpenDataLink from '@/components/index/_shared/OpenDataLink.vue'
+import Chart from '@/components/index/CardsInfection/ConfirmedCasesDetails/Chart.vue'
 import Data from '@/data/data.json'
 import formatConfirmedCases from '@/utils/formatConfirmedCases'
 import formatDetailConfirmedCases from '@/utils/formatDetailGraph'
 
 const options = {
   components: {
     DataView,
-    ConfirmedCasesDetailsTable,
+    Chart,
     HorizontalBarChart,
     DataViewDataSetPanel,
     OpenDataLink,

diff --git a/components/ConfirmedCasesDetailsTable.vue → ...Infection/ConfirmedCasesDetails/Chart.vue b/components/ConfirmedCasesDetailsTable.vue → ...Infection/ConfirmedCasesDetails/Chart.vue
diff --git a/...onents/cards/ConfirmedCasesNumberCard.vue → ...dsInfection/ConfirmedCasesNumber/Card.vue b/...onents/cards/ConfirmedCasesNumberCard.vue → ...dsInfection/ConfirmedCasesNumber/Card.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import ConfirmedCasesNumberChart from '@/components/TimeBarWithAverageChart.vue'
+import ConfirmedCasesNumberChart from '@/components/index/_shared/TimeBarWithAverageChart.vue'
 import Data from '@/data/data.json'
 import formatGraph from '@/utils/formatGraph'
 import {

diff --git a/components/cards/DeathsCard.vue → ...ents/index/CardsInfection/Deaths/Card.vue b/components/cards/DeathsCard.vue → ...ents/index/CardsInfection/Deaths/Card.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import TimeBarChart from '@/components/TimeBarChart.vue'
+import TimeBarChart from '@/components/index/_shared/TimeBarChart.vue'
 import Data from '@/data/data.json'
 import formatGraph from '@/utils/formatGraph'
 

diff --git a/components/cards/IbarakiCoronaNext.vue → ...CardsInfection/IbarakiCoronaNext/Card.vue b/components/cards/IbarakiCoronaNext.vue → ...CardsInfection/IbarakiCoronaNext/Card.vue
@@ -190,8 +190,8 @@
 </template>
 
 <script>
-import DataView from '@/components/DataView.vue'
-import OpenDataLink from '@/components/OpenDataLink.vue'
+import DataView from '@/components/index/_shared/DataView.vue'
+import OpenDataLink from '@/components/index/_shared/OpenDataLink.vue'
 import Data from '@/data/data.json'
 
 export default {

diff --git a/components/cards/IbarakiGraphicalMapCard.vue → ...rdsInfection/IbarakiGraphicalMap/Card.vue b/components/cards/IbarakiGraphicalMapCard.vue → ...rdsInfection/IbarakiGraphicalMap/Card.vue
@@ -43,7 +43,7 @@
 
 <script>
 import IbarakiMap from '@/assets/ibaraki-map.svg'
-import DataView from '@/components/DataView.vue'
+import DataView from '@/components/index/_shared/DataView.vue'
 import CityData from '@/data/cities.json'
 import Data from '@/data/data.json'
 

diff --git a/.../cards/MutantConfirmedCasesNumberCard.vue → ...ction/MutantConfirmedCasesNumber/Card.vue b/.../cards/MutantConfirmedCasesNumberCard.vue → ...ction/MutantConfirmedCasesNumber/Card.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import ConfirmedCasesNumberChart from '@/components/TimeBarWithAverageChart.vue'
+import ConfirmedCasesNumberChart from '@/components/index/_shared/TimeBarWithAverageChart.vue'
 import Data from '@/data/data.json'
 import formatGraph from '@/utils/formatGraph'
 import {