Merge branch 'YG' into 'master'

전공도서 검색 UI 완료 See merge request !5

Merge branch 'YG' into 'master'
fbb1f675 · HyeonJu Kong · 8e164614 · a7398474 · fbb1f675 · fbb1f675
Commit fbb1f675 authored 5 years ago by HyeonJu Kong
--- a/frontend/src/components/home.vue
+++ b/frontend/src/components/home.vue
+<template>
+  <!DOCTYPE html>
+  <html lang="en">
+    <head>
+      <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+      <title>Majorbook</title>
+    </head>
+    <body>
+      <header class='header'>
+        <h1>Majorbook</h1>
+        <div align='right'>
+          <template v-if='logged_io'>
+            ID : <input v-model='id' placeholder="ID" type='text' required>
+            PASSWORD : <input v-model='pwd' placeholder='password' type='password' required>
+            <button v-on:click='login' class='btn'>Login</button>
+            <button class='btn'><a href='/signup'>Sign up</a></button>
+          </template>
+          <template v-else>
+            <button class='btn'>거래현황</button>
+            <button v-on:click='logout' class='btn'>Logout</button>
+          </template>
+        </div>
+      </header>
+      <nav class='nav'>
+        <router-link to="/myPage">my Page</router-link>
+        <router-link to="/buy">buy</router-link>
+        <router-link to="/sell">sell</router-link>
+        <a href="/BookSearchPage">전공서적보기</a>
+      </nav>
+      <section class='section'>
+        <img src='../../static/img/img1.jpg'/>
+      </section>
+      <aside class='aside'> 이용방법
+      </aside>
+      <footer class='footer'>Implemented by 202-WebSysDesign</footer>
+    </body>
+  </html>
+</template>
+<script>
+export default{
+    data() {
+        return{
+          id : '',
+          pwd : '',
+          flag : false
+        }
+    },
+    computed:{
+        changeID(){
+            this.id = `${this.id}`
+        },
+        changePWD() {
+            this.pwd = `${this.pwd}`
+        },
+        logged_io() {
+            if(!this.flag) return true;
+            else return false;
+        }
+    },
+    methods:{
+        login: function(){
+          if(this.id!='' && this.pwd!=''){
+            alert(this.id+"  login!!")
+            this.flag = !this.flag
+            this.id = ''
+            this.pwd = ''
+          }else alert('ID/PASSWORD를 입력하세요')
+        },
+        logout: function(){
+            this.flag = !this.flag
+        },
+    }
+    }
+</script>
+<style lang='css'>
+html,body {
+  text-align: center;
+  margin:0;
+  width:100%;
+  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
+}
+.nav a {
+  color: #00B7FF;
+  text-align: center;
+  padding-right: 8%;
+  padding-left: 8%;
+  font-size: 18px;
+  text-decoration: none;
+}
+.nav {
+  background-color:#333;
+  overflow:hidden;
+}
+.header{
+  margin: 15px;
+  height: 12%;
+  font-size: 10px;
+}
+.btn{
+  color: #00B7FF;
+  background-color: #333;
+  border-radius: 15%;
+}
+h1{ 
+  text-align: left;
+  font-size: 35px;
+}
+.section{
+  height: 500px;
+}
+img{
+  height: 100%;
+  width: 100%;
+}
+.aside{
+ height: 40px;
+ background-color:rgb(255, 220, 123);
+}
+.footer{
+ height: 20px;
+ color:white;
+ background-color:#333;
+}
+.myPage{
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  height: 400px;
+}
+</style>
--- a/frontend/src/components/myPage.vue
+++ b/frontend/src/components/myPage.vue
+<template>
+  <!DOCTYPE html>
+  <html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <meta name='viewport' content='width=device-width, initial-scale=1.0'>
+        <title>Majorbook-My Page</title>
+    </head>
+    <body>
+        <h1>My Page</h1>
+        <button>수정하기</button>
+    </body>
+  </html>
+</template>
\ No newline at end of file
--- a/frontend/src/components/sell.vue
+++ b/frontend/src/components/sell.vue
+<template>
+    <h1> sell </h1>
+</template>
+<script>
+export default{
+    data() {
+        return{
+            name : '',
+            univ : '',
+            email : ''
+        }
+    },
+    computed:{
+    },
+    methods:{
+    }
+    }
+</script>
+<style lang='css'>
+</style>
--- a/frontend/src/components/signup.vue
+++ b/frontend/src/components/signup.vue
+<template>
+    <h1> 회원가입 </h1>
+</template>
+<script>
+export default{
+    data() {
+        return{
+            name : '',
+            univ : '',
+            email : ''
+        }
+    },
+    computed:{
+    },
+    methods:{
+    }
+    }
+</script>
+<style lang='css'>
+</style>
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -4,14 +4,16 @@ import Vue from 'vue'
 import App from './App'
 import router from './router'
 import axios from 'axios'
+import Vuetify from 'vuetify'
+import 'vuetify/dist/vuetify.min.css'
+Vue.use(Vuetify)
 Vue.prototype.$http = axios
 Vue.config.productionTip = false
 /* eslint-disable no-new */
 new Vue({
  el: '#app',
  router,
  components: { App },
-  template: '<App/>'
+  template: '<App/>',
+  render: h => h(App)
 })
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
 import Vue from 'vue'
-import Router from 'vue-router'
+import Router from 'vue-router';
 Vue.use(Router)
+import home from '@/components/home'
-//import IndexPage from '@/components/IndexPage'
+import myPage from '@/components/myPage'
-import BookIndexPage from '@/components/BookIndexPage'
+import buy from '@/components/buy'
-import BookShowPage from '@/components/BookShowPage'
+import sell from '@/components/sell'
+import signup from '@/components/signup'
+import BookSearchPage from '@/components/BookSearchPage'
 export default new Router({
  mode: 'history',
  routes: [
-    // {
-    //   path: '/',
-    //   name: 'IndexPage',
-    //   component: IndexPage
-    // },
    {
      path: '/',
-      name: 'bookindex',
+      name: 'home',
-      component: BookIndexPage
+      component: home
+    },
+    {
+      path: '/myPage',
+      name : 'myPage',
+      component: myPage
    },
    {
-      path: '/:id',
+      path: '/buy',
-      name: 'bookdetail',
+      name: 'buy',
-      component: BookShowPage
+      component: buy
+    },
+    {
+      path: '/sell',
+      name: 'sell',
+      component: sell
+    },
+    {
+      path: '/signup',
+      name: 'signup',
+      component: signup
+    },
+    {
+      path: '/BookSearchPage',
+      name: 'bookindex',
+      component: BookSearchPage
    }
  ]
 })
--- a/frontend/static/img/img1.jpg
+++ b/frontend/static/img/img1.jpg