结构调整，修改为服务端渲染

Author: lscho

server/.eslintrc renamed to .eslintrc

@@ -1,62 +1,10 @@
 ## 设计方案  
 
 #### 后台
-1.前后端分离
-2.RESTful API
-3.使用 jwt 身份认证
-4.后台使用 iview
-
-#### 前台
-1.前台使用 nuxt.js 做服务端渲染
-
-## 结构  
-
-|-[admin](https://github.com/lscho/ThinkJS-Vue.js-blog/tree/master/admin) 后台  
-|-[home](https://github.com/lscho/ThinkJS-Vue.js-blog/tree/master/home) 前台  
-|-[server](https://github.com/lscho/ThinkJS-Vue.js-blog/tree/master/server) 服务端  
-
-
-## 依赖 
-
-#### 服务端  
-
-```json
-  "dependencies": {
-    "think-cache": "^1.0.0",
-    "think-cache-file": "^1.0.8",
-    "think-logger3": "^1.0.0",
-    "think-model": "^1.0.0",
-    "think-model-mysql": "^1.0.0",
-    "think-session": "^1.0.0",
-    "think-session-jwt": "^1.0.8",
-    "think-view": "^1.0.11",
-    "think-view-ejs": "^0.0.11",
-    "thinkjs": "^3.0.0"
-  }
-```
-#### 后台
-
-```json
-  "dependencies": {
-    "axios": "^0.17.0",
-    "echarts": "^3.8.5",
-    "iview": "^2.8.0",
-    "mavon-editor": "^2.4.13",
-    "vue": "^2.5.2",
-    "vue-axios": "^2.0.2",
-    "vue-router": "^3.0.1",
-    "vuex": "^3.0.0",
-    "vuex-router-sync": "^5.0.0"
-  }
-```
-
-#### 前台
-
-```json
-  "dependencies": {
-    "nuxt": "^1.0.0"
-  }
-```
+1.前后端分离 
+2.RESTful API 
+3.使用 jwt 身份认证 
+4.后台使用 iview 
 
 ## 安装  
 
@@ -65,14 +13,10 @@
 导入sql,修改[配置](https://github.com/lscho/ThinkJS-Vue.js-blog/blob/master/server/src/config/adapter.js)中 mysql 部分,启动服务  
 ```bash
 # 启动服务端
-cd ./admin
-npm run dev
-# 启动前台服务
-cd ./home
-npm run dev
+npm start
 # 启动后台服务
 cd ./admin
-npm run dev
+npm start
 ```
 
 #### 部署  
@@ -81,8 +25,9 @@ npm run dev
 # 编译
 cd ./admin
 npm run build
-cd ./home
-npm run build
 ```
 
-将 server 文件夹上传至服务器，参考[nginx.conf](https://github.com/lscho/ThinkJS-Vue.js-blog/blob/master/server/nginx.conf)进行配置
+将 src/ view/ www/ 文件夹上传至服务器
+执行`npm install`
+修改[配置](https://github.com/lscho/ThinkJS-Vue.js-blog/blob/master/server/src/config/adapter.js)中 mysql 部分,启动服务
+参考[nginx.conf](https://github.com/lscho/ThinkJS-Vue.js-blog/blob/master/server/nginx.conf)进行配置

server/.gitignore renamed to .gitignore

@@ -60,12 +60,12 @@ module.exports = {
 
   build: {
     // Template for index.html
-    index: path.resolve(__dirname, '../dist/index.html'),
+    index: path.resolve(__dirname, '../../www/admin.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
+    assetsRoot: path.resolve(__dirname, '../../www/static/admin'),
+    assetsSubDirectory: '',
+    assetsPublicPath: '/static/admin/',
 
     /**
      * Source Maps

README.md

@@ -0,0 +1,36 @@
+import Vue from 'vue'
+
+export default {
+
+  getList (map = {}) {
+    return new Promise((resolve, reject) => {
+      Vue.axios.get('/comment', { params: map }).then(response => {
+        resolve(response.data)
+      })
+    })
+  },
+
+  getInfo (slug) {
+    return new Promise((resolve, reject) => {
+      Vue.axios.get('/comment/' + slug).then(response => {
+        resolve(response.data)
+      })
+    })
+  },
+
+  update (id, data) {
+    return new Promise((resolve, reject) => {
+      Vue.axios.put('/comment/' + id, data).then(response => {
+        resolve(response.data)
+      })
+    })
+  },
+
+  delete (id) {
+    return new Promise((resolve, reject) => {
+      Vue.axios.delete('/comment/' + id).then(response => {
+        resolve(response.data)
+      })
+    })
+  }
+}

admin/config/index.js

@@ -1,5 +1,4 @@
 import Vue from 'vue'
-console.log(11)
 export default {
 
   upload (data) {

admin/src/api/comment.js

@@ -1,5 +1,6 @@
 import category from '@/api/category'
 import content from '@/api/content'
+import comment from '@/api/comment'
 import image from '@/api/image'
 import tag from '@/api/tag'
 import token from '@/api/token'
@@ -9,6 +10,7 @@ import site from '@/api/site'
 export {
   category,
   content,
+  comment,
   image,
   tag,
   token,

admin/src/api/image.js

@@ -189,3 +189,12 @@ body {
 .line-chart-con {
 	height: 150px;
 }
+
+.page {
+	float: right;
+	margin-top: 10px;
+}
+
+.search {
+	text-align: right;
+}

admin/src/api/index.js

@@ -6,7 +6,7 @@ Vue.use(VueRouter)
 
 // 路由配置
 const RouterConfig = {
-  mode: 'history',
+  //mode: 'history',
   routes: routers
 }
 

admin/src/assets/css/admin.css

@@ -36,6 +36,8 @@ export const adminRouter = [{
     { path: 'page/list', name: 'ContentList', meta: { title: '页面列表', requiresAuth: true }, component: resolve => { require(['@/view/page/list.vue'], resolve) } },
     { path: 'category/save', name: 'CategorySave', meta: { title: '分类编辑', requiresAuth: true }, component: resolve => { require(['@/view/category/save.vue'], resolve) } },
     { path: 'category/list', name: 'CategoryList', meta: { title: '分类列表', requiresAuth: true }, component: resolve => { require(['@/view/category/list.vue'], resolve) } },
+    { path: 'comment/save', name: 'CommentSave', meta: { title: '分类编辑', requiresAuth: true }, component: resolve => { require(['@/view/comment/save.vue'], resolve) } },
+    { path: 'comment/list', name: 'CommentList', meta: { title: '分类列表', requiresAuth: true }, component: resolve => { require(['@/view/comment/list.vue'], resolve) } },
     { path: 'tag/save', name: 'TagSave', meta: { title: '标签编辑', requiresAuth: true }, component: resolve => { require(['@/view/tag/save.vue'], resolve) } },
     { path: 'tag/list', name: 'TagList', meta: { title: '标签列表', requiresAuth: true }, component: resolve => { require(['@/view/tag/list.vue'], resolve) } },
     { path: 'user/info', name: 'UserInfo', meta: { title: '个人资料', requiresAuth: true }, component: resolve => { require(['@/view/user/info.vue'], resolve) } },

admin/src/router/index.js

@@ -89,71 +89,28 @@ export default {
         },
         {
           name: "内容管理",
-          path: "/content",
+          path: "/content/list",
           icon: "document",
-          children: [
-            {
-              name: "内容发布",
-              path: "/content/save",
-              icon: "edit"
-            },
-            {
-              name: "内容列表",
-              path: "/content/list",
-              icon: "navicon-round"
-            }
-          ]
         },
         {
           name: "页面管理",
-          path: "/page",
+          path: "/page/list",
           icon: "ios-paper",
-          children: [
-            {
-              name: "页面发布",
-              path: "/page/save",
-              icon: "edit"
-            },
-            {
-              name: "页面列表",
-              path: "/page/list",
-              icon: "navicon-round"
-            }
-          ]
+        },
+        {
+          name: "评论管理",
+          path: "/comment/list",
+          icon: "chatbubbles"
         },
         {
           name: "分类管理",
-          path: "/category",
+          path: "/category/list",
           icon: "shuffle",
-          children: [
-            {
-              name: "分类发布",
-              path: "/category/save",
-              icon: "edit"
-            },
-            {
-              name: "分类列表",
-              path: "/category/list",
-              icon: "navicon-round"
-            }
-          ]
         },
         {
           name: "标签管理",
-          path: "/tag",
+          path: "/tag/list",
           icon: "pricetags",
-          children: [
-            {
-              name: "标签发布",
-              path: "/tag/save",
-              icon: "edit"
-            },
-            {
-              name: "标签列表",
-              path: "/tag/list",
-              icon: "navicon-round"
-            }
-          ]
         },
         {
           name: "系统设置",
@@ -174,6 +131,8 @@ export default {
         home: "控制台",
         content: "内容",
         category: "分类",
+        page: "页面",
+        comment: "评论",
         tag: "标签",
         save: "编辑",
         list: "列表"

admin/src/router/router.js

@@ -1,13 +1,22 @@
 <template>
-    <Table border  :loading="loading" :columns="columns" :data="data"></Table>
+    <div>
+      <Form ref="formInline" inline>
+          <FormItem>
+          <Button type="primary" icon="plus" @click="add">添加分类</Button>
+          </FormItem>
+      </Form>
+      <Table border :loading="loading" :columns="columns" :data="data"></Table>
+    </div>
 </template>
 <script>
 import { category } from "@/api";
-import { Button, Table } from 'iview';
+import { Button, Table, Form, FormItem } from 'iview';
 export default {
   components: {
     Button,
-    Table
+    Table,
+    Form,
+    FormItem
   },
   data() {
     return {
@@ -49,7 +58,8 @@ export default {
                 {
                   props: {
                     type: "primary",
-                    size: "small"
+                    size: "small",
+                    icon:'edit'
                   },
                   style: {
                     marginRight: "5px"
@@ -64,15 +74,15 @@ export default {
                       });
                     }
                   }
-                },
-                "编辑"
+                }
               ),
               h(
                 "Button",
                 {
                   props: {
                     type: "error",
-                    size: "small"
+                    size: "small",
+                    icon:'trash-a'
                   },
                   on: {
                     click: () => {
@@ -81,8 +91,7 @@ export default {
                       }
                     }
                   }
-                },
-                "删除"
+                }
               )
             ]);
           }
@@ -102,6 +111,9 @@ export default {
       category.delete(id).then(res => {
         this.data.splice(index, 1);
       });
+    },
+    add(){
+      this.$router.push('/category/save');
     }
   },
   mounted() {

admin/src/view/Main.vue

@@ -45,12 +45,12 @@ export default {
           if (this.formItem.id) {
             //更新数据
             category.update(this.formItem.id, this.formItem).then(res => {
-              this.$router.push("/admin/category/list");
+              this.$router.push("/category/list");
             });
           } else {
             //新增数据
             category.create(this.formItem).then(res => {
-              this.$router.push("/admin/category/list");
+              this.$router.push("/category/list");
             });
           }
         } else {