models update

Author: wangqi

containers/Layout/index.style.js

@@ -5,6 +5,7 @@ export  default styled.div`
   flex-direction: column;
    #main-content {
     min-height: calc(100vh - 171px);
+    padding: 32px 20px 0 20px;
     border-top: 1px solid rgb(231,231,231);
     border-bottom: 1px solid rgb(231,231,231);
    }

package.json

@@ -2,7 +2,7 @@
   "name": "yibozi",
   "version": "1.0.0",
   "scripts": {
-    "dev": "node server.js",
+    "dev": "nodemon server.js",
     "build": "next build",
     "start": "NODE_ENV=production node server.js"
   },

pages/article/editor/index.js

@@ -15,12 +15,11 @@ const DynamicBraftEditorNossr = dynamic(
 );
 
 const Editor = () => {
-  const [ editorState, setEditorState ] = useState(null);
+  const [ editorState = {}, setEditorState ] = useState({});
   // useEffect只在客户端调用
-  useEffect(() => {
-    const editorState = JSON.parse(localStorage.getItem('editorState') || '{}');
-    setEditorState(editorState);
-  }, []);
+  // useEffect(() => {
+  //   setEditorState();
+  // }, []);
 
   // 保持文章方法
   const handleSubmitEditorState = async (submitData) => {

pages/article/index.style.jsx

@@ -1,7 +1,6 @@
 import styled from 'styled-components';
 
 export default styled.div`
-  padding: 32px 20px 0 20px;
   .article-list {
     display: flex;
     flex-direction: row;

pages/home/index.js

@@ -11,6 +11,7 @@ const Index = () => {
         <title>YIBOZI</title>
       </Head>
       <Style>
+        home
       </Style>
     </Layout>
   );

server/controllers/article/check.js

@@ -0,0 +1,34 @@
+const { ArticleMolel } = require('../../models');
+
+module.exports = async (ctx) => {
+  const uuid = ctx.params.uuid;
+  try {
+    if (uuid) {
+      const data = await ArticleMolel.findOne({ uuid });
+      if(data) {
+        ctx.state = {
+          code: 0,
+          data
+        };
+      }else {
+        ctx.state = {
+          code: -3,
+          data: { msg: '暂无此数据' },
+        };
+      }
+    } else {
+      ctx.state = {
+        code: -2,
+        data: { msg: '参数不正确' },
+      };
+    }
+  } catch (e) {
+    ctx.state = {
+      code: -1,
+      data: {
+        errorInfo: e,
+        msg: '失败'
+      },
+    };
+  }
+};

server/controllers/navigation/list.js

@@ -13,7 +13,7 @@ module.exports = async (ctx) => {
     {
       id: 2,
       parent_id: 0,
-      name: '博文',
+      name: '文章',
       key:'article',
       path: '/article',
       asPath:'/article',

server/models/Article.js

@@ -6,7 +6,7 @@ const { createuuid } = require('../utils');
 // article 会自动加s去找数据库的集合 忽略大写
 module.exports = mongoose.model('article',
   new Schema({
-    'uuid': { type: String, default: createuuid(8,16) }, // id
+    'uuid': { type: String, default: () => createuuid(8,16) }, // id
     'title': { type: String }, // 文章标题
     'type': { type: String }, // 文章类别
     'createTime': { type: Number }, // 创建时间

server/models/Goods.js

@@ -6,7 +6,7 @@ const { createuuid } = require('../utils');
 // goods 会自动加s去找数据库的集合 忽略大写
 module.exports = mongoose.model('good',
   new Schema({
-    'uuid': { type: String, default: createuuid(8,16) }, // id
+    'uuid': { type: String, default: () => createuuid(8,16) }, // id
     'displayName': { type: String }, // 名称
   })
 );

server/routes/index.js

@@ -17,9 +17,12 @@ router.delete('/api/goods/:uuid', controllers.goods.delete);
 /* navigation */
 router.get('/api/navigation', controllers.navigation.list );
 
-/* 查找文章 */
+/* 查找文章列表 */
 router.get('/api/article', controllers.article.list );
 
+/* 查找单个文章(通过id) */
+router.get('/api/article/:uuid', controllers.article.check );
+
 /* 添加文章 */
 router.post('/api/article', controllers.article.add );