From 627b2fec0cf5b4392214a1de7853ee711942a9cb Mon Sep 17 00:00:00 2001
From: naokinaokiboo <naokinaokiboo@gmail.com>
Date: Fri, 2 Feb 2024 22:57:45 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E4=B8=80=E8=A6=A7=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AE=E5=90=84?=
 =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E6=95=B0=E3=82=92?=
 =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=AF=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/user-activity-counts.vue       | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/javascript/components/user-activity-counts.vue b/app/javascript/components/user-activity-counts.vue
index e7e384104a1..d857bcb9aa3 100644
--- a/app/javascript/components/user-activity-counts.vue
+++ b/app/javascript/components/user-activity-counts.vue
@@ -7,35 +7,50 @@
           | 日報
         dd.card-counts__item-value(
           :class='user.report_count == 0 ? "is-empty" : ""')
-          | {{ user.report_count }}
+          span(v-if='user.report_count == 0')
+            | {{ user.report_count }}
+          a.a-text-link(v-else)(:href='`${user.url}/reports`')
+            | {{ user.report_count }}
     .card-counts__item
       .card-counts__item-inner
         dt.card-counts__item-label
           | 提出物
         dd.card-counts__item-value(
           :class='user.product_count == 0 ? "is-empty" : ""')
-          | {{ user.product_count }}
+          span(v-if='user.product_count == 0')
+            | {{ user.product_count }}
+          a.a-text-link(v-else)(:href='`${user.url}/products`')
+            | {{ user.product_count }}
     .card-counts__item
       .card-counts__item-inner
         dt.card-counts__item-label
           | コメント
         dd.card-counts__item-value(
           :class='user.comment_count == 0 ? "is-empty" : ""')
-          | {{ user.comment_count }}
+          span(v-if='user.comment_count == 0')
+            | {{ user.comment_count }}
+          a.a-text-link(v-else)(:href='`${user.url}/comments`')
+            | {{ user.comment_count }}
     .card-counts__item
       .card-counts__item-inner
         dt.card-counts__item-label
           | 質問
         dd.card-counts__item-value(
           :class='user.question_count == 0 ? "is-empty" : ""')
-          | {{ user.question_count }}
+          span(v-if='user.question_count == 0')
+            | {{ user.question_count }}
+          a.a-text-link(v-else)(:href='`${user.url}/questions`')
+            | {{ user.question_count }}
     .card-counts__item
       .card-counts__item-inner
         dt.card-counts__item-label
           | 回答
         dd.card-counts__item-value(
           :class='user.answer_count == 0 ? "is-empty" : ""')
