디자인 추가 수정

Sejong-Creative-Semester2021 · Nov 19, 2021 · 570147f · 570147f
1 parent 955ddfe
commit 570147f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/OJ-FE/src/pages/oj/components/ModalView.vue b/OJ-FE/src/pages/oj/components/ModalView.vue
@@ -10,7 +10,6 @@
               <b-button-close @click="$emit('close')"></b-button-close>
             </slot>
           </div>
-
           <div class="modal-body">
             <slot name="body">
               <Input type="password" v-model="passwordFromUser" placeholder="비밀번호를 입력하세요" size="large">

diff --git a/OJ-FE/src/pages/oj/views/aicontest/AIContestClassList.vue b/OJ-FE/src/pages/oj/views/aicontest/AIContestClassList.vue
@@ -65,6 +65,7 @@
                 <p class="content" style="font-size: 16px; float: right; margin-top: -45px;">{{problem.start_time | localtime('YYYY-M-D')}} - {{problem.end_time | localtime('YYYY-M-D')}}</p>
               </b-card-text>
               <b-button pill variant="outline-primary" @click="isModalViewed = true" size="sm" style="float: right; margin-top: -30px; font-size: 1.1rem;"><b>입장하기</b></b-button>
+
               <ModalView v-if="isModalViewed" v-bind:problemID="problem._id" v-bind:problemPassword="problem.password" @close="isModalViewed = false"></ModalView>
             </b-card-body>
           </b-card>
@@ -209,7 +210,7 @@
       },
       pushRouter () {
         this.$router.push({
-          name: 'aiproblem-list',
+          name: 'aiproblem-list-class',
           query: utils.filterEmptyValue(this.query)
         })
       },

diff --git a/OJ-FE/src/pages/oj/views/aicontest/AIContestList.vue b/OJ-FE/src/pages/oj/views/aicontest/AIContestList.vue
@@ -79,6 +79,7 @@
 <script>
   import {mapGetters} from 'vuex'
   import api from '@oj/api'
+  import utils from '@/utils/utils'
   import { ProblemMixin } from '@oj/components/mixins'
   import Pagination from '@oj/components/Pagination'
   import ModalView from '@oj/components/ModalView'
@@ -271,6 +272,12 @@
         this.query.page = 1
         this.pushRouter()
       },
+      pushRouter () {
+        this.$router.push({
+          name: 'aiproblem-list',
+          query: utils.filterEmptyValue(this.query)
+        })
+      },
       handleTagsVisible (value) {
         if (value) {
           this.problemTableColumns.push(

diff --git a/OJ-FE/src/pages/oj/views/user/UserHome.vue b/OJ-FE/src/pages/oj/views/user/UserHome.vue
@@ -24,8 +24,8 @@
                             :key="problem.title"
                             :img-src='`../../../../../static/img/${problem.id}.jpg`'
                             img-left
-                            img-height="200"
-                            img-width="400"
+                            img-height="150"
+                            img-width="300"
                             shadow
                             class="mb-2 problem-card">
                   <b-card-body class="problem-content">
@@ -34,12 +34,12 @@
                     <b-card-text class="problem-text">
                       <p class="content">{{problem.start_time | localtime('YYYY-M-D HH:mm')}} - {{problem.end_time | localtime('YYYY-M-D HH:mm')}}</p> 
                     </b-card-text>
-                    <b-button pill variant="outline-primary" @click="goGeneralProblem(problem._id)"><b>더보기</b></b-button>
+                    <b-button pill variant="outline-primary" @click="goGeneralProblem(problem._id)" style="float: right;"><b>더보기</b></b-button>
                   </b-card-body>
                 </b-card>
               </div>
               </b-tab>
-
+              
               <b-tab title="수업용" id="contest-content">
               <div id="problem-group">
                 <b-card v-for="problem in classproblemList"