Feat/1.3.0/UI (#840)

Author: shuashuai

i18n/en_US.yaml

@@ -1169,6 +1169,15 @@ ui:
     system_setting: System setting
     default: Default
     reset: Reset
+    tag: Tag
+    post_lowercase: post
+    filter: Filter
+    ignore: Ignore
+    submit: Submit
+    normal: Normal
+    closed: Closed
+    deleted: Deleted
+    pending: Pending
   search:
     title: Search Results
     keywords: Keywords
@@ -1444,6 +1453,7 @@ ui:
       github: GitHub
       blog: Blog
       contact: Contact
+      forum: Forum
       documents: Documents
       feedback: Feedback
       support: Support
@@ -1546,9 +1556,6 @@ ui:
         content: A suspended user can't log in.
     questions:
       page_title: Questions
-      normal: Normal
-      closed: Closed
-      deleted: Deleted
       unlisted: Unlisted
       post: Post
       votes: Votes
@@ -1557,12 +1564,11 @@ ui:
       status: Status
       action: Action
       change: Change
+      pending: Pending
       filter:
         placeholder: "Filter by title, question:id"
     answers:
       page_title: Answers
-      normal: Normal
-      deleted: Deleted
       post: Post
       votes: Votes
       created: Created
@@ -1676,8 +1682,8 @@ ui:
       page_title: Write
       restrict_answer:
         title: Restrict answer
-        label: Each user can only write one answer for each question
-        text: "They can use the edit link to refine and improve their existing answer, instead."
+        label: Each user can only write one answer for the same question
+        text: "Turn off to allow users to write multiple answers to the same question, which may cause answers to be unfocused."
       recommend_tags:
         label: Recommend tags
         text: "Please input tag slug above, one tag per line."
@@ -1811,6 +1817,22 @@ ui:
     edit_answer: Edit answer
     edit_tag: Edit tag
     empty: No review tasks left.
+    approve_revision_tip: Do you approve this revision?
+    approve_flag_tip: Do you approve this flag?
+    approve_post_tip: Do you approve this post?
+    approve_user_tip: Do you approve this user?
+    suggest_edits: Suggested edits
+    flag_post: Flag post
+    flag_user: Flag user
+    queued_post: Queued post
+    queued_user: Queued user
+    filter_label: Type
+    reputation: reputation
+    flag_post_type: Flagged this post as {{ type }}
+    flag_user_type: Flagged this user as {{ type }}
+    edit_post: Edit post
+    list_post: List post
+    unlist_post: Unlist post
   timeline:
     undeleted: undeleted
     deleted: deleted

i18n/zh_CN.yaml

@@ -1133,6 +1133,15 @@ ui:
     system_setting: System setting
     default: Default
     reset: Reset
+    tag: Tag
+    post_lowercase: 帖子
+    filter: Filter
+    ignore: 忽略
+    submit: 提交
+    normal: 正常
+    closed: 已关闭
+    deleted: 已删除
+    pending: Pending
   search:
     title: 搜索结果
     keywords: 关键词
@@ -1631,8 +1640,8 @@ ui:
       page_title: 编辑
       restrict_answer:
         title: 限制一个回答
-        label: 每个用户对于每个问题只能有一个回答
-        text: "用户可以使用编辑按钮优化已有的回答"
+        label: 每个用户只能为同一问题写一个回答
+        text: "关闭以允许用户对同一问题编写多个回答，这可能会导致回答不集中。"
       recommend_tags:
         label: 推荐标签
         text: "请在上方输入标签固定链接，每行一个标签。"

internal/controller/template_controller.go

@@ -22,7 +22,6 @@ package controller
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/incubator-answer/internal/entity"
 	"html/template"
 	"net/http"
 	"regexp"
@@ -32,6 +31,7 @@ import (
 	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/base/handler"
 	templaterender "github.com/apache/incubator-answer/internal/controller/template_render"
+	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
 	"github.com/apache/incubator-answer/internal/service/siteinfo_common"
 	"github.com/apache/incubator-answer/pkg/checker"
@@ -47,7 +47,7 @@ import (
 var SiteUrl = ""
 
 type TemplateController struct {
-	scriptPath               string
+	scriptPath               []string
 	cssPath                  string
 	templateRenderController *templaterender.TemplateRenderController
 	siteInfoService          siteinfo_common.SiteInfoCommonService
@@ -66,18 +66,21 @@ func NewTemplateController(
 		siteInfoService:          siteInfoService,
 	}
 }
-func GetStyle() (script, css string) {
+func GetStyle() (script []string, css string) {
 	file, err := ui.Build.ReadFile("build/index.html")
 	if err != nil {
 		return
 	}
-	scriptRegexp := regexp.MustCompile(`<script defer="defer" src="(.*)"></script>`)
-	scriptData := scriptRegexp.FindStringSubmatch(string(file))
+	scriptRegexp := regexp.MustCompile(`<script defer="defer" src="([^"]*)"></script>`)
+	scriptData := scriptRegexp.FindAllStringSubmatch(string(file), -1)
+	for _, s := range scriptData {
+		if len(s) == 2 {
+			script = append(script, s[1])
+		}
+	}
+
 	cssRegexp := regexp.MustCompile(`<link href="(.*)" rel="stylesheet">`)
 	cssListData := cssRegexp.FindStringSubmatch(string(file))
-	if len(scriptData) == 2 {
-		script = scriptData[1]
-	}
 	if len(cssListData) == 2 {
 		css = cssListData[1]
 	}

ui/config-overrides.js

@@ -20,6 +20,7 @@
 const {
   addWebpackModuleRule,
   addWebpackAlias,
+  setWebpackOptimizationSplitChunks,
 } = require("customize-cra");
 
 const path = require("path");
@@ -37,6 +38,101 @@ module.exports = {
       use: "yaml-loader"
     })(config);
 
+    setWebpackOptimizationSplitChunks({
+      maxInitialRequests: 20,
+      minSize: 20 * 1024,
+      minChunks: 2,
+      cacheGroups: {
+        automaticNamePrefix: 'chunk',
+        components: {
+          test: /[\\/]components[\\/]/,
+          name: 'components',
+          priority: 14,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
+        i18next: {
+          name: 'i18next',
+          test: /[\/]node_modules[\/](i18next)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 12,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
+        reactBootstrap: {
+          name: 'react-bootstrap',
+          test: /[\/]node_modules[\/](react-bootstrap)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 11,
+          minChunks: 1,
+          chunks: 'initial',
+          reuseExistingChunk: true,
+        },
+        lodash: {
+          name: 'lodash',
+          test: /[\/]node_modules[\/](lodash)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 10,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
+        codemirror: {
+          name: 'codemirror',
+          test: /[\/]node_modules[\/](codemirror)[\/]/,
+          priority: 9,
+          reuseExistingChunk: true,
+          enforce: true,
+        },
+        nextShare: {
+          name: 'next-share',
+          test: /[\/]node_modules[\/](next-share)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 8,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
+        marked: {
+          name: 'marked',
+          test: /[\/]node_modules[\/](marked)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 7,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
+        reactDom: {
+          name: 'react-dom',
+          test: /[\/]node_modules[\/](react-dom)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 7,
+          reuseExistingChunk: true,
+          chunks: 'all',
+          enforce: true,
+        },
+        nodesAsync: {
+          name: 'chunk-nodesAsync',
+          test: /[\/]node_modules[\/]/,
+          priority: 2,
+          minChunks: 2,
+          chunks: 'async', // 仅打包异步引用的依赖
+          reuseExistingChunk: true, // 重复使用已经存在的块
+        },
+        nodesInitial: {
+          name: 'chunk-nodesInitial',
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          test: /[\/]node_modules[\/]/,
+          priority: 1,
+          minChunks: 1,
+          chunks: 'initial',
+          reuseExistingChunk: true,
+        },
+      },
+    })(config);
+
     // add i18n dir to ModuleScopePlugin allowedPaths
     const moduleScopePlugin = config.resolve.plugins.find(_ => _.constructor.name === "ModuleScopePlugin");
     if (moduleScopePlugin) {

ui/package.json

@@ -12,7 +12,8 @@
     "prepare": "pnpm build:packages",
     "pre-commit": "lint-staged",
     "build:packages": "pnpm -r --filter=./src/plugins/* run build",
-    "clean": "rm -rf node_modules && rm -rf src/plugins/**/node_modules"
+    "clean": "rm -rf node_modules && rm -rf src/plugins/**/node_modules",
+    "analyze": "source-map-explorer 'build/static/js/*.js'"
   },
   "dependencies": {
     "axios": "^0.27.2",
@@ -82,6 +83,7 @@
     "react-app-rewired": "^2.2.1",
     "react-scripts": "5.0.1",
     "sass": "^1.54.4",
+    "source-map-explorer": "^2.5.3",
     "typescript": "^4.9.5",
     "yaml-loader": "^0.8.0"
   },