pref: Project optimization in progress

Author: guosw

.eslintrc.js

@@ -175,6 +175,7 @@ module.exports = {
     'no-path-concat': 'off', // 可以直接使用 __dirname
     'prefer-promise-reject-errors': 0,
     "react-hooks/rules-of-hooks": "off",
-    'react-hooks/exhaustive-deps': 'off' 
+    'react-hooks/exhaustive-deps': 'off',
+    'jsx-a11y/anchor-is-valid': 'off' 
   }
 }

package.json

@@ -7,7 +7,7 @@
     "@svgr/webpack": "4.3.2",
     "@typescript-eslint/eslint-plugin": "1.13.0",
     "@typescript-eslint/parser": "1.13.0",
-    "antd": "^3.23.0",
+    "antd": "^3.26.6",
     "axios": "^0.19.0",
     "babel-eslint": "10.0.2",
     "babel-jest": "^24.8.0",

server/controllers/article.js

@@ -232,25 +232,21 @@ class ArticleController {
 
     if (validator) {
       const { fileNameList } = ctx.request.body
-      const existList = [] // 存在的文件名列表
-      const noExistList = []
       const list = await Promise.all(
         fileNameList.map(async fileName => {
           const filePath = `${uploadPath}/${fileName}`
-          const result = decodeFile(filePath)
-          const title = result.title || fileName.replace(/\.md/, '')
-          const article = await ArticleModel.findOne({ where: { title } })
+          const file = decodeFile(filePath)
+          const title = file.title || fileName.replace(/\.md/, '')
+          const article = await ArticleModel.findOne({ where: { title }, attributes: ['id'] })
+          const result = { fileName, title }
           if (article) {
-            existList.push({ fileName, articleId: article.id, title: article.title })
-          } else {
-            const params = { fileName, title: result.title }
-            params.title ? noExistList.unshift(params) : noExistList.push(params)
+            result.exist = true
+            result.articleId = article.id
           }
-          return article
+          return result
         })
       )
-
-      ctx.body = { existList, noExistList }
+      ctx.body = list
     }
   }
 
