Merge pull request #72 from KaiShoya/feature/#71_change_components_di…

…rectory コンポーネントのフォルダ構成を変更した fix #71
KaiShoya · Jul 25, 2023 · 5cdc0a1 · 5cdc0a1
2 parents e472924 + 600ee65
commit 5cdc0a1
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 9 deletions.
diff --git a/components/atoms/Table.vue → components/data/Table.vue b/components/atoms/Table.vue → components/data/Table.vue
diff --git a/components/atoms/graphs/Calendar.vue → components/data/graphs/Calendar.vue b/components/atoms/graphs/Calendar.vue → components/data/graphs/Calendar.vue
diff --git a/components/atoms/graphs/ComboChart.vue → components/data/graphs/ComboChart.vue b/components/atoms/graphs/ComboChart.vue → components/data/graphs/ComboChart.vue
diff --git a/components/atoms/graphs/FCalendar.vue → components/data/graphs/FCalendar.vue b/components/atoms/graphs/FCalendar.vue → components/data/graphs/FCalendar.vue
diff --git a/components/atoms/graphs/PieChart.vue → components/data/graphs/PieChart.vue b/components/atoms/graphs/PieChart.vue → components/data/graphs/PieChart.vue
diff --git a/components/atoms/DrinkButton.vue → components/index/DrinkColumn.vue b/components/atoms/DrinkButton.vue → components/index/DrinkColumn.vue
diff --git a/components/atoms/Modal.vue → components/index/WarningModal.vue b/components/atoms/Modal.vue → components/index/WarningModal.vue
@@ -1,4 +1,3 @@
-<!-- eslint-disable vue/multi-word-component-names -->
 <script setup lang="ts">
 defineProps<{
   title: string,

diff --git a/pages/data/monthly.vue b/pages/data/monthly.vue
@@ -96,14 +96,14 @@ await setChartData()
       type="month"
       @change="setChartData"
     >
-    <AtomsGraphsFCalendar
+    <DataGraphsFCalendar
       :key="updateCalendar"
       :year-month="yearMonth"
       :data="calendarData"
     />
-    <AtomsGraphsComboChart :data="graphData" />
-    <AtomsGraphsPieChart :data="chartData" />
-    <AtomsTable
+    <DataGraphsComboChart :data="graphData" />
+    <DataGraphsPieChart :data="chartData" />
+    <DataTable
       :titles="chartDataTitle"
       :table-data="chartDataData"
     />

diff --git a/pages/data/total.vue b/pages/data/total.vue
@@ -51,8 +51,8 @@ calendarData.value = [
 
 <template>
   <div class="container">
-    <AtomsGraphsCalendar :data="calendarData" />
-    <AtomsGraphsPieChart :data="chartData" />
+    <DataGraphsCalendar :data="calendarData" />
+    <DataGraphsPieChart :data="chartData" />
     <AtomsTable
       :titles="chartDataTitle"
       :table-data="chartDataData"

diff --git a/pages/index.vue b/pages/index.vue
@@ -100,7 +100,7 @@ watch(date, async () => {
       class="input is-large mt-4 mb-4"
       type="date"
     >
-    <AtomsDrinkButton
+    <IndexDrinkColumn
       v-for="(drink, id) in drinks"
       :id="drink.counter_id"
       :key="id"
@@ -110,7 +110,7 @@ watch(date, async () => {
       :increment="plusCheck"
       :decrement="minus"
     />
-    <AtomsModal
+    <IndexWarningModal
       title="飲みすぎ注意"
       :content="`今日${drinkCount}杯飲んでるけど、まだそれでもまだ飲みますか？`"
       :success="() => { modalIsActive = false; plus(thisDrinkId, thisCounterId) }"