From 881f34eb31e72be76a21580d523f479e872c6214 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sun, 6 Feb 2022 09:49:07 +0000
Subject: [PATCH 01/47] design change: contest list title

---
 .../pages/oj/views/contest/ContestList.vue    | 105 +++++++++++-------
 1 file changed, 63 insertions(+), 42 deletions(-)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index e5916d2fc..bf29500ce 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -1,39 +1,50 @@
 <template>
-  <div class="contest-list-card font-bold">
-    <page-title text="All Contest"/>
-    <Table
-      hover
-      :items="contests"
-      :fields="contestListFields"
-      :per-page="perPage"
-      :current-page="currentPage"
-      @row-clicked="goContest"
-    >
-      <template v-slot:title="data">
-        <div class="w-80">{{ data.row.title }}</div>
-      </template>
-      <template v-slot:start_time="data">
-        {{ getTimeFormat(data.row.start_time) }}
-      </template>
-      <template v-slot:duration="data">
-        {{ getDuration(data.row.start_time, data.row.end_time) }}
-      </template>
-      <template v-slot:status="data">
-        <b-icon
-          icon="circle-fill"
-          class="mr-2"
-          :style="'color:' + contestStatus(data.row.status).color"
-        />
-        {{ contestStatus(data.row.status).name }}
-      </template>
-    </Table>
-    <div class="pagination">
-      <b-pagination
-        v-model="currentPage"
-        :total-rows="contests.length"
-        :per-page="perPage"
-        limit="3"
-      ></b-pagination>
+  <div>
+    <div class="page-top">
+      <div>
+        <span class="white">SKKU Coding Platform</span>
+        <span class="gold"> Contests</span>
+      </div>
+      <div class="description">Compete with schoolmates & win the prizes!</div>
+    </div>
+    <div>
+      Enter >>
+    </div>
+    <div class="contest-list-card font-bold">
+      <div class="table">
+        <b-table
+          hover
+          :items="contests"
+          :fields="contestListFields"
+          :per-page="perPage"
+          :current-page="currentPage"
+          head-variant="light"
+          @row-clicked="goContest"
+        >
+          <template #cell(start_time)="data">
+            {{ getTimeFormat(data.value) }}
+          </template>
+          <template #cell(duration)="data">
+            {{ getDuration(data.item.start_time, data.item.end_time) }}
+          </template>
+          <template #cell(status)="data">
+            <b-icon
+              icon="circle-fill"
+              class="mr-2"
+              :style="'color:' + contestStatus(data.value).color"
+            />
+            {{ contestStatus(data.value).name }}
+          </template>
+        </b-table>
+      </div>
+      <div class="pagination">
+        <b-pagination
+          v-model="currentPage"
+          :total-rows="contests.length"
+          :per-page="perPage"
+          limit="3"
+        ></b-pagination>
+      </div>
     </div>
   </div>
 </template>
@@ -44,14 +55,10 @@ import { mapState, mapGetters, mapActions } from 'vuex'
 import utils from '@/utils/utils'
 import time from '@/utils/time'
 import { CONTEST_STATUS_REVERSE, CONTEST_TYPE, CONTEST_STATUS } from '@/utils/constants'
