Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

update index.html

aichy12685691e9143d9
diff --git a/internal/base/server/http.go b/internal/base/server/http.go
index 70f0d96d..7e0d3296 100644
--- a/internal/base/server/http.go
+++ b/internal/base/server/http.go
@@ -3,25 +3,13 @@ package server
import (
"html/template"
"io/fs"
- "math"
"os"
- "regexp"
- "strconv"
- "strings"
- "time"
-
- "github.com/answerdev/answer/internal/schema"
- "github.com/answerdev/answer/pkg/converter"
- "github.com/answerdev/answer/pkg/day"
- "github.com/answerdev/answer/pkg/htmltext"
brotli "github.com/anargu/gin-brotli"
"github.com/answerdev/answer/internal/base/middleware"
- "github.com/answerdev/answer/internal/base/translator"
"github.com/answerdev/answer/internal/router"
"github.com/answerdev/answer/ui"
"github.com/gin-gonic/gin"
- "github.com/segmentfault/pacman/i18n"
)
// NewHTTPServer new http server.
@@ -44,6 +32,16 @@ func NewHTTPServer(debug bool,
r.Use(brotli.Brotli(brotli.DefaultCompression))
r.GET("/healthz", func(ctx *gin.Context) { ctx.String(200, "OK") })
+ dev := os.Getenv("DEVCODE")
+ if dev != "" {
+ r.SetFuncMap(funcMap)
+ r.LoadHTMLGlob("../../ui/template/*")
+ } else {
+ html, _ := fs.Sub(ui.Template, "template")
+ htmlTemplate := template.Must(template.New("").Funcs(funcMap).ParseFS(html, "*"))
+ r.SetHTMLTemplate(htmlTemplate)
+ }
+
viewRouter.Register(r)
rootGroup := r.Group("")
@@ -70,116 +68,6 @@ func NewHTTPServer(debug bool,
cmsauthV1.Use(authUserMiddleware.CmsAuth())
answerRouter.RegisterAnswerCmsAPIRouter(cmsauthV1)
- funcMap := template.FuncMap{
- "replaceHTMLTag": func(src string, tags ...string) string {
- p := `(?U)<(\d+)>.+</(\d+)>`
-
- re := regexp.MustCompile(p)
- ms := re.FindAllStringSubmatch(src, -1)
- for _, mi := range ms {
- if mi[1] == mi[2] {
- i, err := strconv.Atoi(mi[1])
- if err != nil || len(tags) < i {
- break
- }
-
- src = strings.ReplaceAll(src, mi[0], tags[i-1])
- }
- }
-
- return src
- },
- "join": func(sep string, elems ...string) string {
- return strings.Join(elems, sep)
- },
- "templateHTML": func(data string) template.HTML {
- return template.HTML(data)
- },
- "translator": func(la i18n.Language, data string, params ...interface{}) string {
- trans := translator.GlobalTrans.Tr(la, data)
-
- if len(params) > 0 && len(params)%2 == 0 {
- for i := 0; i < len(params); i += 2 {
- k := converter.InterfaceToString(params[i])
- v := converter.InterfaceToString(params[i+1])
- trans = strings.ReplaceAll(trans, "{{ "+k+" }}", v)
- }
- }
-
- return trans
- },
- "timeFormatISO": func(tz string, timestamp int64) string {
- _, _ = time.LoadLocation(tz)
- return time.Unix(timestamp, 0).Format("2006-01-02T15:04:05.000Z")
- },
- "translatorTimeFormatLongDate": func(la i18n.Language, tz string, timestamp int64) string {
- trans := translator.GlobalTrans.Tr(la, "ui.dates.long_date_with_time")
- return day.Format(timestamp, trans, tz)
- },
- "translatorTimeFormat": func(la i18n.Language, tz string, timestamp int64) string {
- var (
- now = time.Now().Unix()
- between int64 = 0
- trans string
- )
- _, _ = time.LoadLocation(tz)
- if now > timestamp {
- between = now - timestamp
- }
-
- if between <= 1 {
- return translator.GlobalTrans.Tr(la, "ui.dates.now")
- }
-
- if between > 1 && between < 60 {
- trans = translator.GlobalTrans.Tr(la, "ui.dates.x_seconds_ago")
- return strings.ReplaceAll(trans, "{{count}}", converter.IntToString(between))
- }
-
- if between >= 60 && between < 3600 {
- min := math.Floor(float64(between / 60))
- trans = translator.GlobalTrans.Tr(la, "ui.dates.x_minutes_ago")
- return strings.ReplaceAll(trans, "{{count}}", strconv.FormatFloat(min, 'f', 0, 64))
- }
-
- if between >= 3600 && between < 3600*24 {
- h := math.Floor(float64(between / 3600))
- trans = translator.GlobalTrans.Tr(la, "ui.dates.x_hours_ago")
- return strings.ReplaceAll(trans, "{{count}}", strconv.FormatFloat(h, 'f', 0, 64))
- }
-
- if between >= 3600*24 &&
- between < 3600*24*366 &&
- time.Unix(timestamp, 0).Format("2006") == time.Unix(now, 0).Format("2006") {
- trans = translator.GlobalTrans.Tr(la, "ui.dates.long_date")
- return day.Format(timestamp, trans, tz)
- }
-
- trans = translator.GlobalTrans.Tr(la, "ui.dates.long_date_with_year")
- return day.Format(timestamp, trans, tz)
- },
- "wrapComments": func(comments []*schema.GetCommentResp, la i18n.Language, tz string) map[string]interface{} {
- return map[string]interface{}{
- "comments": comments,
- "language": la,
- "timezone": tz,
- }
- },
- "urlTitle": func(title string) string {
- return htmltext.UrlTitle(title)
- },
- }
- r.SetFuncMap(funcMap)
-
- dev := os.Getenv("DEVCODE")
- if dev != "" {
- r.LoadHTMLGlob("../../ui/template/*")
- } else {
- html, _ := fs.Sub(ui.Template, "template")
- htmlTemplate := template.Must(template.New("").Funcs(funcMap).ParseFS(html, "*"))
- r.SetHTMLTemplate(htmlTemplate)
- }
-
templateRouter.RegisterTemplateRouter(rootGroup)
return r
}
diff --git a/internal/base/server/http_funcmap.go b/internal/base/server/http_funcmap.go
new file mode 100644
index 00000000..caac20f4
--- /dev/null
+++ b/internal/base/server/http_funcmap.go
@@ -0,0 +1,117 @@
+package server
+
+import (
+ "html/template"
+ "math"
+ "regexp"
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/answerdev/answer/internal/base/translator"
+ "github.com/answerdev/answer/internal/schema"
+ "github.com/answerdev/answer/pkg/converter"
+ "github.com/answerdev/answer/pkg/day"
+ "github.com/answerdev/answer/pkg/htmltext"
+ "github.com/segmentfault/pacman/i18n"
+)
+
+var funcMap = template.FuncMap{
+ "replaceHTMLTag": func(src string, tags ...string) string {
+ p := `(?U)<(\d+)>.+</(\d+)>`
+
+ re := regexp.MustCompile(p)
+ ms := re.FindAllStringSubmatch(src, -1)
+ for _, mi := range ms {
+ if mi[1] == mi[2] {
+ i, err := strconv.Atoi(mi[1])
+ if err != nil || len(tags) < i {
+ break
+ }
+
+ src = strings.ReplaceAll(src, mi[0], tags[i-1])
+ }
+ }
+
+ return src
+ },
+ "join": func(sep string, elems ...string) string {
+ return strings.Join(elems, sep)
+ },
+ "templateHTML": func(data string) template.HTML {
+ return template.HTML(data)
+ },
+ "translator": func(la i18n.Language, data string, params ...interface{}) string {
+ trans := translator.GlobalTrans.Tr(la, data)
+
+ if len(params) > 0 && len(params)%2 == 0 {
+ for i := 0; i < len(params); i += 2 {
+ k := converter.InterfaceToString(params[i])
+ v := converter.InterfaceToString(params[i+1])
+ trans = strings.ReplaceAll(trans, "{{ "+k+" }}", v)
+ }
+ }
+
+ return trans
+ },
+ "timeFormatISO": func(tz string, timestamp int64) string {
+ _, _ = time.LoadLocation(tz)
+ return time.Unix(timestamp, 0).Format("2006-01-02T15:04:05.000Z")
+ },
+ "translatorTimeFormatLongDate": func(la i18n.Language, tz string, timestamp int64) string {
+ trans := translator.GlobalTrans.Tr(la, "ui.dates.long_date_with_time")
+ return day.Format(timestamp, trans, tz)
+ },
+ "translatorTimeFormat": func(la i18n.Language, tz string, timestamp int64) string {
+ var (
+ now = time.Now().Unix()
+ between int64 = 0
+ trans string
+ )
+ _, _ = time.LoadLocation(tz)
+ if now > timestamp {
+ between = now - timestamp
+ }
+
+ if between <= 1 {
+ return translator.GlobalTrans.Tr(la, "ui.dates.now")
+ }
+
+ if between > 1 && between < 60 {
+ trans = translator.GlobalTrans.Tr(la, "ui.dates.x_seconds_ago")
+ return strings.ReplaceAll(trans, "{{count}}", converter.IntToString(between))
+ }
+
+ if between >= 60 && between < 3600 {
+ min := math.Floor(float64(between / 60))
+ trans = translator.GlobalTrans.Tr(la, "ui.dates.x_minutes_ago")
+ return strings.ReplaceAll(trans, "{{count}}", strconv.FormatFloat(min, 'f', 0, 64))
+ }
+
+ if between >= 3600 && between < 3600*24 {
+ h := math.Floor(float64(between / 3600))
+ trans = translator.GlobalTrans.Tr(la, "ui.dates.x_hours_ago")
+ return strings.ReplaceAll(trans, "{{count}}", strconv.FormatFloat(h, 'f', 0, 64))
+ }
+
+ if between >= 3600*24 &&
+ between < 3600*24*366 &&
+ time.Unix(timestamp, 0).Format("2006") == time.Unix(now, 0).Format("2006") {
+ trans = translator.GlobalTrans.Tr(la, "ui.dates.long_date")
+ return day.Format(timestamp, trans, tz)
+ }
+
+ trans = translator.GlobalTrans.Tr(la, "ui.dates.long_date_with_year")
+ return day.Format(timestamp, trans, tz)
+ },
+ "wrapComments": func(comments []*schema.GetCommentResp, la i18n.Language, tz string) map[string]interface{} {
+ return map[string]interface{}{
+ "comments": comments,
+ "language": la,
+ "timezone": tz,
+ }
+ },
+ "urlTitle": func(title string) string {
+ return htmltext.UrlTitle(title)
+ },
+}
diff --git a/internal/controller/template_controller.go b/internal/controller/template_controller.go
index 384640d4..801312cf 100644
--- a/internal/controller/template_controller.go
+++ b/internal/controller/template_controller.go
@@ -380,11 +380,12 @@ func (tc *TemplateController) UserInfo(ctx *gin.Context) {
req := &schema.GetOtherUserInfoByUsernameReq{}
req.Username = username
userinfo, err := tc.templateRenderController.UserInfo(ctx, req)
- if !userinfo.Has {
+
+ if err != nil {
tc.Page404(ctx)
return
}
- if err != nil {
+ if !userinfo.Has {
tc.Page404(ctx)
return
}
diff --git a/ui/build/index.html b/ui/build/index.html
index 716dba25..d1591341 100644
--- a/ui/build/index.html
+++ b/ui/build/index.html
@@ -9,10 +9,8 @@
<script defer="defer" src="/static/js/main.9de9552b.js"></script>
<link href="/static/css/main.d4180d41.css" rel="stylesheet">
<link href="/custom.css" rel="stylesheet">
- {{.HeadCode}}
</head>
<body>
- {{.HeaderCode}}
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root">
<style>
@@ -43,5 +41,4 @@
<div id="doc-spinner"><div class="spinner"></div></div>
</div>
</body>
- {{.FooterCode}}
</html>