Merge confilict 수정

frontend/package-lock.json

@@ -11802,6 +11802,11 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
+    "vuelidate": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.4.tgz",
+      "integrity": "sha512-QHZWYOL325Zo+2K7VBNEJTZ496Kd8Z31p85aQJFldKudUUGBmgw4zu4ghl4CyqPwjRCmqZ9lDdx4FSdMnu4fGg=="
+    },
     "vuetify": {
       "version": "2.1.11",
       "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.1.11.tgz",

frontend/src/components/BookSearchPage.vue

@@ -29,10 +29,10 @@
       <div
         v-for="Book in Books"
         :key="Book._id"
-        v-if="Book.grade.includes(grade) && Book.major.includes(major)"
+        v-if="Book.grade.includes(grade)&&Book.major.includes(major)&&Book.type.includes(type)"
       >
         <md-card
-          style="width: 50%; margin: 4px;marginTop:100px; display: inline-block; vertical-align: top;"
+          style="width: 50%; margin: 20px; marginTop:100px; display: inline-block; vertical-align: top;"
         >
           <md-card-header>
             <md-card-header-text>
@@ -54,6 +54,7 @@
             </md-card-header-text>
             <md-card-media md-medium>
               <img v-bind:src="Book.src" />
+              <br />
             </md-card-media>
           </md-card-header>
           <md-card-actions>
@@ -119,9 +120,9 @@ export default {
       grade: null,
       major: null,
       type: null,
-      option1: ["1학년", "2학년", "3학년", "4학년"],
-      option2: ["소프트웨어학과", "미디어학과", "경제학과"],
-      option3: ["test_title2", "전공선택", "교양선택", "기초과목"],
+      option1: ["1학년", "2학년", "3학년", "4학년","전학년"],
+      option2: ["소프트웨어학과", "미디어학과", "경제학과","경영학과","수학과","산업공학과","사회학과","전자공학과","기계공학과","신소재공학과","환경안전공학과","의학전공","공통과목"],
+      option3: ["전공필수", "전공선택", "교양선택", "기초과목"],
       Books: [],
       submit: {
         title: "",

frontend/src/components/profilecomponent/sellist.vue

@@ -9,13 +9,16 @@
         :key="transaction._id"
         v-if="transaction.sellerId == userId"
       >
-        <md-button class="md-icon-button md-raised" style="color:#1DDB16;backgroundColor:#1DDB16">
+        <md-button
+          class="md-icon-button md-raised"
+          style="color:#1DDB16;backgroundColor:#1DDB16"
+        >
           <img src="../../assets/book-open-flat.png" />
         </md-button>
         <div class="md-list-item-text">
-          <span>&nbsp;&nbsp; {{transaction.bookTitle}}</span>
+          <span>&nbsp;&nbsp; {{ transaction.bookTitle }}</span>
           <span>&nbsp;&nbsp;판매 대기중</span>
-          <span>&nbsp;&nbsp;구매자 아이디: {{transaction.buyerId}}</span>
+          <span>&nbsp;&nbsp;구매자 아이디: {{ transaction.buyerId }}</span>
         </div>
         <md-button
           class="md-icon-button md-raised md-accent"
@@ -96,4 +99,4 @@ export default {
   display: inline-block;
   vertical-align: top;
 }
-</style>
\ No newline at end of file
+</style>