1124 mergeconflict 수정 완료

frontend/src/main.js

@@ -4,12 +4,17 @@ 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)
 })

frontend/src/router/index.js

 import Vue from 'vue'
-import Router from 'vue-router'
-import HelloWorld from '@/components/HelloWorld'
-
+import Router from 'vue-router';
 Vue.use(Router)
+import home from '@/components/home'
+import myPage from '@/components/myPage'
+import buy from '@/components/buy'
+import sell from '@/components/sell'
+import signup from '@/components/signup'
+import BookSearchPage from '@/components/BookSearchPage'
 
 export default new Router({
   routes: [
     {
       path: '/',
-      name: 'HelloWorld',
-      component: HelloWorld
+      name: 'home',
+      component: home
+    },
+    {
+      path: '/myPage',
+      name : 'myPage',
+      component: myPage
+    },
+    {
+      path: '/buy',
+      name: 'buy',
+      component: buy
+    },
+    {
+      path: '/sell',
+      name: 'sell',
+      component: sell
+    },
+    {
+      path: '/signup',
+      name: 'signup',
+      component: signup
+    },
+    {
+      path: '/BookSearchPage',
+      name: 'bookindex',
+      component: BookSearchPage
     }
   ]
 })
+