-          | {{ user.answer_count }}
+          span(v-if='user.answer_count == 0')
+            | {{ user.answer_count }}
+          a.a-text-link(v-else)(:href='`${user.url}/answers`')
+            | {{ user.answer_count }}
 </template>
 <script>
 export default {

From 8b58da51cef56e2bad52c5874fce72f8a0f18efc Mon Sep 17 00:00:00 2001
From: naokinaokiboo <naokinaokiboo@gmail.com>
Date: Tue, 6 Feb 2024 22:41:18 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=84=E3=82=A2=E3=82=AF=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E6=95=B0=E3=82=92=E3=82=B3=E3=83=B3=E3=83=9D?=
 =?UTF-8?q?=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/user-activity-count.vue        | 20 +++++
 .../components/user-activity-counts.vue       | 74 ++++++-------------
 2 files changed, 44 insertions(+), 50 deletions(-)
 create mode 100644 app/javascript/components/user-activity-count.vue

diff --git a/app/javascript/components/user-activity-count.vue b/app/javascript/components/user-activity-count.vue
new file mode 100644
index 00000000000..b49b29edba5
--- /dev/null
+++ b/app/javascript/components/user-activity-count.vue
@@ -0,0 +1,20 @@
+<template lang="pug">
+.card-counts__item
+  .card-counts__item-inner
+    dt.card-counts__item-label
+      | {{ activityName }}
+    dd.card-counts__item-value(:class='activityCount == 0 ? "is-empty" : ""')
+      span(v-if='activityCount == 0')
+        | {{ activityCount }}
+      a.a-text-link(v-else)(:href='activityUrl')
+        | {{ activityCount }}
+</template>
+<script>
+export default {
+  props: {
+    activityName: { type: Object, required: true },
+    activityCount: { type: Object, required: true },
+    activityUrl: { type: Object, required: true }
+  }
+}
+</script>
diff --git a/app/javascript/components/user-activity-counts.vue b/app/javascript/components/user-activity-counts.vue
index d857bcb9aa3..ea3a1264806 100644
--- a/app/javascript/components/user-activity-counts.vue
+++ b/app/javascript/components/user-activity-counts.vue
@@ -1,59 +1,33 @@
 <template lang="pug">
 .card-counts.mt-3(v-if='user.student_or_trainee')
   dl.card-counts__items
-    .card-counts__item
-      .card-counts__item-inner
-        dt.card-counts__item-label
-          | 日報
-        dd.card-counts__item-value(
-          :class='user.report_count == 0 ? "is-empty" : ""')
-          span(v-if='user.report_count == 0')
-            | {{ user.report_count }}
-          a.a-text-link(v-else)(:href='`${user.url}/reports`')
-            | {{ user.report_count }}
-    .card-counts__item
-      .card-counts__item-inner
-        dt.card-counts__item-label
-          | 提出物
-        dd.card-counts__item-value(
-          :class='user.product_count == 0 ? "is-empty" : ""')
-          span(v-if='user.product_count == 0')
-            | {{ user.product_count }}
-          a.a-text-link(v-else)(:href='`${user.url}/products`')
-            | {{ user.product_count }}
-    .card-counts__item
-      .card-counts__item-inner
-        dt.card-counts__item-label
-          | コメント
-        dd.card-counts__item-value(
-          :class='user.comment_count == 0 ? "is-empty" : ""')
-          span(v-if='user.comment_count == 0')
-            | {{ user.comment_count }}
-          a.a-text-link(v-else)(:href='`${user.url}/comments`')
-            | {{ user.comment_count }}
-    .card-counts__item
-      .card-counts__item-inner
-        dt.card-counts__item-label
-          | 質問
-        dd.card-counts__item-value(
-          :class='user.question_count == 0 ? "is-empty" : ""')
-          span(v-if='user.question_count == 0')
-            | {{ user.question_count }}
-          a.a-text-link(v-else)(:href='`${user.url}/questions`')
-            | {{ user.question_count }}
-    .card-counts__item
-      .card-counts__item-inner
-        dt.card-counts__item-label
-          | 回答
-        dd.card-counts__item-value(
-          :class='user.answer_count == 0 ? "is-empty" : ""')
-          span(v-if='user.answer_count == 0')
-            | {{ user.answer_count }}
-          a.a-text-link(v-else)(:href='`${user.url}/answers`')
-            | {{ user.answer_count }}
+    user-activity-count(
+      :activity-name='`日報`',
+      :activity-count='user.report_count',
+      :activity-url='`${user.url}/reports`')
+    user-activity-count(
+      :activity-name='`提出物`',
+      :activity-count='user.product_count',
+      :activity-url='`${user.url}/products`')
+    user-activity-count(
+      :activity-name='`コメント`',
+      :activity-count='user.comment_count',
+      :activity-url='`${user.url}/comments`')
+    user-activity-count(
+      :activity-name='`質問`',
+      :activity-count='user.question_count',
+      :activity-url='`${user.url}/questions`')
+    user-activity-count(
+      :activity-name='`回答`',
+      :activity-count='user.answer_count',
+      :activity-url='`${user.url}/answers`')
 </template>
 <script>
+import UserActivityCount from './user-activity-count.vue'
 export default {
+  components: {
+    'user-activity-count': UserActivityCount
+  },
   props: {
     user: { type: Object, required: true }
   }

From 9b7bca05068d2c2c19439a3a97146385332e6634 Mon Sep 17 00:00:00 2001
From: naokinaokiboo <naokinaokiboo@gmail.com>
Date: Fri, 9 Feb 2024 18:48:11 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=E9=9D=99=E7=9A=84=E3=81=AA=E5=80=A4?=
 =?UTF-8?q?=E3=81=A7=E3=81=82=E3=82=8Bprops=E3=81=AE=E6=9B=B8=E3=81=8D?=
 =?UTF-8?q?=E6=96=B9=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/components/user-activity-counts.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/components/user-activity-counts.vue b/app/javascript/components/user-activity-counts.vue
index ea3a1264806..538137510d4 100644
--- a/app/javascript/components/user-activity-counts.vue
+++ b/app/javascript/components/user-activity-counts.vue
@@ -2,23 +2,23 @@
 .card-counts.mt-3(v-if='user.student_or_trainee')
   dl.card-counts__items
     user-activity-count(
-      :activity-name='`日報`',
+      activity-name='日報',
       :activity-count='user.report_count',
       :activity-url='`${user.url}/reports`')
     user-activity-count(
-      :activity-name='`提出物`',
+      activity-name='提出物',
       :activity-count='user.product_count',
       :activity-url='`${user.url}/products`')
     user-activity-count(
-      :activity-name='`コメント`',
+      activity-name='コメント',
       :activity-count='user.comment_count',
       :activity-url='`${user.url}/comments`')
     user-activity-count(
-      :activity-name='`質問`',
+      activity-name='質問',
       :activity-count='user.question_count',
       :activity-url='`${user.url}/questions`')
     user-activity-count(
-      :activity-name='`回答`',
+      activity-name='回答',
       :activity-count='user.answer_count',
       :activity-url='`${user.url}/answers`')
 </template>