From aa6449a3975b02afd1553fa26de98990b0a7d3cd Mon Sep 17 00:00:00 2001
From: Fukusan64 <ikishikawa64@gmail.com>
Date: Fri, 20 Jul 2018 16:57:41 +0900
Subject: [PATCH 1/9] =?UTF-8?q?flexible=E3=81=AA=E3=82=B3=E3=83=B3?=
 =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AB=E5=8F=82=E5=8A=A0=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E6=99=82=E3=81=AB=E7=A2=BA=E8=AA=8D=E3=83=80=E3=82=A4?=
 =?UTF-8?q?=E3=82=A2=E3=83=AD=E3=82=B0=E3=82=92=E5=87=BA=E3=81=99=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/contest/Contest.vue            | 33 +++++++++++++-
 .../contest/EnterConfirmationModal.vue        | 45 +++++++++++++++++++
 src/store/modules/contests/index.js           |  8 +++-
 3 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100644 src/components/contest/EnterConfirmationModal.vue

diff --git a/src/components/contest/Contest.vue b/src/components/contest/Contest.vue
index b8ada42..deb6b5f 100644
--- a/src/components/contest/Contest.vue
+++ b/src/components/contest/Contest.vue
@@ -19,8 +19,11 @@
               </div>
             </div>
             <div class="navbar-end">
-              <span v-if="canEnter && !isEntered && problems === null" class="navbar-item">
-                <button @click="enter" class="button is-large is-outlined">
+              <span
+                v-if="enterable"
+                class="navbar-item"
+              >
+                <button @click="myEnter" class="button is-large is-outlined">
                   コンテストに参加する
                 </button>
               </span>
@@ -67,6 +70,10 @@
       </article>
     </div>
     <div class="container">
+      <EnterConfirmationModal
+        :isActive="showConfirmationModal"
+        @close="showConfirmationModal = false"
+      />
       <ErrorNotification :error="error"/>
       <template v-if="problems !== null">
         <div class="columns is-mobile" v-if="problems.length !== 0">
@@ -187,6 +194,7 @@ import ErrorNotification from '@/components/common/ErrorNotification';
 import Modal from '@/components/common/Modal';
 import SubmitModal from '@/components/problem/SubmitModal';
 import ResultModal from './result_modal/ResultModal';
+import EnterConfirmationModal from './EnterConfirmationModal';
 
 import Tag from './Tag';
 
@@ -198,6 +206,7 @@ export default {
       showStandingsModal: false,
       showResultListModal: false,
       showSubmitModal: false,
+      showConfirmationModal: false,
       activeTab: 0,
       diff: 300000,
     };
