Merge branch 'YG' into 'master'

DB자료 추가, search 완성

See merge request !19

frontend/src/components/BookSearchPage.vue

@@ -4,7 +4,7 @@
       <multiselect
         style="float: left; marginLeft: 15%; width: 20%;"
         v-model.number="grade"
-        :options="option1" 
+        :options="option1"
       ></multiselect>
       <multiselect
         style="float: left; marginLeft: 0.5%; width: 20%;"
@@ -26,14 +26,18 @@
 
     <!-- ==================================================================== -->
     <div v-if="SearchResult === true ">
-      <div v-for="Book in Books" :key="Book._id"  v-if="Book.grade.includes(grade) && Book.major.includes(major)" >
+      <div
+        v-for="Book in Books"
+        :key="Book._id"
+        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>
               <div class="md-title">
-                {{ Book.title }}  
+                {{ Book.title }}
                 <br />
                 <br />
               </div>
@@ -50,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>
@@ -115,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

@@ -10,7 +10,7 @@
         </md-button>
         <div class="md-list-item-text">
           <span>&nbsp;&nbsp; {{user.title}}</span>
-          <span>&nbsp;&nbsp;판매 대기중</span>
+          <span>&nbsp;&nbsp;판매 대기</span>
         </div>
         <md-button class="md-icon-button md-raised md-accent">
           <img src="../../assets/x-512.png" />