From 457a5ea5aa037d9232d316758eda42c7ca61f275 Mon Sep 17 00:00:00 2001
From: fy <fy0@qq.com>
Date: Sat, 9 Sep 2017 00:41:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page/src/app.vue                        |  9 +++++++--
 page/src/components/manage.vue          | 10 +++++++++-
 page/src/components/topic_new.vue       |  2 +-
 page/src/components/utils/msgbox.vue    |  2 +-
 page/src/components/utils/paginator.vue |  2 +-
 page/src/main.js                        |  6 ++----
 page/webpack.config.js                  |  1 +
 readme.md                               |  5 +++++
 todo.md                                 |  2 +-
 9 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/page/src/app.vue b/page/src/app.vue
index 936fc19..c839ee6 100644
--- a/page/src/app.vue
+++ b/page/src/app.vue
@@ -13,8 +13,8 @@
                     <router-link tag="li" :to="{ name: 'tags' }" :class="navActiveClass('tag', 'tags')"><a>印记</a></router-link>
                     <router-link tag="li" :to="{ name: 'timeline' }" ><a>时光</a></router-link>
                     <router-link tag="li" :to="{ path: '/signin' }" ><a>用户</a></router-link>
-                    <router-link v-if="state.data.user" tag="li" :to="{ path: '/new' }" :class="navActiveClass('topic_new', 'topic_edit')"><a>撰文</a></router-link>
-                    <router-link v-if="state.data.user" tag="li" :to="{ path: '/manage' }" ><a>管理</a></router-link>
+                    <router-link v-if="user && user.level >= 80" tag="li" :to="{ path: '/new' }" :class="navActiveClass('topic_new', 'topic_edit')"><a>撰文</a></router-link>
+                    <router-link v-if="user && user.level >= 100" tag="li" :to="{ path: '/manage' }" ><a>管理</a></router-link>
                     <router-link tag="li" :to="{ path: '/about' }" ><a>关于</a></router-link>
                 </ul>
             </div>
@@ -84,6 +84,11 @@ export default {
             config,
         }
     },
+    computed: {
+        user: function () {
+            return this.state.data.user;
+        }
+    },
     methods: {
         navActiveClass: function (...names) {
             for (let name of names) {
diff --git a/page/src/components/manage.vue b/page/src/components/manage.vue
index 693aa13..dcf8f17 100644
--- a/page/src/components/manage.vue
+++ b/page/src/components/manage.vue
@@ -18,6 +18,7 @@
 </style>
 
 <script>
+import state from "../state.js"
 import UserManage from "./manage/user.vue"
 import TopicManage from "./manage/topic.vue"
 
@@ -35,7 +36,14 @@ export default {
         handleClick (tab, event) {
             ;
         }
-    }
+    },
+    beforeRouteEnter: async (to, from, next) => {
+        if (state.data.user.level < 100) {
+            $.message_error(`无权限`);
+            return next('/');
+        }
+        next();
+    },
 }
 </script>
 
diff --git a/page/src/components/topic_new.vue b/page/src/components/topic_new.vue
index 300e908..8ff86d3 100644
--- a/page/src/components/topic_new.vue
+++ b/page/src/components/topic_new.vue
@@ -32,7 +32,7 @@
 import api from "../netapi.js"
 import state from "../state.js"
 import SimpleMDE from "simplemde"
-//const SimpleMDE = () => import('simplemde')
+import 'simplemde/dist/simplemde.min.css'
 import Prism from "prismjs"
 
 export default {
diff --git a/page/src/components/utils/msgbox.vue b/page/src/components/utils/msgbox.vue
index 4298ce5..af86be1 100644
--- a/page/src/components/utils/msgbox.vue
+++ b/page/src/components/utils/msgbox.vue
@@ -1,7 +1,7 @@
 <template>
 <transition-group class="tipbox" tag="div" enter-active-class="animated fadeInLeft" 
     leave-active-class="animated fadeOutLeft">
-    <div class="am-alert item" :class="item.class" :key="item" v-for="item in state.data.msgs">
+    <div class="am-alert item" :class="item.class" :key="item.text" v-for="item in state.data.msgs">
         <a>{{item.text}}</a><br />
     </div>
 </transition-group>
diff --git a/page/src/components/utils/paginator.vue b/page/src/components/utils/paginator.vue
index e6fc581..be7164a 100644
--- a/page/src/components/utils/paginator.vue
+++ b/page/src/components/utils/paginator.vue
@@ -1,5 +1,5 @@
 <template>
-<ul class="ic-pages" v-if="pageInfo && pageInfo.last_page != pageInfo.first_page">
+<ul class="ic-pages" v-if="pageInfo && pageInfo.page_count > 1">
    <li v-if="pageInfo.first_page">
         <router-link :to="toInfo(pageInfo.first_page)" class="slim">«</router-link>
     </li>
diff --git a/page/src/main.js b/page/src/main.js
index bde712a..bd67687 100644
--- a/page/src/main.js
+++ b/page/src/main.js
@@ -5,9 +5,8 @@ import nprogress from 'nprogress/nprogress.js'
 import 'lodash'
 import 'purecss'
 import 'animate.css'
-import 'font-awesome/css/font-awesome.css'
-import 'simplemde/dist/simplemde.min.css'
 import 'nprogress/nprogress.css'
+import 'font-awesome/css/font-awesome.css'
 
 import './assets/css/base.css'
 import tools from './tools.js'
@@ -19,8 +18,7 @@ import App from './app.vue'
 import Index from './components/index.vue'
 import Timeline from './components/timeline.vue'
 import TopicPage from './components/topic.vue'
-// const TopicNew = () => import('./components/topic_new.vue')
-import TopicNew from './components/topic_new.vue'
+const TopicNew = () => import('./components/topic_new.vue')
 import Tags from './components/tags.vue'
 import TagPage from './components/tag.vue'
 import SignIn from './components/user/signin.vue'
diff --git a/page/webpack.config.js b/page/webpack.config.js
index 8b90a86..6748afe 100644
--- a/page/webpack.config.js
+++ b/page/webpack.config.js
@@ -1,6 +1,7 @@
 var path = require('path')
 var webpack = require('webpack')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
+// 备注一下，警告来自 core-js（应该是cash带来的）
 
 module.exports = {
     entry: './src/main.js',
diff --git a/readme.md b/readme.md
index 186335c..de9cf71 100644
--- a/readme.md
+++ b/readme.md
@@ -13,6 +13,10 @@
 
 * 向新版 webpack 迁移
 
+* 修正了低权限用户左侧边栏上仍有撰文和管理导航的问题
+
+* 优化：编辑器按需加载，体积减小1/3
+
 
 ### ver 1.0.1 update 2017.09.07
 
@@ -30,6 +34,7 @@
 
 * 破坏性改动：无
 
+
 ### ver 1.0.0 update 2017.09.06
 
 * 初版
diff --git a/todo.md b/todo.md
index b57ab24..9442d9b 100644
--- a/todo.md
+++ b/todo.md
@@ -4,7 +4,7 @@
 * 标签管理
 * 文章编辑大量细节，例如自动保存提示（精确到秒），加载自动保存时也给与提示等
 * 管理页面真正换页
-* fpage app.py 全端口开放问题
+* ~~fpage app.py 全端口开放问题~~
 * 非注册评论
 * 引用文章功能
 * 百度统计