@@ -279,12 +275,16 @@ class ArticleController {
   static async uploadConfirm(ctx) {
     const validator = ctx.validate(ctx.request.body, {
       authorId: Joi.number(),
-      insertList: Joi.array(),
-      updateList: Joi.array()
+      uploadList: Joi.array()
     })
     if (validator) {
-      const { insertList, updateList, authorId } = ctx.request.body
+      const { uploadList, authorId } = ctx.request.body
       await findOrCreateFilePath(uploadPath) // 检查目录
+      // const insertList = []
+      // const updateList = []
+      // uploadList.forEach(file => {
+      //   file.exist ? updateList.push(file) : insertList.push(file)
+      // })
 
       const _parseList = list => {
         return list.map(item => {
@@ -304,16 +304,17 @@ class ArticleController {
         })
       }
 
-      const list1 = _parseList(insertList)
-      const list2 = _parseList(updateList)
+      const list = _parseList(uploadList)
+      const updateList = list.filter(d => d.articleId !== 'undefined')
+      const insertList = list.filter(d => d.articleId === 'undefined')
 
       // 插入文章
       const insertResultList = await Promise.all(
-        list1.map(data => ArticleModel.create(data, { include: [TagModel, CategoryModel] }))
+        insertList.map(data => ArticleModel.create(data, { include: [TagModel, CategoryModel] }))
       )
 
       const updateResultList = await Promise.all(
-        list2.map(async data => {
+        updateList.map(async data => {
           const { title, content, categories = [], tags = [], articleId } = data
           await ArticleModel.update({ title, content }, { where: { id: articleId } })
           await TagModel.destroy({ where: { articleId } })
@@ -324,7 +325,7 @@ class ArticleController {
         })
       )
 
-      ctx.body = { insertList: insertResultList, updateList: updateResultList }
+      ctx.body = { message: 'success', insertList: insertResultList, updateList: updateResultList }
     }
   }
 

server/controllers/user.js

@@ -124,13 +124,6 @@ class UserController {
       // username: user.username, role, userId: id, token
       const token = createToken({ userId: githubInfo.id, role: target.role }) // 生成 token
 
-      // ctx.client(200, 'success', {
-      //   github: githubInfo,
-      //   username: target.username,
-      //   userId: target.id,
-      //   role: target.role,
-      //   token
-      // })
       ctx.body = {
         github: githubInfo,
         username: target.username,
@@ -139,7 +132,6 @@ class UserController {
         token
       }
     } else {
-      // ctx.client(403, 'github 授权码已失效！')
       ctx.throw(403, 'github 授权码已失效！')
     }
   }
@@ -163,8 +155,7 @@ class UserController {
       } else {
         const user = await UserModel.findOne({ where: { username } })
         if (user && !user.github) {
-          // ctx.client(403, '用户名已被占用')
-          ctx.client(403, '用户名已被占用')
+          ctx.throw(403, '用户名已被占用')
         } else {
           const saltPassword = await encrypt(password)
           await UserModel.create({ username, password: saltPassword, email })

src/components/Discuss/index.jsx

@@ -7,15 +7,16 @@ import { DISCUSS_AVATAR } from '@/config'
 // methods
 import axios from '@/utils/axios'
 import { calcCommentsCount } from '@/utils'
-import { login, register, loginout } from '@/redux/user/actions'
-import { switchSignModal } from '@/redux/app/actions'
+import { loginout } from '@/redux/modal/user'
 
 // components
 import SvgIcon from '@/components/SvgIcon'
 import { Comment, Avatar, Form, Button, Divider, Input, Icon, Menu, Dropdown, message, Modal } from 'antd'
 import List from './list' // 评论列表
 import AppAvatar from '@/components/Avatar'
 
+import useBus from '@/hooks/useBus'
+
 const { TextArea } = Input
 
 const Editor = ({ onChange, onSubmit, submitting, value, articleId }) => (
@@ -37,6 +38,7 @@ const Editor = ({ onChange, onSubmit, submitting, value, articleId }) => (
 
 function Discuss(props) {
   const dispatch = useDispatch()
+  const bus = useBus()
   const userInfo = useSelector(state => state.user)
   const { username, role } = userInfo
 
@@ -60,12 +62,12 @@ function Discuss(props) {
   function handleMenuClick(e) {
     switch (e.key) {
       case 'login':
-        dispatch(switchSignModal('login', true))
+        bus.emit('openSignModal', 'login')
 
         break
 
       case 'register':
-        dispatch(switchSignModal('register', true))
+        bus.emit('openSignModal', 'register')
 
         break
 

src/components/GithubLogining/index.jsx

@@ -4,7 +4,7 @@ import { useDispatch } from 'react-redux'
 // ..
 import { Spin } from 'antd'
 import { decodeQuery } from '@/utils'
-import { login } from '@/redux/user/actions'
+import { login } from '@/redux/modal/user'
 import { get, remove } from '@/utils/storage'
 
 function AppLoading(props) {

src/components/Public/SignModal/index.jsx

@@ -1,8 +1,13 @@
 import React, { useState, useEffect } from 'react'
 import { Form, Icon, Input, Button, Modal } from 'antd'
+import { useLocation } from 'react-router-dom'
 
 import { GITHUB } from '@/config'
-import { save, remove } from '@/utils/storage'
+import { save } from '@/utils/storage'
+
+// redux
+import { login, register } from '@/redux/modal/user'
+import { useDispatch } from 'react-redux'
 
 // hooks
 import { useListener } from '@/hooks/useBus'
@@ -24,9 +29,12 @@ function FormItem(props) {
 }
 
 function SignModal(props) {
+  const dispatch = useDispatch() // dispatch hooks
+  const location = useLocation() // location
   const [visible, setVisible] = useState(false)
   const [type, setType] = useState('login')
   const { getFieldDecorator } = props.form
+
   useListener('openSignModal', type => {
     props.form.resetFields()
     setType(type)
@@ -37,17 +45,15 @@ function SignModal(props) {
     e.preventDefault()
     props.form.validateFieldsAndScroll((errors, values) => {
       if (errors) return
-      console.log(values)
-      if (type === 'login') {
-        // dispatch(login(values))
-      } else if (type === 'register') {
-        // dispatch(register(values))
-      }
+      const action = type === 'login' ? login : register
+      dispatch(action(values)).then(() => {
+        setVisible(false) // type =  login | register
+      })
     })
   }
 
   function githubLogin() {
-    const { pathname, search } = props.location
+    const { pathname, search } = location
     save('prevRouter', `${pathname}${search}`)
     window.location.href = `${GITHUB.url}?client_id=${GITHUB.client_id}`
   }
@@ -97,14 +103,14 @@ function SignModal(props) {
                 })(<Input placeholder='请输入密码' type='password' />)}
               </FormItem>
               <FormItem label='确认密码'>
-                {getFieldDecorator('password', {
+                {getFieldDecorator('confirm', {
                   rules: [
                     { required: true, message: 'Password is required' },
                     { validator: compareToFirstPassword }
                   ]
                 })(<Input placeholder='确认密码' type='password' />)}
               </FormItem>
-              <FormItem label='密码'>
+              <FormItem label='邮箱'>
                 {getFieldDecorator('email', {
                   rules: [
                     { type: 'email', message: 'The input is not valid E-mail!' },