-import PageTitle from '@oj/components/PageTitle.vue'
-import Table from '@oj/components/Table.vue'
 
 export default {
   name: 'ContestList',
   components: {
-    PageTitle,
-    Table
   },
   async beforeRouteEnter (to, from, next) {
     try {
@@ -185,10 +192,24 @@ export default {
     font-family: Manrope_bold;
     src: url('../../../../fonts/Manrope-Bold.ttf');
   }
-  .contest-list-card{
-    margin: 0 auto;
-    width: 70%;
+  .page-top {
+    background: linear-gradient(270deg, rgba(26, 62, 81, 0.90) 0%, #1A3E51 25%, #1A3E51 75%, rgba(26, 62, 81, 0.90) 100%);;
+    padding: 50px 200px;
+    text-align: center;
     font-family: Manrope;
+    .white {
+      font-size: 2rem;
+      color: white;
+    }
+    .gold {
+      font-size: 2rem;
+      color: #FEB144;
+    }
+    .description {
+      font-size: 1rem;
+      color: white;
+      margin-top: 1rem;
+    }
   }
   div{
     &.pagination{

From 72430f2a42da8ab0ba8703e82fc95addd7c79db4 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sun, 6 Feb 2022 17:16:38 +0000
Subject: [PATCH 02/47] feat: create neon box

---
 frontend/src/pages/oj/components/NeonBox.vue  |  79 ++++++++++++
 .../pages/oj/views/contest/ContestList.vue    | 121 ++++++++++++++----
 2 files changed, 177 insertions(+), 23 deletions(-)
 create mode 100644 frontend/src/pages/oj/components/NeonBox.vue

diff --git a/frontend/src/pages/oj/components/NeonBox.vue b/frontend/src/pages/oj/components/NeonBox.vue
new file mode 100644
index 000000000..904a436fc
--- /dev/null
+++ b/frontend/src/pages/oj/components/NeonBox.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="neon-box">
+    <img class="logo" src="@/assets/Cup.png">
+    <div class="contest-information-flex-col">
+      <div class="contest-information-flex-row">
+        <div class="contest-information-big">2021 Spring SKKU 프로그래밍 대회 - 참여중 대회</div>
+        <div class="contest-information-big">#참여</div>
+      </div>
+      <div class="contest-information-flex-row">
+        <div class="contest-information-small">For SKKU Undergraduate</div>
+        <div class="contest-information-small">Started Before 00:07:05 </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'NeonBox',
+  data () {
+    return {
+    }
+  },
+  methods: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  @font-face {
+    font-family: Manrope_bold;
+    src: url('../../../fonts/Manrope-Bold.ttf');
+  }
+  .neon-box {
+    background: #FFFFFF;
+    border: 0.89132px solid #8DC63F;
+    box-shadow: 0px 0px 8.9132px #8DC63F;
+    padding: 1rem;
+    display: flex;
+    transition: 0.3s ease-in-out;
+    &:hover {
+      transform: scale(1.01);
+    }
+
+    .logo {
+      width: 4rem;
+      height: 4rem;
+      margin-right: 1rem;
+    }
+
+    .contest-information-flex-col {
+      display: flex;
+      flex-direction: column;
+      width: 100%;
+      justify-content: space-between;
+      .contest-information-flex-row {
+        display: inline-flex;
+        flex-direction: row;
+        justify-content: space-between;
+        .contest-information-big {
+          color: #173747;
+          font-size: 1.3rem;
+          font-weight: bold;
+          white-space: nowrap;
+        }
+        .contest-information-small {
+          color: #173747;
+          font-size: 1.0rem;
+          white-space: nowrap;
+        }
+      }
+    }
+  }
+</style>
diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index bf29500ce..b625119fb 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -1,17 +1,36 @@
 <template>
   <div>
     <div class="page-top">
-      <div>
-        <span class="white">SKKU Coding Platform</span>
-        <span class="gold"> Contests</span>
-      </div>
+      <h2>
+        <span class="title-white">🏆 SKKU Coding Platform</span>
+        <span class="title-gold"> Contests</span>
+      </h2>
       <div class="description">Compete with schoolmates & win the prizes!</div>
     </div>
-    <div>
-      Enter >>
-    </div>
     <div class="contest-list-card font-bold">
-      <div class="table">
+      <h4 class="subtitle-blue">
+        Enter >>
+      </h4>
+      <neon-box></neon-box>
+      <h4 class="subtitle-blue">
+        Register Now >>
+      </h4>
+      <h4 class="subtitle-blue">
+        Upcoming Contests >>
+      </h4>
+      <h4 class="subtitle-red">
+        Cannot Participate
+        <button class="subtitle-toggle">
+          <b-icon-caret-down-fill color="#FF6663"></b-icon-caret-down-fill>
+        </button>
+      </h4>
+      <h4 class="subtitle-red">
+        Finished Contests
+        <button class="subtitle-toggle">
+          <b-icon-caret-down-fill color="#FF6663"></b-icon-caret-down-fill>
+        </button>
+      </h4>
+      <!-- <div class="table">
         <b-table
           hover
           :items="contests"
@@ -44,17 +63,18 @@
           :per-page="perPage"
           limit="3"
         ></b-pagination>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
 
 <script>
 import api from '@oj/api'
-import { mapState, mapGetters, mapActions } from 'vuex'
+import { mapGetters, mapActions } from 'vuex'
 import utils from '@/utils/utils'
 import time from '@/utils/time'
 import { CONTEST_STATUS_REVERSE, CONTEST_TYPE, CONTEST_STATUS } from '@/utils/constants'
+import NeonBox from '@oj/components/NeonBox.vue'
 
 export default {
   name: 'ContestList',
@@ -71,6 +91,9 @@ export default {
       next()
     }
   },
+  components: {
+    NeonBox
+  },
   data () {
     return {
       limit: 20,
@@ -166,9 +189,6 @@ export default {
     }
   },
   computed: {
-    ...mapState({
-      contest: state => state.contest.contest
-    }),
     ...mapGetters(
       ['contestMenuDisabled', 'countdown', 'isContestAdmin',
         'OIContestRealTimePermission', 'passwordFormVisible', 'isAuthenticated']
@@ -194,15 +214,13 @@ export default {
   }
   .page-top {
     background: linear-gradient(270deg, rgba(26, 62, 81, 0.90) 0%, #1A3E51 25%, #1A3E51 75%, rgba(26, 62, 81, 0.90) 100%);;
-    padding: 50px 200px;
+    padding: 50px 0px;
     text-align: center;
     font-family: Manrope;
-    .white {
-      font-size: 2rem;
+    .title-white {
       color: white;
     }
-    .gold {
-      font-size: 2rem;
+    .title-gold {
       color: #FEB144;
     }
     .description {
@@ -211,12 +229,69 @@ export default {
       margin-top: 1rem;
     }
   }
-  div{
-    &.pagination{
-    margin-right: 5%;
-    margin-top: 20px;
+  .subtitle-blue {
+    color: #1A3E51;
+    margin: 1.5rem 0;
+  }
+
+  .subtitle-red {
+    color: #FF6663;
+    padding-top: 1rem;
+  }
+  .subtitle-toggle {
+    display: inline-block;
+    width: 1.5rem;
+    height: 1.5rem;
+    border: none;
+    background: none;
+  }
+
+  .neon-box {
+    background: #FFFFFF;
+    border: 0.89132px solid #8DC63F;
+    box-shadow: 0px 0px 8.9132px #8DC63F;
+    padding: 1rem;
     display: flex;
-    justify-content: flex-end;
+    transition: 0.3s ease-in-out;
+    &:hover {
+      transform: scale(1.01);
+    }
+
+    .logo {
+      width: 4rem;
+      height: 4rem;
+      margin-right: 1rem;
+    }
+
+    .contest-information-flex-col {
+      display: flex;
+      flex-direction: column;
+      width: 100%;
+      justify-content: space-between;
+      .contest-information-flex-row {
+        display: inline-flex;
+        flex-direction: row;
+        justify-content: space-between;
+        .contest-information-big {
+          color: #173747;
+          font-size: 1.3rem;
+          font-weight: bold;
+          white-space: nowrap;
+        }
+        .contest-information-small {
+          color: #173747;
+          font-size: 1.0rem;
+          white-space: nowrap;
+        }
+      }
+    }
+  }
+  div{
+    &.pagination {
+      margin-right: 5%;
+      margin-top: 20px;
+      display: flex;
+      justify-content: flex-end;
     }
   }
   .contest-list-card::v-deep {

From a9f901ebcc80cb46b005ca719e7995fbca3e42e0 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Mon, 7 Feb 2022 17:08:51 +0000
Subject: [PATCH 03/47] feat: neonbox css props

---
 frontend/src/pages/oj/components/NeonBox.vue  | 24 +++++--
 .../pages/oj/views/contest/ContestList.vue    | 65 ++++---------------
 2 files changed, 31 insertions(+), 58 deletions(-)

diff --git a/frontend/src/pages/oj/components/NeonBox.vue b/frontend/src/pages/oj/components/NeonBox.vue
index 904a436fc..7495d39c2 100644
--- a/frontend/src/pages/oj/components/NeonBox.vue
+++ b/frontend/src/pages/oj/components/NeonBox.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="neon-box">
+  <div class="neon-box" :style="cssColor">
     <img class="logo" src="@/assets/Cup.png">
     <div class="contest-information-flex-col">
       <div class="contest-information-flex-row">
@@ -18,6 +18,15 @@
 
 export default {
   name: 'NeonBox',
+  props: {
+    color: {
+      type: String,
+      required: true
+    },
+    shadow: {
+      type: Boolean
+    }
+  },
   data () {
     return {
     }
@@ -25,6 +34,12 @@ export default {
   methods: {
   },
   computed: {
+    cssColor () {
+      return {
+        '--main-color': this.color,
+        '--shadow': this.shadow ? '9px' : '0'
+      }
+    }
   },
   watch: {
   }
@@ -38,14 +53,15 @@ export default {
   }
   .neon-box {
     background: #FFFFFF;
-    border: 0.89132px solid #8DC63F;
-    box-shadow: 0px 0px 8.9132px #8DC63F;
+    border: 0.89132px solid var(--main-color);
+    box-shadow: 0px 0px var(--shadow) var(--main-color);
     padding: 1rem;
     display: flex;
     transition: 0.3s ease-in-out;
     &:hover {
       transform: scale(1.01);
     }
+    cursor: pointer;
 
     .logo {
       width: 4rem;
@@ -69,7 +85,7 @@ export default {
           white-space: nowrap;
         }
         .contest-information-small {
-          color: #173747;
+          color: var(--main-color);
           font-size: 1.0rem;
           white-space: nowrap;
         }
diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index b625119fb..239f09fea 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -7,29 +7,35 @@
       </h2>
       <div class="description">Compete with schoolmates & win the prizes!</div>
     </div>
-    <div class="contest-list-card font-bold">
+    <div class="contest-list-container font-bold">
       <h4 class="subtitle-blue">
         Enter >>
       </h4>
-      <neon-box></neon-box>
+      <neon-box color="#8DC63F" :shadow="true" class="my-4"></neon-box>
       <h4 class="subtitle-blue">
         Register Now >>
       </h4>
+      <neon-box color="#8DC63F" class="my-4"></neon-box>
+      <neon-box color="#8DC63F" class="my-4"></neon-box>
       <h4 class="subtitle-blue">
         Upcoming Contests >>
       </h4>
+      <neon-box color="#8DC63F" class="my-4"></neon-box>
+      <neon-box color="#8DC63F" class="my-4"></neon-box>
       <h4 class="subtitle-red">
         Cannot Participate
         <button class="subtitle-toggle">
           <b-icon-caret-down-fill color="#FF6663"></b-icon-caret-down-fill>
         </button>
       </h4>
+      <neon-box color="#FF6663" :shadow="true" class="my-4"></neon-box>
       <h4 class="subtitle-red">
         Finished Contests
         <button class="subtitle-toggle">
           <b-icon-caret-down-fill color="#FF6663"></b-icon-caret-down-fill>
         </button>
       </h4>
+      <neon-box color="#FF6663" class="my-4"></neon-box>
       <!-- <div class="table">
         <b-table
           hover
@@ -231,12 +237,12 @@ export default {
   }
   .subtitle-blue {
     color: #1A3E51;
-    margin: 1.5rem 0;
+    margin: 2rem 0 0.5rem 0;
   }
 
   .subtitle-red {
     color: #FF6663;
-    padding-top: 1rem;
+    margin: 1rem 0;
   }
   .subtitle-toggle {
     display: inline-block;
@@ -245,56 +251,7 @@ export default {
     border: none;
     background: none;
   }
-
-  .neon-box {
-    background: #FFFFFF;
-    border: 0.89132px solid #8DC63F;
-    box-shadow: 0px 0px 8.9132px #8DC63F;
-    padding: 1rem;
-    display: flex;
-    transition: 0.3s ease-in-out;
-    &:hover {
-      transform: scale(1.01);
-    }
-
-    .logo {
-      width: 4rem;
-      height: 4rem;
-      margin-right: 1rem;
-    }
-
-    .contest-information-flex-col {
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-      justify-content: space-between;
-      .contest-information-flex-row {
-        display: inline-flex;
-        flex-direction: row;
-        justify-content: space-between;
-        .contest-information-big {
-          color: #173747;
-          font-size: 1.3rem;
-          font-weight: bold;
-          white-space: nowrap;
-        }
-        .contest-information-small {
-          color: #173747;
-          font-size: 1.0rem;
-          white-space: nowrap;
-        }
-      }
-    }
-  }
-  div{
-    &.pagination {
-      margin-right: 5%;
-      margin-top: 20px;
-      display: flex;
-      justify-content: flex-end;
-    }
-  }
-  .contest-list-card::v-deep {
+  .contest-list-container {
     margin: 0 auto;
     width: 70%;
     font-family: Manrope;

From 4d04c3bdcd9aa80007fc99c15fb214d83af14128 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Tue, 8 Feb 2022 11:29:44 +0000
Subject: [PATCH 04/47] feat: neonbox add overlay

---
 frontend/src/pages/oj/components/NeonBox.vue  | 122 ++++++++++++------
 .../pages/oj/views/contest/ContestList.vue    |  18 +--
 2 files changed, 89 insertions(+), 51 deletions(-)

diff --git a/frontend/src/pages/oj/components/NeonBox.vue b/frontend/src/pages/oj/components/NeonBox.vue
index 7495d39c2..7f5b5c42c 100644
--- a/frontend/src/pages/oj/components/NeonBox.vue
+++ b/frontend/src/pages/oj/components/NeonBox.vue
@@ -1,14 +1,21 @@
 <template>
-  <div class="neon-box" :style="cssColor">
-    <img class="logo" src="@/assets/Cup.png">
-    <div class="contest-information-flex-col">
-      <div class="contest-information-flex-row">
-        <div class="contest-information-big">2021 Spring SKKU 프로그래밍 대회 - 참여중 대회</div>
-        <div class="contest-information-big">#참여</div>
+  <div class="neon-box-container" :style="cssColor">
+    <div class="neon-box-hover">
+      <div class="ellipse">
+        <div id="triangle-right"></div>
       </div>
-      <div class="contest-information-flex-row">
-        <div class="contest-information-small">For SKKU Undergraduate</div>
-        <div class="contest-information-small">Started Before 00:07:05 </div>
+    </div>
+    <div class="neon-box">
+      <img class="logo" src="@/assets/Cup.png">
+      <div class="contest-information-flex-col">
+        <div class="contest-information-flex-row">
+          <div class="contest-information-big">2021 Spring SKKU 프로그래밍 대회 - 참여중 대회</div>
+          <div class="contest-information-big">#참여</div>
+        </div>
+        <div class="contest-information-flex-row">
+          <div class="contest-information-small">For SKKU Undergraduate</div>
+          <div class="contest-information-small">Started Before 00:07:05 </div>
+        </div>
       </div>
     </div>
   </div>
@@ -51,43 +58,74 @@ export default {
     font-family: Manrope_bold;
     src: url('../../../fonts/Manrope-Bold.ttf');
   }
-  .neon-box {
-    background: #FFFFFF;
-    border: 0.89132px solid var(--main-color);
-    box-shadow: 0px 0px var(--shadow) var(--main-color);
-    padding: 1rem;
-    display: flex;
-    transition: 0.3s ease-in-out;
-    &:hover {
-      transform: scale(1.01);
-    }
-    cursor: pointer;
+  .neon-box-container {
+    position: relative;
+    &:hover .neon-box-hover {
+      position: absolute;
+      display: flex;
+      justify-content: end;
+      right: 1px;
+      width: 100%;
+      height: 98%;
+      margin: 1px;
+      background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 30.39%, rgba(255, 255, 255, 0.9) 71%, #FFFFFF 100%);
+      cursor: pointer;
 
-    .logo {
-      width: 4rem;
-      height: 4rem;
-      margin-right: 1rem;
-    }
+      .ellipse {
+        height: 60px;
+        width: 60px;
+        margin: auto 10px;
+        background: white;
+        border-radius: 50%;
+        border: var(--main-color) 1px solid;
+        box-shadow: 0px 0px var(--shadow) var(--main-color);
+        display: flex;
+        align-items: center;
+        justify-content: center;
 
-    .contest-information-flex-col {
+        #triangle-right {
+          width: 0;
+          height: 0;
+          margin-left: 4px;
+          border-top: 10px solid transparent;
+          border-left: 18px solid var(--main-color);
+          border-bottom: 10px solid transparent;
+        }
+      }
+    }
+    .neon-box {
+      background: #FFFFFF;
+      border: 1px solid var(--main-color);
+      box-shadow: 0px 0px var(--shadow) var(--main-color);
+      padding: 0.8rem;
       display: flex;
-      flex-direction: column;
-      width: 100%;
-      justify-content: space-between;
-      .contest-information-flex-row {
-        display: inline-flex;
-        flex-direction: row;
+      transition: 0.3s ease-in-out;
+      .logo {
+        width: 3.1rem;
+        height: 3.1rem;
+        margin: 0.2rem 1rem 0.2rem 0.2rem;
+      }
+
+      .contest-information-flex-col {
+        display: flex;
+        flex-direction: column;
+        width: 100%;
         justify-content: space-between;
-        .contest-information-big {
-          color: #173747;
-          font-size: 1.3rem;
-          font-weight: bold;
-          white-space: nowrap;
-        }
-        .contest-information-small {
-          color: var(--main-color);
-          font-size: 1.0rem;
-          white-space: nowrap;
+        .contest-information-flex-row {
+          display: inline-flex;
+          flex-direction: row;
+          justify-content: space-between;
+          .contest-information-big {
+            color: #173747;
+            font-size: 1.2rem;
+            font-weight: bold;
+            white-space: nowrap;
+          }
+          .contest-information-small {
+            color: var(--main-color);
+            font-size: 0.9rem;
+            white-space: nowrap;
+          }
         }
       }
     }
diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index 239f09fea..03c9a1ee0 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -11,31 +11,31 @@
       <h4 class="subtitle-blue">
         Enter >>
       </h4>
-      <neon-box color="#8DC63F" :shadow="true" class="my-4"></neon-box>
+      <neon-box color="#8DC63F" :shadow="true" class="my-3"></neon-box>
       <h4 class="subtitle-blue">
         Register Now >>
       </h4>
-      <neon-box color="#8DC63F" class="my-4"></neon-box>
-      <neon-box color="#8DC63F" class="my-4"></neon-box>
+      <neon-box color="#8DC63F" class="my-3"></neon-box>
+      <neon-box color="#8DC63F" class="my-3"></neon-box>
       <h4 class="subtitle-blue">
         Upcoming Contests >>
       </h4>
-      <neon-box color="#8DC63F" class="my-4"></neon-box>
-      <neon-box color="#8DC63F" class="my-4"></neon-box>
+      <neon-box color="#8DC63F" class="my-3"></neon-box>
+      <neon-box color="#8DC63F" class="my-3"></neon-box>
       <h4 class="subtitle-red">
         Cannot Participate
         <button class="subtitle-toggle">
           <b-icon-caret-down-fill color="#FF6663"></b-icon-caret-down-fill>
         </button>
       </h4>
-      <neon-box color="#FF6663" :shadow="true" class="my-4"></neon-box>
+      <neon-box color="#FF6663" :shadow="true" class="my-3"></neon-box>
       <h4 class="subtitle-red">
         Finished Contests
         <button class="subtitle-toggle">
           <b-icon-caret-down-fill color="#FF6663"></b-icon-caret-down-fill>
         </button>
       </h4>
-      <neon-box color="#FF6663" class="my-4"></neon-box>
+      <neon-box color="#FF6663" class="my-3"></neon-box>
       <!-- <div class="table">
         <b-table
           hover
@@ -237,12 +237,12 @@ export default {
   }
   .subtitle-blue {
     color: #1A3E51;
-    margin: 2rem 0 0.5rem 0;
+    margin: 2rem 0 1rem 0;
   }
 
   .subtitle-red {
     color: #FF6663;
-    margin: 1rem 0;
+    margin: 2rem 0 1rem 0;
   }
   .subtitle-toggle {
     display: inline-block;

From 96c894942de8456d3168537b683bf7d56455c880 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Wed, 9 Feb 2022 08:59:25 +0000
Subject: [PATCH 05/47] feat: publishing contestInformation

---
 .../oj/components/ContestInformation.vue      | 177 ++++++++++++++++++
 frontend/src/pages/oj/components/NeonBox.vue  |  26 +--
 .../pages/oj/views/contest/ContestList.vue    |  20 +-
 3 files changed, 208 insertions(+), 15 deletions(-)
 create mode 100644 frontend/src/pages/oj/components/ContestInformation.vue

diff --git a/frontend/src/pages/oj/components/ContestInformation.vue b/frontend/src/pages/oj/components/ContestInformation.vue
new file mode 100644
index 000000000..5212d6b4b
--- /dev/null
+++ b/frontend/src/pages/oj/components/ContestInformation.vue
@@ -0,0 +1,177 @@
+<template>
+  <div class="contest-information-container">
+    <h2 class="title">{{ title }}</h2>
+    <div class="summary">
+      <div class="summary-contents-container">
+        <h3 class="subtitle">Requirements</h3>
+        <div class="summary-content-row">
+          <div class="summary-content-col">
+            <div class="requirement" v-for="(requirement, index) of requirements" :key="index">{{requirement}}</div>
+            <div class="constraint" v-for="(constraint, index) of constraints" :key="index">{{constraint}}></div>
+          </div>
+        </div>
+        </div>
+      <div class="summary-contents-container">
+        <h3 class="subtitle">Scoring</h3>
+        <div class="summary-content-row">
+          <div class="summary-content-col">
+            <div class="scoring">{{ scoring }}</div>
+          </div>
+        </div>
+      </div>
+      <div class="summary-contents-container">
+        <h3 class="subtitle">Prize</h3>
+        <div class="summary-content-row">
+          <div class="summary-content-col">
+            <div class="prize-col" v-for="(prize, index) of prizes" :key="index" :style="'color: ' + prize.color + ';'" >
+              <b-icon-circle-fill class="mr-2" :color="prize.color" width="1.3rem" height="1.3rem"></b-icon-circle-fill>
+              <div>{{ prize.name }}</div>
+              <div class="line"></div>
+              <div>{{ prize.reward }}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'ContestInformation',
+  props: {
+  },
+  data () {
+    return {
+      title: '2021 Spring SKKU 프로그래밍 대회 in 소프트의 밤',
+      requirements: [
+        'SKKU undergrate enrolled 2021 Spring'
+      ],
+      constraints: [
+        'Not Awarded in same past competition'
+      ],
+      scoring: 'ACM-ICPC style',
+      prizes: [
+        {
+          color: '#FF6663',
+          name: 'Top 2',
+          reward: '1,000,000 Won'
+        },
+        {
+          color: '#FFD700',
+          name: '3(3~5)',
+          reward: '500,000 Won'
+        },
+        {
+          color: '#C0C0C0',
+          name: '5(6~10)',
+          reward: '100,000 Won'
+        },
+        {
+          color: '#CD7F32',
+          name: '10(11~20)',
+          reward: '50,000 Won'
+        }
+      ],
+      importantNote: 'You should not be a cute cat',
+      description: `
+      <p data-v-5ab32299="" class="contest-tab-description"><p>Description</p><p>dd</p><p>dd</p><p>ee</p><p>eee</p></p>
+      `
+    }
+  },
+  methods: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  @font-face {
+    font-family: Manrope_bold;
+    src: url('../../../fonts/Manrope-Bold.ttf');
+  }
+  .contest-information-container {
+    display: flex;
+    width: 100%;
+    max-width: 100%;
+    justify-content: space-around;
+    align-items: flex-start;
+    flex-flow: row wrap;
+    font-family: Manrope_bold;
+    .title {
+      font-size: 2rem;
+      text-align: center;
+    }
+
+    .summary {
+      display: flex;
+      margin: 2rem 4rem;
+      justify-content: space-around;
+      align-items: center;
+      flex-wrap: wrap;
+      flex-grow: 1;
+      .summary-contents-container {
+        display: flex;
+        flex-direction: column;
+        border-left: #BCBCBC 1px solid;
+        padding: 0 1rem 0 1rem;
+        flex: 1 0 20rem;
+        min-height: 10rem;
+        margin-bottom: 1rem;
+        .requirement {
+          color: #8DC63F;
+          font-size: 1rem;
+          margin-bottom: 1rem;
+        }
+        .constraint {
+          color: #FF6663;
+          font-size: 1rem;
+          margin-bottom: 1rem;
+        }
+        .scoring {
+          color: #8DC63F;
+          font-size: 1.2rem;
+        }
+        .summary-content-row {
+          display: flex;
+          flex-direction: row;
+          justify-content: flex-start;
+          margin: auto 0;
+          .summary-content-col {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-evenly;
+            align-items: stretch;
+            flex: 1
+          }
+          .prize-col {
+            display: flex;
+            flex-direction: row;
+            justify-content: stretch;
+            align-items: center;
+            flex: 1;
+            margin-bottom: 0.5rem;
+            .circle {
+              width: 4rem;
+              height: 4rem;
+              border-radius: 50%;
+            }
+            .line {
+              flex: 1 0 1rem;
+              margin: 0 1.5rem;
+              height: 1px;
+              background-color:#BCBCBC;
+            }
+          }
+        }
+      }
+    }
+  }
+  .subtitle {
+    font-size: 1.5rem;
+  }
+</style>
diff --git a/frontend/src/pages/oj/components/NeonBox.vue b/frontend/src/pages/oj/components/NeonBox.vue
index 7f5b5c42c..153b1fc1b 100644
--- a/frontend/src/pages/oj/components/NeonBox.vue
+++ b/frontend/src/pages/oj/components/NeonBox.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="neon-box-container" :style="cssColor">
     <div class="neon-box-hover">
-      <div class="ellipse">
-        <div id="triangle-right"></div>
+      <div class="ellipse" @click="$bvModal.show('modal-contest-information')">
+        <slot name="overlay-icon"></slot>
       </div>
     </div>
     <div class="neon-box">
@@ -18,10 +18,14 @@
         </div>
       </div>
     </div>
+    <b-modal id="modal-contest-information" size="xl">
+      <contest-information></contest-information>
+    </b-modal>
   </div>
 </template>
 
 <script>
+import ContestInformation from './ContestInformation.vue'
 
 export default {
   name: 'NeonBox',
@@ -40,6 +44,9 @@ export default {
   },
   methods: {
   },
+  components: {
+    ContestInformation
+  },
   computed: {
     cssColor () {
       return {
@@ -60,10 +67,13 @@ export default {
   }
   .neon-box-container {
     position: relative;
+    .neon-box-hover {
+      display: none;
+    }
     &:hover .neon-box-hover {
       position: absolute;
       display: flex;
-      justify-content: end;
+      justify-content: flex-end;
       right: 1px;
       width: 100%;
       height: 98%;
@@ -82,15 +92,6 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
-
-        #triangle-right {
-          width: 0;
-          height: 0;
-          margin-left: 4px;
-          border-top: 10px solid transparent;
-          border-left: 18px solid var(--main-color);
-          border-bottom: 10px solid transparent;
-        }
       }
     }
     .neon-box {
@@ -99,7 +100,6 @@ export default {
       box-shadow: 0px 0px var(--shadow) var(--main-color);
       padding: 0.8rem;
       display: flex;
-      transition: 0.3s ease-in-out;
       .logo {
         width: 3.1rem;
         height: 3.1rem;
diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index 03c9a1ee0..1c6e2680e 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -11,11 +11,19 @@
       <h4 class="subtitle-blue">
         Enter >>
       </h4>
-      <neon-box color="#8DC63F" :shadow="true" class="my-3"></neon-box>
+      <neon-box color="#8DC63F" :shadow="true" class="my-3">
+        <template #overlay-icon>
+          <div id="triangle-right"></div>
+        </template>
+      </neon-box>
       <h4 class="subtitle-blue">
         Register Now >>
       </h4>
-      <neon-box color="#8DC63F" class="my-3"></neon-box>
+      <neon-box color="#8DC63F" class="my-3">
+        <template #overlay-icon>
+          <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
+        </template>
+      </neon-box>
       <neon-box color="#8DC63F" class="my-3"></neon-box>
       <h4 class="subtitle-blue">
         Upcoming Contests >>
@@ -259,4 +267,12 @@ export default {
   .font-bold {
     font-family: manrope_bold;
   }
+  #triangle-right {
+    width: 0;
+    height: 0;
+    margin-left: 4px;
+    border-top: 10px solid transparent;
+    border-left: 18px solid var(--main-color);
+    border-bottom: 10px solid transparent;
+  }
 </style>

From a7b3fb4114288f221a92ba81571e60875ee26b86 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Thu, 10 Feb 2022 05:59:15 +0000
Subject: [PATCH 06/47] feat: contestInformation- detail

---
 .../oj/components/ContestInformation.vue      | 13 +++++++++++
 frontend/src/pages/oj/components/NeonBox.vue  |  9 +-------
 .../pages/oj/views/contest/ContestList.vue    | 23 ++++++++++++-------
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/frontend/src/pages/oj/components/ContestInformation.vue b/frontend/src/pages/oj/components/ContestInformation.vue
index 5212d6b4b..25421bdc0 100644
--- a/frontend/src/pages/oj/components/ContestInformation.vue
+++ b/frontend/src/pages/oj/components/ContestInformation.vue
@@ -33,6 +33,10 @@
         </div>
       </div>
     </div>
+    <div class="description-container">
+      <h3 class="subtitle">Description</h3>
+      <div class="description" v-dompurify-html="description"></div>
+    </div>
   </div>
 </template>
 
@@ -109,6 +113,7 @@ export default {
 
     .summary {
       display: flex;
+      width: 100%;
       margin: 2rem 4rem;
       justify-content: space-around;
       align-items: center;
@@ -170,6 +175,14 @@ export default {
         }
       }
     }
+    .description-container {
+      display: flex;
+      flex-direction: column;
+      flex: 1 0 20rem;
+      width: 100%;
+      align-items: flex-start;
+      margin: 2rem 4rem;
+    }
   }
   .subtitle {
     font-size: 1.5rem;
diff --git a/frontend/src/pages/oj/components/NeonBox.vue b/frontend/src/pages/oj/components/NeonBox.vue
index 153b1fc1b..36a016648 100644
--- a/frontend/src/pages/oj/components/NeonBox.vue
+++ b/frontend/src/pages/oj/components/NeonBox.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="neon-box-container" :style="cssColor">
     <div class="neon-box-hover">
-      <div class="ellipse" @click="$bvModal.show('modal-contest-information')">
+      <div class="ellipse">
         <slot name="overlay-icon"></slot>
       </div>
     </div>
@@ -18,14 +18,10 @@
         </div>
       </div>
     </div>
-    <b-modal id="modal-contest-information" size="xl">
-      <contest-information></contest-information>
-    </b-modal>
   </div>
 </template>
 
 <script>
-import ContestInformation from './ContestInformation.vue'
 
 export default {
   name: 'NeonBox',
@@ -44,9 +40,6 @@ export default {
   },
   methods: {
   },
-  components: {
-    ContestInformation
-  },
   computed: {
     cssColor () {
       return {
diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index 1c6e2680e..b3d62280a 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -11,7 +11,7 @@
       <h4 class="subtitle-blue">
         Enter >>
       </h4>
-      <neon-box color="#8DC63F" :shadow="true" class="my-3">
+      <neon-box color="#8DC63F" :shadow="true" class="my-3" @click.native="$bvModal.show('modal-contest-information')">
         <template #overlay-icon>
           <div id="triangle-right"></div>
         </template>
@@ -32,18 +32,18 @@
       <neon-box color="#8DC63F" class="my-3"></neon-box>
       <h4 class="subtitle-red">
         Cannot Participate
-        <button class="subtitle-toggle">
-          <b-icon-caret-down-fill color="#FF6663"></b-icon-caret-down-fill>
+        <button class="subtitle-toggle" @click="showCannotParticipate = !showCannotParticipate">
+          <b-icon :icon="showCannotParticipate ? 'caret-up-fill':'caret-down-fill'" color="#FF6663"></b-icon>
         </button>
       </h4>
-      <neon-box color="#FF6663" :shadow="true" class="my-3"></neon-box>
+      <neon-box v-show="showCannotParticipate" color="#FF6663" :shadow="true" class="my-3"></neon-box>
       <h4 class="subtitle-red">
         Finished Contests
-        <button class="subtitle-toggle">
-          <b-icon-caret-down-fill color="#FF6663"></b-icon-caret-down-fill>
+        <button class="subtitle-toggle" @click="showFinishedContests = !showFinishedContests">
+          <b-icon :icon="showFinishedContests ? 'caret-up-fill':'caret-down-fill'" color="#FF6663"></b-icon>
         </button>
       </h4>
-      <neon-box color="#FF6663" class="my-3"></neon-box>
+      <neon-box v-show="showFinishedContests" color="#FF6663" class="my-3"></neon-box>
       <!-- <div class="table">
         <b-table
           hover
@@ -79,6 +79,9 @@
         ></b-pagination>
       </div> -->
     </div>
+    <b-modal id="modal-contest-information" size="xl">
+      <contest-information></contest-information>
+    </b-modal>
   </div>
 </template>
 
@@ -89,6 +92,7 @@ import utils from '@/utils/utils'
 import time from '@/utils/time'
 import { CONTEST_STATUS_REVERSE, CONTEST_TYPE, CONTEST_STATUS } from '@/utils/constants'
 import NeonBox from '@oj/components/NeonBox.vue'
+import ContestInformation from '@oj/components/ContestInformation.vue'
 
 export default {
   name: 'ContestList',
@@ -106,10 +110,13 @@ export default {
     }
   },
   components: {
-    NeonBox
+    NeonBox,
+    ContestInformation
   },
   data () {
     return {
+      showCannotParticipate: false,
+      showFinishedContests: false,
       limit: 20,
       total: 0,
       perPage: 5,

From 971e40132508556c205ee1ceddadf44a30105f40 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Thu, 10 Feb 2022 17:02:44 +0000
Subject: [PATCH 07/47] feat(api): add contest summary field

---
 .../migrations/0014_auto_20220211_0109.py     | 29 +++++++++++++++++++
 backend/contest/models.py                     |  3 ++
 backend/contest/serializers.py                |  6 ++++
 3 files changed, 38 insertions(+)
 create mode 100644 backend/contest/migrations/0014_auto_20220211_0109.py

diff --git a/backend/contest/migrations/0014_auto_20220211_0109.py b/backend/contest/migrations/0014_auto_20220211_0109.py
new file mode 100644
index 000000000..66b07d9c7
--- /dev/null
+++ b/backend/contest/migrations/0014_auto_20220211_0109.py
@@ -0,0 +1,29 @@
+# Generated by Django 3.2.12 on 2022-02-10 16:09
+
+from django.db import migrations, models
+import utils.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contest', '0013_contestannouncement_problem'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contest',
+            name='prize',
+            field=models.JSONField(default=dict),
+        ),
+        migrations.AddField(
+            model_name='contest',
+            name='requirements',
+            field=utils.models.RichTextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='contest',
+            name='scoring',
+            field=models.TextField(default='ACM-ICPC style'),
+        ),
+    ]
diff --git a/backend/contest/models.py b/backend/contest/models.py
index d605b2c6c..066861b36 100644
--- a/backend/contest/models.py
+++ b/backend/contest/models.py
@@ -11,6 +11,9 @@
 class Contest(models.Model):
     title = models.TextField()
     description = RichTextField()
+    requirements = RichTextField(null=True)
+    scoring = models.TextField(default="ACM-ICPC style")
+    prize = models.JSONField(default=dict)
     # show real time rank or cached rank
     real_time_rank = models.BooleanField()
     password = models.TextField(null=True)
diff --git a/backend/contest/serializers.py b/backend/contest/serializers.py
index 010714192..3e1b19dc1 100644
--- a/backend/contest/serializers.py
+++ b/backend/contest/serializers.py
@@ -7,6 +7,9 @@
 class CreateConetestSeriaizer(serializers.Serializer):
     title = serializers.CharField(max_length=128)
     description = serializers.CharField()
+    requirements = serializers.CharField()
+    scoring = serializers.CharField()
+    prize = serializers.ListField(child=serializers.DictField(child=serializers.CharField()))
     start_time = serializers.DateTimeField()
     end_time = serializers.DateTimeField()
     rule_type = serializers.ChoiceField(choices=[ContestRuleType.ACM, ContestRuleType.OI])
@@ -20,6 +23,9 @@ class EditConetestSeriaizer(serializers.Serializer):
     id = serializers.IntegerField()
     title = serializers.CharField(max_length=128)
     description = serializers.CharField()
+    requirements = serializers.CharField()
+    scoring = serializers.CharField()
+    prize = serializers.JSONField()
     start_time = serializers.DateTimeField()
     end_time = serializers.DateTimeField()
     password = serializers.CharField(allow_blank=True, allow_null=True, max_length=32)

From 7bcf867d3aa6c2d5d97c5498a5c1d69ba2c73185 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Fri, 11 Feb 2022 05:17:17 +0000
Subject: [PATCH 08/47] add contest group manytomanyfield

---
 .../migrations/0015_auto_20220211_1416.py     | 29 +++++++++++++++++++
 backend/contest/models.py                     |  7 +++--
 backend/contest/serializers.py                | 18 +++++++++---
 backend/contest/tests.py                      |  7 +++++
 4 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 backend/contest/migrations/0015_auto_20220211_1416.py

diff --git a/backend/contest/migrations/0015_auto_20220211_1416.py b/backend/contest/migrations/0015_auto_20220211_1416.py
new file mode 100644
index 000000000..fd4813bd2
--- /dev/null
+++ b/backend/contest/migrations/0015_auto_20220211_1416.py
@@ -0,0 +1,29 @@
+# Generated by Django 3.2.12 on 2022-02-11 05:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0004_rename_is_admin_groupmember_is_group_admin'),
+        ('contest', '0014_auto_20220211_0109'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contest',
+            name='allowed_groups',
+            field=models.ManyToManyField(to='group.Group'),
+        ),
+        migrations.AddField(
+            model_name='contest',
+            name='constraints',
+            field=models.JSONField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='contest',
+            name='requirements',
+            field=models.JSONField(null=True),
+        ),
+    ]
diff --git a/backend/contest/models.py b/backend/contest/models.py
index 066861b36..bd143998b 100644
--- a/backend/contest/models.py
+++ b/backend/contest/models.py
@@ -5,15 +5,18 @@
 
 from utils.constants import ContestStatus, ContestType
 from account.models import User
+from group.models import Group
 from utils.models import RichTextField
 
 
 class Contest(models.Model):
     title = models.TextField()
     description = RichTextField()
-    requirements = RichTextField(null=True)
+    requirements = JSONField(null=True)
+    constraints = JSONField(null=True)
+    allowed_groups = models.ManyToManyField(Group)
     scoring = models.TextField(default="ACM-ICPC style")
-    prize = models.JSONField(default=dict)
+    prize = JSONField(default=dict)
     # show real time rank or cached rank
     real_time_rank = models.BooleanField()
     password = models.TextField(null=True)
diff --git a/backend/contest/serializers.py b/backend/contest/serializers.py
index 3e1b19dc1..40a77ada3 100644
--- a/backend/contest/serializers.py
+++ b/backend/contest/serializers.py
@@ -4,12 +4,20 @@
 from .models import ACMContestRank, OIContestRank
 
 
+class CreateOrEditPrizeSerializer(serializers.Serializer):
+    color = serializers.CharField(max_length=20)
+    name = serializers.CharField(max_length=20)
+    reward = serializers.CharField(max_length=20)
+
+
 class CreateConetestSeriaizer(serializers.Serializer):
     title = serializers.CharField(max_length=128)
     description = serializers.CharField()
-    requirements = serializers.CharField()
+    requirements = serializers.ListField(child=serializers.CharField(max_length=128))
+    constraints = serializers.ListField(child=serializers.CharField(max_length=128), allow_empty=True)
+    allowed_groups = serializers.ListField(child=serializers.IntegerField())
     scoring = serializers.CharField()
-    prize = serializers.ListField(child=serializers.DictField(child=serializers.CharField()))
+    prize = serializers.ListField(child=CreateOrEditPrizeSerializer())
     start_time = serializers.DateTimeField()
     end_time = serializers.DateTimeField()
     rule_type = serializers.ChoiceField(choices=[ContestRuleType.ACM, ContestRuleType.OI])
@@ -23,9 +31,11 @@ class EditConetestSeriaizer(serializers.Serializer):
     id = serializers.IntegerField()
     title = serializers.CharField(max_length=128)
     description = serializers.CharField()
-    requirements = serializers.CharField()
+    requirements = serializers.ListField(child=serializers.CharField(max_length=128))
+    constraints = serializers.ListField(child=serializers.CharField(max_length=128), allow_empty=True)
+    allowed_groups = serializers.ListField(child=serializers.IntegerField())
     scoring = serializers.CharField()
-    prize = serializers.JSONField()
+    prize = serializers.ListField(child=CreateOrEditPrizeSerializer())
     start_time = serializers.DateTimeField()
     end_time = serializers.DateTimeField()
     password = serializers.CharField(allow_blank=True, allow_null=True, max_length=32)
diff --git a/backend/contest/tests.py b/backend/contest/tests.py
index c7f5a2e86..d35975cd0 100644
--- a/backend/contest/tests.py
+++ b/backend/contest/tests.py
@@ -22,6 +22,13 @@
                         "rule_type": "ACM", "hint": "<p>test</p>", "source": "test"}
 
 DEFAULT_CONTEST_DATA = {"title": "test title", "description": "test description",
+                        "requirements": ["SKKU undergrate enrolled 2021 Spring"],
+                        "constraints": ["Not Awarded in same past competition"],
+                        "scoring": 'ACM-ICPC style',
+                        "prizes": [{"color": "#FF6663", "name": "Top 2", "reward": "1,000,000 Won"},
+                                   {"color": "#FFD700", "name": "3(3~5)", "reward": "500,000 Won"},
+                                   {"color": "#C0C0C0", "name": "5(6~10)", "reward": "100,000 Won"},
+                                   {"color": "#CD7F32", "name": "10(11~20)", "reward": "50,000 Won"}],
                         "start_time": timezone.localtime(timezone.now()),
                         "end_time": timezone.localtime(timezone.now()) + timedelta(days=1),
                         "rule_type": ContestRuleType.ACM,

From fb15baf91ea069a6e40e6d870a3a60d0ab1d9fa6 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Fri, 11 Feb 2022 05:34:30 +0000
Subject: [PATCH 09/47] migrate contest summary model change again

---
 ...211_0109.py => 0014_auto_20220211_1432.py} | 12 ++++----
 .../migrations/0015_auto_20220211_1416.py     | 29 -------------------
 .../migrations/0015_auto_20220211_1433.py     | 23 +++++++++++++++
 backend/contest/models.py                     |  4 +--
 4 files changed, 31 insertions(+), 37 deletions(-)
 rename backend/contest/migrations/{0014_auto_20220211_0109.py => 0014_auto_20220211_1432.py} (73%)
 delete mode 100644 backend/contest/migrations/0015_auto_20220211_1416.py
 create mode 100644 backend/contest/migrations/0015_auto_20220211_1433.py

diff --git a/backend/contest/migrations/0014_auto_20220211_0109.py b/backend/contest/migrations/0014_auto_20220211_1432.py
similarity index 73%
rename from backend/contest/migrations/0014_auto_20220211_0109.py
rename to backend/contest/migrations/0014_auto_20220211_1432.py
index 66b07d9c7..0f1453862 100644
--- a/backend/contest/migrations/0014_auto_20220211_0109.py
+++ b/backend/contest/migrations/0014_auto_20220211_1432.py
@@ -1,25 +1,25 @@
-# Generated by Django 3.2.12 on 2022-02-10 16:09
+# Generated by Django 3.2.12 on 2022-02-11 05:32
 
 from django.db import migrations, models
-import utils.models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
+        ('group', '0004_rename_is_admin_groupmember_is_group_admin'),
         ('contest', '0013_contestannouncement_problem'),
     ]
 
     operations = [
         migrations.AddField(
             model_name='contest',
-            name='prize',
-            field=models.JSONField(default=dict),
+            name='allowed_groups',
+            field=models.ManyToManyField(to='group.Group'),
         ),
         migrations.AddField(
             model_name='contest',
-            name='requirements',
-            field=utils.models.RichTextField(null=True),
+            name='prize',
+            field=models.JSONField(default=dict),
         ),
         migrations.AddField(
             model_name='contest',
diff --git a/backend/contest/migrations/0015_auto_20220211_1416.py b/backend/contest/migrations/0015_auto_20220211_1416.py
deleted file mode 100644
index fd4813bd2..000000000
--- a/backend/contest/migrations/0015_auto_20220211_1416.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated by Django 3.2.12 on 2022-02-11 05:16
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0004_rename_is_admin_groupmember_is_group_admin'),
-        ('contest', '0014_auto_20220211_0109'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contest',
-            name='allowed_groups',
-            field=models.ManyToManyField(to='group.Group'),
-        ),
-        migrations.AddField(
-            model_name='contest',
-            name='constraints',
-            field=models.JSONField(null=True),
-        ),
-        migrations.AlterField(
-            model_name='contest',
-            name='requirements',
-            field=models.JSONField(null=True),
-        ),
-    ]
diff --git a/backend/contest/migrations/0015_auto_20220211_1433.py b/backend/contest/migrations/0015_auto_20220211_1433.py
new file mode 100644
index 000000000..52f1eaaf5
--- /dev/null
+++ b/backend/contest/migrations/0015_auto_20220211_1433.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.12 on 2022-02-11 05:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contest', '0014_auto_20220211_1432'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contest',
+            name='constraints',
+            field=models.JSONField(default=list),
+        ),
+        migrations.AddField(
+            model_name='contest',
+            name='requirements',
+            field=models.JSONField(default=list),
+        ),
+    ]
diff --git a/backend/contest/models.py b/backend/contest/models.py
index bd143998b..db9a04380 100644
--- a/backend/contest/models.py
+++ b/backend/contest/models.py
@@ -12,8 +12,8 @@
 class Contest(models.Model):
     title = models.TextField()
     description = RichTextField()
-    requirements = JSONField(null=True)
-    constraints = JSONField(null=True)
+    requirements = JSONField(default=list)
+    constraints = JSONField(default=list)
     allowed_groups = models.ManyToManyField(Group)
     scoring = models.TextField(default="ACM-ICPC style")
     prize = JSONField(default=dict)

From e3760dc8d27e07a91ef81ce05c18a1867e1a72b0 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Fri, 11 Feb 2022 07:20:00 +0000
Subject: [PATCH 10/47] fix allowed_groups associated problems

---
 .../0016_rename_prize_contest_prizes.py       | 18 ++++++++++++++++++
 .../0017_alter_contest_allowed_groups.py      | 19 +++++++++++++++++++
 backend/contest/models.py                     |  4 ++--
 backend/contest/serializers.py                | 10 ++++++----
 backend/contest/tests.py                      | 10 ++++++++--
 backend/contest/views/admin.py                | 12 ++++++++++++
 6 files changed, 65 insertions(+), 8 deletions(-)
 create mode 100644 backend/contest/migrations/0016_rename_prize_contest_prizes.py
 create mode 100644 backend/contest/migrations/0017_alter_contest_allowed_groups.py

diff --git a/backend/contest/migrations/0016_rename_prize_contest_prizes.py b/backend/contest/migrations/0016_rename_prize_contest_prizes.py
new file mode 100644
index 000000000..a9cff6bed
--- /dev/null
+++ b/backend/contest/migrations/0016_rename_prize_contest_prizes.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-02-11 05:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contest', '0015_auto_20220211_1433'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='contest',
+            old_name='prize',
+            new_name='prizes',
+        ),
+    ]
diff --git a/backend/contest/migrations/0017_alter_contest_allowed_groups.py b/backend/contest/migrations/0017_alter_contest_allowed_groups.py
new file mode 100644
index 000000000..453ec818e
--- /dev/null
+++ b/backend/contest/migrations/0017_alter_contest_allowed_groups.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.12 on 2022-02-11 05:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0004_rename_is_admin_groupmember_is_group_admin'),
+        ('contest', '0016_rename_prize_contest_prizes'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contest',
+            name='allowed_groups',
+            field=models.ManyToManyField(blank=True, to='group.Group'),
+        ),
+    ]
diff --git a/backend/contest/models.py b/backend/contest/models.py
index db9a04380..6d504aa1a 100644
--- a/backend/contest/models.py
+++ b/backend/contest/models.py
@@ -14,9 +14,9 @@ class Contest(models.Model):
     description = RichTextField()
     requirements = JSONField(default=list)
     constraints = JSONField(default=list)
-    allowed_groups = models.ManyToManyField(Group)
+    allowed_groups = models.ManyToManyField(Group, blank=True)
     scoring = models.TextField(default="ACM-ICPC style")
-    prize = JSONField(default=dict)
+    prizes = JSONField(default=dict)
     # show real time rank or cached rank
     real_time_rank = models.BooleanField()
     password = models.TextField(null=True)
diff --git a/backend/contest/serializers.py b/backend/contest/serializers.py
index 40a77ada3..b67117756 100644
--- a/backend/contest/serializers.py
+++ b/backend/contest/serializers.py
@@ -2,6 +2,7 @@
 
 from .models import Contest, ContestAnnouncement, ContestRuleType
 from .models import ACMContestRank, OIContestRank
+from group.serializers import GroupSummarySerializer
 
 
 class CreateOrEditPrizeSerializer(serializers.Serializer):
@@ -15,9 +16,9 @@ class CreateConetestSeriaizer(serializers.Serializer):
     description = serializers.CharField()
     requirements = serializers.ListField(child=serializers.CharField(max_length=128))
     constraints = serializers.ListField(child=serializers.CharField(max_length=128), allow_empty=True)
-    allowed_groups = serializers.ListField(child=serializers.IntegerField())
+    allowed_groups = serializers.ListField(child=serializers.IntegerField(), allow_empty=True)
     scoring = serializers.CharField()
-    prize = serializers.ListField(child=CreateOrEditPrizeSerializer())
+    prizes = serializers.ListField(child=CreateOrEditPrizeSerializer())
     start_time = serializers.DateTimeField()
     end_time = serializers.DateTimeField()
     rule_type = serializers.ChoiceField(choices=[ContestRuleType.ACM, ContestRuleType.OI])
@@ -33,9 +34,9 @@ class EditConetestSeriaizer(serializers.Serializer):
     description = serializers.CharField()
     requirements = serializers.ListField(child=serializers.CharField(max_length=128))
     constraints = serializers.ListField(child=serializers.CharField(max_length=128), allow_empty=True)
-    allowed_groups = serializers.ListField(child=serializers.IntegerField())
+    allowed_groups = serializers.ListField(child=serializers.IntegerField(), allow_empty=True)
     scoring = serializers.CharField()
-    prize = serializers.ListField(child=CreateOrEditPrizeSerializer())
+    prizes = serializers.ListField(child=CreateOrEditPrizeSerializer())
     start_time = serializers.DateTimeField()
     end_time = serializers.DateTimeField()
     password = serializers.CharField(allow_blank=True, allow_null=True, max_length=32)
@@ -48,6 +49,7 @@ class ContestAdminSerializer(serializers.ModelSerializer):
     created_by = UsernameSerializer()
     status = serializers.CharField()
     contest_type = serializers.CharField()
+    allowed_groups = GroupSummarySerializer(many=True)
 
     class Meta:
         model = Contest
diff --git a/backend/contest/tests.py b/backend/contest/tests.py
index d35975cd0..ad37bd9a3 100644
--- a/backend/contest/tests.py
+++ b/backend/contest/tests.py
@@ -2,6 +2,7 @@
 from datetime import datetime, timedelta
 
 from django.utils import timezone
+from group.models import Group
 
 from utils.api.tests import APITestCase
 
@@ -24,11 +25,12 @@
 DEFAULT_CONTEST_DATA = {"title": "test title", "description": "test description",
                         "requirements": ["SKKU undergrate enrolled 2021 Spring"],
                         "constraints": ["Not Awarded in same past competition"],
-                        "scoring": 'ACM-ICPC style',
+                        "scoring": "ACM-ICPC style",
                         "prizes": [{"color": "#FF6663", "name": "Top 2", "reward": "1,000,000 Won"},
                                    {"color": "#FFD700", "name": "3(3~5)", "reward": "500,000 Won"},
                                    {"color": "#C0C0C0", "name": "5(6~10)", "reward": "100,000 Won"},
                                    {"color": "#CD7F32", "name": "10(11~20)", "reward": "50,000 Won"}],
+                        "allowed_groups": [],
                         "start_time": timezone.localtime(timezone.now()),
                         "end_time": timezone.localtime(timezone.now()) + timedelta(days=1),
                         "rule_type": ContestRuleType.ACM,
@@ -83,7 +85,11 @@ def test_get_one_contest(self):
 class ContestAPITest(APITestCase):
     def setUp(self):
         user = self.create_admin()
-        self.contest = Contest.objects.create(created_by=user, **DEFAULT_CONTEST_DATA)
+        data = copy.deepcopy(DEFAULT_CONTEST_DATA)
+        allowed_groups = data.pop("allowed_groups")
+        allowed_groups_qs = Group.objects.filter(id__in=allowed_groups)
+        self.contest = Contest.objects.create(created_by=user, **data)
+        self.contest.allowed_groups.set(allowed_groups_qs)
         self.url = self.reverse("contest_api") + "?id=" + str(self.contest.id)
 
     def test_get_contest_list(self):
diff --git a/backend/contest/views/admin.py b/backend/contest/views/admin.py
index f2b6557ee..e9742ca8e 100644
--- a/backend/contest/views/admin.py
+++ b/backend/contest/views/admin.py
@@ -9,6 +9,7 @@
 from drf_yasg import openapi
 
 from account.models import User
+from group.models import Group
 from submission.models import Submission, JudgeStatus
 from utils.api import APIView, validate_serializer
 from utils.cache import cache
@@ -43,7 +44,12 @@ def post(self, request):
                 ip_network(ip_range, strict=False)
             except ValueError:
                 return self.error(f"{ip_range} is not a valid cidr network")
+        allowed_groups = data.pop("allowed_groups")
+        allowed_groups_qs = Group.objects.filter(id__in=allowed_groups)
+        if allowed_groups_qs.count() != len(allowed_groups):
+            return self.error("Some groups don't exist")
         contest = Contest.objects.create(**data)
+        contest.allowed_groups.set(allowed_groups_qs)
         return self.success(ContestAdminSerializer(contest).data)
 
     @swagger_auto_schema(
@@ -70,6 +76,12 @@ def put(self, request):
                 ip_network(ip_range, strict=False)
             except ValueError:
                 return self.error(f"{ip_range} is not a valid cidr network")
+
+        allowed_groups = data.pop("allowed_groups")
+        allowed_groups_qs = Group.objects.filter(id__in=allowed_groups)
+        if allowed_groups_qs.count() != len(allowed_groups):
+            return self.error("Some groups don't exist")
+        contest.allowed_groups.set(allowed_groups_qs)
         if not contest.real_time_rank and data.get("real_time_rank"):
             cache_key = f"{CacheKey.contest_rank_cache}:{contest.id}"
             cache.delete(cache_key)

From 2a76c4c5f270a9294c5256736fff93c471e9aab5 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Fri, 11 Feb 2022 08:38:35 +0000
Subject: [PATCH 11/47] decorators

---
 backend/contest/tests.py    | 33 +++++++++++++++++++++++++++++++--
 backend/utils/decorators.py |  7 +++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/backend/contest/tests.py b/backend/contest/tests.py
index ad37bd9a3..9bd99e72b 100644
--- a/backend/contest/tests.py
+++ b/backend/contest/tests.py
@@ -41,7 +41,7 @@
 
 class ContestAdminAPITest(APITestCase):
     def setUp(self):
-        self.create_super_admin()
+        self.super_admin = self.create_super_admin()
         self.url = self.reverse("contest_admin_api")
         self.data = copy.deepcopy(DEFAULT_CONTEST_DATA)
 
@@ -55,6 +55,24 @@ def test_create_contest_with_invalid_cidr(self):
         resp = self.client.post(self.url, data=self.data)
         self.assertTrue(resp.data["data"].endswith("is not a valid cidr network"))
 
+    def test_create_contest_with_group_not_existing(self):
+        self.data["allowed_groups"] = [1]
+        response = self.client.post(self.url, data=self.data)
+        self.assertFailed(response)
+
+    def test_create_contest_with_group_existing(self):
+        group = Group.objects.create(
+            created_by=self.super_admin,
+            name="SKKUding",
+            short_description="post group registration request",
+            description="post group registration request",
+            is_official=True
+        )
+        group.members.add(self.super_admin, through_defaults={"is_group_admin": False})
+        self.data["allowed_groups"] = [group.id]
+        response = self.client.post(self.url, data=self.data)
+        self.assertSuccess(response)
+
     def test_update_contest(self):
         id = self.test_create_contest().data["data"]["id"]
         update_data = {"id": id, "title": "update title",
@@ -85,8 +103,16 @@ def test_get_one_contest(self):
 class ContestAPITest(APITestCase):
     def setUp(self):
         user = self.create_admin()
+        group = Group.objects.create(
+            created_by=user,
+            name="SKKUding",
+            short_description="post group registration request",
+            description="post group registration request",
+            is_official=True
+        )
         data = copy.deepcopy(DEFAULT_CONTEST_DATA)
-        allowed_groups = data.pop("allowed_groups")
+        data.pop("allowed_groups")
+        allowed_groups = [group.id]
         allowed_groups_qs = Group.objects.filter(id__in=allowed_groups)
         self.contest = Contest.objects.create(created_by=user, **data)
         self.contest.allowed_groups.set(allowed_groups_qs)
@@ -124,6 +150,9 @@ def test_regular_user_access_contest(self):
         resp = self.client.get(self.url)
         self.assertSuccess(resp)
 
+    def test_not_group_member_access_contest(self):
+        self.create_user("test", "test123")
+        url = self.reverse("contest_access_api")
 
 class ContestAnnouncementAdminAPITest(APITestCase):
     def setUp(self):
diff --git a/backend/utils/decorators.py b/backend/utils/decorators.py
index 18e8752ef..2ac8c95d8 100644
--- a/backend/utils/decorators.py
+++ b/backend/utils/decorators.py
@@ -137,6 +137,13 @@ def _check_permission(*args, **kwargs):
                 if not self.contest.real_time_rank and (check_type == "ranks" or check_type == "submissions"):
                     return self.error(f"No permission to get {check_type}")
 
+            if not self.contest.allowed_groups.count():
+                print("count is 0")
+            elif self.contest.allowed_groups.filter(members__in=user).exists():
+                print("you are not a group member of this contest.")
+            else:
+                print("pass")
+
             return func(*args, **kwargs)
         return _check_permission
     return decorator

From a71c191d2068b48367203f117f7053d99d3f4067 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Fri, 11 Feb 2022 16:41:56 +0000
Subject: [PATCH 12/47] test: contest group permission

---
 backend/contest/tests.py    | 20 ++++++++++++--------
 backend/problem/tests.py    |  7 +++++--
 backend/utils/api/tests.py  | 10 ++++++++++
 backend/utils/decorators.py | 11 ++++-------
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/backend/contest/tests.py b/backend/contest/tests.py
index 9bd99e72b..145d919d4 100644
--- a/backend/contest/tests.py
+++ b/backend/contest/tests.py
@@ -103,13 +103,7 @@ def test_get_one_contest(self):
 class ContestAPITest(APITestCase):
     def setUp(self):
         user = self.create_admin()
-        group = Group.objects.create(
-            created_by=user,
-            name="SKKUding",
-            short_description="post group registration request",
-            description="post group registration request",
-            is_official=True
-        )
+        group = self.create_group(created_by=user)
         data = copy.deepcopy(DEFAULT_CONTEST_DATA)
         data.pop("allowed_groups")
         allowed_groups = [group.id]
@@ -151,8 +145,18 @@ def test_regular_user_access_contest(self):
         self.assertSuccess(resp)
 
     def test_not_group_member_access_contest(self):
-        self.create_user("test", "test123")
+        self.create_user("test2", "test1234")
         url = self.reverse("contest_access_api")
+        resp = self.client.get(url + "?contest_id=" + str(self.contest.id))
+        self.assertFalse(resp.data["data"]["access"])
+
+        password_url = self.reverse("contest_password_api")
+        resp = self.client.post(password_url,
+                                {"contest_id": self.contest.id, "password": DEFAULT_CONTEST_DATA["password"]})
+        self.assertSuccess(resp)
+        resp = self.client.get(self.url)
+        self.assertSuccess(resp)
+
 
 class ContestAnnouncementAdminAPITest(APITestCase):
     def setUp(self):
diff --git a/backend/problem/tests.py b/backend/problem/tests.py
index 381ef8204..9784123c7 100644
--- a/backend/problem/tests.py
+++ b/backend/problem/tests.py
@@ -200,8 +200,11 @@ def get_one_problem(self):
 class ContestProblemAdminTest(APITestCase):
     def setUp(self):
         self.url = self.reverse("contest_problem_admin_api")
-        self.create_admin()
-        self.contest = self.client.post(self.reverse("contest_admin_api"), data=DEFAULT_CONTEST_DATA).data["data"]
+        admin = self.create_admin()
+        group = self.create_group(created_by=admin)
+        contest_data = DEFAULT_CONTEST_DATA
+        contest_data["admin_groups"] = [group.id]
+        self.contest = self.client.post(self.reverse("contest_admin_api"), data=contest_data).data["data"]
 
     def test_create_contest_problem(self):
         data = copy.deepcopy(DEFAULT_PROBLEM_DATA)
diff --git a/backend/utils/api/tests.py b/backend/utils/api/tests.py
index 0f0a79b84..2ffc6c2c8 100644
--- a/backend/utils/api/tests.py
+++ b/backend/utils/api/tests.py
@@ -3,6 +3,7 @@
 from rest_framework.test import APIClient
 
 from account.models import AdminType, ProblemPermission, User, UserProfile
+from group.models import Group
 
 
 class APITestCase(TestCase):
@@ -27,6 +28,15 @@ def create_super_admin(self, username="root", password="root", login=True):
         return self.create_user(username=username, password=password, admin_type=AdminType.SUPER_ADMIN,
                                 problem_permission=ProblemPermission.ALL, login=login)
 
+    def create_group(self, created_by, name="SKKUding", short_description="post group registration request", description="post group registration request", is_official=True):
+        group = Group.objects.create(created_by=created_by, name=name, short_description=short_description, description=description, is_official=is_official)
+        group.members.add(created_by, through_defaults={"is_group_admin": True})
+        return group
+
+    def add_group_member(self, group, member, is_admin=False):
+        group.members.add(member, through_defaults={"is_group_admin": is_admin})
+        return group
+
     def reverse(self, url_name, *args, **kwargs):
         return reverse(url_name, *args, **kwargs)
 
diff --git a/backend/utils/decorators.py b/backend/utils/decorators.py
index 2ac8c95d8..5fab9a8d8 100644
--- a/backend/utils/decorators.py
+++ b/backend/utils/decorators.py
@@ -132,18 +132,15 @@ def _check_permission(*args, **kwargs):
             if self.contest.status == ContestStatus.CONTEST_NOT_START and check_type != "details":
                 return self.error("Contest has not started yet.")
 
+            # allowed_groups exist and member doesn't belong to any group, error
+            if self.contest.allowed_groups.count() and not self.contest.allowed_groups.filter(members__in=user).exists():
+                return self.error("You are not a member of the group allowed to this contest")
+
             # check does user have permission to get ranks, submissions in OI Contest
             if self.contest.status == ContestStatus.CONTEST_UNDERWAY and self.contest.rule_type == ContestRuleType.OI:
                 if not self.contest.real_time_rank and (check_type == "ranks" or check_type == "submissions"):
                     return self.error(f"No permission to get {check_type}")
 
-            if not self.contest.allowed_groups.count():
-                print("count is 0")
-            elif self.contest.allowed_groups.filter(members__in=user).exists():
-                print("you are not a group member of this contest.")
-            else:
-                print("pass")
-
             return func(*args, **kwargs)
         return _check_permission
     return decorator

From f047af669371595ac2f5d60755b35cb7733c94eb Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sat, 12 Feb 2022 13:28:37 +0000
Subject: [PATCH 13/47] Add contest summary field in contest admin page

---
 .../src/pages/admin/views/contest/Contest.vue | 194 +++++++++++++++++-
 .../oj/components/ContestInformation.vue      |  91 +++++---
 2 files changed, 250 insertions(+), 35 deletions(-)

diff --git a/frontend/src/pages/admin/views/contest/Contest.vue b/frontend/src/pages/admin/views/contest/Contest.vue
index dc081deb5..351c93835 100644
--- a/frontend/src/pages/admin/views/contest/Contest.vue
+++ b/frontend/src/pages/admin/views/contest/Contest.vue
@@ -26,6 +26,132 @@
           </p>
           <tiptap v-model="contest.description"/>
         </b-col>
+        <b-col cols="6">
+          <b-form-group>
+            <template #label>
+              <p class="labels" style="margin-top:16px">
+                <span class="text-danger">*</span>
+                Requirements
+              </p>
+            </template>
+            <div
+              v-for="(range, index) in contest.requirements"
+              :key="index"
+            >
+              <b-row style="margin-bottom: 15px">
+                <b-col cols="8">
+                  <b-form-input
+                    v-model="range.value"
+                    placeholder="Contest Requirement"
+                  />
+                </b-col>
+                <b-col cols="1">
+                  <b-button @click="addRequirement" variant="outline-secondary">
+                      <b-icon icon="plus"></b-icon>
+                  </b-button>
+                </b-col>
+                <b-col cols="1">
+                  <b-button @click="removeRequirement(range)" variant="outline-secondary">
+                      <b-icon icon="trash-fill"></b-icon>
+                  </b-button>
+                </b-col>
+              </b-row>
+            </div>
+          </b-form-group>
+        </b-col>
+        <b-col cols="6">
+          <b-form-group>
+            <template #label>
+              <p class="labels" style="margin-top:16px">
+                Constraints
+              </p>
+            </template>
+            <div
+              v-for="(range, index) in contest.constraints"
+              :key="index"
+            >
+              <b-row style="margin-bottom: 15px">
+                <b-col cols="8">
+                  <b-form-input
+                    v-model="range.value"
+                    placeholder="Contest Constraints"
+                  />
+                </b-col>
+                <b-col cols="1">
+                  <b-button @click="addConstraint" variant="outline-secondary">
+                      <b-icon icon="plus"></b-icon>
+                  </b-button>
+                </b-col>
+                <b-col cols="1">
+                  <b-button @click="removeConstraint(range)" variant="outline-secondary">
+                      <b-icon icon="trash-fill"></b-icon>
+                  </b-button>
+                </b-col>
+              </b-row>
+            </div>
+          </b-form-group>
+        </b-col>
+        <b-col cols="12">
+          <b-form-group
+            label-for="ContestScoring"
+          >
+            <template #label>
+              <p class="labels">
+                <span class="text-danger">*</span>
+                Scoring
+              </p>
+            </template>
+            <b-form-input
+              id="ContestScoring"
+              v-model="contest.scoring"
+              placeholder="Scoring"
+            />
+          </b-form-group>
+        </b-col>
+        <b-col cols="12">
+          <b-form-group>
+            <template #label>
+              <p class="labels" style="margin-top:16px">
+                Prizes
+              </p>
+            </template>
+            <div
+              v-for="(range, index) in contest.prizes"
+              :key="index"
+            >
+              <b-row style="margin-bottom: 15px">
+                <b-col cols="2">
+                  <b-form-input
+                    v-model="range.color"
+                    placeholder="Contest prize color"
+                  />
+                </b-col>
+                <b-col cols="4">
+                  <b-form-input
+                    v-model="range.name"
+                    placeholder="Contest prize name"
+                  />
+                </b-col>
+                <b-col cols="4">
+                  <b-form-input
+                    v-model="range.reward"
+                    placeholder="Contest reward"
+                  />
+                </b-col>
+                <b-col cols="1">
+                  <b-button @click="addPrize" variant="outline-secondary">
+                    <b-icon icon="plus"></b-icon>
+                  </b-button>
+                </b-col>
+                <b-col cols="1">
+                  <b-button @click="removePrize(range)" variant="outline-secondary">
+                      <b-icon icon="trash-fill"></b-icon>
+                  </b-button>
+                </b-col>
+              </b-row>
+            </div>
+          </b-form-group>
+        </b-col>
         <b-col cols="4">
           <b-form-group label-for="Contest_Start_Time">
             <template #label>
@@ -175,6 +301,19 @@ export default {
       contest: {
         title: '',
         description: '',
+        requirements: [{
+          value: ''
+        }],
+        constraints: [{
+          value: ''
+        }],
+        scoring: '',
+        prizes: [{
+          color: '',
+          name: '',
+          reward: ''
+        }],
+        allowed_groups: [],
         start_time: '',
         end_time: '',
         rule_type: 'ACM',
@@ -225,6 +364,32 @@ export default {
         }
       }
       data.allowed_ip_ranges = ranges
+
+      const requirements = []
+      for (const v of data.requirements) {
+        if (v.value !== '') {
+          requirements.push(v.value)
+        }
+      }
+      data.requirements = requirements
+      const constraints = []
+      for (const v of data.constraints) {
+        if (v.value !== '') {
+          constraints.push(v.value)
+        }
+      }
+      data.constraints = constraints
+      const prizes = []
+      for (const v of data.prizes) {
+        if (v.color !== '' && v.name !== '' && v.reward !== '') {
+          prizes.push({
+            color: v.color,
+            name: v.name,
+            reward: v.reward
+          })
+        }
+      }
+      data.prizes = prizes
       try {
         await api[funcName](data)
         await this.$router.push({ name: 'contest-list', query: { refresh: 'true' } })
@@ -246,9 +411,36 @@ export default {
     },
     removeIPRange (range) {
       const index = this.contest.allowed_ip_ranges.indexOf(range)
-      if (index !== -1) {
+      if (index !== -1 && this.contest.allowed_ip_ranges.length !== 1) {
         this.contest.allowed_ip_ranges.splice(index, 1)
       }
+    },
+    addRequirement () {
+      this.contest.requirements.push({ value: '' })
+    },
+    removeRequirement (range) {
+      const index = this.contest.requirements.indexOf(range)
+      if (index !== -1 && this.contest.requirements.length !== 1) {
+        this.contest.requirements.splice(index, 1)
+      }
+    },
+    addConstraint () {
+      this.contest.constraints.push({ value: '' })
+    },
+    removeConstraint (range) {
+      const index = this.contest.constraints.indexOf(range)
+      if (index !== -1 && this.contest.constraints.length !== 1) {
+        this.contest.constraints.splice(index, 1)
+      }
+    },
+    addPrize () {
+      this.contest.prizes.push({ value: '' })
+    },
+    removePrize (range) {
+      const index = this.contest.prizes.indexOf(range)
+      if (index !== -1 && this.contest.prizes.length !== 1) {
+        this.contest.prizes.splice(index, 1)
+      }
     }
   }
 }
diff --git a/frontend/src/pages/oj/components/ContestInformation.vue b/frontend/src/pages/oj/components/ContestInformation.vue
index 25421bdc0..fddf80040 100644
--- a/frontend/src/pages/oj/components/ContestInformation.vue
+++ b/frontend/src/pages/oj/components/ContestInformation.vue
@@ -45,43 +45,66 @@
 export default {
   name: 'ContestInformation',
   props: {
+    title: {
+      type: String,
+      required: true
+    },
+    requirements: {
+      type: Array,
+      required: true
+    },
+    constraints: {
+      type: Array,
+      required: true
+    },
+    scoring: {
+      type: String,
+      required: true
+    },
+    prizes: {
+      type: Array,
+      required: true
+    },
+    description: {
+      type: String,
+      required: true
+    }
   },
   data () {
     return {
-      title: '2021 Spring SKKU 프로그래밍 대회 in 소프트의 밤',
-      requirements: [
-        'SKKU undergrate enrolled 2021 Spring'
-      ],
-      constraints: [
-        'Not Awarded in same past competition'
-      ],
-      scoring: 'ACM-ICPC style',
-      prizes: [
-        {
-          color: '#FF6663',
-          name: 'Top 2',
-          reward: '1,000,000 Won'
-        },
-        {
-          color: '#FFD700',
-          name: '3(3~5)',
-          reward: '500,000 Won'
-        },
-        {
-          color: '#C0C0C0',
-          name: '5(6~10)',
-          reward: '100,000 Won'
-        },
-        {
-          color: '#CD7F32',
-          name: '10(11~20)',
-          reward: '50,000 Won'
-        }
-      ],
-      importantNote: 'You should not be a cute cat',
-      description: `
-      <p data-v-5ab32299="" class="contest-tab-description"><p>Description</p><p>dd</p><p>dd</p><p>ee</p><p>eee</p></p>
-      `
+      // title: '2021 Spring SKKU 프로그래밍 대회 in 소프트의 밤',
+      // requirements: [
+      //   'SKKU undergrate enrolled 2021 Spring'
+      // ],
+      // constraints: [
+      //   'Not Awarded in same past competition'
+      // ],
+      // scoring: 'ACM-ICPC style',
+      // prizes: [
+      //   {
+      //     color: '#FF6663',
+      //     name: 'Top 2',
+      //     reward: '1,000,000 Won'
+      //   },
+      //   {
+      //     color: '#FFD700',
+      //     name: '3(3~5)',
+      //     reward: '500,000 Won'
+      //   },
+      //   {
+      //     color: '#C0C0C0',
+      //     name: '5(6~10)',
+      //     reward: '100,000 Won'
+      //   },
+      //   {
+      //     color: '#CD7F32',
+      //     name: '10(11~20)',
+      //     reward: '50,000 Won'
+      //   }
+      // ],
+      // description: `
+      // <p data-v-5ab32299="" class="contest-tab-description"><p>Description</p><p>dd</p><p>dd</p><p>ee</p><p>eee</p></p>
+      // `
     }
   },
   methods: {

From d98d850aadd916536d68424ce83d24f47130bff9 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sun, 13 Feb 2022 04:19:33 +0000
Subject: [PATCH 14/47] feat: add admin create group api

---
 backend/group/serializers.py |  7 +++++++
 backend/group/urls/admin.py  |  5 +++--
 backend/group/views/admin.py | 33 +++++++++++++++++++++++++++++++--
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/backend/group/serializers.py b/backend/group/serializers.py
index fe0723bd1..7cdae1eba 100644
--- a/backend/group/serializers.py
+++ b/backend/group/serializers.py
@@ -16,6 +16,13 @@ class Meta:
         fields = "__all__"
 
 
+class CreateGroupSerializer(serializers.Serializer):
+    name = serializers.CharField()
+    short_description = serializers.CharField()
+    description = serializers.CharField()
+    is_official = serializers.BooleanField()
+
+
 class GroupSummarySerializer(serializers.ModelSerializer):
     # logo = serializers.ImageField()
 
diff --git a/backend/group/urls/admin.py b/backend/group/urls/admin.py
index 5753d3ef2..382d4f074 100644
--- a/backend/group/urls/admin.py
+++ b/backend/group/urls/admin.py
@@ -1,7 +1,8 @@
 from django.urls import path
-from ..views.admin import AdminGroupRegistrationRequestAPI
+from ..views.admin import AdminGroupRegistrationRequestAPI, GroupAdminAPI
 
 
 urlpatterns = [
-    path("group/registration_request/", AdminGroupRegistrationRequestAPI.as_view(), name="group_registration_request_admin_api")
+    path("group/registration_request/", AdminGroupRegistrationRequestAPI.as_view(), name="group_registration_request_admin_api"),
+    path("group/", GroupAdminAPI.as_view(), name="group_admin_api")
 ]
diff --git a/backend/group/views/admin.py b/backend/group/views/admin.py
index 6f640d97e..4a2e0ed39 100644
--- a/backend/group/views/admin.py
+++ b/backend/group/views/admin.py
@@ -4,8 +4,8 @@
 from utils.decorators import super_admin_required
 
 # from group.models import Group, GroupMemberJoin
-from group.serializers import GroupRegistrationRequestSerializer, GroupDetailSerializer
-from utils.api import APIView
+from group.serializers import GroupRegistrationRequestSerializer, GroupDetailSerializer, CreateGroupSerializer
+from utils.api import APIView, validate_serializer
 
 from ..models import GroupRegistrationRequest, Group
 
@@ -72,3 +72,32 @@ def delete(self, request):
         GroupRegistrationRequest.objects.get(id=request_id).delete()
 
         return self.success(GroupDetailSerializer(group).data)
+
+
+class GroupAdminAPI(APIView):
+    @swagger_auto_schema(
+        request_body=CreateGroupSerializer,
+        operation_description="Request to register a group",
+        responses={200: CreateGroupSerializer}
+    )
+    @validate_serializer(CreateGroupSerializer)
+    def post(self, request):
+        user = request.user
+        if not user.is_authenticated:
+            return self.error("Login First")
+
+        data = request.data
+        name = data["name"]
+
+        if GroupRegistrationRequest.objects.filter(name=name).exists() or Group.objects.filter(name=name).exists():
+            return self.error("Duplicate group name")
+
+        group = Group.objects.create(
+            name=name,
+            short_description=data["short_description"],
+            description=data["description"],
+            is_official=data["is_official"],
+            created_by=request.user
+        )
+        group.members.add(user, through_defaults={"is_group_admin": True})
+        return self.success(GroupDetailSerializer(group).data)

From efc953839efb510dabf0d61a6d9f45708d50fbd2 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sun, 13 Feb 2022 04:47:08 +0000
Subject: [PATCH 15/47] feat: add admin get group api

---
 backend/group/views/admin.py | 43 ++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/backend/group/views/admin.py b/backend/group/views/admin.py
index 4a2e0ed39..ebb7818d4 100644
--- a/backend/group/views/admin.py
+++ b/backend/group/views/admin.py
@@ -4,10 +4,10 @@
 from utils.decorators import super_admin_required
 
 # from group.models import Group, GroupMemberJoin
-from group.serializers import GroupRegistrationRequestSerializer, GroupDetailSerializer, CreateGroupSerializer
+from group.serializers import GroupRegistrationRequestSerializer, GroupDetailSerializer, CreateGroupSerializer, GroupSummarySerializer, GroupMemberSerializer, GroupMemberJoinSerializer
 from utils.api import APIView, validate_serializer
 
-from ..models import GroupRegistrationRequest, Group
+from ..models import GroupRegistrationRequest, Group, GroupMember, GroupMemberJoin
 
 
 class AdminGroupRegistrationRequestAPI(APIView):
@@ -101,3 +101,42 @@ def post(self, request):
         )
         group.members.add(user, through_defaults={"is_group_admin": True})
         return self.success(GroupDetailSerializer(group).data)
+
+    @swagger_auto_schema(
+        manual_parameters=[
+            openapi.Parameter(
+                name="id",
+                in_=openapi.IN_QUERY,
+                description="Unique ID of a group. if id is not given, return group list, else return detail of a group",
+                type=openapi.TYPE_INTEGER,
+                required=False
+            ),
+        ],
+        operation_description="Get group list or detail of a group"
+    )
+    def get(self, request):
+        user = request.user
+        if not user.is_authenticated:
+            return self.error("Login First")
+
+        group_id = request.GET.get("id")
+
+        # Group List
+        if not group_id:
+            groups = Group.objects.all()
+            return self.success(GroupSummarySerializer(groups, many=True).data)
+
+        # Group Detail
+        try:
+            group = Group.objects.get(id=group_id)
+        except Group.DoesNotExist:
+            return self.error("Group does not exist")
+        data = GroupDetailSerializer(group).data
+
+        data["members"] = GroupMemberSerializer(GroupMember.objects.filter(group=group_id), many=True).data
+
+        if GroupMember.objects.filter(is_group_admin=True, group=group, user=user).exists():
+            group_member_join = GroupMemberJoin.objects.filter(group=group)
+            data["group_member_join"] = GroupMemberJoinSerializer(group_member_join, many=True).data
+
+        return self.success(data)

From 4380104ef31fb17d88e59d71af96aba402567240 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sun, 13 Feb 2022 05:11:08 +0000
Subject: [PATCH 16/47] feat: add vuex group module

---
 frontend/src/pages/oj/api.js                  |  4 ++
 .../pages/oj/views/contest/ContestList.vue    | 53 +++++--------------
 frontend/src/store/index.js                   |  4 +-
 frontend/src/store/modules/group.js           | 40 ++++++++++++++
 frontend/src/store/types.js                   |  4 +-
 5 files changed, 62 insertions(+), 43 deletions(-)
 create mode 100644 frontend/src/store/modules/group.js

diff --git a/frontend/src/pages/oj/api.js b/frontend/src/pages/oj/api.js
index b0656be2f..f1f7cdc9f 100644
--- a/frontend/src/pages/oj/api.js
+++ b/frontend/src/pages/oj/api.js
@@ -314,6 +314,10 @@ export default {
     return ajax('assignment_submissions/', 'get', {
       params
     })
+  },
+  getGroupList () {
+    return ajax('group/', 'get', {
+    })
   }
 }
 
diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index b3d62280a..4fb267302 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -19,7 +19,7 @@
       <h4 class="subtitle-blue">
         Register Now >>
       </h4>
-      <neon-box color="#8DC63F" class="my-3">
+      <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsRegisterNow" :key="index">
         <template #overlay-icon>
           <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>
@@ -28,56 +28,22 @@
       <h4 class="subtitle-blue">
         Upcoming Contests >>
       </h4>
-      <neon-box color="#8DC63F" class="my-3"></neon-box>
-      <neon-box color="#8DC63F" class="my-3"></neon-box>
+      <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUpcoming" :key="index">
+      </neon-box>
       <h4 class="subtitle-red">
         Cannot Participate
         <button class="subtitle-toggle" @click="showCannotParticipate = !showCannotParticipate">
           <b-icon :icon="showCannotParticipate ? 'caret-up-fill':'caret-down-fill'" color="#FF6663"></b-icon>
         </button>
       </h4>
-      <neon-box v-show="showCannotParticipate" color="#FF6663" :shadow="true" class="my-3"></neon-box>
+      <neon-box v-show="showCannotParticipate" v-for="(contest, index) in contestsCannotParticipate" :key="index" color="#FF6663" :shadow="true" class="my-3"></neon-box>
       <h4 class="subtitle-red">
         Finished Contests
         <button class="subtitle-toggle" @click="showFinishedContests = !showFinishedContests">
           <b-icon :icon="showFinishedContests ? 'caret-up-fill':'caret-down-fill'" color="#FF6663"></b-icon>
         </button>
       </h4>
-      <neon-box v-show="showFinishedContests" color="#FF6663" class="my-3"></neon-box>
-      <!-- <div class="table">
-        <b-table
-          hover
-          :items="contests"
-          :fields="contestListFields"
-          :per-page="perPage"
-          :current-page="currentPage"
-          head-variant="light"
-          @row-clicked="goContest"
-        >
-          <template #cell(start_time)="data">
-            {{ getTimeFormat(data.value) }}
-          </template>
-          <template #cell(duration)="data">
-            {{ getDuration(data.item.start_time, data.item.end_time) }}
-          </template>
-          <template #cell(status)="data">
-            <b-icon
-              icon="circle-fill"
-              class="mr-2"
-              :style="'color:' + contestStatus(data.value).color"
-            />
-            {{ contestStatus(data.value).name }}
-          </template>
-        </b-table>
-      </div>
-      <div class="pagination">
-        <b-pagination
-          v-model="currentPage"
-          :total-rows="contests.length"
-          :per-page="perPage"
-          limit="3"
-        ></b-pagination>
-      </div> -->
+      <neon-box v-show="showFinishedContests" v-for="(contest, index) in contestsFinished" :key="index" color="#FF6663" class="my-3"></neon-box>
     </div>
     <b-modal id="modal-contest-information" size="xl">
       <contest-information></contest-information>
@@ -93,6 +59,7 @@ import time from '@/utils/time'
 import { CONTEST_STATUS_REVERSE, CONTEST_TYPE, CONTEST_STATUS } from '@/utils/constants'
 import NeonBox from '@oj/components/NeonBox.vue'
 import ContestInformation from '@oj/components/ContestInformation.vue'
+import store from '@/store'
 
 export default {
   name: 'ContestList',
@@ -101,6 +68,7 @@ export default {
   async beforeRouteEnter (to, from, next) {
     try {
       const res = await api.getContestList(0, 20)
+      store.dispatch('getGroupList')
       next((vm) => {
         vm.contests = res.data.data.results
         vm.total = res.data.data.total
@@ -130,7 +98,10 @@ export default {
         rule_type: ''
       },
       rows: '',
-      contests: [],
+      contestsRegisterNow: [],
+      contestsUpcoming: [],
+      contestsCannotParticipate: [],
+      contestsFinished: [],
       CONTEST_STATUS_REVERSE: CONTEST_STATUS_REVERSE,
       // for password modal use
       cur_contest_id: '',
@@ -155,7 +126,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['changeDomTitle']),
+    ...mapActions(['changeDomTitle', 'getGroupList']),
     async handleRoute (route) {
       await this.$router.push(route)
     },
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index 5f799e1f5..8ed88d072 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -3,6 +3,7 @@ import Vuex from 'vuex'
 import user from './modules/user'
 import contest from './modules/contest'
 import course from './modules/course'
+import group from './modules/group'
 import api from '@oj/api'
 import types from './types'
 
@@ -67,7 +68,8 @@ export default new Vuex.Store({
   modules: {
     user,
     contest,
-    course
+    course,
+    group
   },
   state: rootState,
   getters: rootGetters,
diff --git a/frontend/src/store/modules/group.js b/frontend/src/store/modules/group.js
new file mode 100644
index 000000000..b07c58e36
--- /dev/null
+++ b/frontend/src/store/modules/group.js
@@ -0,0 +1,40 @@
+import types from '../types'
+import api from '@oj/api'
+
+const state = {
+  groups: {
+    admin_groups: [],
+    groups: [],
+    other_groups: []
+  }
+}
+
+const getters = {
+}
+
+const mutations = {
+  [types.CHANGE_GROUP_LIST] (state, payload) {
+    state.groups = payload.groups
+  }
+}
+
+const actions = {
+  async getGroupList ({ commit, rootState }) {
+    try {
+      console.log('call')
+      const res = await api.getGroupList()
+      commit(types.CHANGE_GROUP_LIST, { groups: res.data.data })
+      return res
+    } catch (err) {
+      commit(types.CHANGE_GROUP_LIST, { groups: [] })
+      throw err
+    }
+  }
+}
+
+export default {
+  state,
+  mutations,
+  getters,
+  actions
+}
diff --git a/frontend/src/store/types.js b/frontend/src/store/types.js
index d4afeec77..3a7a1d7fd 100644
--- a/frontend/src/store/types.js
+++ b/frontend/src/store/types.js
@@ -26,5 +26,7 @@ export default keyMirror({
 
   CHANGE_ASSIGNMENT: null,
   CHANGE_ASSIGNMENTLIST: null,
-  CHANGE_ASSIGNMENT_PROBLEMS: null
+  CHANGE_ASSIGNMENT_PROBLEMS: null,
+
+  CHANGE_GROUP_LIST: null
 })

From cbc8f0df04aaea2ec3a98dad578c43b26a1a9842 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sun, 13 Feb 2022 07:27:31 +0000
Subject: [PATCH 17/47] feat: connect contest design change api

---
 backend/group/views/admin.py                  |  3 +-
 frontend/src/pages/admin/api.js               |  3 ++
 .../src/pages/admin/views/contest/Contest.vue | 47 +++++++++++++++++++
 .../pages/oj/views/contest/ContestList.vue    | 32 +++++++++++--
 frontend/src/store/modules/group.js           |  1 -
 5 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/backend/group/views/admin.py b/backend/group/views/admin.py
index ebb7818d4..4e6f5329b 100644
--- a/backend/group/views/admin.py
+++ b/backend/group/views/admin.py
@@ -4,7 +4,8 @@
 from utils.decorators import super_admin_required
 
 # from group.models import Group, GroupMemberJoin
-from group.serializers import GroupRegistrationRequestSerializer, GroupDetailSerializer, CreateGroupSerializer, GroupSummarySerializer, GroupMemberSerializer, GroupMemberJoinSerializer
+from group.serializers import GroupRegistrationRequestSerializer, GroupDetailSerializer, CreateGroupSerializer, GroupSummarySerializer, GroupMemberSerializer, \
+                                GroupMemberJoinSerializer
 from utils.api import APIView, validate_serializer
 
 from ..models import GroupRegistrationRequest, Group, GroupMember, GroupMemberJoin
diff --git a/frontend/src/pages/admin/api.js b/frontend/src/pages/admin/api.js
index 3dcacd8cd..4f86c9695 100644
--- a/frontend/src/pages/admin/api.js
+++ b/frontend/src/pages/admin/api.js
@@ -346,6 +346,9 @@ export default {
   },
   getIPAddress () {
     return ajax('admin/ip_info/', 'get')
+  },
+  getGroupList () {
+    return ajax('admin/group/', 'get')
   }
 }
 
diff --git a/frontend/src/pages/admin/views/contest/Contest.vue b/frontend/src/pages/admin/views/contest/Contest.vue
index 351c93835..7f288972c 100644
--- a/frontend/src/pages/admin/views/contest/Contest.vue
+++ b/frontend/src/pages/admin/views/contest/Contest.vue
@@ -247,6 +247,17 @@
             </b-form-checkbox>
           </b-form-group>
         </b-col>
+        <b-col>
+          <b-form-group>
+            <template #label>
+              <p class="labels">
+                Allowed Groups
+              </p>
+            </template>
+            <b-form-select v-model="contest.allowed_groups" :options="groupOptions" multiple :select-size="4" value-field="id" text-field="name">
+            </b-form-select>
+          </b-form-group>
+        </b-col>
         <b-col>
           <b-form-group>
             <template #label>
@@ -324,6 +335,7 @@ export default {
           value: ''
         }]
       },
+      groupOptions: [],
       startTime: '',
       startDate: '',
       endTime: '',
@@ -331,12 +343,15 @@ export default {
     }
   },
   async mounted () {
+    const res = await api.getGroupList()
+    this.groupOptions = res.data.data
     if (this.$route.name === 'edit-contest') {
       this.title = 'Edit Contest'
       this.disableRuleType = true
       try {
         const res = await api.getContest(this.$route.params.contestId)
         const data = res.data.data
+
         const ranges = []
         for (const v of data.allowed_ip_ranges) {
           ranges.push({ value: v })
@@ -345,6 +360,38 @@ export default {
           ranges.push({ value: '' })
         }
         data.allowed_ip_ranges = ranges
+
+        const requirements = []
+        for (const v of data.requirements) {
+          requirements.push({ value: v })
+        }
+        if (requirements.length === 0) {
+          requirements.push({ value: '' })
+        }
+        data.requirements = requirements
+
+        const constraints = []
+        for (const v of data.constraints) {
+          constraints.push({ value: v })
+        }
+        if (constraints.length === 0) {
+          constraints.push({ value: '' })
+        }
+        data.constraints = constraints
+
+        const prizes = []
+        for (const v of data.prizes) {
+          prizes.push({
+            color: v.color,
+            name: v.name,
+            reward: v.reward
+          })
+        }
+        if (prizes.length === 0) {
+          prizes.push({ value: '' })
+        }
+        data.prizes = prizes
+
         this.contest = data
         this.initTime()
       } catch (err) {
diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index 4fb267302..43ad4118e 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -8,14 +8,14 @@
       <div class="description">Compete with schoolmates & win the prizes!</div>
     </div>
     <div class="contest-list-container font-bold">
-      <h4 class="subtitle-blue">
+      <!-- <h4 class="subtitle-blue">
         Enter >>
       </h4>
       <neon-box color="#8DC63F" :shadow="true" class="my-3" @click.native="$bvModal.show('modal-contest-information')">
         <template #overlay-icon>
           <div id="triangle-right"></div>
         </template>
-      </neon-box>
+      </neon-box> -->
       <h4 class="subtitle-blue">
         Register Now >>
       </h4>
@@ -24,7 +24,6 @@
           <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>
       </neon-box>
-      <neon-box color="#8DC63F" class="my-3"></neon-box>
       <h4 class="subtitle-blue">
         Upcoming Contests >>
       </h4>
@@ -68,7 +67,7 @@ export default {
   async beforeRouteEnter (to, from, next) {
     try {
       const res = await api.getContestList(0, 20)
-      store.dispatch('getGroupList')
+      await store.dispatch('getGroupList')
       next((vm) => {
         vm.contests = res.data.data.results
         vm.total = res.data.data.total
@@ -77,6 +76,29 @@ export default {
       next()
     }
   },
+  created () {
+    this.group_as_member = [...this.$store.state.group.groups.admin_groups, ...this.$store.state.group.groups.groups]
+    function partition (array, filter) {
+      const pass = []
+      const fail = []
+      array.forEach((e, idx, arr) => (filter(e, idx, arr) ? pass : fail).push(e))
+      return [pass, fail]
+    }
+    const [finished, b] = partition(this.contests, contest => contest.status === CONTEST_STATUS.ENDED)
+    this.contestsFinished = finished
+    const [canParticipate, c] = partition(b, contest => {
+      for (const allowedGroup of contest.allowed_groups) {
+        if (allowedGroup.id in this.group_as_member) {
+          return true
+        }
+      }
+      return false
+    })
+    this.contestsCannotParticipate = c
+    const [registerNow, contestsUpcoming] = partition(canParticipate, contest => contest.status === CONTEST_STATUS.UNDERWAY)
+    this.contestsRegisterNow = registerNow
+    this.contestsUpcoming = contestsUpcoming
+  },
   components: {
     NeonBox,
     ContestInformation
@@ -91,13 +113,13 @@ export default {
       currentPage: 1,
       CONTEST_STATUS: CONTEST_STATUS,
       route_name: '',
-      contestID: '',
       query: {
         status: '',
         keyword: '',
         rule_type: ''
       },
       rows: '',
+      contests: [],
       contestsRegisterNow: [],
       contestsUpcoming: [],
       contestsCannotParticipate: [],
diff --git a/frontend/src/store/modules/group.js b/frontend/src/store/modules/group.js
index b07c58e36..1a0892b95 100644
--- a/frontend/src/store/modules/group.js
+++ b/frontend/src/store/modules/group.js
@@ -21,7 +21,6 @@ const mutations = {
 const actions = {
   async getGroupList ({ commit, rootState }) {
     try {
-      console.log('call')
       const res = await api.getGroupList()
       commit(types.CHANGE_GROUP_LIST, { groups: res.data.data })
       return res

From e7544357d14fac93182cbabf0db16bdfa74870d9 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sun, 13 Feb 2022 17:03:47 +0000
Subject: [PATCH 18/47] feat: neonbox can get contents as props

---
 frontend/src/pages/oj/components/NeonBox.vue | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/oj/components/NeonBox.vue b/frontend/src/pages/oj/components/NeonBox.vue
index 36a016648..265c60578 100644
--- a/frontend/src/pages/oj/components/NeonBox.vue
+++ b/frontend/src/pages/oj/components/NeonBox.vue
@@ -9,12 +9,12 @@
       <img class="logo" src="@/assets/Cup.png">
       <div class="contest-information-flex-col">
         <div class="contest-information-flex-row">
-          <div class="contest-information-big">2021 Spring SKKU 프로그래밍 대회 - 참여중 대회</div>
-          <div class="contest-information-big">#참여</div>
+          <div class="contest-information-big">{{ leftTop }}</div>
+          <div class="contest-information-big">{{ rightTop }}</div>
         </div>
         <div class="contest-information-flex-row">
-          <div class="contest-information-small">For SKKU Undergraduate</div>
-          <div class="contest-information-small">Started Before 00:07:05 </div>
+          <div class="contest-information-small">{{ leftBottom }}</div>
+          <div class="contest-information-small">{{ rightBottom }} </div>
         </div>
       </div>
     </div>
@@ -32,6 +32,18 @@ export default {
     },
     shadow: {
       type: Boolean
+    },
+    leftTop: {
+      type: String
+    },
+    rightTop: {
+      type: String
+    },
+    leftBottom: {
+      type: String
+    },
+    rightBottom: {
+      type: String
     }
   },
   data () {

From c6bc9d77f330b7462ceef54d78860075198e9db2 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sun, 13 Feb 2022 17:06:24 +0000
Subject: [PATCH 19/47] feat: contestlist api return participants count

---
 backend/contest/serializers.py | 2 ++
 backend/contest/views/oj.py    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/contest/serializers.py b/backend/contest/serializers.py
index b67117756..509ea735f 100644
--- a/backend/contest/serializers.py
+++ b/backend/contest/serializers.py
@@ -57,6 +57,8 @@ class Meta:
 
 
 class ContestSerializer(ContestAdminSerializer):
+    participants_count = serializers.IntegerField(required=False)
+
     class Meta:
         model = Contest
         exclude = ("password", "visible", "allowed_ip_ranges")
diff --git a/backend/contest/views/oj.py b/backend/contest/views/oj.py
index 9e82647e8..8eff584ca 100644
--- a/backend/contest/views/oj.py
+++ b/backend/contest/views/oj.py
@@ -1,5 +1,6 @@
 from django.utils.timezone import now
 from django.core.cache import cache
+from django.db.models import Count
 from drf_yasg.utils import swagger_auto_schema
 from drf_yasg import openapi
 
@@ -113,7 +114,7 @@ class ContestListAPI(APIView):
         operation_description="Get contest list from <`offset`> to <`offset`+`limit`>",
     )
     def get(self, request):
-        contests = Contest.objects.select_related("created_by").filter(visible=True)
+        contests = Contest.objects.select_related("created_by").filter(visible=True).annotate(participants_count=Count("acmcontestrank"))
         keyword = request.GET.get("keyword")
         rule_type = request.GET.get("rule_type")
         status = request.GET.get("status")

From 50ab26bd1aa04906b5ce841e42a0076b85b366a1 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sun, 13 Feb 2022 17:09:17 +0000
Subject: [PATCH 20/47] feat: contest list api connection

---
 .../pages/oj/views/contest/ContestList.vue    | 56 +++++++++++++++----
 1 file changed, 46 insertions(+), 10 deletions(-)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index 43ad4118e..f5b60bce6 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -16,36 +16,61 @@
           <div id="triangle-right"></div>
         </template>
       </neon-box> -->
-      <h4 class="subtitle-blue">
+      <h4 class="subtitle-blue" v-if="contestsRegisterNow.length">
         Register Now >>
       </h4>
-      <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsRegisterNow" :key="index">
+      <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsRegisterNow" :key="index"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count"
+                @click.native="goContest(contest)">
         <template #overlay-icon>
-          <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
+          <div id="triangle-right"></div>
         </template>
       </neon-box>
-      <h4 class="subtitle-blue">
+      <h4 class="subtitle-blue" v-if="contestsUpcoming.length">
         Upcoming Contests >>
       </h4>
-      <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUpcoming" :key="index">
+      <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUpcoming" :key="index"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count"
+                @click.native="showContestInformationModal(contest)">
+        <template #overlay-icon>
+          <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
+        </template>
       </neon-box>
-      <h4 class="subtitle-red">
+      <h4 class="subtitle-red" v-if="contestsCannotParticipate.length">
         Cannot Participate
         <button class="subtitle-toggle" @click="showCannotParticipate = !showCannotParticipate">
           <b-icon :icon="showCannotParticipate ? 'caret-up-fill':'caret-down-fill'" color="#FF6663"></b-icon>
         </button>
       </h4>
-      <neon-box v-show="showCannotParticipate" v-for="(contest, index) in contestsCannotParticipate" :key="index" color="#FF6663" :shadow="true" class="my-3"></neon-box>
+      <neon-box v-show="showCannotParticipate" v-for="(contest, index) in contestsCannotParticipate"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count"
+                :key="index" color="#FF6663" :shadow="true" class="my-3" @click.native="showContestInformationModal(contest)">
+        <template #overlay-icon>
+          <b-icon-zoom-in color="#FF6663" width="1.5em" height="1.5em"></b-icon-zoom-in>
+        </template>
+      </neon-box>
       <h4 class="subtitle-red">
         Finished Contests
         <button class="subtitle-toggle" @click="showFinishedContests = !showFinishedContests">
           <b-icon :icon="showFinishedContests ? 'caret-up-fill':'caret-down-fill'" color="#FF6663"></b-icon>
         </button>
       </h4>
-      <neon-box v-show="showFinishedContests" v-for="(contest, index) in contestsFinished" :key="index" color="#FF6663" class="my-3"></neon-box>
+      <neon-box v-show="showFinishedContests" v-for="(contest, index) in contestsFinished"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count"
+                :key="index" color="#FF6663" class="my-3" @click.native="showContestInformationModal(contest)">
+        <template #overlay-icon>
+          <b-icon-zoom-in color="#FF6663" width="1.5em" height="1.5em"></b-icon-zoom-in>
+        </template>
+      </neon-box>
     </div>
     <b-modal id="modal-contest-information" size="xl">
-      <contest-information></contest-information>
+      <contest-information
+        :title="contestInformation.title" :requirements="contestInformation.requirements"
+        :constraints="contestInformation.constraints" :scoring="contestInformation.scoring"
+        :prizes="contestInformation.prizes" :description="contestInformation.description"
+        @goContest="goContest(contestInformation)"
+      >
+      </contest-information>
     </b-modal>
   </div>
 </template>
@@ -76,7 +101,7 @@ export default {
       next()
     }
   },
-  created () {
+  mounted () {
     this.group_as_member = [...this.$store.state.group.groups.admin_groups, ...this.$store.state.group.groups.groups]
     function partition (array, filter) {
       const pass = []
@@ -87,6 +112,9 @@ export default {
     const [finished, b] = partition(this.contests, contest => contest.status === CONTEST_STATUS.ENDED)
     this.contestsFinished = finished
     const [canParticipate, c] = partition(b, contest => {
+      if (!contest.allowed_groups.length) {
+        return true
+      }
       for (const allowedGroup of contest.allowed_groups) {
         if (allowedGroup.id in this.group_as_member) {
           return true
@@ -124,6 +152,7 @@ export default {
       contestsUpcoming: [],
       contestsCannotParticipate: [],
       contestsFinished: [],
+      contestInformation: {},
       CONTEST_STATUS_REVERSE: CONTEST_STATUS_REVERSE,
       // for password modal use
       cur_contest_id: '',
@@ -200,6 +229,13 @@ export default {
         name: CONTEST_STATUS_REVERSE[value].name,
         color: CONTEST_STATUS_REVERSE[value].color
       }
+    },
+    showContestInformationModal (contest) {
+      this.contestInformation = contest
+      this.$bvModal.show('modal-contest-information')
+    },
+    makeGroupRequirementInfo (contest) {
+      return 'For ' + (contest.allowed_groups.map(g => g.name).join(', ') || 'All')
     }
   },
   computed: {

From 9e2161c60005b4024be8a8435d65ed6eb69a02cc Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sun, 13 Feb 2022 17:10:51 +0000
Subject: [PATCH 21/47] fix: check_contest_perm. inspect group permission

check_contest_permission decorator now inspects group permission
correctly
---
 backend/utils/decorators.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/utils/decorators.py b/backend/utils/decorators.py
index 5fab9a8d8..19e063f95 100644
--- a/backend/utils/decorators.py
+++ b/backend/utils/decorators.py
@@ -133,8 +133,9 @@ def _check_permission(*args, **kwargs):
                 return self.error("Contest has not started yet.")
 
             # allowed_groups exist and member doesn't belong to any group, error
-            if self.contest.allowed_groups.count() and not self.contest.allowed_groups.filter(members__in=user).exists():
-                return self.error("You are not a member of the group allowed to this contest")
+            if self.contest.allowed_groups.count() and not self.contest.allowed_groups.filter(members=user).exists():
+                if check_type == "ranks" or check_type == "submissions" or check_type == 'problems':
+                    return self.error("You are not a member of the group allowed to this contest")
 
             # check does user have permission to get ranks, submissions in OI Contest
             if self.contest.status == ContestStatus.CONTEST_UNDERWAY and self.contest.rule_type == ContestRuleType.OI:

From cc7872ab1a0ed17ef305fe81112f795a7bbe4086 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sun, 13 Feb 2022 17:11:50 +0000
Subject: [PATCH 22/47] fix: allowed_group not fetched issue

- contest edit/create now fetches allowed_group in correct structure
---
 frontend/src/pages/admin/views/contest/Contest.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/pages/admin/views/contest/Contest.vue b/frontend/src/pages/admin/views/contest/Contest.vue
index 7f288972c..618260e1f 100644
--- a/frontend/src/pages/admin/views/contest/Contest.vue
+++ b/frontend/src/pages/admin/views/contest/Contest.vue
@@ -392,6 +392,11 @@ export default {
         }
         data.prizes = prizes
 
+        const allowedGroups = []
+        for (const v of data.allowed_groups) {
+          allowedGroups.push(v.id)
+        }
+        data.allowed_groups = allowedGroups
         this.contest = data
         this.initTime()
       } catch (err) {

From aaa60b728a6204d4b8b7e02d5ccdf4ef11c2a02b Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sun, 13 Feb 2022 17:12:10 +0000
Subject: [PATCH 23/47] feat: temp button to go contest

---
 frontend/src/pages/oj/components/ContestInformation.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/pages/oj/components/ContestInformation.vue b/frontend/src/pages/oj/components/ContestInformation.vue
index fddf80040..2ce042083 100644
--- a/frontend/src/pages/oj/components/ContestInformation.vue
+++ b/frontend/src/pages/oj/components/ContestInformation.vue
@@ -37,6 +37,7 @@
       <h3 class="subtitle">Description</h3>
       <div class="description" v-dompurify-html="description"></div>
     </div>
+    <button @click="$emit('goContest')">Go Contest</button>
   </div>
 </template>
 

From b0b2d91a96f722056e1b129d2c1ac5845ef95614 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Mon, 14 Feb 2022 16:17:52 +0000
Subject: [PATCH 24/47] fix: merge conflict resolve

---
 frontend/src/pages/oj/views/contest/ContestList.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index f5b60bce6..c949a2603 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -87,8 +87,6 @@ import store from '@/store'
 
 export default {
   name: 'ContestList',
-  components: {
-  },
   async beforeRouteEnter (to, from, next) {
     try {
       const res = await api.getContestList(0, 20)

From 5b93a9c8f8c85ab56ebad126e3a953027fefaf5f Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Mon, 14 Feb 2022 16:51:02 +0000
Subject: [PATCH 25/47] fix: apply tailwindcss default header size

---
 .../pages/oj/views/contest/ContestList.vue    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index c949a2603..39662360b 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
     <div class="page-top">
-      <h2>
+      <h2 class="text-3xl">
         <span class="title-white">🏆 SKKU Coding Platform</span>
         <span class="title-gold"> Contests</span>
       </h2>
-      <div class="description">Compete with schoolmates & win the prizes!</div>
+      <div class="description text-xl">Compete with schoolmates & win the prizes!</div>
     </div>
     <div class="contest-list-container font-bold">
       <!-- <h4 class="subtitle-blue">
@@ -16,7 +16,7 @@
           <div id="triangle-right"></div>
         </template>
       </neon-box> -->
-      <h4 class="subtitle-blue" v-if="contestsRegisterNow.length">
+      <h4 class="subtitle-blue text-xl" v-if="contestsRegisterNow.length">
         Register Now >>
       </h4>
       <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsRegisterNow" :key="index"
@@ -26,7 +26,7 @@
           <div id="triangle-right"></div>
         </template>
       </neon-box>
-      <h4 class="subtitle-blue" v-if="contestsUpcoming.length">
+      <h4 class="subtitle-blue text-xl" v-if="contestsUpcoming.length">
         Upcoming Contests >>
       </h4>
       <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUpcoming" :key="index"
@@ -36,7 +36,7 @@
           <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>
       </neon-box>
-      <h4 class="subtitle-red" v-if="contestsCannotParticipate.length">
+      <h4 class="subtitle-red text-xl" v-if="contestsCannotParticipate.length">
         Cannot Participate
         <button class="subtitle-toggle" @click="showCannotParticipate = !showCannotParticipate">
           <b-icon :icon="showCannotParticipate ? 'caret-up-fill':'caret-down-fill'" color="#FF6663"></b-icon>
@@ -49,7 +49,7 @@
           <b-icon-zoom-in color="#FF6663" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>
       </neon-box>
-      <h4 class="subtitle-red">
+      <h4 class="subtitle-red text-xl">
         Finished Contests
         <button class="subtitle-toggle" @click="showFinishedContests = !showFinishedContests">
           <b-icon :icon="showFinishedContests ? 'caret-up-fill':'caret-down-fill'" color="#FF6663"></b-icon>
@@ -63,7 +63,7 @@
         </template>
       </neon-box>
     </div>
-    <b-modal id="modal-contest-information" size="xl">
+    <modal id="modal-contest-information" width="xl">
       <contest-information
         :title="contestInformation.title" :requirements="contestInformation.requirements"
         :constraints="contestInformation.constraints" :scoring="contestInformation.scoring"
@@ -71,7 +71,7 @@
         @goContest="goContest(contestInformation)"
       >
       </contest-information>
-    </b-modal>
+    </modal>
   </div>
 </template>
 
@@ -84,6 +84,7 @@ import { CONTEST_STATUS_REVERSE, CONTEST_TYPE, CONTEST_STATUS } from '@/utils/co
 import NeonBox from '@oj/components/NeonBox.vue'
 import ContestInformation from '@oj/components/ContestInformation.vue'
 import store from '@/store'
+import Modal from '../../components/Modal.vue'
 
 export default {
   name: 'ContestList',
@@ -127,7 +128,8 @@ export default {
   },
   components: {
     NeonBox,
-    ContestInformation
+    ContestInformation,
+    Modal
   },
   data () {
     return {

From 13be155591bd0a80df20ff82514c152d5c9c8455 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Mon, 14 Feb 2022 17:17:39 +0000
Subject: [PATCH 26/47] use b-modal temporarily

---
 .../src/pages/oj/components/ContestInformation.vue   |  2 +-
 frontend/src/pages/oj/views/contest/ContestList.vue  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/pages/oj/components/ContestInformation.vue b/frontend/src/pages/oj/components/ContestInformation.vue
index 2ce042083..572331688 100644
--- a/frontend/src/pages/oj/components/ContestInformation.vue
+++ b/frontend/src/pages/oj/components/ContestInformation.vue
@@ -37,7 +37,6 @@
       <h3 class="subtitle">Description</h3>
       <div class="description" v-dompurify-html="description"></div>
     </div>
-    <button @click="$emit('goContest')">Go Contest</button>
   </div>
 </template>
 
@@ -210,5 +209,6 @@ export default {
   }
   .subtitle {
     font-size: 1.5rem;
+    margin-bottom: 1rem;
   }
 </style>
diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index 39662360b..56d6370cb 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -63,15 +63,17 @@
         </template>
       </neon-box>
     </div>
-    <modal id="modal-contest-information" width="xl">
+    <b-modal id="modal-contest-information" size="xl">
       <contest-information
         :title="contestInformation.title" :requirements="contestInformation.requirements"
         :constraints="contestInformation.constraints" :scoring="contestInformation.scoring"
         :prizes="contestInformation.prizes" :description="contestInformation.description"
-        @goContest="goContest(contestInformation)"
       >
       </contest-information>
-    </modal>
+      <template #modal-footer>
+        <b-button @click="goContest(contestInformation)">Go Contest</b-button>
+      </template>
+    </b-modal>
   </div>
 </template>
 
@@ -84,7 +86,6 @@ import { CONTEST_STATUS_REVERSE, CONTEST_TYPE, CONTEST_STATUS } from '@/utils/co
 import NeonBox from '@oj/components/NeonBox.vue'
 import ContestInformation from '@oj/components/ContestInformation.vue'
 import store from '@/store'
-import Modal from '../../components/Modal.vue'
 
 export default {
   name: 'ContestList',
@@ -128,8 +129,7 @@ export default {
   },
   components: {
     NeonBox,
-    ContestInformation,
-    Modal
+    ContestInformation
   },
   data () {
     return {

From 12866c7716a1519d140064a95993489f83facbdb Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Tue, 15 Feb 2022 05:07:40 +0000
Subject: [PATCH 27/47] feat: contestList neonbox righttop shows contest
 participants

---
 frontend/src/pages/oj/components/NeonBox.vue       |  5 ++++-
 .../src/pages/oj/views/contest/ContestList.vue     | 14 +++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frontend/src/pages/oj/components/NeonBox.vue b/frontend/src/pages/oj/components/NeonBox.vue
index 265c60578..6ce0035fe 100644
--- a/frontend/src/pages/oj/components/NeonBox.vue
+++ b/frontend/src/pages/oj/components/NeonBox.vue
@@ -10,7 +10,7 @@
       <div class="contest-information-flex-col">
         <div class="contest-information-flex-row">
           <div class="contest-information-big">{{ leftTop }}</div>
-          <div class="contest-information-big">{{ rightTop }}</div>
+          <div class="contest-information-big"><icon :icon="rightTopIcon" class="mr-2"/>{{ rightTop }}</div>
         </div>
         <div class="contest-information-flex-row">
           <div class="contest-information-small">{{ leftBottom }}</div>
@@ -44,6 +44,9 @@ export default {
     },
     rightBottom: {
       type: String
+    },
+    rightTopIcon: {
+      type: String
     }
   },
   data () {
diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index 56d6370cb..470db433f 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -20,17 +20,17 @@
         Register Now >>
       </h4>
       <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsRegisterNow" :key="index"
-                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count"
-                @click.native="goContest(contest)">
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count" rightTopIcon="users"
+                @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
-          <div id="triangle-right"></div>
+          <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>
       </neon-box>
       <h4 class="subtitle-blue text-xl" v-if="contestsUpcoming.length">
         Upcoming Contests >>
       </h4>
       <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUpcoming" :key="index"
-                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count" rightTopIcon="users"
                 @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
@@ -43,7 +43,7 @@
         </button>
       </h4>
       <neon-box v-show="showCannotParticipate" v-for="(contest, index) in contestsCannotParticipate"
-                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count" rightTopIcon="users"
                 :key="index" color="#FF6663" :shadow="true" class="my-3" @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#FF6663" width="1.5em" height="1.5em"></b-icon-zoom-in>
@@ -56,8 +56,8 @@
         </button>
       </h4>
       <neon-box v-show="showFinishedContests" v-for="(contest, index) in contestsFinished"
-                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count"
-                :key="index" color="#FF6663" class="my-3" @click.native="showContestInformationModal(contest)">
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count" rightTopIcon="users"
+                :key="index" color="#FF6663" class="my-3" @click.native="goContest(contestInformation)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#FF6663" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>

From 992be702a2f54fc5154a7ae0b77ab041d1395020 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Tue, 15 Feb 2022 05:13:48 +0000
Subject: [PATCH 28/47] fix: make header bg-white

---
 frontend/src/pages/oj/components/Header.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/oj/components/Header.vue b/frontend/src/pages/oj/components/Header.vue
index 61ad0ff39..2a7aa120b 100644
--- a/frontend/src/pages/oj/components/Header.vue
+++ b/frontend/src/pages/oj/components/Header.vue
@@ -1,5 +1,5 @@
 <template>
-  <nav class="flex justify-between items-center px-5 py-3 font-medium content-center sticky top-0 z-50">
+  <nav class="flex justify-between items-center px-5 py-3 font-medium content-center sticky top-0 z-50 bg-white opacity-95">
     <a href="/">
         <img
             src="@/assets/logos/signature.png"

From 0dcf33929f6b559ceed81f59475aa44bc3469322 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Tue, 15 Feb 2022 06:39:35 +0000
Subject: [PATCH 29/47] Neonbox hover design change

---
 frontend/src/pages/oj/components/NeonBox.vue        | 5 ++---
 frontend/src/pages/oj/views/contest/ContestList.vue | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/oj/components/NeonBox.vue b/frontend/src/pages/oj/components/NeonBox.vue
index 6ce0035fe..dd99e792f 100644
--- a/frontend/src/pages/oj/components/NeonBox.vue
+++ b/frontend/src/pages/oj/components/NeonBox.vue
@@ -95,8 +95,8 @@ export default {
         margin: auto 10px;
         background: white;
         border-radius: 50%;
-        border: var(--main-color) 1px solid;
-        box-shadow: 0px 0px var(--shadow) var(--main-color);
+        // border: var(--main-color) 1px solid;
+        // box-shadow: 0px 0px var(--shadow) var(--main-color);
         display: flex;
         align-items: center;
         justify-content: center;
@@ -126,7 +126,6 @@ export default {
           .contest-information-big {
             color: #173747;
             font-size: 1.2rem;
-            font-weight: bold;
             white-space: nowrap;
           }
           .contest-information-small {
diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index 470db433f..786a8068f 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -7,13 +7,13 @@
       </h2>
       <div class="description text-xl">Compete with schoolmates & win the prizes!</div>
     </div>
-    <div class="contest-list-container font-bold">
+    <div class="contest-list-container">
       <!-- <h4 class="subtitle-blue">
         Enter >>
       </h4>
       <neon-box color="#8DC63F" :shadow="true" class="my-3" @click.native="$bvModal.show('modal-contest-information')">
         <template #overlay-icon>
-          <div id="triangle-right"></div>
+          <icon icon="arrow-right"></icon>
         </template>
       </neon-box> -->
       <h4 class="subtitle-blue text-xl" v-if="contestsRegisterNow.length">

From 2f2ffc102f92121cc53d9df5ead1016c021a4d45 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Tue, 15 Feb 2022 07:22:38 +0000
Subject: [PATCH 30/47] show contest status in contestlist

---
 .../pages/oj/views/contest/ContestList.vue    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index 786a8068f..1b285fea1 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -8,20 +8,12 @@
       <div class="description text-xl">Compete with schoolmates & win the prizes!</div>
     </div>
     <div class="contest-list-container">
-      <!-- <h4 class="subtitle-blue">
-        Enter >>
-      </h4>
-      <neon-box color="#8DC63F" :shadow="true" class="my-3" @click.native="$bvModal.show('modal-contest-information')">
-        <template #overlay-icon>
-          <icon icon="arrow-right"></icon>
-        </template>
-      </neon-box> -->
       <h4 class="subtitle-blue text-xl" v-if="contestsRegisterNow.length">
         Register Now >>
       </h4>
       <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsRegisterNow" :key="index"
-                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count" rightTopIcon="users"
-                @click.native="showContestInformationModal(contest)">
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
+                :shadow="true" @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>
@@ -30,7 +22,7 @@
         Upcoming Contests >>
       </h4>
       <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUpcoming" :key="index"
-                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count" rightTopIcon="users"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
                 @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
@@ -43,7 +35,7 @@
         </button>
       </h4>
       <neon-box v-show="showCannotParticipate" v-for="(contest, index) in contestsCannotParticipate"
-                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count" rightTopIcon="users"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
                 :key="index" color="#FF6663" :shadow="true" class="my-3" @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#FF6663" width="1.5em" height="1.5em"></b-icon-zoom-in>
@@ -56,7 +48,7 @@
         </button>
       </h4>
       <neon-box v-show="showFinishedContests" v-for="(contest, index) in contestsFinished"
-                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started Before'" :rightTop="contest.participants_count" rightTopIcon="users"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
                 :key="index" color="#FF6663" class="my-3" @click.native="goContest(contestInformation)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#FF6663" width="1.5em" height="1.5em"></b-icon-zoom-in>
@@ -236,6 +228,15 @@ export default {
     },
     makeGroupRequirementInfo (contest) {
       return 'For ' + (contest.allowed_groups.map(g => g.name).join(', ') || 'All')
+    },
+    makeStartTimeInfo (contest) {
+      if (contest.status === CONTEST_STATUS.UNDERWAY) {
+        return 'Underway'
+      } else if (contest.status === CONTEST_STATUS.NOT_START) {
+        return 'Not Started'
+      } else {
+        return 'Ended'
+      }
     }
   },
   computed: {

From 1c520a33696ead1bef062a974a770b4c800006c9 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Tue, 15 Feb 2022 11:40:30 +0000
Subject: [PATCH 31/47] Comment todo (enter now)

---
 frontend/src/pages/oj/views/contest/ContestList.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index 1b285fea1..c95f48556 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -8,6 +8,14 @@
       <div class="description text-xl">Compete with schoolmates & win the prizes!</div>
     </div>
     <div class="contest-list-container">
+      <!-- <h4 class="subtitle-blue">
+        Enter >>
+      </h4>
+      <neon-box color="#8DC63F" :shadow="true" class="my-3" @click.native="$bvModal.show('modal-contest-information')">
+        <template #overlay-icon>
+          <icon icon="arrow-right"></icon>
+        </template>
+      </neon-box> -->
       <h4 class="subtitle-blue text-xl" v-if="contestsRegisterNow.length">
         Register Now >>
       </h4>
@@ -115,8 +123,9 @@ export default {
       return false
     })
     this.contestsCannotParticipate = c
-    const [registerNow, contestsUpcoming] = partition(canParticipate, contest => contest.status === CONTEST_STATUS.UNDERWAY)
-    this.contestsRegisterNow = registerNow
+    const [contestsUnderway, contestsUpcoming] = partition(canParticipate, contest => contest.status === CONTEST_STATUS.UNDERWAY)
+    this.contestsRegisterNow = contestsUnderway
+    // TODO: filter contestsUnderway into contestsRegisterNow, contestsEnter(contests user already participating)
     this.contestsUpcoming = contestsUpcoming
   },
   components: {

From 79b49bbd19e37288c2ebe58899bb1de1da958a7d Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Thu, 17 Feb 2022 03:10:25 +0000
Subject: [PATCH 32/47] fix: contests list structure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- contest list 구조를 Enter / register now / upcoming contests
/ finished contests / cannot participate 에서
active contests, upcoming contests, finished contests로 바꾸고
group permission을 검사하여 색으로 참여 가능여부를 알려주도록 한다.
---
 .../pages/oj/views/contest/ContestList.vue    | 181 ++++++++++++------
 frontend/src/store/modules/group.js           |   3 +
 2 files changed, 127 insertions(+), 57 deletions(-)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index c95f48556..68ee0950b 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -8,25 +8,25 @@
       <div class="description text-xl">Compete with schoolmates & win the prizes!</div>
     </div>
     <div class="contest-list-container">
-      <!-- <h4 class="subtitle-blue">
-        Enter >>
+      <h4 class="subtitle-blue text-xl" v-if="contestsUnderway.length || contestsUnderwayNoPermission.length">
+        Active Contests >>
       </h4>
-      <neon-box color="#8DC63F" :shadow="true" class="my-3" @click.native="$bvModal.show('modal-contest-information')">
-        <template #overlay-icon>
-          <icon icon="arrow-right"></icon>
-        </template>
-      </neon-box> -->
-      <h4 class="subtitle-blue text-xl" v-if="contestsRegisterNow.length">
-        Register Now >>
-      </h4>
-      <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsRegisterNow" :key="index"
+      <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUnderway" :key="index"
                 :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
                 :shadow="true" @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>
       </neon-box>
-      <h4 class="subtitle-blue text-xl" v-if="contestsUpcoming.length">
+      <neon-box color="#B4B4B4" v-for="(contest, index) in contestsUnderwayNoPermission"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
+                :key="index"  :shadow="true" class="my-3" @click.native="showContestInformationModal(contest)">
+        <template #overlay-icon>
+          <b-icon-zoom-in color="#B4B4B4" width="1.5em" height="1.5em"></b-icon-zoom-in>
+        </template>
+      </neon-box>
+      <button v-if="contestsUnderwayRendered < contestsUnderwayTotal" @click="loadMoreContests(CONTEST_STATUS.UNDERWAY)">Load More..</button>
+      <h4 class="subtitle-blue text-xl" v-if="contestsUpcoming.length || contestsUpcomingNoPermission.length">
         Upcoming Contests >>
       </h4>
       <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUpcoming" :key="index"
@@ -36,19 +36,14 @@
           <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>
       </neon-box>
-      <h4 class="subtitle-red text-xl" v-if="contestsCannotParticipate.length">
-        Cannot Participate
-        <button class="subtitle-toggle" @click="showCannotParticipate = !showCannotParticipate">
-          <b-icon :icon="showCannotParticipate ? 'caret-up-fill':'caret-down-fill'" color="#FF6663"></b-icon>
-        </button>
-      </h4>
-      <neon-box v-show="showCannotParticipate" v-for="(contest, index) in contestsCannotParticipate"
+      <neon-box v-for="(contest, index) in contestsUpcomingNoPermission"
                 :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
-                :key="index" color="#FF6663" :shadow="true" class="my-3" @click.native="showContestInformationModal(contest)">
+                :key="index" color="#B4B4B4" class="my-3" @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
-          <b-icon-zoom-in color="#FF6663" width="1.5em" height="1.5em"></b-icon-zoom-in>
+          <b-icon-zoom-in color="#B4B4B4" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>
       </neon-box>
+      <button v-if="contestsUpcomingRendered < contestsUpcomingTotal" @click="loadMoreContests(CONTEST_STATUS.NOT_START)">Load More..</button>
       <h4 class="subtitle-red text-xl">
         Finished Contests
         <button class="subtitle-toggle" @click="showFinishedContests = !showFinishedContests">
@@ -91,42 +86,36 @@ export default {
   name: 'ContestList',
   async beforeRouteEnter (to, from, next) {
     try {
-      const res = await api.getContestList(0, 20)
-      await store.dispatch('getGroupList')
+      const res = await api.getContestList(0, 30, {
+        status: CONTEST_STATUS.UNDERWAY
+      })
+      const res2 = await api.getContestList(0, 30, {
+        status: CONTEST_STATUS.NOT_START
+      })
+      const res3 = await api.getContestList(0, 20, {
+        status: CONTEST_STATUS.ENDED
+      })
       next((vm) => {
-        vm.contests = res.data.data.results
-        vm.total = res.data.data.total
+        vm.contestsUnderway = res.data.data.results
+        vm.contestsUnderwayRendered = 30
+        vm.contestsUnderwayTotal = res.data.data.total
+
+        vm.contestsUpcoming = res2.data.data.results
+        vm.contestsUpcomingRendered = 30
+        vm.contestsUpcomingTotal = res2.data.data.total
+
+        vm.contestsFinished = res3.data.data.results
+        vm.contestsFinishedRendered = 30
+        vm.contestsFinishedTotal = res3.data.data.total
       })
     } catch (err) {
       next()
     }
   },
-  mounted () {
-    this.group_as_member = [...this.$store.state.group.groups.admin_groups, ...this.$store.state.group.groups.groups]
-    function partition (array, filter) {
-      const pass = []
-      const fail = []
-      array.forEach((e, idx, arr) => (filter(e, idx, arr) ? pass : fail).push(e))
-      return [pass, fail]
+  async mounted () {
+    if (this.isAuthenticated) {
+      this.filterWithGroupPermission()
     }
-    const [finished, b] = partition(this.contests, contest => contest.status === CONTEST_STATUS.ENDED)
-    this.contestsFinished = finished
-    const [canParticipate, c] = partition(b, contest => {
-      if (!contest.allowed_groups.length) {
-        return true
-      }
-      for (const allowedGroup of contest.allowed_groups) {
-        if (allowedGroup.id in this.group_as_member) {
-          return true
-        }
-      }
-      return false
-    })
-    this.contestsCannotParticipate = c
-    const [contestsUnderway, contestsUpcoming] = partition(canParticipate, contest => contest.status === CONTEST_STATUS.UNDERWAY)
-    this.contestsRegisterNow = contestsUnderway
-    // TODO: filter contestsUnderway into contestsRegisterNow, contestsEnter(contests user already participating)
-    this.contestsUpcoming = contestsUpcoming
   },
   components: {
     NeonBox,
@@ -148,11 +137,21 @@ export default {
         rule_type: ''
       },
       rows: '',
-      contests: [],
-      contestsRegisterNow: [],
+      contestsUnderway: [],
+      contestsUnderwayNoPermission: [],
+      contestsUnderwayRendered: 0,
+      contestsUnderwayTotal: 0,
+
       contestsUpcoming: [],
-      contestsCannotParticipate: [],
+      contestsUpcomingNoPermission: [],
+      contestsUpcomingRendered: 0,
+      contestsUpcomingTotal: 0,
+
       contestsFinished: [],
+      contestsFinishedNoPermission: [],
+      contestsFinishedRendered: 0,
+      contestsFinishedTotal: 0,
+
       contestInformation: {},
       CONTEST_STATUS_REVERSE: CONTEST_STATUS_REVERSE,
       // for password modal use
@@ -189,15 +188,82 @@ export default {
       this.query.keyword = route.keyword || ''
       this.page = parseInt(route.page) || 1
       await this.getContestList()
+      await this.filterWithGroupPermission()
     },
     async getContestList () {
       try {
-        const res = await api.getContestList(0, this.limit, this.query)
-        this.contests = res.data.data.results
-        this.total = res.data.data.total
+        const res = await api.getContestList(0, 30, {
+          status: CONTEST_STATUS.UNDERWAY
+        })
+        const res2 = await api.getContestList(0, 30, {
+          status: CONTEST_STATUS.NOT_START
+        })
+        const res3 = await api.getContestList(0, 20, {
+          status: CONTEST_STATUS.ENDED
+        })
+        this.contestsUnderway = res.data.data.results
+        this.contestsUnderwayRendered = 30
+        this.contestsUnderwayTotal = res.data.data.total
+
+        this.contestsUpcoming = res2.data.data.results
+        this.contestsUpcomingRendered = 30
+        this.contestsUpcomingTotal = res2.data.data.total
+
+        this.contestsFinished = res3.data.data.results
+        this.contestsFinishedRendered = 30
+        this.contestsFinishedTotal = res3.data.data.total
       } catch (err) {
       }
     },
+    async filterWithGroupPermission () {
+      await store.dispatch('getGroupList')
+      this.group_as_member = [...this.adminGroups, ...this.groups]
+      function partition (array, filter) {
+        const pass = []
+        const fail = []
+        array.forEach((e, idx, arr) => (filter(e, idx, arr) ? pass : fail).push(e))
+        return [pass, fail]
+      }
+      const [a, b] = partition(this.contestsUnderway, contest => {
+        if (!contest.allowed_groups.length) {
+          return true
+        }
+        for (const allowedGroup of contest.allowed_groups) {
+          if (allowedGroup.id in this.group_as_member) {
+            return true
+          }
+        }
+        return false
+      })
+      this.contestsUnderway = a
+      this.contestsUnderwayNoPermission = b
+
+      const [c, d] = partition(this.contestsUpcoming, contest => {
+        if (!contest.allowed_groups.length) {
+          return true
+        }
+        for (const allowedGroup of contest.allowed_groups) {
+          if (allowedGroup.id in this.group_as_member) {
+            return true
+          }
+        }
+        return false
+      })
+      this.contestsUpcoming = c
+      this.contestsUpcomingNoPermission = d
+    },
+    async loadMoreContests (status) {
+      if (status === CONTEST_STATUS.UNDERWAY) {
+        const res = await api.getContestList(this.contestsUnderwayRendered, 30)
+        this.contestsUnderwayRendered += 30
+        this.contestsUnderway = this.contestsUnderway.concat(res.data.data.results)
+      } else if (status === CONTEST_STATUS.NOT_START) {
+        const res = await api.getContestList(this.contestsUpcoming, 30)
+        this.contestsUpcomingRendered += 30
+        this.contestsUpcoming = this.contestsUpcoming.concat(res.data.data.results)
+      } else {
+      }
+    },
     async changeRoute () {
       const query = Object.assign({}, this.query)
       query.page = this.page
@@ -251,7 +317,8 @@ export default {
   computed: {
     ...mapGetters(
       ['contestMenuDisabled', 'countdown', 'isContestAdmin',
-        'OIContestRealTimePermission', 'passwordFormVisible', 'isAuthenticated']
+        'OIContestRealTimePermission', 'passwordFormVisible', 'isAuthenticated',
+        'groups', 'adminGroups', 'otherGroups']
     ),
     row () {
       return this.contests.length
diff --git a/frontend/src/store/modules/group.js b/frontend/src/store/modules/group.js
index 1a0892b95..6d0c4ef34 100644
--- a/frontend/src/store/modules/group.js
+++ b/frontend/src/store/modules/group.js
@@ -10,6 +10,9 @@ const state = {
 }
 
 const getters = {
+  groups: state => state.groups.groups || [],
+  adminGroups: state => state.groups.admin_groups || [],
+  otherGroups: state => state.groups.other_groups || []
 }
 
 const mutations = {

From a5e8206607ed1625578c62c226e7855a1d5598c8 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Thu, 17 Feb 2022 03:20:41 +0000
Subject: [PATCH 33/47] fix: loadmorecontests call with status

---
 frontend/src/pages/oj/views/contest/ContestList.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index 68ee0950b..d6d99221b 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -13,9 +13,9 @@
       </h4>
       <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUnderway" :key="index"
                 :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
-                :shadow="true" @click.native="showContestInformationModal(contest)">
+                :shadow="true" @click.native="goContest(contest)">
         <template #overlay-icon>
-          <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
+          <icon icon="arrow-right"></icon>
         </template>
       </neon-box>
       <neon-box color="#B4B4B4" v-for="(contest, index) in contestsUnderwayNoPermission"
@@ -254,11 +254,15 @@ export default {
     },
     async loadMoreContests (status) {
       if (status === CONTEST_STATUS.UNDERWAY) {
-        const res = await api.getContestList(this.contestsUnderwayRendered, 30)
+        const res = await api.getContestList(this.contestsUnderwayRendered, 30, {
+          status: CONTEST_STATUS.UNDERWAY
+        })
         this.contestsUnderwayRendered += 30
         this.contestsUnderway = this.contestsUnderway.concat(res.data.data.results)
       } else if (status === CONTEST_STATUS.NOT_START) {
-        const res = await api.getContestList(this.contestsUpcoming, 30)
+        const res = await api.getContestList(this.contestsUpcoming, 30, {
+          status: CONTEST_STATUS.ENDED
+        })
         this.contestsUpcomingRendered += 30
         this.contestsUpcoming = this.contestsUpcoming.concat(res.data.data.results)
       } else {

From 8ecff81e862e933843da368bf2f2e75a741bf0c6 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Thu, 17 Feb 2022 12:02:50 +0000
Subject: [PATCH 34/47] Add Pagination to finishedcontests + adjust api call
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- finished contest list에 페이지네이션 적용
- upcoming contests와 underway contests 부르는 개수 조정
---
 .../pages/oj/views/contest/ContestList.vue    | 51 +++++++++++--------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index d6d99221b..df8195568 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -57,6 +57,13 @@
           <b-icon-zoom-in color="#FF6663" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>
       </neon-box>
+      <b-pagination
+        v-show="showFinishedContests"
+        v-model="currentPage"
+        :per-page="perPage"
+        align="right"
+        :total-rows="contestsFinishedTotal"
+      />
     </div>
     <b-modal id="modal-contest-information" size="xl">
       <contest-information
@@ -86,10 +93,10 @@ export default {
   name: 'ContestList',
   async beforeRouteEnter (to, from, next) {
     try {
-      const res = await api.getContestList(0, 30, {
+      const res = await api.getContestList(0, 10, {
         status: CONTEST_STATUS.UNDERWAY
       })
-      const res2 = await api.getContestList(0, 30, {
+      const res2 = await api.getContestList(0, 10, {
         status: CONTEST_STATUS.NOT_START
       })
       const res3 = await api.getContestList(0, 20, {
@@ -97,15 +104,14 @@ export default {
       })
       next((vm) => {
         vm.contestsUnderway = res.data.data.results
-        vm.contestsUnderwayRendered = 30
+        vm.contestsUnderwayRendered = 10
         vm.contestsUnderwayTotal = res.data.data.total
 
         vm.contestsUpcoming = res2.data.data.results
-        vm.contestsUpcomingRendered = 30
+        vm.contestsUpcomingRendered = 10
         vm.contestsUpcomingTotal = res2.data.data.total
 
         vm.contestsFinished = res3.data.data.results
-        vm.contestsFinishedRendered = 30
         vm.contestsFinishedTotal = res3.data.data.total
       })
     } catch (err) {
@@ -125,10 +131,6 @@ export default {
     return {
       showCannotParticipate: false,
       showFinishedContests: false,
-      limit: 20,
-      total: 0,
-      perPage: 5,
-      currentPage: 1,
       CONTEST_STATUS: CONTEST_STATUS,
       route_name: '',
       query: {
@@ -149,8 +151,9 @@ export default {
 
       contestsFinished: [],
       contestsFinishedNoPermission: [],
-      contestsFinishedRendered: 0,
       contestsFinishedTotal: 0,
+      perPage: 20,
+      currentPage: 1,
 
       contestInformation: {},
       CONTEST_STATUS_REVERSE: CONTEST_STATUS_REVERSE,
@@ -192,29 +195,35 @@ export default {
     },
     async getContestList () {
       try {
-        const res = await api.getContestList(0, 30, {
+        const res = await api.getContestList(0, 10, {
           status: CONTEST_STATUS.UNDERWAY
         })
-        const res2 = await api.getContestList(0, 30, {
+        const res2 = await api.getContestList(0, 10, {
           status: CONTEST_STATUS.NOT_START
         })
         const res3 = await api.getContestList(0, 20, {
           status: CONTEST_STATUS.ENDED
         })
         this.contestsUnderway = res.data.data.results
-        this.contestsUnderwayRendered = 30
+        this.contestsUnderwayRendered = 10
         this.contestsUnderwayTotal = res.data.data.total
 
         this.contestsUpcoming = res2.data.data.results
-        this.contestsUpcomingRendered = 30
+        this.contestsUpcomingRendered = 10
         this.contestsUpcomingTotal = res2.data.data.total
 
         this.contestsFinished = res3.data.data.results
-        this.contestsFinishedRendered = 30
         this.contestsFinishedTotal = res3.data.data.total
       } catch (err) {
       }
     },
+    async currentChange (page) {
+      this.currentPage = page
+      const res = await api.getContestList(20 * (page - 1), 20, {
+        status: CONTEST_STATUS.ENDED
+      })
+      this.contestsFinished = res.data.data.results
+    },
     async filterWithGroupPermission () {
       await store.dispatch('getGroupList')
       this.group_as_member = [...this.adminGroups, ...this.groups]
@@ -254,16 +263,16 @@ export default {
     },
     async loadMoreContests (status) {
       if (status === CONTEST_STATUS.UNDERWAY) {
-        const res = await api.getContestList(this.contestsUnderwayRendered, 30, {
+        const res = await api.getContestList(this.contestsUnderwayRendered, 10, {
           status: CONTEST_STATUS.UNDERWAY
         })
-        this.contestsUnderwayRendered += 30
+        this.contestsUnderwayRendered += 10
         this.contestsUnderway = this.contestsUnderway.concat(res.data.data.results)
       } else if (status === CONTEST_STATUS.NOT_START) {
-        const res = await api.getContestList(this.contestsUpcoming, 30, {
+        const res = await api.getContestList(this.contestsUpcoming, 10, {
           status: CONTEST_STATUS.ENDED
         })
-        this.contestsUpcomingRendered += 30
+        this.contestsUpcomingRendered += 10
         this.contestsUpcoming = this.contestsUpcoming.concat(res.data.data.results)
       } else {
       }
@@ -324,8 +333,8 @@ export default {
         'OIContestRealTimePermission', 'passwordFormVisible', 'isAuthenticated',
         'groups', 'adminGroups', 'otherGroups']
     ),
-    row () {
-      return this.contests.length
+    updateCurrentPage () {
+      return this.currentChange(this.currentPage)
     }
   },
   watch: {

From ac86e26c808bb15d60a8e50958cd934416bf52b8 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Thu, 17 Feb 2022 14:24:37 +0000
Subject: [PATCH 35/47] fix: assign key for contest list neonboxes

---
 frontend/src/pages/oj/views/contest/ContestList.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index df8195568..88b97b038 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -11,7 +11,7 @@
       <h4 class="subtitle-blue text-xl" v-if="contestsUnderway.length || contestsUnderwayNoPermission.length">
         Active Contests >>
       </h4>
-      <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUnderway" :key="index"
+      <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUnderway" :key="'unp' + index"
                 :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
                 :shadow="true" @click.native="goContest(contest)">
         <template #overlay-icon>
@@ -20,7 +20,7 @@
       </neon-box>
       <neon-box color="#B4B4B4" v-for="(contest, index) in contestsUnderwayNoPermission"
                 :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
-                :key="index"  :shadow="true" class="my-3" @click.native="showContestInformationModal(contest)">
+                :key="'unn' + index"  :shadow="true" class="my-3" @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#B4B4B4" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>
@@ -29,7 +29,7 @@
       <h4 class="subtitle-blue text-xl" v-if="contestsUpcoming.length || contestsUpcomingNoPermission.length">
         Upcoming Contests >>
       </h4>
-      <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUpcoming" :key="index"
+      <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUpcoming" :key="'upp' + index"
                 :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
                 @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
@@ -38,7 +38,7 @@
       </neon-box>
       <neon-box v-for="(contest, index) in contestsUpcomingNoPermission"
                 :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
-                :key="index" color="#B4B4B4" class="my-3" @click.native="showContestInformationModal(contest)">
+                :key="'upn' + index" color="#B4B4B4" class="my-3" @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#B4B4B4" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>
@@ -52,7 +52,7 @@
       </h4>
       <neon-box v-show="showFinishedContests" v-for="(contest, index) in contestsFinished"
                 :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
-                :key="index" color="#FF6663" class="my-3" @click.native="goContest(contestInformation)">
+                :key="'fi' + index" color="#FF6663" class="my-3" @click.native="goContest(contestInformation)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#FF6663" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>

From 5531749434f2ccb7f3d2a0ec534400fbbd0b29f8 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Thu, 17 Feb 2022 16:34:22 +0000
Subject: [PATCH 36/47] fix: goContest click event

---
 frontend/src/pages/oj/views/contest/ContestList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index 88b97b038..aaf127e84 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -52,7 +52,7 @@
       </h4>
       <neon-box v-show="showFinishedContests" v-for="(contest, index) in contestsFinished"
                 :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
-                :key="'fi' + index" color="#FF6663" class="my-3" @click.native="goContest(contestInformation)">
+                :key="'fi' + index" color="#FF6663" class="my-3" @click.native="goContest(contest)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#FF6663" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>

From 2738beef45878ae079eef815718d6b2a7f41a8f3 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Thu, 17 Feb 2022 16:36:05 +0000
Subject: [PATCH 37/47] =?UTF-8?q?fix:=20contest=20finished=20neonbox=20cli?=
 =?UTF-8?q?ck=20event=20-=20=EB=81=9D=EB=82=9C=20=EB=8C=80=ED=9A=8C?=
 =?UTF-8?q?=EB=8A=94=20=EB=B0=94=EB=A1=9C=20=ED=95=B4=EB=8B=B9=20contest?=
 =?UTF-8?q?=20detail=20page=EB=A1=9C=20=EC=95=88=EB=82=B4=ED=95=A9?=
 =?UTF-8?q?=EB=8B=88=EB=8B=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/oj/views/contest/ContestList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index aaf127e84..57f8a2061 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -54,7 +54,7 @@
                 :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
                 :key="'fi' + index" color="#FF6663" class="my-3" @click.native="goContest(contest)">
         <template #overlay-icon>
-          <b-icon-zoom-in color="#FF6663" width="1.5em" height="1.5em"></b-icon-zoom-in>
+          <icon icon="arrow-right"></icon>
         </template>
       </neon-box>
       <b-pagination

From 0e204ab06d1af9718358b0e6ec5c03d95bffe2c6 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Thu, 17 Feb 2022 16:37:29 +0000
Subject: [PATCH 38/47] chore: remove bad quotes

---
 backend/utils/decorators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/utils/decorators.py b/backend/utils/decorators.py
index 19e063f95..4ed4c2e4c 100644
--- a/backend/utils/decorators.py
+++ b/backend/utils/decorators.py
@@ -134,7 +134,7 @@ def _check_permission(*args, **kwargs):
 
             # allowed_groups exist and member doesn't belong to any group, error
             if self.contest.allowed_groups.count() and not self.contest.allowed_groups.filter(members=user).exists():
-                if check_type == "ranks" or check_type == "submissions" or check_type == 'problems':
+                if check_type == "ranks" or check_type == "submissions" or check_type == "problems":
                     return self.error("You are not a member of the group allowed to this contest")
 
             # check does user have permission to get ranks, submissions in OI Contest

From 136c7e37cfab8ac5a730027990e4deedfcd9ffff Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Thu, 17 Feb 2022 18:06:43 +0000
Subject: [PATCH 39/47] feat: contestList shows time difference
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- contest list에서 moment 모듈을 사용하여 진행중인 대회가 시작된 시간, 예정된 대회가 시작될 시간
, 끝난 대회가 끝난 시간을 지금(now)와 비교하여 보여준다.
---
 .../pages/oj/views/contest/ContestList.vue    | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index 57f8a2061..c9b4f7fdd 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -12,14 +12,14 @@
         Active Contests >>
       </h4>
       <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUnderway" :key="'unp' + index"
-                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started ' + contest.startedTimeFromNow" :rightTop="contest.participants_count" rightTopIcon="users"
                 :shadow="true" @click.native="goContest(contest)">
         <template #overlay-icon>
           <icon icon="arrow-right"></icon>
         </template>
       </neon-box>
       <neon-box color="#B4B4B4" v-for="(contest, index) in contestsUnderwayNoPermission"
-                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Started ' + contest.startedTimeFromNow" :rightTop="contest.participants_count" rightTopIcon="users"
                 :key="'unn' + index"  :shadow="true" class="my-3" @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#B4B4B4" width="1.5em" height="1.5em"></b-icon-zoom-in>
@@ -30,14 +30,14 @@
         Upcoming Contests >>
       </h4>
       <neon-box color="#8DC63F" class="my-3" v-for="(contest, index) in contestsUpcoming" :key="'upp' + index"
-                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Start ' + contest.remainTime" :rightTop="contest.participants_count" rightTopIcon="users"
                 @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#8DC63F" width="1.5em" height="1.5em"></b-icon-zoom-in>
         </template>
       </neon-box>
       <neon-box v-for="(contest, index) in contestsUpcomingNoPermission"
-                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Start ' + contest.remainTime" :rightTop="contest.participants_count" rightTopIcon="users"
                 :key="'upn' + index" color="#B4B4B4" class="my-3" @click.native="showContestInformationModal(contest)">
         <template #overlay-icon>
           <b-icon-zoom-in color="#B4B4B4" width="1.5em" height="1.5em"></b-icon-zoom-in>
@@ -51,7 +51,7 @@
         </button>
       </h4>
       <neon-box v-show="showFinishedContests" v-for="(contest, index) in contestsFinished"
-                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="makeStartTimeInfo(contest)" :rightTop="contest.participants_count" rightTopIcon="users"
+                :leftTop="contest.title" :leftBottom="makeGroupRequirementInfo(contest)" :rightBottom="'Finished ' + contest.finishedTimeFromNow" :rightTop="contest.participants_count" rightTopIcon="users"
                 :key="'fi' + index" color="#FF6663" class="my-3" @click.native="goContest(contest)">
         <template #overlay-icon>
           <icon icon="arrow-right"></icon>
@@ -88,6 +88,7 @@ import { CONTEST_STATUS_REVERSE, CONTEST_TYPE, CONTEST_STATUS } from '@/utils/co
 import NeonBox from '@oj/components/NeonBox.vue'
 import ContestInformation from '@oj/components/ContestInformation.vue'
 import store from '@/store'
+import moment from 'moment'
 
 export default {
   name: 'ContestList',
@@ -122,6 +123,10 @@ export default {
     if (this.isAuthenticated) {
       this.filterWithGroupPermission()
     }
+    this.calculateTimeDiff()
+    setInterval(() => {
+      this.calculateTimeDiff()
+    }, 10000)
   },
   components: {
     NeonBox,
@@ -317,13 +322,21 @@ export default {
     makeGroupRequirementInfo (contest) {
       return 'For ' + (contest.allowed_groups.map(g => g.name).join(', ') || 'All')
     },
-    makeStartTimeInfo (contest) {
-      if (contest.status === CONTEST_STATUS.UNDERWAY) {
-        return 'Underway'
-      } else if (contest.status === CONTEST_STATUS.NOT_START) {
-        return 'Not Started'
-      } else {
-        return 'Ended'
+    calculateTimeDiff () {
+      for (const contest of this.contestsUpcoming) {
+        this.$set(contest, 'remainTime', moment().to(moment(contest.start_time)))
+      }
+      for (const contest of this.contestsUpcomingNoPermission) {
+        this.$set(contest, 'remainTime', moment().to(moment(contest.start_time)))
+      }
+      for (const contest of this.contestsFinished) {
+        this.$set(contest, 'finishedTimeFromNow', moment(contest.end_time).fromNow())
+      }
+      for (const contest of this.contestsUnderway) {
+        this.$set(contest, 'startedTimeFromNow', moment(contest.start_time).fromNow())
+      }
+      for (const contest of this.contestsUnderwayNoPermission) {
+        this.$set(contest, 'startedTimeFromNow', moment(contest.start_time).fromNow())
       }
     }
   },

From fe3c205a10abf46e4f32514cf0e2634269476689 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Sat, 19 Feb 2022 12:48:42 +0000
Subject: [PATCH 40/47] fix: calculateTimeDiff on pagination change

---
 frontend/src/pages/oj/views/contest/ContestList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/pages/oj/views/contest/ContestList.vue b/frontend/src/pages/oj/views/contest/ContestList.vue
index c9b4f7fdd..9c106d7e8 100644
--- a/frontend/src/pages/oj/views/contest/ContestList.vue
+++ b/frontend/src/pages/oj/views/contest/ContestList.vue
@@ -228,6 +228,7 @@ export default {
         status: CONTEST_STATUS.ENDED
       })
       this.contestsFinished = res.data.data.results
+      this.calculateTimeDiff()
     },
     async filterWithGroupPermission () {
       await store.dispatch('getGroupList')

From bc841c31aadeed82fc6b2be9262a234e356d4fba Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Fri, 25 Feb 2022 03:23:10 +0000
Subject: [PATCH 41/47] feat: add contestprize model

---
 backend/contest/models.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/backend/contest/models.py b/backend/contest/models.py
index 6d504aa1a..e5f849312 100644
--- a/backend/contest/models.py
+++ b/backend/contest/models.py
@@ -16,7 +16,6 @@ class Contest(models.Model):
     constraints = JSONField(default=list)
     allowed_groups = models.ManyToManyField(Group, blank=True)
     scoring = models.TextField(default="ACM-ICPC style")
-    prizes = JSONField(default=dict)
     # show real time rank or cached rank
     real_time_rank = models.BooleanField()
     password = models.TextField(null=True)
@@ -61,10 +60,18 @@ class Meta:
         ordering = ("-start_time",)
 
 
+class ContestPrize(models.Model):
+    contest = models.ForeignKey(Contest, on_delete=models.CASCADE)
+    color = models.TextField()
+    name = models.TextField()
+    reward = models.TextField()
+
+
 class AbstractContestRank(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     contest = models.ForeignKey(Contest, on_delete=models.CASCADE)
     submission_number = models.IntegerField(default=0)
+    prize = models.ForeignKey(ContestPrize, on_delete=models.SET_NULL, blank=True, null=True)
 
     class Meta:
         abstract = True

From 0fe8254e35b7ab5352e0cc5c5e1a263517ff6695 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Fri, 25 Feb 2022 05:24:29 +0000
Subject: [PATCH 42/47] feat: change contest prize related serializer, api

---
 .../migrations/0018_auto_20220225_1422.py     | 38 +++++++++++++++++++
 backend/contest/serializers.py                | 22 +++++++++--
 backend/contest/views/admin.py                | 22 +++++++++--
 3 files changed, 75 insertions(+), 7 deletions(-)
 create mode 100644 backend/contest/migrations/0018_auto_20220225_1422.py

diff --git a/backend/contest/migrations/0018_auto_20220225_1422.py b/backend/contest/migrations/0018_auto_20220225_1422.py
new file mode 100644
index 000000000..6eb8b9147
--- /dev/null
+++ b/backend/contest/migrations/0018_auto_20220225_1422.py
@@ -0,0 +1,38 @@
+# Generated by Django 3.2.12 on 2022-02-25 05:22
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contest', '0017_alter_contest_allowed_groups'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='contest',
+            name='prizes',
+        ),
+        migrations.CreateModel(
+            name='ContestPrize',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('color', models.TextField()),
+                ('name', models.TextField()),
+                ('reward', models.TextField()),
+                ('contest', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contest.contest')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='acmcontestrank',
+            name='prize',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='contest.contestprize'),
+        ),
+        migrations.AddField(
+            model_name='oicontestrank',
+            name='prize',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='contest.contestprize'),
+        ),
+    ]
diff --git a/backend/contest/serializers.py b/backend/contest/serializers.py
index 509ea735f..39f13a95d 100644
--- a/backend/contest/serializers.py
+++ b/backend/contest/serializers.py
@@ -1,16 +1,29 @@
 from utils.api import UsernameSerializer, serializers
 
-from .models import Contest, ContestAnnouncement, ContestRuleType
+from .models import Contest, ContestAnnouncement, ContestPrize, ContestRuleType
 from .models import ACMContestRank, OIContestRank
 from group.serializers import GroupSummarySerializer
 
 
-class CreateOrEditPrizeSerializer(serializers.Serializer):
+class CreateContestPrizeSerializer(serializers.Serializer):
     color = serializers.CharField(max_length=20)
     name = serializers.CharField(max_length=20)
     reward = serializers.CharField(max_length=20)
 
 
+class EditContestPrizeSerializer(serializers.Serializer):
+    id = serializers.IntegerField()
+    color = serializers.CharField(max_length=20)
+    name = serializers.CharField(max_length=20)
+    reward = serializers.CharField(max_length=20)
+
+
+class ContestPrizeSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ContestPrize
+        fields = "__all__"
+
+
 class CreateConetestSeriaizer(serializers.Serializer):
     title = serializers.CharField(max_length=128)
     description = serializers.CharField()
@@ -18,7 +31,7 @@ class CreateConetestSeriaizer(serializers.Serializer):
     constraints = serializers.ListField(child=serializers.CharField(max_length=128), allow_empty=True)
     allowed_groups = serializers.ListField(child=serializers.IntegerField(), allow_empty=True)
     scoring = serializers.CharField()
-    prizes = serializers.ListField(child=CreateOrEditPrizeSerializer())
+    prizes = serializers.ListField(child=CreateContestPrizeSerializer())
     start_time = serializers.DateTimeField()
     end_time = serializers.DateTimeField()
     rule_type = serializers.ChoiceField(choices=[ContestRuleType.ACM, ContestRuleType.OI])
@@ -36,7 +49,7 @@ class EditConetestSeriaizer(serializers.Serializer):
     constraints = serializers.ListField(child=serializers.CharField(max_length=128), allow_empty=True)
     allowed_groups = serializers.ListField(child=serializers.IntegerField(), allow_empty=True)
     scoring = serializers.CharField()
-    prizes = serializers.ListField(child=CreateOrEditPrizeSerializer())
+    prizes = serializers.ListField(child=EditContestPrizeSerializer())
     start_time = serializers.DateTimeField()
     end_time = serializers.DateTimeField()
     password = serializers.CharField(allow_blank=True, allow_null=True, max_length=32)
@@ -50,6 +63,7 @@ class ContestAdminSerializer(serializers.ModelSerializer):
     status = serializers.CharField()
     contest_type = serializers.CharField()
     allowed_groups = GroupSummarySerializer(many=True)
+    prizes = ContestPrizeSerializer(many=True)
 
     class Meta:
         model = Contest
diff --git a/backend/contest/views/admin.py b/backend/contest/views/admin.py
index e9742ca8e..a72c15eab 100644
--- a/backend/contest/views/admin.py
+++ b/backend/contest/views/admin.py
@@ -17,7 +17,7 @@
 from utils.decorators import ensure_created_by
 from utils.shortcuts import rand_str
 from utils.tasks import delete_files
-from ..models import Contest, ContestAnnouncement
+from ..models import Contest, ContestAnnouncement, ContestPrize
 from ..serializers import (ContestAnnouncementSerializer, ContestAdminSerializer,
                            CreateConetestSeriaizer, CreateContestAnnouncementSerializer,
                            EditConetestSeriaizer, EditContestAnnouncementSerializer)
@@ -44,12 +44,16 @@ def post(self, request):
                 ip_network(ip_range, strict=False)
             except ValueError:
                 return self.error(f"{ip_range} is not a valid cidr network")
+        prizes = data.pop("prizes")
         allowed_groups = data.pop("allowed_groups")
         allowed_groups_qs = Group.objects.filter(id__in=allowed_groups)
         if allowed_groups_qs.count() != len(allowed_groups):
             return self.error("Some groups don't exist")
         contest = Contest.objects.create(**data)
         contest.allowed_groups.set(allowed_groups_qs)
+        for prize in prizes:
+            ContestPrize.objects.create(contest=contest, *prize)
+        contest.prizes = ContestPrize.objects.filter(contest=contest)
         return self.success(ContestAdminSerializer(contest).data)
 
     @swagger_auto_schema(
@@ -77,6 +81,18 @@ def put(self, request):
             except ValueError:
                 return self.error(f"{ip_range} is not a valid cidr network")
 
+        prizes = data.pop("prizes")
+        for item in prizes:
+            try:
+                prize = ContestPrize.objects.get(contest=contest, id=item.id)
+                for k, v in prize.items():
+                    setattr(prize, k, v)
+                prize.save()
+            except ContestPrize.DoesNotExist:
+                item.pop("id")
+                ContestPrize.objects.create(contest=contest, *item)
+        contest.prizes = ContestPrize.objects.filter(contest=contest)
+
         allowed_groups = data.pop("allowed_groups")
         allowed_groups_qs = Group.objects.filter(id__in=allowed_groups)
         if allowed_groups_qs.count() != len(allowed_groups):
@@ -127,13 +143,13 @@ def get(self, request):
         contest_id = request.GET.get("id")
         if contest_id:
             try:
-                contest = Contest.objects.get(id=contest_id)
+                contest = Contest.objects.prefetch_related("contest_prize_set").get(id=contest_id)
                 ensure_created_by(contest, request.user)
                 return self.success(ContestAdminSerializer(contest).data)
             except Contest.DoesNotExist:
                 return self.error("Contest does not exist")
 
-        contests = Contest.objects.all().order_by("-create_time")
+        contests = Contest.objects.prefetch_related("contest_prize_set").all().order_by("-create_time")
         if request.user.is_admin():
             contests = contests.filter(created_by=request.user)
 

From 9539696d6cafa345ece4919c32676eb3991f6ece Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Fri, 25 Feb 2022 06:47:58 +0000
Subject: [PATCH 43/47] fix: contest prize model, test, serializer, api

---
 .../0019_alter_contestprize_contest.py        | 19 +++++++++++++++
 backend/contest/models.py                     |  2 +-
 backend/contest/serializers.py                |  1 +
 backend/contest/tests.py                      |  8 ++++++-
 backend/contest/views/admin.py                | 24 ++++++++++++-------
 5 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 backend/contest/migrations/0019_alter_contestprize_contest.py

diff --git a/backend/contest/migrations/0019_alter_contestprize_contest.py b/backend/contest/migrations/0019_alter_contestprize_contest.py
new file mode 100644
index 000000000..7fad6e9e2
--- /dev/null
+++ b/backend/contest/migrations/0019_alter_contestprize_contest.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.12 on 2022-02-25 05:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contest', '0018_auto_20220225_1422'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contestprize',
+            name='contest',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='prizes', to='contest.contest'),
+        ),
+    ]
diff --git a/backend/contest/models.py b/backend/contest/models.py
index e5f849312..0497a0d34 100644
--- a/backend/contest/models.py
+++ b/backend/contest/models.py
@@ -61,7 +61,7 @@ class Meta:
 
 
 class ContestPrize(models.Model):
-    contest = models.ForeignKey(Contest, on_delete=models.CASCADE)
+    contest = models.ForeignKey(Contest, on_delete=models.CASCADE, related_name="prizes")
     color = models.TextField()
     name = models.TextField()
     reward = models.TextField()
diff --git a/backend/contest/serializers.py b/backend/contest/serializers.py
index 39f13a95d..98831da6c 100644
--- a/backend/contest/serializers.py
+++ b/backend/contest/serializers.py
@@ -72,6 +72,7 @@ class Meta:
 
 class ContestSerializer(ContestAdminSerializer):
     participants_count = serializers.IntegerField(required=False)
+    prizes = ContestPrizeSerializer(many=True)
 
     class Meta:
         model = Contest
diff --git a/backend/contest/tests.py b/backend/contest/tests.py
index 145d919d4..f5c8807ba 100644
--- a/backend/contest/tests.py
+++ b/backend/contest/tests.py
@@ -78,7 +78,12 @@ def test_update_contest(self):
         update_data = {"id": id, "title": "update title",
                        "description": "update description",
                        "password": "12345",
-                       "visible": False, "real_time_rank": False}
+                       "visible": False, "real_time_rank": False,
+                       "prizes": [{"id": 100, "color": "#FF6663", "name": "Top 2", "reward": "1,000,000 Won"},
+                                  {"id": 101, "color": "#FFD700", "name": "3(3~5)", "reward": "500,000 Won"},
+                                  {"id": 102, "color": "#C0C0C0", "name": "5(6~10)", "reward": "100,000 Won"},
+                                  {"id": 103, "color": "#CD7F32", "name": "10(11~20)", "reward": "50,000 Won"}]
+                       }
         data = copy.deepcopy(self.data)
         data.update(update_data)
         response = self.client.put(self.url, data=data)
@@ -106,6 +111,7 @@ def setUp(self):
         group = self.create_group(created_by=user)
         data = copy.deepcopy(DEFAULT_CONTEST_DATA)
         data.pop("allowed_groups")
+        data.pop("prizes")
         allowed_groups = [group.id]
         allowed_groups_qs = Group.objects.filter(id__in=allowed_groups)
         self.contest = Contest.objects.create(created_by=user, **data)
diff --git a/backend/contest/views/admin.py b/backend/contest/views/admin.py
index a72c15eab..6698dfc86 100644
--- a/backend/contest/views/admin.py
+++ b/backend/contest/views/admin.py
@@ -20,7 +20,8 @@
 from ..models import Contest, ContestAnnouncement, ContestPrize
 from ..serializers import (ContestAnnouncementSerializer, ContestAdminSerializer,
                            CreateConetestSeriaizer, CreateContestAnnouncementSerializer,
-                           EditConetestSeriaizer, EditContestAnnouncementSerializer)
+                           EditConetestSeriaizer, EditContestAnnouncementSerializer,
+                           ContestPrizeSerializer)
 
 
 class ContestAPI(APIView):
@@ -52,9 +53,10 @@ def post(self, request):
         contest = Contest.objects.create(**data)
         contest.allowed_groups.set(allowed_groups_qs)
         for prize in prizes:
-            ContestPrize.objects.create(contest=contest, *prize)
-        contest.prizes = ContestPrize.objects.filter(contest=contest)
-        return self.success(ContestAdminSerializer(contest).data)
+            ContestPrize.objects.create(contest=contest, **prize)
+        data = ContestAdminSerializer(contest).data
+        data["prizes"] = ContestPrizeSerializer(ContestPrize.objects.filter(contest=contest), many=True).data
+        return self.success(data)
 
     @swagger_auto_schema(
         request_body=EditConetestSeriaizer,
@@ -82,16 +84,20 @@ def put(self, request):
                 return self.error(f"{ip_range} is not a valid cidr network")
 
         prizes = data.pop("prizes")
+        prize_id_list = []
         for item in prizes:
+            prize_id_list.append(item["id"])
             try:
-                prize = ContestPrize.objects.get(contest=contest, id=item.id)
+                prize = ContestPrize.objects.get(contest=contest, id=item["id"])
                 for k, v in prize.items():
                     setattr(prize, k, v)
                 prize.save()
             except ContestPrize.DoesNotExist:
                 item.pop("id")
-                ContestPrize.objects.create(contest=contest, *item)
-        contest.prizes = ContestPrize.objects.filter(contest=contest)
+                ContestPrize.objects.create(contest=contest, **item)
+
+        ContestPrize.objects.filter(contest=contest).exclude(id__in=prize_id_list).delete()
+        contest.prizes.set(ContestPrize.objects.filter(contest=contest))
 
         allowed_groups = data.pop("allowed_groups")
         allowed_groups_qs = Group.objects.filter(id__in=allowed_groups)
@@ -143,13 +149,13 @@ def get(self, request):
         contest_id = request.GET.get("id")
         if contest_id:
             try:
-                contest = Contest.objects.prefetch_related("contest_prize_set").get(id=contest_id)
+                contest = Contest.objects.prefetch_related("prizes").get(id=contest_id)
                 ensure_created_by(contest, request.user)
                 return self.success(ContestAdminSerializer(contest).data)
             except Contest.DoesNotExist:
                 return self.error("Contest does not exist")
 
-        contests = Contest.objects.prefetch_related("contest_prize_set").all().order_by("-create_time")
+        contests = Contest.objects.prefetch_related("prizes").all().order_by("-create_time")
         if request.user.is_admin():
             contests = contests.filter(created_by=request.user)
 

From f6fb13adabd3fbbbc1585b00975bb3bbf21e285f Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Fri, 25 Feb 2022 14:56:11 +0000
Subject: [PATCH 44/47] fix: contest prize put api

---
 backend/contest/serializers.py | 13 +++----------
 backend/contest/tests.py       |  8 +++-----
 backend/contest/views/admin.py | 15 ++++++++++-----
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/backend/contest/serializers.py b/backend/contest/serializers.py
index 98831da6c..9288be476 100644
--- a/backend/contest/serializers.py
+++ b/backend/contest/serializers.py
@@ -5,14 +5,7 @@
 from group.serializers import GroupSummarySerializer
 
 
-class CreateContestPrizeSerializer(serializers.Serializer):
-    color = serializers.CharField(max_length=20)
-    name = serializers.CharField(max_length=20)
-    reward = serializers.CharField(max_length=20)
-
-
-class EditContestPrizeSerializer(serializers.Serializer):
-    id = serializers.IntegerField()
+class CreateOrEditContestPrizeSerializer(serializers.Serializer):
     color = serializers.CharField(max_length=20)
     name = serializers.CharField(max_length=20)
     reward = serializers.CharField(max_length=20)
@@ -31,7 +24,7 @@ class CreateConetestSeriaizer(serializers.Serializer):
     constraints = serializers.ListField(child=serializers.CharField(max_length=128), allow_empty=True)
     allowed_groups = serializers.ListField(child=serializers.IntegerField(), allow_empty=True)
     scoring = serializers.CharField()
-    prizes = serializers.ListField(child=CreateContestPrizeSerializer())
+    prizes = serializers.ListField(child=CreateOrEditContestPrizeSerializer())
     start_time = serializers.DateTimeField()
     end_time = serializers.DateTimeField()
     rule_type = serializers.ChoiceField(choices=[ContestRuleType.ACM, ContestRuleType.OI])
@@ -49,7 +42,7 @@ class EditConetestSeriaizer(serializers.Serializer):
     constraints = serializers.ListField(child=serializers.CharField(max_length=128), allow_empty=True)
     allowed_groups = serializers.ListField(child=serializers.IntegerField(), allow_empty=True)
     scoring = serializers.CharField()
-    prizes = serializers.ListField(child=EditContestPrizeSerializer())
+    prizes = serializers.ListField(child=CreateOrEditContestPrizeSerializer())
     start_time = serializers.DateTimeField()
     end_time = serializers.DateTimeField()
     password = serializers.CharField(allow_blank=True, allow_null=True, max_length=32)
diff --git a/backend/contest/tests.py b/backend/contest/tests.py
index f5c8807ba..806fd97c5 100644
--- a/backend/contest/tests.py
+++ b/backend/contest/tests.py
@@ -78,17 +78,15 @@ def test_update_contest(self):
         update_data = {"id": id, "title": "update title",
                        "description": "update description",
                        "password": "12345",
-                       "visible": False, "real_time_rank": False,
-                       "prizes": [{"id": 100, "color": "#FF6663", "name": "Top 2", "reward": "1,000,000 Won"},
-                                  {"id": 101, "color": "#FFD700", "name": "3(3~5)", "reward": "500,000 Won"},
-                                  {"id": 102, "color": "#C0C0C0", "name": "5(6~10)", "reward": "100,000 Won"},
-                                  {"id": 103, "color": "#CD7F32", "name": "10(11~20)", "reward": "50,000 Won"}]
+                       "visible": False, "real_time_rank": False
                        }
         data = copy.deepcopy(self.data)
         data.update(update_data)
         response = self.client.put(self.url, data=data)
         self.assertSuccess(response)
         response_data = response.data["data"]
+        response_data.pop("prizes")
+        data.pop("prizes")
         for k in data.keys():
             if isinstance(data[k], datetime):
                 continue
diff --git a/backend/contest/views/admin.py b/backend/contest/views/admin.py
index 6698dfc86..6af834f70 100644
--- a/backend/contest/views/admin.py
+++ b/backend/contest/views/admin.py
@@ -86,18 +86,21 @@ def put(self, request):
         prizes = data.pop("prizes")
         prize_id_list = []
         for item in prizes:
-            prize_id_list.append(item["id"])
             try:
+                if "id" not in item:
+                    res = ContestPrize.objects.create(contest=contest, **item)
+                    prize_id_list.append(res.id)
+                    continue
                 prize = ContestPrize.objects.get(contest=contest, id=item["id"])
+                prize_id_list.append(item["id"])
                 for k, v in prize.items():
                     setattr(prize, k, v)
                 prize.save()
             except ContestPrize.DoesNotExist:
                 item.pop("id")
-                ContestPrize.objects.create(contest=contest, **item)
-
+                res = ContestPrize.objects.create(contest=contest, **item)
+                prize_id_list.append(res.id)
         ContestPrize.objects.filter(contest=contest).exclude(id__in=prize_id_list).delete()
-        contest.prizes.set(ContestPrize.objects.filter(contest=contest))
 
         allowed_groups = data.pop("allowed_groups")
         allowed_groups_qs = Group.objects.filter(id__in=allowed_groups)
@@ -111,7 +114,9 @@ def put(self, request):
         for k, v in data.items():
             setattr(contest, k, v)
         contest.save()
-        return self.success(ContestAdminSerializer(contest).data)
+        data = ContestAdminSerializer(contest).data
+        data["prizes"] = ContestPrizeSerializer(ContestPrize.objects.filter(contest=contest), many=True).data
+        return self.success(data)
 
     @swagger_auto_schema(
         manual_parameters=[

From c3963e28942bcdb6f812ebc9862ad0d3d71c5509 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Fri, 25 Feb 2022 15:58:00 +0000
Subject: [PATCH 45/47] fix: contestprize put api

---
 backend/contest/serializers.py | 1 +
 backend/contest/views/admin.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/contest/serializers.py b/backend/contest/serializers.py
index 9288be476..5bd516636 100644
--- a/backend/contest/serializers.py
+++ b/backend/contest/serializers.py
@@ -6,6 +6,7 @@
 
 
 class CreateOrEditContestPrizeSerializer(serializers.Serializer):
+    id = serializers.IntegerField(required=False)
     color = serializers.CharField(max_length=20)
     name = serializers.CharField(max_length=20)
     reward = serializers.CharField(max_length=20)
diff --git a/backend/contest/views/admin.py b/backend/contest/views/admin.py
index 6af834f70..fc46ac581 100644
--- a/backend/contest/views/admin.py
+++ b/backend/contest/views/admin.py
@@ -93,7 +93,7 @@ def put(self, request):
                     continue
                 prize = ContestPrize.objects.get(contest=contest, id=item["id"])
                 prize_id_list.append(item["id"])
-                for k, v in prize.items():
+                for k, v in item.items():
                     setattr(prize, k, v)
                 prize.save()
             except ContestPrize.DoesNotExist:

From 1ea7796930de2063241dfc83fdd693ff9d436806 Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Fri, 25 Feb 2022 17:49:28 +0000
Subject: [PATCH 46/47] feat: contestrank put api for contest prize field
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- contest rank put api를 통하여 rank에 해당하는 prize를 선택할수 있게 한다.
---
 backend/contest/serializers.py |  4 ++--
 backend/contest/urls/admin.py  |  3 ++-
 backend/contest/views/admin.py | 19 +++++++++++++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/backend/contest/serializers.py b/backend/contest/serializers.py
index 5bd516636..35f9b5be1 100644
--- a/backend/contest/serializers.py
+++ b/backend/contest/serializers.py
@@ -104,10 +104,10 @@ class ContestPasswordVerifySerializer(serializers.Serializer):
 
 class ACMContestRankSerializer(serializers.ModelSerializer):
     username = serializers.SerializerMethodField()
-
+    prize = ContestPrizeSerializer()
     class Meta:
         model = ACMContestRank
-        fields = ["accepted_number", "total_time", "total_penalty", "submission_info", "username"]
+        fields = ["id", "accepted_number", "total_time", "total_penalty", "submission_info", "username", "prize"]
 
     def __init__(self, *args, **kwargs):
         self.is_contest_admin = kwargs.pop("is_contest_admin", False)
diff --git a/backend/contest/urls/admin.py b/backend/contest/urls/admin.py
index ccb3cd571..2e5c34c89 100644
--- a/backend/contest/urls/admin.py
+++ b/backend/contest/urls/admin.py
@@ -1,9 +1,10 @@
 from django.urls import path
 
-from ..views.admin import ContestAnnouncementAPI, ContestAPI, DownloadContestSubmissions
+from ..views.admin import ContestAnnouncementAPI, ContestAPI, ContestRankAPI, DownloadContestSubmissions
 
 urlpatterns = [
     path("contest/", ContestAPI.as_view(), name="contest_admin_api"),
     path("contest/announcement/", ContestAnnouncementAPI.as_view(), name="contest_announcement_admin_api"),
     path("download_submissions/", DownloadContestSubmissions.as_view(), name="acm_contest_helper"),
+    path("contest/rank/", ContestRankAPI.as_view(), name="contest_rank_api")
 ]
diff --git a/backend/contest/views/admin.py b/backend/contest/views/admin.py
index fc46ac581..1fe82a158 100644
--- a/backend/contest/views/admin.py
+++ b/backend/contest/views/admin.py
@@ -17,11 +17,11 @@
 from utils.decorators import ensure_created_by
 from utils.shortcuts import rand_str
 from utils.tasks import delete_files
-from ..models import Contest, ContestAnnouncement, ContestPrize
+from ..models import Contest, ContestAnnouncement, ContestPrize, ACMContestRank
 from ..serializers import (ContestAnnouncementSerializer, ContestAdminSerializer,
                            CreateConetestSeriaizer, CreateContestAnnouncementSerializer,
                            EditConetestSeriaizer, EditContestAnnouncementSerializer,
-                           ContestPrizeSerializer)
+                           ContestPrizeSerializer, ACMContestRankSerializer)
 
 
 class ContestAPI(APIView):
@@ -310,6 +310,21 @@ def get(self, request):
         return self.success(ContestAnnouncementSerializer(contest_announcements, many=True).data)
 
 
+class ContestRankAPI(APIView):
+    def put(self, request):
+        """
+        update contest_rank Prize
+        """
+        data = request.data
+        try:
+            contest_rank = ACMContestRank.objects.get(id=data.pop("id"))
+        except ACMContestRank.DoesNotExist:
+            return self.error("ACM contest rank does not exist")
+        contest_rank.prize = ContestPrize.objects.get(id=data["prize_id"])
+        contest_rank.save()
+        return self.success(ACMContestRankSerializer(contest_rank).data)
+
+
 class DownloadContestSubmissions(APIView):
     def _dump_submissions(self, contest, exclude_admin=True):
         problem_ids = contest.problem_set.all().values_list("id", "_id")

From 33914a0fd33e4ddf28ff78c8e572941554c550db Mon Sep 17 00:00:00 2001
From: Jimin Ha <jimin9038@g.skku.edu>
Date: Fri, 25 Feb 2022 18:06:11 +0000
Subject: [PATCH 47/47] chore(lint): lint

---
 backend/contest/serializers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/contest/serializers.py b/backend/contest/serializers.py
index 35f9b5be1..3a77f2a8f 100644
--- a/backend/contest/serializers.py
+++ b/backend/contest/serializers.py
@@ -105,6 +105,7 @@ class ContestPasswordVerifySerializer(serializers.Serializer):
 class ACMContestRankSerializer(serializers.ModelSerializer):
     username = serializers.SerializerMethodField()
     prize = ContestPrizeSerializer()
+
     class Meta:
         model = ACMContestRank
         fields = ["id", "accepted_number", "total_time", "total_penalty", "submission_info", "username", "prize"]