From bca5207fa679e55dfd532d8db2f813059d553e3f Mon Sep 17 00:00:00 2001
From: seigo <utti.nbst.s@gmail.com>
Date: Tue, 26 Mar 2024 01:55:34 +0000
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E5=86=8D=E8=AA=AD=E3=81=BF=E8=BE=BC?=
 =?UTF-8?q?=E3=81=BF=E3=82=92=E6=B6=88=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/groups/_groupId/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/groups/_groupId/index.vue b/pages/groups/_groupId/index.vue
index b118b8a..cef1832 100644
--- a/pages/groups/_groupId/index.vue
+++ b/pages/groups/_groupId/index.vue
@@ -149,10 +149,11 @@
                 >すると整理券を取得できます。</v-card-subtitle
               >
               <v-divider class="mb-3"></v-divider>
-
+              <!--
               <v-btn class="ma-2" color="primary" @click="$nuxt.refresh()"
                 ><v-icon class="mr-1">mdi-reload</v-icon>再読み込み</v-btn
               >
+              -->
               <div v-for="(event, index) in suitableEvents()" :key="event.id">
                 <v-card
                   class="ma-2 d-flex"

From fafc3c184ea2fba92bad67bab715a249bf8fca80 Mon Sep 17 00:00:00 2001
From: seigo <utti.nbst.s@gmail.com>
Date: Tue, 26 Mar 2024 10:34:44 +0000
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20/tickets=E3=81=A7API=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E6=83=85=E5=A0=B1=E3=82=92=E5=8F=96=E5=BE=97=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=82=92=E5=81=9C=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/groups/_groupId/index.vue | 13 ++-----------
 pages/tickets/index.vue         |  3 +++
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/pages/groups/_groupId/index.vue b/pages/groups/_groupId/index.vue
index cef1832..8d4a7c3 100644
--- a/pages/groups/_groupId/index.vue
+++ b/pages/groups/_groupId/index.vue
@@ -518,17 +518,8 @@ export default Vue.extend({
         })
       }
     }
-    this.$axios
-      .$get(
-        '/ga/screenpageview?start_date=7daysAgo&end_date=today&page_path=' +
-          this.$route.path
-      )
-      .then((res) => {
-        this.view_count = res.view
-      })
-      .catch(() => {
-        this.view_count = 'エラー'
-      })
+
+    this.view_count = 'エラー'
 
     //  全ての公演（events）から，ログイン中のユーザ属性（e.g.students,parents）に合致する公演のみがfilteredEventsに格納される
     //  '&& this.isToday(val.sell_starts, val.sell_ends, val.starts_at)'を付け加えれば，当日の整理券のみが表示されるようになる