@@ -216,6 +225,7 @@ export default {
       'participants',
       'id',
       'error',
+      'duration',
     ]),
     ...mapState('koneko/timeDiff', [
       'timeDiff',
@@ -224,7 +234,18 @@ export default {
       'canEnter',
       'isEntered',
       'isWriter',
+      'isFlexibleContest',
     ]),
+    enterable() {
+      return this.canEnter &&
+        !this.isEntered &&
+        this.problems === null &&
+        !(
+          this.isFlexibleContest &&
+          this.countDownTimer !== 'Already started'
+        )
+      ;
+    },
     countDownTimer() {
       if (this.diff < 0) return 'Already started';
       const DD = `00${Math.floor(this.diff / 1000 / 60 / 60 / 24)}`.slice(-2);
@@ -284,6 +305,13 @@ export default {
       await this.getResults();
       this.showResultListModal = true;
     },
+    myEnter() {
+      if (this.isFlexibleContest) {
+        this.showConfirmationModal = true;
+      } else {
+        this.enter();
+      }
+    },
     num2alpha(num) {
       return String.fromCharCode(97 + num);
     },
@@ -308,6 +336,7 @@ export default {
     Tag,
     Modal,
     Problem,
+    EnterConfirmationModal,
     ErrorNotification,
     SubmitModal,
     ResultModal,
diff --git a/src/components/contest/EnterConfirmationModal.vue b/src/components/contest/EnterConfirmationModal.vue
new file mode 100644
index 0000000..22f60c1
--- /dev/null
+++ b/src/components/contest/EnterConfirmationModal.vue
@@ -0,0 +1,45 @@
+<template>
+  <Modal
+    :isActive="isActive"
+    title="参加確認"
+    @close="close"
+  >
+    <p>参加するとすぐにコンテストが始まります。</p>
+    <div slot="footer">
+      <button class="button is-success" @click="myEnter">参加する</button>
+      <button class="button" @click="close">キャンセル</button>
+   </div>
+   </Modal>
+</template>
+
+<script>
+import { mapActions, mapState } from 'vuex';
+import Modal from '@/components/common/Modal';
+
+export default {
+  props: [
+    'isActive',
+  ],
+  computed: {
+    ...mapState('koneko/contests', [
+      'id',
+    ]),
+  },
+  methods: {
+    ...mapActions('koneko/contests', [
+      'enter',
+      'getContest',
+    ]),
+    async myEnter() {
+      await this.enter();
+      this.$emit('close');
+    },
+    close() {
+      this.$emit('close');
+    },
+  },
+  components: {
+    Modal,
+  },
+};
+</script>
diff --git a/src/store/modules/contests/index.js b/src/store/modules/contests/index.js
index 3745799..c0a86f5 100644
--- a/src/store/modules/contests/index.js
+++ b/src/store/modules/contests/index.js
@@ -19,6 +19,7 @@ export default {
     requiredWatching: false,
     isWaitingJudge: true,
     error: null,
+    duration: null,
   },
   getters: {
     isWriter({ writers }, _, rootState) {
@@ -30,6 +31,9 @@ export default {
     canEnter(_, { isWriter, isEntered }) {
       return !isEntered && !isWriter;
     },
+    isFlexibleContest({ duration }) {
+      return !!duration;
+    },
   },
   mutations: {
     setContestData(state, contestData) {
@@ -50,6 +54,7 @@ export default {
       state.participants = contestData.participants.map(v => ({
         name: v.name, displayName: v.displayName, id: v.id,
       }));
+      state.duration = contestData.duration ? contestData.duration / 3600000000000 : null;
     },
     setStatusesWatcherFlag(state) {
       state.statusesWatcherFlag = true;
@@ -78,7 +83,7 @@ export default {
     },
     setParticipants(state, participants) {
       state.participants = participants.map(v => ({
-        name: v.name, displayName: v.displayName, id: v.id,
+        name: v.user.name, displayName: v.user.displayName, id: v.user.id,
       }));
     },
     setError(state, error) {
@@ -127,6 +132,7 @@ export default {
     async enter({ commit, rootState, state }) {
       try {
         const res = await api.enterContest(rootState.koneko.sessionID, state.id);
+        console.log(res.data.participants);
         commit('setParticipants', res.data.participants);
       } catch (e) {
         commit('setError', e);

From fa1187eadd3b311fccf37db09b8468303b3b5031 Mon Sep 17 00:00:00 2001
From: Fukusan64 <ikishikawa64@gmail.com>
Date: Fri, 20 Jul 2018 16:59:46 +0900
Subject: [PATCH 2/9] =?UTF-8?q?console.log=E3=82=92=E6=B6=88=E3=81=97?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/contests/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/store/modules/contests/index.js b/src/store/modules/contests/index.js
index c0a86f5..5c6af1b 100644
--- a/src/store/modules/contests/index.js
+++ b/src/store/modules/contests/index.js
@@ -132,7 +132,6 @@ export default {
     async enter({ commit, rootState, state }) {
       try {
         const res = await api.enterContest(rootState.koneko.sessionID, state.id);
-        console.log(res.data.participants);
         commit('setParticipants', res.data.participants);
       } catch (e) {
         commit('setError', e);

From 4d70e129a0fc81ee148ba9c472bea149adbd4872 Mon Sep 17 00:00:00 2001
From: Fukusan64 <ikishikawa64@gmail.com>
Date: Fri, 20 Jul 2018 17:18:29 +0900
Subject: [PATCH 3/9] =?UTF-8?q?=E9=96=8B=E5=A7=8B=E6=99=82=E9=96=93?=
 =?UTF-8?q?=E3=81=BE=E3=81=A7flexible=E3=81=AA=E3=82=B3=E3=83=B3=E3=83=86?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E3=81=AB=E5=8F=82=E5=8A=A0=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/contest/Contest.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/contest/Contest.vue b/src/components/contest/Contest.vue
index deb6b5f..50e0e93 100644
--- a/src/components/contest/Contest.vue
+++ b/src/components/contest/Contest.vue
@@ -23,7 +23,11 @@
                 v-if="enterable"
                 class="navbar-item"
               >
-                <button @click="myEnter" class="button is-large is-outlined">
+                <button
+                  @click="myEnter"
+                  class="button is-large is-outlined"
+                  :disabled="this.isFlexibleContest && this.countDownTimer !== 'Already started'"
+                >
                   コンテストに参加する
                 </button>
               </span>
@@ -239,11 +243,7 @@ export default {
     enterable() {
       return this.canEnter &&
         !this.isEntered &&
-        this.problems === null &&
-        !(
-          this.isFlexibleContest &&
-          this.countDownTimer !== 'Already started'
-        )
+        this.problems === null
       ;
     },
     countDownTimer() {

From c880a3f64a0fc7da7596576abdbb76422623480f Mon Sep 17 00:00:00 2001
From: Fukusan64 <ikishikawa64@gmail.com>
Date: Fri, 20 Jul 2018 18:51:49 +0900
Subject: [PATCH 4/9] bugfix

---
 src/store/modules/contests/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/contests/index.js b/src/store/modules/contests/index.js
index 5c6af1b..3791837 100644
--- a/src/store/modules/contests/index.js
+++ b/src/store/modules/contests/index.js
@@ -52,7 +52,7 @@ export default {
         name: v.name, displayName: v.displayName, id: v.id,
       }));
       state.participants = contestData.participants.map(v => ({
-        name: v.name, displayName: v.displayName, id: v.id,
+        name: v.user.name, displayName: v.user.displayName, id: v.user.id,
       }));
       state.duration = contestData.duration ? contestData.duration / 3600000000000 : null;
     },

From 9046db48ef4073c48e90dbd531d0ec24bc229236 Mon Sep 17 00:00:00 2001
From: Fukusan64 <ikishikawa64@gmail.com>
Date: Fri, 20 Jul 2018 19:46:35 +0900
Subject: [PATCH 5/9] =?UTF-8?q?=E5=8F=82=E5=8A=A0=E6=99=82=E9=96=93?=
 =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/contest/Contest.vue  |  5 +++++
 src/store/modules/contests/index.js | 30 +++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/components/contest/Contest.vue b/src/components/contest/Contest.vue
index 50e0e93..2f2ad30 100644
--- a/src/components/contest/Contest.vue
+++ b/src/components/contest/Contest.vue
@@ -11,6 +11,9 @@
                   <span class="is-size-5 has-text-weight-bold">
                     期間: {{formatDate(startAt)}} ~ {{formatDate(endAt)}}<br>
                   </span>
+                  <span v-if="isFlexibleContest && isEntered" class="is-size-5 has-text-weight-bold">
+                    参加時間: {{formatDate(flexibleCreatedAt)}} ~ {{formatDate(flexibleEndAt)}}<br>
+                  </span>
                   <span class="is-size-7">
                     作成日時: {{formatDate(createdAt)}}<br>
                     最終更新: {{formatDate(updatedAt)}}
@@ -230,6 +233,7 @@ export default {
       'id',
       'error',
       'duration',
+      'flexibleCreatedAt',
     ]),
     ...mapState('koneko/timeDiff', [
       'timeDiff',
@@ -239,6 +243,7 @@ export default {
       'isEntered',
       'isWriter',
       'isFlexibleContest',
+      'flexibleEndAt',
     ]),
     enterable() {
       return this.canEnter &&
diff --git a/src/store/modules/contests/index.js b/src/store/modules/contests/index.js
index 3791837..e195951 100644
--- a/src/store/modules/contests/index.js
+++ b/src/store/modules/contests/index.js
@@ -20,6 +20,7 @@ export default {
     isWaitingJudge: true,
     error: null,
     duration: null,
+    flexibleCreatedAt: null,
   },
   getters: {
     isWriter({ writers }, _, rootState) {
@@ -34,6 +35,12 @@ export default {
     isFlexibleContest({ duration }) {
       return !!duration;
     },
+    flexibleEndAt({ flexibleCreatedAt, duration }) {
+      if (flexibleCreatedAt === null) return null;
+      const tmp = new Date(flexibleCreatedAt);
+      tmp.setSeconds(tmp.getSeconds() + duration);
+      return tmp;
+    },
   },
   mutations: {
     setContestData(state, contestData) {
@@ -54,7 +61,7 @@ export default {
       state.participants = contestData.participants.map(v => ({
         name: v.user.name, displayName: v.user.displayName, id: v.user.id,
       }));
-      state.duration = contestData.duration ? contestData.duration / 3600000000000 : null;
+      state.duration = contestData.duration ? contestData.duration / 1000000000 : null;
     },
     setStatusesWatcherFlag(state) {
       state.statusesWatcherFlag = true;
@@ -78,6 +85,9 @@ export default {
       });
       state.isWaitingJudge = state.problems.some(({ status }) => status < 2 && status > -1);
     },
+    setFlexibleCreatedAt(state, createdAt) {
+      state.flexibleCreatedAt = createdAt;
+    },
     waitJudge(state) {
       state.isWaitingJudge = true;
     },
@@ -91,10 +101,18 @@ export default {
     },
   },
   actions: {
-    async getContest({ commit, rootState }, contestID) {
+    async getContest({ state, commit, rootState }, contestID) {
       try {
         const res = await api.getContest(rootState.koneko.sessionID, contestID);
         commit('setContestData', res.data);
+        if (state.duration) {
+          for (let i = 0; i < res.data.participants.length; i += 1) {
+            if (rootState.koneko.user.id === res.data.participants[i].user.id) {
+              commit('setFlexibleCreatedAt', new Date(res.data.participants[i].createdAt));
+              break;
+            }
+          }
+        }
         commit('setRequiredWatching', true);
       } catch (e) {
         commit('setError', e);
@@ -133,6 +151,14 @@ export default {
       try {
         const res = await api.enterContest(rootState.koneko.sessionID, state.id);
         commit('setParticipants', res.data.participants);
+        if (state.duration) {
+          for (let i = 0; i < res.data.participants.length; i += 1) {
+            if (rootState.koneko.user.id === res.data.participants[i].user.id) {
+              commit('setFlexibleCreatedAt', new Date(res.data.participants[i].createdAt));
+              break;
+            }
+          }
+        }
       } catch (e) {
         commit('setError', e);
       }

From a47e9c2c6b89e0613c27879c9f6df8e3bea63295 Mon Sep 17 00:00:00 2001
From: Fukusan64 <ikishikawa64@gmail.com>
Date: Fri, 20 Jul 2018 20:04:49 +0900
Subject: [PATCH 6/9] =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=BF=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E6=80=92=E3=82=89=E3=82=8C=E3=81=A6=E3=81=9F=E3=81=94?=
 =?UTF-8?q?=E3=82=81=E3=82=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/contest/Contest.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/contest/Contest.vue b/src/components/contest/Contest.vue
index 2f2ad30..4cf5796 100644
--- a/src/components/contest/Contest.vue
+++ b/src/components/contest/Contest.vue
@@ -11,7 +11,10 @@
                   <span class="is-size-5 has-text-weight-bold">
                     期間: {{formatDate(startAt)}} ~ {{formatDate(endAt)}}<br>
                   </span>
-                  <span v-if="isFlexibleContest && isEntered" class="is-size-5 has-text-weight-bold">
+                  <span
+                    v-if="isFlexibleContest && isEntered"
+                    class="is-size-5 has-text-weight-bold"
+                  >
                     参加時間: {{formatDate(flexibleCreatedAt)}} ~ {{formatDate(flexibleEndAt)}}<br>
                   </span>
                   <span class="is-size-7">

From 60d84fa47150b9add6e22b6aa9940a9a30b53e10 Mon Sep 17 00:00:00 2001
From: Fukusan64 <ikishikawa64@gmail.com>
Date: Fri, 20 Jul 2018 21:12:32 +0900
Subject: [PATCH 7/9] =?UTF-8?q?=E5=8F=82=E5=8A=A0=E6=99=82=E9=96=93?=
 =?UTF-8?q?=E3=82=92=E3=81=82=E3=81=AA=E3=81=9F=E3=81=AE=E3=82=B3=E3=83=B3?=
 =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E6=99=82=E9=96=93=E3=81=AB=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/contest/Contest.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/contest/Contest.vue b/src/components/contest/Contest.vue
index 4cf5796..1e0fc26 100644
--- a/src/components/contest/Contest.vue
+++ b/src/components/contest/Contest.vue
@@ -15,7 +15,7 @@
                     v-if="isFlexibleContest && isEntered"
                     class="is-size-5 has-text-weight-bold"
                   >
-                    参加時間: {{formatDate(flexibleCreatedAt)}} ~ {{formatDate(flexibleEndAt)}}<br>
+                    あなたのコンテスト時間: {{formatDate(flexibleCreatedAt)}} ~ {{formatDate(flexibleEndAt)}}<br>
                   </span>
                   <span class="is-size-7">
                     作成日時: {{formatDate(createdAt)}}<br>

From 8e461947b26731ccef878b13c99bd1f2fe3e661c Mon Sep 17 00:00:00 2001
From: Fukusan64 <ikishikawa64@gmail.com>
Date: Fri, 20 Jul 2018 21:20:49 +0900
Subject: [PATCH 8/9] =?UTF-8?q?=E7=A2=BA=E8=AA=8D=E3=83=A2=E3=83=BC?=
 =?UTF-8?q?=E3=83=80=E3=83=AB=E3=81=AB=E3=82=B3=E3=83=B3=E3=83=86=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E6=99=82=E9=96=93=E3=82=92=E5=87=BA=E3=81=99=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/contest/EnterConfirmationModal.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/contest/EnterConfirmationModal.vue b/src/components/contest/EnterConfirmationModal.vue
index 22f60c1..35057eb 100644
--- a/src/components/contest/EnterConfirmationModal.vue
+++ b/src/components/contest/EnterConfirmationModal.vue
@@ -4,7 +4,10 @@
     title="参加確認"
     @close="close"
   >
-    <p>参加するとすぐにコンテストが始まります。</p>
+    <p>
+      参加するとすぐにコンテストが始まります。<br/>
+      コンテスト時間は、参加から{{Math.floor(duration / 60)}}分です
+    </p>
     <div slot="footer">
       <button class="button is-success" @click="myEnter">参加する</button>
       <button class="button" @click="close">キャンセル</button>
@@ -22,6 +25,7 @@ export default {
   ],
   computed: {
     ...mapState('koneko/contests', [
+      'duration',
       'id',
     ]),
   },

From 677151a74afd78dc1d5b7a0ac27cafde9bc032ba Mon Sep 17 00:00:00 2001
From: Fukusan64 <ikishikawa64@gmail.com>
Date: Fri, 20 Jul 2018 23:03:23 +0900
Subject: [PATCH 9/9] =?UTF-8?q?=E3=81=BE=E3=81=9F=E6=80=92=E3=82=89?=
 =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/contest/Contest.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/contest/Contest.vue b/src/components/contest/Contest.vue
index 1e0fc26..3688db4 100644
--- a/src/components/contest/Contest.vue
+++ b/src/components/contest/Contest.vue
@@ -15,7 +15,9 @@
                     v-if="isFlexibleContest && isEntered"
                     class="is-size-5 has-text-weight-bold"
                   >
-                    あなたのコンテスト時間: {{formatDate(flexibleCreatedAt)}} ~ {{formatDate(flexibleEndAt)}}<br>
+                    あなたのコンテスト時間:
+                    {{formatDate(flexibleCreatedAt)}} ~
+                    {{formatDate(flexibleEndAt)}}<br>
                   </span>
                   <span class="is-size-7">
                     作成日時: {{formatDate(createdAt)}}<br>