diff --git a/pages/tickets/index.vue b/pages/tickets/index.vue
index c63b4a5..13e0527 100644
--- a/pages/tickets/index.vue
+++ b/pages/tickets/index.vue
@@ -423,6 +423,8 @@ export default Vue.extend({
     title: '整理券',
   },
   async created() {
+    // 静的サイトにするにあたって全て削除
+    /*
     this.fetchTicket()
     try {
       if (this.$auth.$state.strategy === 'ad') {
@@ -431,6 +433,7 @@ export default Vue.extend({
         this.qrcodeUrl = await getQRCodeDataUrl(this.$auth.user?.sub as string)
       }
     } catch {}
+    */
     // 500msごとに現在時刻を取得
     // setInterval(this.getNow, 500)
   },

From 1de47d79fc31f0c8f886a987fc52e1fabba726de Mon Sep 17 00:00:00 2001
From: seigo <utti.nbst.s@gmail.com>
Date: Tue, 26 Mar 2024 10:37:49 +0000
Subject: [PATCH 3/6] =?UTF-8?q?fix:=20linter=E3=81=AB=E5=BC=BE=E3=81=8B?=
 =?UTF-8?q?=E3=82=8C=E3=81=9F=E5=A0=B4=E6=89=80=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tickets/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/tickets/index.vue b/pages/tickets/index.vue
index 13e0527..08484f5 100644
--- a/pages/tickets/index.vue
+++ b/pages/tickets/index.vue
@@ -354,7 +354,6 @@
 </template>
 
 <script lang="ts">
-import { toDataURL as getQRCodeDataUrl } from 'qrcode'
 import { Event, Group, Ticket } from 'types/quaint'
 import Vue from 'vue'
 type TicketInfo = {

From f5f9b5ac7b452510fac80252c5c74df1fdaa8476 Mon Sep 17 00:00:00 2001
From: seigo <utti.nbst.s@gmail.com>
Date: Tue, 26 Mar 2024 13:48:51 +0000
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20tickets/index=E3=81=AE=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tickets/index.vue | 360 ++--------------------------------------
 1 file changed, 13 insertions(+), 347 deletions(-)

diff --git a/pages/tickets/index.vue b/pages/tickets/index.vue
index 08484f5..56e5a39 100644
--- a/pages/tickets/index.vue
+++ b/pages/tickets/index.vue
@@ -1,354 +1,11 @@
 <template>
   <v-app>
-    <v-container name="ticket_container">
+    <v-container name="ticket_container" fill-height>
       <v-row justify="center" align-content="center">
-        <v-col cols="12" sm="6" lg="6">
-          <v-btn
-            v-show="$auth.user?.groups?.includes(userGroups.parents)"
-            href="https://forms.office.com/Pages/ResponsePage.aspx?id=07VbxZj7okm9Yto1xwcA4mrjYZ4y3-RGkgE_OQbXv41UNEVDRU9BWUtWUlI5REtGTjZaUzNFVkNVNi4u"
-            class="primary"
-          >
-            保護者用投票フォーム
-          </v-btn>
-          <v-btn
-            v-show="$auth.user?.groups?.includes(userGroups.students)"
-            href="https://forms.office.com/Pages/ResponsePage.aspx?id=07VbxZj7okm9Yto1xwcA4mrjYZ4y3-RGkgE_OQbXv41UOTNTRlIzRTJIMU1IQUI2UlFEM1dWTlk0RS4u"
-            class="primary"
-          >
-            生徒用投票フォーム
-          </v-btn>
-          <!--現在時刻を表示・現在時刻を取得するとv-progress-linearが正常に動作しないため非表示-->
-          <!--
-            <v-chip v-if="time" label class="ma-1"
-              >{{ time }} <span class="text-h5">{{ seconds }} </span></v-chip
-            >
-            -->
-
-          <!--校内への入場処理が行われていない場合に，入場処理を促すメッセージと処理用のQRコードを表示-->
-          <!--ここのデザインをもうちょっと可愛く出来ないかな-->
-          <v-card
-            v-if="
-              !(
-                $auth.user?.jobTitle?.includes('Visited') ||
-                $auth.$state.strategy === 'ad'
-              )
-            "
-          >
-            <v-card-title class="text-h5">🥳星陵祭へようこそ！</v-card-title>
-            <v-card-subtitle class="text-h6"
-              >校門でこの画面をご提示ください。</v-card-subtitle
-            >
-            <v-card-text
-              >※日比谷生の入場手続きは不要です。そのままお待ちください。</v-card-text
-            >
-            <v-img
-              class="mx-auto my-0"
-              style="display: block"
-              :src="qrcodeUrl"
-              width="90%"
-            />
-            <!--mx-autoで画像を中央寄せに-->
-            <v-card-text
-              >User ID:{{ $auth.user?.oid ?? $auth.user?.sub }}</v-card-text
-            >
-          </v-card>
-
-          <!--整理券未取得の場合に，「探す」タブへ誘導-->
-          <v-card
-            v-if="
-              now_loading == false &&
-              tickets.length == 0 &&
-              ($auth.user?.jobTitle?.includes('Visited') ||
-                $auth.$state.strategy === 'ad')
-            "
-            class="ma-1 pa-2"
-          >
-            <div>
-              <v-card-title>まだ整理券を取得していません</v-card-title>
-              <v-card-actions>
-                <v-btn :href="'/groups'" block
-                  ><v-icon>mdi-magnify</v-icon>公演を探す</v-btn
-                >
-              </v-card-actions>
-            </div>
-          </v-card>
-
-          <!--開場中の整理券がある場合に上部に大きく表示-->
-          <div
-            v-for="ticketInfo in tickets"
-            :key="ticketInfo.ticket.id"
-            focusable
-          >
-            <v-card
-              v-if="
-                isUpNext(
-                  new Date(ticketInfo.event.starts_at),
-                  new Date(ticketInfo.event.ends_at)
-                ) && ticketInfo.ticket.status == 'active'
-              "
-            >
-              <v-card-title class="mb-2"
-                ><v-icon>mdi-ticket</v-icon>整理券
-                <v-spacer></v-spacer>
-                <v-chip color="primary" outlined label
-                  ><v-icon>mdi-theater</v-icon>開場中</v-chip
-                ></v-card-title
-              >
-              <v-card-subtitle
-                >この画面を各クラスの受付に提示してください。</v-card-subtitle
-              >
-              <v-divider></v-divider>
-              <div class="text-truncate">
-                <v-card-title class="text-h7 text-truncate">
-                  {{ ticketInfo.group.title }}
-                </v-card-title>
-                <v-card-subtitle
-                  class="grey--text text--darken-2 text-h5 pb-0 text-truncate"
-                >
-                  {{ ticketInfo.event.eventname }}</v-card-subtitle
-                >
-
-                <v-card-subtitle class="pb-0 text-truncate">
-                  {{ ticketInfo.group.groupname }}</v-card-subtitle
-                >
-                <div style="display: flex">
-                  <v-card-subtitle
-                    class="grey--text text--darken-2 text-truncate"
-                  >
-                    <!--日付：画面がごちゃごちゃするため省略．1日目の整理券を画面収録して2日目に使う人が現れるなどしたら，実装が必要-->
-                    <!--
-                <span class="text-h3"
-                  ><v-icon>mdi-calendar</v-icon
-                  >{{ dateFormatter(ticketInfo.event.starts_at) }}</span
-                >
-                -->
-                    <!--上演時刻-->
-                    <span class="text-h3"
-                      ><v-icon>mdi-clock-time-nine</v-icon
-                      >{{ timeFormatter(ticketInfo.event.starts_at) }}</span
-                    >
-                    -{{ timeFormatter(ticketInfo.event.ends_at) }}
-                    <v-spacer></v-spacer>
-                    <!--入場人数-->
-                    <span class="text-h3"
-                      ><v-icon>mdi-account-supervisor</v-icon
-                      >{{ ticketInfo.ticket.person }}</span
-                    >人
-                  </v-card-subtitle>
-                  <v-spacer></v-spacer>
-                  <img class="chochin" src="/images/chochin.png" />
-                </div>
-              </div>
-              <v-card-actions>
-                <v-spacer></v-spacer>
-                <!--終演時刻前の時だけ「整理券をキャンセル」ボタンを表示-->
-                <v-btn
-                  v-if="!isUsed(new Date(ticketInfo.event.ends_at))"
-                  color="error"
-                  @click="selectCancelTicket(ticketInfo)"
-                >
-                  <v-icon>mdi-close</v-icon>
-                  整理券をキャンセル
-                </v-btn>
-              </v-card-actions>
-              <v-img
-                v-if="ticketInfo.group.public_thumbnail_image_url != null"
-                :src="ticketInfo.group.public_thumbnail_image_url"
-                width="100%"
-                contain
-                max-height="300px"
-              ></v-img>
-            </v-card>
-          </div>
-          <!--取得した整理券一覧-->
-          <v-card v-if="tickets.length !== 0" class="my-4">
-            <v-card-title
-              ><v-icon>mdi-ticket-account</v-icon>あなたの整理券</v-card-title
-            >
-            <v-expansion-panels inset>
-              <v-expansion-panel
-                v-for="ticketInfo in tickets"
-                :key="ticketInfo.ticket.id"
-                focusable
-              >
-                <!--activeな整理券のみ表示．キャンセル済み整理券とUpNextな整理券は表示されない-->
-                <div
-                  v-if="
-                    ticketInfo.ticket.status == 'active' &&
-                    !isUpNext(
-                      new Date(ticketInfo.event.starts_at),
-                      new Date(ticketInfo.event.ends_at)
-                    )
-                  "
-                >
-                  <v-expansion-panel-header class="pa-3">
-                    <div class="text-truncate">
-                      <v-list-item>
-                        <div>
-                          <v-img
-                            v-if="
-                              ticketInfo.group.public_thumbnail_image_url !=
-                              null
-                            "
-                            height="120px"
-                            width="90px"
-                            contain
-                            :src="ticketInfo.group.public_thumbnail_image_url"
-                          ></v-img>
-                          <v-img
-                            v-else
-                            :class="HashColor(ticketInfo.group.id)"
-                            height="120px"
-                            width="90px"
-                          ></v-img>
-                        </div>
-                        <div class="ma-2 text-truncate">
-                          <!--取得した整理券の情報を表示-->
-                          <v-list-item-subtitle class="text-truncate"
-                            >{{ dateFormatter(ticketInfo.event.starts_at) }}
-                            {{
-                              ticketInfo.event.eventname
-                            }}</v-list-item-subtitle
-                          >
-                          <v-list-item-title class="text-h7 text-truncate">
-                            {{ ticketInfo.group.title }}
-                          </v-list-item-title>
-                          <v-list-item-subtitle class="text-truncate">
-                            {{
-                              ticketInfo.group.groupname
-                            }}</v-list-item-subtitle
-                          >
-                          <v-list-item-subtitle
-                            class="mt-2 grey--text text--darken-2 text-truncate"
-                          >
-                            <span class="text-h5"
-                              ><v-icon>mdi-clock-time-nine</v-icon
-                              >{{
-                                timeFormatter(ticketInfo.event.starts_at)
-                              }}</span
-                            >
-                            -{{ timeFormatter(ticketInfo.event.ends_at) }}
-                          </v-list-item-subtitle>
-                          <v-list-item-subtitle
-                            class="mb-2 grey--text text--darken-2 text-truncate"
-                          >
-                            <span class="text-h5"
-                              ><v-icon>mdi-account-supervisor</v-icon
-                              >{{ ticketInfo.ticket.person }}</span
-                            >人
-                          </v-list-item-subtitle>
-
-                          <!--整理券の状況を「開場前」（開演20分前まで），「開場中」（開演20分前から終演），「公演終了」（終演以降）に分けて表示-->
-                          <v-chip
-                            v-if="
-                              isUpNext(
-                                new Date(ticketInfo.event.starts_at),
-                                new Date(ticketInfo.event.ends_at)
-                              )
-                            "
-                            color="primary"
-                            outlined
-                            label
-                            ><v-icon>mdi-theater</v-icon>開場中</v-chip
-                          >
-                          <v-chip
-                            v-else-if="
-                              isUsed(new Date(ticketInfo.event.ends_at))
-                            "
-                            color="error"
-                            outlined
-                            label
-                            ><v-icon>mdi-check</v-icon>公演終了</v-chip
-                          >
-                          <v-chip v-else color="green" outlined label>
-                            <v-icon>mdi-account-clock</v-icon>開場前
-                          </v-chip>
-                        </div>
-                      </v-list-item>
-                    </div>
-                  </v-expansion-panel-header>
-                  <v-expansion-panel-content class="pa-1">
-                    <v-divider></v-divider>
-                    <v-card-text>
-                      <p class="text-body-2 grey--text">
-                        ID: {{ ticketInfo.ticket.id }}
-                      </p>
-                    </v-card-text>
-                    <v-card-actions>
-                      <v-btn :href="'/groups/' + ticketInfo.group.id"
-                        >公演詳細
-                      </v-btn>
-                      <v-spacer></v-spacer>
-
-                      <!--終演時刻前の時だけ「整理券をキャンセル」ボタンを表示-->
-                      <v-btn
-                        v-if="!isUsed(new Date(ticketInfo.event.ends_at))"
-                        color="error"
-                        @click="selectCancelTicket(ticketInfo)"
-                      >
-                        <v-icon>mdi-close</v-icon>
-                        整理券をキャンセル
-                      </v-btn>
-                    </v-card-actions>
-                  </v-expansion-panel-content>
-                </div>
-              </v-expansion-panel>
-            </v-expansion-panels>
-          </v-card>
-
-          <!--整理券キャンセルの有無を問うダイアログ-->
-          <v-dialog
-            v-if="selectedTicket"
-            v-model="cancelDialog"
-            max-width="500"
-          >
-            <v-card>
-              <v-card-title class="text-h5">
-                本当にキャンセルしますか？
-              </v-card-title>
-              <v-card-subtitle class="pt-5 pb-0"
-                >{{ dateFormatter(selectedTicket.event.starts_at) }}
-                {{ selectedTicket.event.eventname }}</v-card-subtitle
-              >
-              <v-card-title class="pt-0">
-                {{ selectedTicket.group.title }}
-              </v-card-title>
-              <v-card-subtitle>{{
-                selectedTicket.group.groupname
-              }}</v-card-subtitle>
-              <v-card-text>この操作は取り消せません</v-card-text>
-              <v-card-actions>
-                <v-spacer></v-spacer>
-                <v-btn text @click="cancelDialog = false">いいえ</v-btn>
-                <v-btn color="error" @click="CancelTicket(selectedTicket)"
-                  >はい</v-btn
-                >
-              </v-card-actions>
-            </v-card>
-          </v-dialog>
-        </v-col>
+        <h1 id="title">
+          第48回星陵祭は終了しました。お越しいただき、本当にありがとうございました。
+        </h1>
       </v-row>
-      <v-snackbar v-model="success_alert" color="success" elevation="2">
-        {{ success_message }}
-        <template #action="{ attrs }">
-          <v-btn
-            color="white"
-            icon
-            v-bind="attrs"
-            @click="success_alert = false"
-          >
-            <v-icon>mdi-close</v-icon>
-          </v-btn>
-        </template>
-      </v-snackbar>
-      <v-snackbar v-model="error_alert" color="red" elevation="2">
-        {{ error_message }}
-        <template #action="{ attrs }">
-          <v-btn color="white" icon v-bind="attrs" @click="error_alert = false">
-            <v-icon>mdi-close</v-icon>
-          </v-btn>
-        </template>
-      </v-snackbar>
     </v-container>
   </v-app>
 </template>
@@ -595,6 +252,15 @@ export default Vue.extend({
 })
 </script>
 <style>
+#title {
+  display: inline-block;
+  padding: 0.5rem 3rem 0.5rem 0;
+  margin-bottom: 5rem;
+  border-bottom: 3px solid #b49656;
+  font-family: serif;
+  font-weight: bold;
+}
+
 .text-truncate {
   display: block;
   white-space: nowrap;

From a1228326886ca37c48ec820440f0e02b5b87edce Mon Sep 17 00:00:00 2001
From: seigo <utti.nbst.s@gmail.com>
Date: Tue, 26 Mar 2024 14:33:18 +0000
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20tickets/index=E3=81=AE=E3=83=87?=
 =?UTF-8?q?=E3=82=B6=E3=82=A4=E3=83=B3=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tickets/index.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pages/tickets/index.vue b/pages/tickets/index.vue
index 56e5a39..00f995a 100644
--- a/pages/tickets/index.vue
+++ b/pages/tickets/index.vue
@@ -2,9 +2,18 @@
   <v-app>
     <v-container name="ticket_container" fill-height>
       <v-row justify="center" align-content="center">
-        <h1 id="title">
-          第48回星陵祭は終了しました。お越しいただき、本当にありがとうございました。
-        </h1>
+        <v-col cols="12">
+          <h2 id="title">
+            第48回星陵祭は終了しました。お越しいただき、本当にありがとうございました。
+          </h2>
+        </v-col>
+        <v-col cols="12">
+          <v-card class="text-center">
+            <v-card-title class="justify-center">日比谷高校文化祭</v-card-title>
+            <v-img src="/images/Sairai.jpeg"></v-img>
+            <v-card-title class="justify-center">星陵祭2023</v-card-title>
+          </v-card>
+        </v-col>
       </v-row>
     </v-container>
   </v-app>
@@ -256,7 +265,6 @@ export default Vue.extend({
   display: inline-block;
   padding: 0.5rem 3rem 0.5rem 0;
   margin-bottom: 5rem;
-  border-bottom: 3px solid #b49656;
   font-family: serif;
   font-weight: bold;
 }

From 86035ca287a439bcce3d5e9508bf11074363665f Mon Sep 17 00:00:00 2001
From: hibiyahibiyahibiya
 <128669695+hibiyahibiyahibiya@users.noreply.github.com>
Date: Tue, 26 Mar 2024 23:43:35 +0000
Subject: [PATCH 6/6] fix: design of tickets page

---
 pages/tickets/index.vue | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pages/tickets/index.vue b/pages/tickets/index.vue
index 00f995a..5fa6d34 100644
--- a/pages/tickets/index.vue
+++ b/pages/tickets/index.vue
@@ -1,18 +1,17 @@
 <template>
   <v-app>
-    <v-container name="ticket_container" fill-height>
-      <v-row justify="center" align-content="center">
-        <v-col cols="12">
-          <h2 id="title">
-            第48回星陵祭は終了しました。お越しいただき、本当にありがとうございました。
-          </h2>
-        </v-col>
-        <v-col cols="12">
-          <v-card class="text-center">
-            <v-card-title class="justify-center">日比谷高校文化祭</v-card-title>
-            <v-img src="/images/Sairai.jpeg"></v-img>
-            <v-card-title class="justify-center">星陵祭2023</v-card-title>
-          </v-card>
+    <v-container>
+      <v-row>
+        <v-col>
+          <div style="height: 220px"></div>
+          <div v-if="$vuetify.breakpoint.xs" class="container">
+            <h3 id="title">第48回星陵祭は終了しました。</h3>
+            <h3 id="title">お越しいただき、本当にありがとうございました。</h3>
+          </div>
+          <div v-else class="container">
+            <h2 id="title">第48回星陵祭は終了しました。</h2>
+            <h2 id="title">お越しいただき、本当にありがとうございました。</h2>
+          </div>
         </v-col>
       </v-row>
     </v-container>
@@ -262,9 +261,7 @@ export default Vue.extend({
 </script>
 <style>
 #title {
-  display: inline-block;
-  padding: 0.5rem 3rem 0.5rem 0;
-  margin-bottom: 5rem;
+  text-align: center;
   font-family: serif;
   font-weight: bold;
 }