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.
Release/1.2.1 (#678)
LinkinStars82fdfc77636d
diff --git a/Makefile b/Makefileindex 9371418a..875d874a 100644--- a/Makefile+++ b/Makefile@@ -1,6 +1,6 @@.PHONY: build clean ui-VERSION=1.2.0+VERSION=1.2.1BIN=answerDIR_SRC=./cmd/answerDOCKER_CMD=dockerdiff --git a/cmd/command.go b/cmd/command.goindex e9b35294..5b3bb700 100644--- a/cmd/command.go+++ b/cmd/command.go@@ -45,6 +45,8 @@ var (// This config is used to upgrade the database from a specific version manually.// If you want to upgrade the database to version 1.1.0, you can use `answer upgrade -f v1.1.0`.upgradeVersion string+ // The fields that need to be set to the default value+ configFields []string)func init() {@@ -60,7 +62,9 @@ func init() {upgradeCmd.Flags().StringVarP(&upgradeVersion, "from", "f", "", "upgrade from specific version, eg: -f v1.1.0")- for _, cmd := range []*cobra.Command{initCmd, checkCmd, runCmd, dumpCmd, upgradeCmd, buildCmd, pluginCmd} {+ configCmd.Flags().StringSliceVarP(&configFields, "with", "w", []string{}, "the fields that need to be set to the default value, eg: -w allow_password_login")++ for _, cmd := range []*cobra.Command{initCmd, checkCmd, runCmd, dumpCmd, upgradeCmd, buildCmd, pluginCmd, configCmd} {rootCmd.AddCommand(cmd)}}@@ -231,6 +235,38 @@ To run answer, use:})},}++ // configCmd set some config to default value+ configCmd = &cobra.Command{+ Use: "config",+ Short: "set some config to default value",+ Long: `set some config to default value`,+ Run: func(_ *cobra.Command, _ []string) {+ cli.FormatAllPath(dataDirPath)++ c, err := conf.ReadConfig(cli.GetConfigFilePath())+ if err != nil {+ fmt.Println("read config failed: ", err.Error())+ return+ }++ field := &cli.ConfigField{}+ for _, f := range configFields {+ switch f {+ case "allow_password_login":+ field.AllowPasswordLogin = true+ default:+ fmt.Printf("field %s not support\n", f)+ }+ }+ err = cli.SetDefaultConfig(c.Data.Database, c.Data.Cache, field)+ if err != nil {+ fmt.Println("set default config failed: ", err.Error())+ } else {+ fmt.Println("set default config successfully")+ }+ },+ })// Execute adds all child commands to the root command and sets flags appropriately.diff --git a/cmd/main.go b/cmd/main.goindex 306d841c..f57cc4b5 100644--- a/cmd/main.go+++ b/cmd/main.go@@ -47,6 +47,8 @@ var (Revision = "-"// Time is the build time of the projectTime = "-"+ // GoVersion is the go version of the project+ GoVersion = "1.19"// log levellogLevel = os.Getenv("LOG_LEVEL")// log path@@ -75,6 +77,7 @@ func runApp() {}constant.Version = Versionconstant.Revision = Revision+ constant.GoVersion = GoVersionschema.AppStartTime = time.Now()fmt.Println("answer Version:", constant.Version, " Revision:", constant.Revision)diff --git a/cmd/wire_gen.go b/cmd/wire_gen.goindex cef3f985..a057660c 100644--- a/cmd/wire_gen.go+++ b/cmd/wire_gen.go@@ -149,9 +149,9 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,userRoleRelService := role2.NewUserRoleRelService(userRoleRelRepo, roleService)userCommon := usercommon.NewUserCommon(userRepo, userRoleRelService, authService, siteInfoCommonService)userExternalLoginRepo := user_external_login.NewUserExternalLoginRepo(dataData)- userExternalLoginService := user_external_login2.NewUserExternalLoginService(userRepo, userCommon, userExternalLoginRepo, emailService, siteInfoCommonService, userActiveActivityRepo)userNotificationConfigRepo := user_notification_config.NewUserNotificationConfigRepo(dataData)userNotificationConfigService := user_notification_config2.NewUserNotificationConfigService(userRepo, userNotificationConfigRepo)+ userExternalLoginService := user_external_login2.NewUserExternalLoginService(userRepo, userCommon, userExternalLoginRepo, emailService, siteInfoCommonService, userActiveActivityRepo, userNotificationConfigService)userService := service.NewUserService(userRepo, userActiveActivityRepo, activityRepo, emailService, authService, siteInfoCommonService, userRoleRelService, userCommon, userExternalLoginService, userNotificationConfigRepo, userNotificationConfigService)captchaRepo := captcha.NewCaptchaRepo(dataData)captchaService := action.NewCaptchaService(captchaRepo)@@ -205,7 +205,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,questionService := service.NewQuestionService(questionRepo, tagCommonService, questionCommon, userCommon, userRepo, revisionService, metaService, collectionCommon, answerActivityService, emailService, notificationQueueService, externalNotificationQueueService, activityQueueService, siteInfoCommonService, externalNotificationService)answerService := service.NewAnswerService(answerRepo, questionRepo, questionCommon, userCommon, collectionCommon, userRepo, revisionService, answerActivityService, answerCommon, voteRepo, emailService, userRoleRelService, notificationQueueService, externalNotificationQueueService, activityQueueService)questionController := controller.NewQuestionController(questionService, answerService, rankService, siteInfoCommonService, captchaService, rateLimitMiddleware)- answerController := controller.NewAnswerController(answerService, rankService, captchaService, rateLimitMiddleware)+ answerController := controller.NewAnswerController(answerService, rankService, captchaService, siteInfoCommonService, rateLimitMiddleware)searchParser := search_parser.NewSearchParser(tagCommonService, userCommon)searchRepo := search_common.NewSearchRepo(dataData, uniqueIDRepo, userCommon, tagCommonService)searchService := service.NewSearchService(searchParser, searchRepo)diff --git a/docs/docs.go b/docs/docs.goindex 897fcd66..7a6d08bd 100644--- a/docs/docs.go+++ b/docs/docs.go@@ -6902,12 +6902,13 @@ const docTemplate = `{"object_id"],"properties": {+ "bookmark": {+ "type": "boolean"+ },"group_id": {- "description": "user collection group TagID","type": "string"},"object_id": {- "description": "object TagID","type": "string"}}@@ -6916,13 +6917,7 @@ const docTemplate = `{"type": "object","properties": {"object_collection_count": {- "type": "string"- },- "object_id": {- "type": "string"- },- "switch": {- "type": "boolean"+ "type": "integer"}}},@@ -8786,6 +8781,9 @@ const docTemplate = `{"site_users": {"$ref": "#/definitions/schema.SiteUsersResp"},+ "site_write": {+ "$ref": "#/definitions/schema.SiteWriteResp"+ },"theme": {"$ref": "#/definitions/schema.SiteThemeResp"},@@ -8877,6 +8875,9 @@ const docTemplate = `{"allow_new_registrations": {"type": "boolean"},+ "allow_password_login": {+ "type": "boolean"+ },"login_required": {"type": "boolean"}@@ -8897,6 +8898,9 @@ const docTemplate = `{"allow_new_registrations": {"type": "boolean"},+ "allow_password_login": {+ "type": "boolean"+ },"login_required": {"type": "boolean"}@@ -9059,6 +9063,9 @@ const docTemplate = `{"items": {"type": "string"}+ },+ "restrict_answer": {+ "type": "boolean"}}},@@ -9079,6 +9086,9 @@ const docTemplate = `{"items": {"type": "string"}+ },+ "restrict_answer": {+ "type": "boolean"}}},diff --git a/docs/swagger.json b/docs/swagger.jsonindex 48b6283e..77a1ada3 100644--- a/docs/swagger.json+++ b/docs/swagger.json@@ -6871,12 +6871,13 @@"object_id"],"properties": {+ "bookmark": {+ "type": "boolean"+ },"group_id": {- "description": "user collection group TagID","type": "string"},"object_id": {- "description": "object TagID","type": "string"}}@@ -6885,13 +6886,7 @@"type": "object","properties": {"object_collection_count": {- "type": "string"- },- "object_id": {- "type": "string"- },- "switch": {- "type": "boolean"+ "type": "integer"}}},@@ -8755,6 +8750,9 @@"site_users": {"$ref": "#/definitions/schema.SiteUsersResp"},+ "site_write": {+ "$ref": "#/definitions/schema.SiteWriteResp"+ },"theme": {"$ref": "#/definitions/schema.SiteThemeResp"},@@ -8846,6 +8844,9 @@"allow_new_registrations": {"type": "boolean"},+ "allow_password_login": {+ "type": "boolean"+ },"login_required": {"type": "boolean"}@@ -8866,6 +8867,9 @@"allow_new_registrations": {"type": "boolean"},+ "allow_password_login": {+ "type": "boolean"+ },"login_required": {"type": "boolean"}@@ -9028,6 +9032,9 @@"items": {"type": "string"}+ },+ "restrict_answer": {+ "type": "boolean"}}},@@ -9048,6 +9055,9 @@"items": {"type": "string"}+ },+ "restrict_answer": {+ "type": "boolean"}}},diff --git a/docs/swagger.yaml b/docs/swagger.yamlindex 851e8a86..f3f53a76 100644--- a/docs/swagger.yaml+++ b/docs/swagger.yaml@@ -357,11 +357,11 @@ definitions:type: objectschema.CollectionSwitchReq:properties:+ bookmark:+ type: booleangroup_id:- description: user collection group TagIDtype: stringobject_id:- description: object TagIDtype: stringrequired:- group_id@@ -370,11 +370,7 @@ definitions:schema.CollectionSwitchResp:properties:object_collection_count:- type: string- object_id:- type: string- switch:- type: boolean+ type: integertype: objectschema.ConfigField:properties:@@ -1677,6 +1673,8 @@ definitions:$ref: '#/definitions/schema.SiteSeoResp'site_users:$ref: '#/definitions/schema.SiteUsersResp'+ site_write:+ $ref: '#/definitions/schema.SiteWriteResp'theme:$ref: '#/definitions/schema.SiteThemeResp'version:@@ -1738,6 +1736,8 @@ definitions:type: booleanallow_new_registrations:type: boolean+ allow_password_login:+ type: booleanlogin_required:type: booleantype: object@@ -1751,6 +1751,8 @@ definitions:type: booleanallow_new_registrations:type: boolean+ allow_password_login:+ type: booleanlogin_required:type: booleantype: object@@ -1861,6 +1863,8 @@ definitions:items:type: stringtype: array+ restrict_answer:+ type: booleantype: objectschema.SiteWriteResp:properties:@@ -1874,6 +1878,8 @@ definitions:items:type: stringtype: array+ restrict_answer:+ type: booleantype: objectschema.TagItem:properties:diff --git a/i18n/en_US.yaml b/i18n/en_US.yamlindex 315bc70c..7fddd9e5 100644--- a/i18n/en_US.yaml+++ b/i18n/en_US.yaml@@ -268,6 +268,8 @@ backend:other: You cannot modify your role.not_allowed_registration:other: Currently the site is not open for registration.+ not_allowed_login_via_password:+ other: Currently the site is not allowed to login via password.access_denied:other: Access deniedpage_access_denied:@@ -534,6 +536,7 @@ ui:http_404: HTTP Error 404http_50X: HTTP Error 500http_403: HTTP Error 403+ logout: Log Outnotifications:title: Notificationsinbox: Inbox@@ -749,6 +752,8 @@ ui:x_hours_ago: "{{count}}h ago"hour: hourday: day+ hours: hours+ days: dayscomment:btn_add_comment: Add commentreply_to: Reply to@@ -857,7 +862,7 @@ ui:placeholder: Searchfooter:build_on: >-- Built on <1> Answer </1>- the open-source software that powers Q&A+ Powered by <1> Apache Answer </1>- the open-source software that powers Q&Acommunities.<br />Made with love © {{cc}}.upload_img:name: Change@@ -1084,6 +1089,7 @@ ui:btn_accepted: Acceptedwrite_answer:title: Your Answer+ edit_answer: Edit my existing answerbtn_name: Post your answeradd_another_answer: Add another answerconfirm_title: Continue to answer@@ -1401,23 +1407,33 @@ ui:dashboard:title: Dashboardwelcome: Welcome to Answer Admin!- site_statistics: Site Statistics+ site_statistics: Site statisticsquestions: "Questions:"answers: "Answers:"comments: "Comments:"votes: "Votes:"- active_users: "Active users:"+ users: "Users:"flags: "Flags:"- site_health_status: Site Health Status+ site_health_status: Site health statusversion: "Version:"https: "HTTPS:"- uploading_files: "Uploading files:"+ upload_folder: "Upload folder:"+ run_mode: "Running mode:"+ private: Private+ public: Publicsmtp: "SMTP:"timezone: "Timezone:"- system_info: System Info+ system_info: System info+ go_version: "Go version:"+ database: "Database:"+ database_size: "Database size:"storage_used: "Storage used:"uptime: "Uptime:"- answer_links: Answer Links+ answer_links: Answer links+ plugins: Plugins+ github: GitHub+ blog: Blog+ contact: Contactdocuments: Documentsfeedback: Feedbacksupport: Support@@ -1432,6 +1448,8 @@ ui:allowed: Allowedenabled: Enableddisabled: Disabled+ writable: Writable+ not_writable: Not writableflags:title: Flagspending: Pending@@ -1642,6 +1660,10 @@ ui:text: "You can add privacy policy content here. If you already have a document hosted elsewhere, provide the full URL here."write: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."recommend_tags:label: Recommend tagstext: "Please input tag slug above, one tag per line."@@ -1705,6 +1727,10 @@ ui:title: Privatelabel: Login requiredtext: Only logged in users can access this community.+ password_login:+ title: Password login+ label: Allow email and password login+ text: "WARNING: If turn off, you may be unable to log in if you have not previously configured other login method."installed_plugins:title: Installed Pluginsplugin_link: Plugins extend and expand the functionality of Answer. You may find plugins in the <1>Answer Plugin Repository</1>.diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yamlindex 66324b7e..fd17ee48 100644--- a/i18n/zh_CN.yaml+++ b/i18n/zh_CN.yaml@@ -1052,8 +1052,9 @@ ui:btn_accepted: 已被采纳write_answer:title: 你的回答+ edit_answer: 编辑我的回答btn_name: 提交你的回答- add_another_answer: 添加另一个答案+ add_another_answer: 添加另一个回答confirm_title: 继续回答continue: 继续confirm_info: >-@@ -1594,6 +1595,10 @@ ui:text: "您可以在此添加隐私政策内容。如果您已经在别处托管了文档,请在这里提供完整的URL。"write:page_title: 编辑+ restrict_answer:+ title: 限制一个回答+ label: 每个用户对于每个问题只能有一个回答+ text: "用户可以使用编辑按钮优化已有的回答"recommend_tags:label: 推荐标签text: "请在上方输入标签固定链接,每行一个标签。"diff --git a/internal/base/constant/constant.go b/internal/base/constant/constant.goindex 56a45b50..f467f157 100644--- a/internal/base/constant/constant.go+++ b/internal/base/constant/constant.go@@ -25,6 +25,7 @@ const ()var (- Version string = ""- Revision string = ""+ Version = ""+ Revision = ""+ GoVersion = "")diff --git a/internal/base/reason/reason.go b/internal/base/reason/reason.goindex a264dfd5..99a7a6d9 100644--- a/internal/base/reason/reason.go+++ b/internal/base/reason/reason.go@@ -49,6 +49,7 @@ const (AnswerCannotDeleted = "error.answer.cannot_deleted"AnswerCannotUpdate = "error.answer.cannot_update"AnswerCannotAddByClosedQuestion = "error.answer.question_closed_cannot_add"+ AnswerRestrictAnswer = "error.answer.restrict_answer"CommentEditWithoutPermission = "error.comment.edit_without_permission"DisallowVote = "error.object.disallow_vote"DisallowFollow = "error.object.disallow_follow"@@ -92,6 +93,7 @@ const (UserCannotUpdateYourRole = "error.user.cannot_update_your_role"TagCannotSetSynonymAsItself = "error.tag.cannot_set_synonym_as_itself"NotAllowedRegistration = "error.user.not_allowed_registration"+ NotAllowedLoginViaPassword = "error.user.not_allowed_login_via_password"SMTPConfigFromNameCannotBeEmail = "error.smtp.config_from_name_cannot_be_email"AdminCannotUpdateTheirPassword = "error.admin.cannot_update_their_password"AdminCannotModifySelfStatus = "error.admin.cannot_modify_self_status"diff --git a/internal/cli/config.go b/internal/cli/config.gonew file mode 100644index 00000000..06764e41--- /dev/null+++ b/internal/cli/config.go@@ -0,0 +1,84 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one+ * or more contributor license agreements. See the NOTICE file+ * distributed with this work for additional information+ * regarding copyright ownership. The ASF licenses this file+ * to you under the Apache License, Version 2.0 (the+ * "License"); you may not use this file except in compliance+ * with the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing,+ * software distributed under the License is distributed on an+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ * KIND, either express or implied. See the License for the+ * specific language governing permissions and limitations+ * under the License.+ */++package cli++import (+ "context"+ "encoding/json"+ "fmt"+ "github.com/apache/incubator-answer/internal/base/constant"+ "github.com/apache/incubator-answer/internal/base/data"+ "github.com/apache/incubator-answer/internal/entity"+ "xorm.io/xorm"+)++type ConfigField struct {+ AllowPasswordLogin bool `json:"allow_password_login"`+}++// SetDefaultConfig set default config+func SetDefaultConfig(dbConf *data.Database, cacheConf *data.CacheConf, field *ConfigField) error {+ db, err := data.NewDB(false, dbConf)+ if err != nil {+ return err+ }+ defer db.Close()++ cache, cacheCleanup, err := data.NewCache(cacheConf)+ if err != nil {+ fmt.Println("new cache failed")+ }+ defer func() {+ if cache != nil {+ cache.Flush(context.Background())+ cacheCleanup()+ }+ }()++ if field.AllowPasswordLogin {+ return defaultLoginConfig(db)+ }++ return nil+}++func defaultLoginConfig(x *xorm.Engine) (err error) {+ fmt.Println("set default login config")++ loginSiteInfo := &entity.SiteInfo{+ Type: constant.SiteTypeLogin,+ }+ exist, err := x.Get(loginSiteInfo)+ if err != nil {+ return fmt.Errorf("get config failed: %w", err)+ }+ if exist {+ var content map[string]any+ _ = json.Unmarshal([]byte(loginSiteInfo.Content), &content)+ content["allow_password_login"] = true+ dataByte, _ := json.Marshal(content)+ loginSiteInfo.Content = string(dataByte)+ _, err = x.ID(loginSiteInfo.ID).Cols("content").Update(loginSiteInfo)+ if err != nil {+ return fmt.Errorf("update site info failed: %w", err)+ }+ }+ return nil+}diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.goindex 1f57bc88..8fdb089c 100644--- a/internal/controller/answer_controller.go+++ b/internal/controller/answer_controller.go@@ -34,6 +34,7 @@ import ("github.com/apache/incubator-answer/internal/service/action""github.com/apache/incubator-answer/internal/service/permission""github.com/apache/incubator-answer/internal/service/rank"+ "github.com/apache/incubator-answer/internal/service/siteinfo_common""github.com/apache/incubator-answer/pkg/uid""github.com/gin-gonic/gin""github.com/segmentfault/pacman/errors"@@ -41,10 +42,11 @@ import (// AnswerController answer controllertype AnswerController struct {- answerService *service.AnswerService- rankService *rank.RankService- actionService *action.CaptchaService- rateLimitMiddleware *middleware.RateLimitMiddleware+ answerService *service.AnswerService+ rankService *rank.RankService+ actionService *action.CaptchaService+ siteInfoCommonService siteinfo_common.SiteInfoCommonService+ rateLimitMiddleware *middleware.RateLimitMiddleware}// NewAnswerController new controller@@ -52,13 +54,15 @@ func NewAnswerController(answerService *service.AnswerService,rankService *rank.RankService,actionService *action.CaptchaService,+ siteInfoCommonService siteinfo_common.SiteInfoCommonService,rateLimitMiddleware *middleware.RateLimitMiddleware,) *AnswerController {return &AnswerController{- answerService: answerService,- rankService: rankService,- actionService: actionService,- rateLimitMiddleware: rateLimitMiddleware,+ answerService: answerService,+ rankService: rankService,+ actionService: actionService,+ siteInfoCommonService: siteInfoCommonService,+ rateLimitMiddleware: rateLimitMiddleware,}}@@ -238,6 +242,24 @@ func (ac *AnswerController) Add(ctx *gin.Context) {return}+ write, err := ac.siteInfoCommonService.GetSiteWrite(ctx)+ if err != nil {+ handler.HandleResponse(ctx, err, nil)+ return+ }+ if write.RestrictAnswer {+ // check if there's already an answer by this user+ ids, err := ac.answerService.GetCountByUserIDQuestionID(ctx, req.UserID, req.QuestionID)+ if err != nil {+ handler.HandleResponse(ctx, err, nil)+ return+ }+ if len(ids) >= 1 {+ handler.HandleResponse(ctx, errors.Forbidden(reason.AnswerRestrictAnswer), nil)+ return+ }+ }+answerID, err := ac.answerService.Insert(ctx, req)if err != nil {handler.HandleResponse(ctx, err, nil)diff --git a/internal/controller/collection_controller.go b/internal/controller/collection_controller.goindex 74005fc4..4e3eff38 100644--- a/internal/controller/collection_controller.go+++ b/internal/controller/collection_controller.go@@ -22,14 +22,10 @@ package controllerimport ("github.com/apache/incubator-answer/internal/base/handler""github.com/apache/incubator-answer/internal/base/middleware"- "github.com/apache/incubator-answer/internal/base/reason""github.com/apache/incubator-answer/internal/schema""github.com/apache/incubator-answer/internal/service"- "github.com/apache/incubator-answer/pkg/converter""github.com/apache/incubator-answer/pkg/uid""github.com/gin-gonic/gin"- "github.com/jinzhu/copier"- "github.com/segmentfault/pacman/errors")// CollectionController collection controller@@ -57,21 +53,10 @@ func (cc *CollectionController) CollectionSwitch(ctx *gin.Context) {if handler.BindAndCheck(ctx, req) {return}- req.ObjectID = uid.DeShortID(req.ObjectID)-- dto := &schema.CollectionSwitchDTO{}- _ = copier.Copy(dto, req)- dto.UserID = middleware.GetLoginUserIDFromContext(ctx)-- if converter.StringToInt64(req.ObjectID) < 1 {- return- }- if converter.StringToInt64(dto.UserID) < 1 {- handler.HandleResponse(ctx, errors.Unauthorized(reason.UnauthorizedError), nil)- return- }+ req.ObjectID = uid.DeShortID(req.ObjectID)+ req.UserID = middleware.GetLoginUserIDFromContext(ctx)- resp, err := cc.collectionService.CollectionSwitch(ctx, dto)+ resp, err := cc.collectionService.CollectionSwitch(ctx, req)handler.HandleResponse(ctx, err, resp)}diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.goindex 1f96790f..7d287210 100644--- a/internal/controller/question_controller.go+++ b/internal/controller/question_controller.go@@ -657,10 +657,10 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {return}respInfo, ok := resp.(*schema.QuestionInfo)- if !ok {+ if !ok {handler.HandleResponse(ctx, err, resp)return- }+ }if !isAdmin || !linkUrlLimitUser {qc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionEdit, req.UserID)}diff --git a/internal/controller/siteinfo_controller.go b/internal/controller/siteinfo_controller.goindex f4e1ece6..51b596f1 100644--- a/internal/controller/siteinfo_controller.go+++ b/internal/controller/siteinfo_controller.go@@ -87,6 +87,10 @@ func (sc *SiteInfoController) GetSiteInfo(ctx *gin.Context) {if err != nil {log.Error(err)}+ resp.Write, err = sc.siteInfoService.GetSiteWrite(ctx)+ if err != nil {+ log.Error(err)+ }handler.HandleResponse(ctx, nil, resp)}diff --git a/internal/entity/user_entity.go b/internal/entity/user_entity.goindex 4508874b..32821864 100644--- a/internal/entity/user_entity.go+++ b/internal/entity/user_entity.go@@ -56,7 +56,7 @@ type User struct {Status int `xorm:"not null default 1 INT(11) status"`AuthorityGroup int `xorm:"not null default 1 INT(11) authority_group"`DisplayName string `xorm:"not null default '' VARCHAR(30) display_name"`- Avatar string `xorm:"not null default '' VARCHAR(255) avatar"`+ Avatar string `xorm:"not null default '' VARCHAR(1024) avatar"`Mobile string `xorm:"not null VARCHAR(20) mobile"`Bio string `xorm:"not null TEXT bio"`BioHTML string `xorm:"not null TEXT bio_html"`diff --git a/internal/migrations/init.go b/internal/migrations/init.goindex f8c0babb..8448bfc4 100644--- a/internal/migrations/init.go+++ b/internal/migrations/init.go@@ -72,6 +72,7 @@ func (m *Mentor) InitDB() error {m.do("init site info seo config", m.initSiteInfoSEOConfig)m.do("init site info user config", m.initSiteInfoUsersConfig)m.do("init site info privilege rank", m.initSiteInfoPrivilegeRank)+ m.do("init site info write", m.initSiteInfoWrite)return m.err}@@ -179,6 +180,7 @@ func (m *Mentor) initSiteInfoLoginConfig() {loginConfig := map[string]bool{"allow_new_registrations": true,"allow_email_registrations": true,+ "allow_password_login": true,"login_required": m.userData.LoginRequired,}loginConfigDataBytes, _ := json.Marshal(loginConfig)@@ -241,3 +243,15 @@ func (m *Mentor) initSiteInfoPrivilegeRank() {Status: 1,})}++func (m *Mentor) initSiteInfoWrite() {+ writeData := map[string]interface{}{+ "restrict_answer": true,+ }+ writeDataBytes, _ := json.Marshal(writeData)+ _, m.err = m.engine.Context(m.ctx).Insert(&entity.SiteInfo{+ Type: "write",+ Content: string(writeDataBytes),+ Status: 1,+ })+}diff --git a/internal/migrations/migrations.go b/internal/migrations/migrations.goindex e99a7030..a6163516 100644--- a/internal/migrations/migrations.go+++ b/internal/migrations/migrations.go@@ -93,6 +93,7 @@ var migrations = []Migration{NewMigration("v1.1.2", "add notification config", addNoticeConfig, true),NewMigration("v1.1.3", "set default user notification config", setDefaultUserNotificationConfig, false),NewMigration("v1.2.0", "add recover answer permission", addRecoverPermission, true),+ NewMigration("v1.2.1", "add password login control", addPasswordLoginControl, true),}func GetMigrations() []Migration {diff --git a/internal/migrations/v18.go b/internal/migrations/v18.gonew file mode 100644index 00000000..3ad8325f--- /dev/null+++ b/internal/migrations/v18.go@@ -0,0 +1,75 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one+ * or more contributor license agreements. See the NOTICE file+ * distributed with this work for additional information+ * regarding copyright ownership. The ASF licenses this file+ * to you under the Apache License, Version 2.0 (the+ * "License"); you may not use this file except in compliance+ * with the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing,+ * software distributed under the License is distributed on an+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ * KIND, either express or implied. See the License for the+ * specific language governing permissions and limitations+ * under the License.+ */++package migrations++import (+ "context"+ "encoding/json"+ "fmt"+ "github.com/apache/incubator-answer/internal/base/constant"+ "github.com/apache/incubator-answer/internal/entity"+ "github.com/apache/incubator-answer/internal/schema"+ "xorm.io/xorm"+)++func addPasswordLoginControl(ctx context.Context, x *xorm.Engine) error {+ loginSiteInfo := &entity.SiteInfo{+ Type: constant.SiteTypeLogin,+ }+ exist, err := x.Context(ctx).Get(loginSiteInfo)+ if err != nil {+ return fmt.Errorf("get config failed: %w", err)+ }+ if exist {+ content := &schema.SiteLoginReq{}+ _ = json.Unmarshal([]byte(loginSiteInfo.Content), content)+ content.AllowPasswordLogin = true+ data, _ := json.Marshal(content)+ loginSiteInfo.Content = string(data)+ _, err = x.Context(ctx).ID(loginSiteInfo.ID).Cols("content").Update(loginSiteInfo)+ if err != nil {+ return fmt.Errorf("update site info failed: %w", err)+ }+ }++ writeSiteInfo := &entity.SiteInfo{+ Type: constant.SiteTypeWrite,+ }+ exist, err = x.Context(ctx).Get(writeSiteInfo)+ if err != nil {+ return fmt.Errorf("get config failed: %w", err)+ }+ if exist {+ content := &schema.SiteWriteReq{}+ _ = json.Unmarshal([]byte(writeSiteInfo.Content), content)+ content.RestrictAnswer = true+ data, _ := json.Marshal(content)+ writeSiteInfo.Content = string(data)+ _, err = x.Context(ctx).ID(writeSiteInfo.ID).Cols("content").Update(writeSiteInfo)+ if err != nil {+ return fmt.Errorf("update site info failed: %w", err)+ }+ }++ type User struct {+ Avatar string `xorm:"not null default '' VARCHAR(1024) avatar"`+ }+ return x.Context(ctx).Sync(new(User))+}diff --git a/internal/repo/activity/activity_repo.go b/internal/repo/activity/activity_repo.goindex 14ffa065..d41f0071 100644--- a/internal/repo/activity/activity_repo.go+++ b/internal/repo/activity/activity_repo.go@@ -52,7 +52,7 @@ func NewActivityRepo(func (ar *activityRepo) GetObjectAllActivity(ctx context.Context, objectID string, showVote bool) (activityList []*entity.Activity, err error) {activityList = make([]*entity.Activity, 0)- session := ar.data.DB.Context(ctx).Desc("created_at")+ session := ar.data.DB.Context(ctx).Desc("id")if !showVote {activityTypeNotShown := ar.getAllActivityType(ctx)diff --git a/internal/repo/activity/answer_repo.go b/internal/repo/activity/answer_repo.goindex 66bcc2d0..f3ad1dc0 100644--- a/internal/repo/activity/answer_repo.go+++ b/internal/repo/activity/answer_repo.go@@ -306,11 +306,7 @@ func (ar *AnswerActivityRepo) sendAcceptAnswerNotification(ReceiverUserID: act.ActivityUserID,TriggerUserID: act.TriggerUserID,}- if act.ActivityUserID == op.QuestionUserID {- msg.ObjectType = constant.AnswerObjectType- } else {- msg.ObjectType = constant.AnswerObjectType- }+ msg.ObjectType = constant.AnswerObjectTypeif msg.TriggerUserID != msg.ReceiverUserID {ar.notificationQueueService.Send(ctx, msg)}diff --git a/internal/repo/answer/answer_repo.go b/internal/repo/answer/answer_repo.goindex 4e77b087..3a71fd70 100644--- a/internal/repo/answer/answer_repo.go+++ b/internal/repo/answer/answer_repo.go@@ -21,8 +21,6 @@ package answerimport ("context"- "github.com/apache/incubator-answer/plugin"- "github.com/segmentfault/pacman/log""time""github.com/apache/incubator-answer/internal/base/constant"@@ -37,7 +35,9 @@ import ("github.com/apache/incubator-answer/internal/service/rank""github.com/apache/incubator-answer/internal/service/unique""github.com/apache/incubator-answer/pkg/uid"+ "github.com/apache/incubator-answer/plugin""github.com/segmentfault/pacman/errors"+ "github.com/segmentfault/pacman/log")// answerRepo answer repository@@ -185,8 +185,8 @@ func (ar *answerRepo) GetAnswer(ctx context.Context, id string) (// GetQuestionCountfunc (ar *answerRepo) GetAnswerCount(ctx context.Context) (count int64, err error) {- list := make([]*entity.Answer, 0)- count, err = ar.data.DB.Context(ctx).Where("status = ?", entity.AnswerStatusAvailable).FindAndCount(&list)+ var resp = new(entity.Answer)+ count, err = ar.data.DB.Context(ctx).Where("status = ?", entity.AnswerStatusAvailable).Count(resp)if err != nil {return count, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}@@ -272,8 +272,8 @@ func (ar *answerRepo) GetByID(ctx context.Context, answerID string) (*entity.Ansfunc (ar *answerRepo) GetCountByQuestionID(ctx context.Context, questionID string) (int64, error) {questionID = uid.DeShortID(questionID)- rows := make([]*entity.Answer, 0)- count, err := ar.data.DB.Context(ctx).Where("question_id =? and status = ?", questionID, entity.AnswerStatusAvailable).FindAndCount(&rows)+ var resp = new(entity.Answer)+ count, err := ar.data.DB.Context(ctx).Where("question_id =? and status = ?", questionID, entity.AnswerStatusAvailable).Count(resp)if err != nil {return count, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}@@ -281,26 +281,30 @@ func (ar *answerRepo) GetCountByQuestionID(ctx context.Context, questionID strin}func (ar *answerRepo) GetCountByUserID(ctx context.Context, userID string) (int64, error) {- rows := make([]*entity.Answer, 0)- count, err := ar.data.DB.Context(ctx).Where(" user_id = ? and status = ?", userID, entity.AnswerStatusAvailable).FindAndCount(&rows)+ var resp = new(entity.Answer)+ count, err := ar.data.DB.Context(ctx).Where(" user_id = ? and status = ?", userID, entity.AnswerStatusAvailable).Count(resp)if err != nil {return count, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}return count, nil}-func (ar *answerRepo) GetByUserIDQuestionID(ctx context.Context, userID string, questionID string) (*entity.Answer, bool, error) {+func (ar *answerRepo) GetIDsByUserIDAndQuestionID(ctx context.Context, userID string, questionID string) ([]string, error) {questionID = uid.DeShortID(questionID)- var resp entity.Answer- has, err := ar.data.DB.Context(ctx).Where("question_id =? and user_id = ? and status = ?", questionID, userID, entity.AnswerStatusAvailable).Get(&resp)+ var ids []string+ resp := make([]string, 0)+ err := ar.data.DB.Context(ctx).Table(entity.Answer{}.TableName()).Where("question_id =? and user_id = ? and status = ?", questionID, userID, entity.AnswerStatusAvailable).OrderBy("created_at ASC").Cols("id").Find(&ids)if err != nil {- return &resp, false, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()+ return resp, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}if handler.GetEnableShortID(ctx) {- resp.ID = uid.EnShortID(resp.ID)- resp.QuestionID = uid.EnShortID(resp.QuestionID)+ for _, id := range ids {+ resp = append(resp, uid.EnShortID(id))+ }+ } else {+ resp = ids}- return &resp, has, nil+ return resp, nil}// SearchListdiff --git a/internal/repo/collection/collection_group_repo.go b/internal/repo/collection/collection_group_repo.goindex d0d6c804..0fc9c27a 100644--- a/internal/repo/collection/collection_group_repo.go+++ b/internal/repo/collection/collection_group_repo.go@@ -21,6 +21,7 @@ package collectionimport ("context"+ "xorm.io/xorm""github.com/apache/incubator-answer/internal/base/data""github.com/apache/incubator-answer/internal/base/pager"@@ -68,6 +69,42 @@ func (cr *collectionGroupRepo) AddCollectionDefaultGroup(ctx context.Context, usreturn}+// CreateDefaultGroupIfNotExist create default group if not exist+func (cr *collectionGroupRepo) CreateDefaultGroupIfNotExist(ctx context.Context, userID string) (+ collectionGroup *entity.CollectionGroup, err error) {+ _, err = cr.data.DB.Transaction(func(session *xorm.Session) (result any, err error) {+ session = session.Context(ctx)+ old := &entity.CollectionGroup{+ UserID: userID,+ DefaultGroup: schema.CGDefault,+ }+ exist, err := session.ForUpdate().Get(old)+ if err != nil {+ return nil, err+ }+ if exist {+ collectionGroup = old+ return old, nil+ }++ defaultGroup := &entity.CollectionGroup{+ Name: "default",+ DefaultGroup: schema.CGDefault,+ UserID: userID,+ }+ _, err = session.Insert(defaultGroup)+ if err != nil {+ return nil, err+ }+ collectionGroup = defaultGroup+ return nil, nil+ })+ if err != nil {+ return nil, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()+ }+ return collectionGroup, nil+}+// UpdateCollectionGroup update collection groupfunc (cr *collectionGroupRepo) UpdateCollectionGroup(ctx context.Context, collectionGroup *entity.CollectionGroup, cols []string) (err error) {_, err = cr.data.DB.Context(ctx).ID(collectionGroup.ID).Cols(cols...).Update(collectionGroup)diff --git a/internal/repo/collection/collection_repo.go b/internal/repo/collection/collection_repo.goindex ea075497..c67b7bd2 100644--- a/internal/repo/collection/collection_repo.go+++ b/internal/repo/collection/collection_repo.go@@ -50,42 +50,39 @@ func NewCollectionRepo(data *data.Data, uniqueIDRepo unique.UniqueIDRepo) collec// AddCollection add collectionfunc (cr *collectionRepo) AddCollection(ctx context.Context, collection *entity.Collection) (err error) {- needAdd := false+ collection.ID, err = cr.uniqueIDRepo.GenUniqueIDStr(ctx, collection.TableName())+ if err != nil {+ return errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()+ }+_, err = cr.data.DB.Transaction(func(session *xorm.Session) (result any, err error) {session = session.Context(ctx)- var has bool- dbcollection := &entity.Collection{}- result = nil- has, err = session.Where("user_id = ? and object_id = ?", collection.UserID, collection.ObjectID).Get(dbcollection)+ old := &entity.Collection{+ UserID: collection.UserID,+ ObjectID: collection.ObjectID,+ }+ exist, err := session.ForUpdate().Get(old)if err != nil {- return+ return nil, err+ }+ if exist {+ return nil, nil}- if has {- return+ _, err = session.Insert(collection)+ if err != nil {+ return nil, err}- needAdd = truereturn})if err != nil {- return- }- if needAdd {- id, err := cr.uniqueIDRepo.GenUniqueIDStr(ctx, collection.TableName())- if err == nil {- collection.ID = id- _, err = cr.data.DB.Context(ctx).Insert(collection)- if err != nil {- return errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()- }- }+ return errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}-- return err+ return nil}// RemoveCollection delete collectionfunc (cr *collectionRepo) RemoveCollection(ctx context.Context, id string) (err error) {- _, err = cr.data.DB.Context(ctx).Where("id =?", id).Delete(&entity.Collection{})+ _, err = cr.data.DB.Context(ctx).Where("id = ?", id).Delete(&entity.Collection{})if err != nil {return errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}diff --git a/internal/repo/question/question_repo.go b/internal/repo/question/question_repo.goindex 9288fce8..2cd9a325 100644--- a/internal/repo/question/question_repo.go+++ b/internal/repo/question/question_repo.go@@ -28,6 +28,7 @@ import ("strings""time""unicode"+ "xorm.io/xorm""github.com/apache/incubator-answer/internal/base/handler""xorm.io/builder"@@ -127,14 +128,26 @@ func (qr *questionRepo) UpdateAnswerCount(ctx context.Context, questionID stringreturn nil}-func (qr *questionRepo) UpdateCollectionCount(ctx context.Context, questionID string, num int) (err error) {+func (qr *questionRepo) UpdateCollectionCount(ctx context.Context, questionID string) (count int64, err error) {questionID = uid.DeShortID(questionID)- question := &entity.Question{}- _, err = qr.data.DB.Context(ctx).Where("id =?", questionID).Incr("collection_count", num).Update(question)+ _, err = qr.data.DB.Transaction(func(session *xorm.Session) (result any, err error) {+ session = session.Context(ctx)+ count, err = session.Count(&entity.Collection{ObjectID: questionID})+ if err != nil {+ return nil, err+ }++ question := &entity.Question{CollectionCount: int(count)}+ _, err = session.ID(questionID).MustCols("collection_count").Update(question)+ if err != nil {+ return nil, err+ }+ return+ })if err != nil {- return errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()+ return 0, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}- return nil+ return count, nil}func (qr *questionRepo) UpdateQuestionStatus(ctx context.Context, questionID string, status int) (err error) {diff --git a/internal/repo/tag_common/tag_common_repo.go b/internal/repo/tag_common/tag_common_repo.goindex a4771d16..f3a85282 100644--- a/internal/repo/tag_common/tag_common_repo.go+++ b/internal/repo/tag_common/tag_common_repo.go@@ -22,6 +22,7 @@ package tag_commonimport ("context""fmt"+ "strconv""strings""github.com/apache/incubator-answer/internal/base/data"@@ -170,11 +171,23 @@ func (tr *tagCommonRepo) GetTagPage(ctx context.Context, page, pageSize int, tagsession := tr.data.DB.Context(ctx)if len(tag.SlugName) > 0 {- session.Where(builder.Or(builder.Like{"slug_name", fmt.Sprintf("LOWER(%s)", tag.SlugName)}, builder.Like{"display_name", tag.SlugName}))+ mainTagCond := builder.And(+ builder.Or(+ builder.Like{"slug_name", fmt.Sprintf("LOWER(%s)", tag.SlugName)},+ builder.Like{"display_name", tag.SlugName},+ ),+ builder.Eq{"main_tag_id": 0},+ )+ synonymCond := builder.And(+ builder.Eq{"slug_name": tag.SlugName},+ builder.Neq{"main_tag_id": 0},+ )+ session.Where(builder.Or(mainTagCond, synonymCond))tag.SlugName = ""+ } else {+ session.Where(builder.Eq{"main_tag_id": 0})}session.Where(builder.Eq{"status": entity.TagStatusAvailable})- session.Where("main_tag_id = 0") // if this tag is synonym, exclude itswitch queryCond {case "popular":@@ -188,7 +201,22 @@ func (tr *tagCommonRepo) GetTagPage(ctx context.Context, page, pageSize int, tagtotal, err = pager.Help(page, pageSize, &tagList, tag, session)if err != nil {err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()+ return}++ for i := 0; i < len(tagList); i++ {+ if tagList[i].MainTagID != 0 {+ mainTag, exist, errSynonym := tr.GetTagByID(ctx, strconv.FormatInt(tagList[i].MainTagID, 10), false)+ if errSynonym != nil {+ err = errors.InternalServer(reason.DatabaseError).WithError(errSynonym).WithStack()+ return+ }+ if exist {+ tagList[i] = mainTag+ }+ }+ }+return}diff --git a/internal/repo/user/user_repo.go b/internal/repo/user/user_repo.goindex 2b21e265..deb1427d 100644--- a/internal/repo/user/user_repo.go+++ b/internal/repo/user/user_repo.go@@ -236,12 +236,13 @@ func (ur *userRepo) GetByEmail(ctx context.Context, email string) (userInfo *ent}func (ur *userRepo) GetUserCount(ctx context.Context) (count int64, err error) {- list := make([]*entity.User, 0)- count, err = ur.data.DB.Context(ctx).Where("mail_status =?", entity.EmailStatusAvailable).And("status =?", entity.UserStatusAvailable).FindAndCount(&list)+ session := ur.data.DB.Context(ctx)+ session.Where("status = ? OR status = ?", entity.UserStatusAvailable, entity.UserStatusSuspended)+ count, err = session.Count(&entity.User{})if err != nil {return count, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}- return+ return count, nil}func (ur *userRepo) SearchUserListByName(ctx context.Context, name string, limit int) (userList []*entity.User, err error) {diff --git a/internal/schema/collection_group_schema.go b/internal/schema/collection_group_schema.goindex 212d6993..3177f3f1 100644--- a/internal/schema/collection_group_schema.go+++ b/internal/schema/collection_group_schema.go@@ -28,24 +28,15 @@ const (// CollectionSwitchReq switch collection requesttype CollectionSwitchReq struct {- // object TagIDObjectID string `validate:"required" json:"object_id"`- // user collection group TagID- GroupID string `validate:"required" json:"group_id"`-}--// CollectionSwitchDTO collection data transfer object-type CollectionSwitchDTO struct {- ObjectID string- GroupID string- UserID string+ GroupID string `validate:"required" json:"group_id"`+ Bookmark bool `validate:"omitempty" json:"bookmark"`+ UserID string `json:"-"`}// CollectionSwitchResp switch collection responsetype CollectionSwitchResp struct {- ObjectID string `json:"object_id"`- Switch bool `json:"switch"`- ObjectCollectionCount string `json:"object_collection_count"`+ ObjectCollectionCount int64 `json:"object_collection_count"`}// AddCollectionGroupReq add collection group requestdiff --git a/internal/schema/dashboard_schema.go b/internal/schema/dashboard_schema.goindex 1fa90f7e..2d780b8c 100644--- a/internal/schema/dashboard_schema.go+++ b/internal/schema/dashboard_schema.go@@ -36,12 +36,16 @@ type DashboardInfo struct {UserCount int64 `json:"user_count"`ReportCount int64 `json:"report_count"`UploadingFiles bool `json:"uploading_files"`- SMTP bool `json:"smtp"`+ SMTP string `json:"smtp"`HTTPS bool `json:"https"`TimeZone string `json:"time_zone"`OccupyingStorageSpace string `json:"occupying_storage_space"`AppStartTime string `json:"app_start_time"`VersionInfo DashboardInfoVersion `json:"version_info"`+ LoginRequired bool `json:"login_required"`+ GoVersion string `json:"go_version"`+ DatabaseVersion string `json:"database_version"`+ DatabaseSize string `json:"database_size"`}type DashboardInfoVersion struct {diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.goindex bb409e6d..5b583993 100644--- a/internal/schema/question_schema.go+++ b/internal/schema/question_schema.go@@ -245,6 +245,7 @@ type QuestionInfo struct {UpdateUserInfo *UserBasicInfo `json:"update_user_info,omitempty"`LastAnsweredUserInfo *UserBasicInfo `json:"last_answered_user_info,omitempty"`Answered bool `json:"answered"`+ FirstAnswerId string `json:"first_answer_id"`Collected bool `json:"collected"`VoteStatus string `json:"vote_status"`IsFollowed bool `json:"is_followed"`@@ -257,7 +258,7 @@ type QuestionInfo struct {// UpdateQuestionResp update question resptype UpdateQuestionResp struct {UrlTitle string `json:"url_title"`- WaitForReview bool `json:"wait_for_review"`+ WaitForReview bool `json:"wait_for_review"`}type AdminQuestionInfo struct {diff --git a/internal/schema/siteinfo_schema.go b/internal/schema/siteinfo_schema.goindex bcbe7689..fc56bf5a 100644--- a/internal/schema/siteinfo_schema.go+++ b/internal/schema/siteinfo_schema.go@@ -66,10 +66,11 @@ type SiteBrandingReq struct {// SiteWriteReq site write requesttype SiteWriteReq struct {- RequiredTag bool `validate:"omitempty" form:"required_tag" json:"required_tag"`- RecommendTags []string `validate:"omitempty" form:"recommend_tags" json:"recommend_tags"`- ReservedTags []string `validate:"omitempty" form:"reserved_tags" json:"reserved_tags"`- UserID string `json:"-"`+ RestrictAnswer bool `validate:"omitempty" form:"restrict_answer" json:"restrict_answer"`+ RequiredTag bool `validate:"omitempty" form:"required_tag" json:"required_tag"`+ RecommendTags []string `validate:"omitempty" form:"recommend_tags" json:"recommend_tags"`+ ReservedTags []string `validate:"omitempty" form:"reserved_tags" json:"reserved_tags"`+ UserID string `json:"-"`}// SiteLegalReq site branding request@@ -117,6 +118,7 @@ type SiteUsersReq struct {type SiteLoginReq struct {AllowNewRegistrations bool `json:"allow_new_registrations"`AllowEmailRegistrations bool `json:"allow_email_registrations"`+ AllowPasswordLogin bool `json:"allow_password_login"`LoginRequired bool `json:"login_required"`AllowEmailDomains []string `json:"allow_email_domains"`}@@ -207,6 +209,7 @@ type SiteInfoResp struct {CustomCssHtml *SiteCustomCssHTMLResp `json:"custom_css_html"`SiteSeo *SiteSeoResp `json:"site_seo"`SiteUsers *SiteUsersResp `json:"site_users"`+ Write *SiteWriteResp `json:"site_write"`Version string `json:"version"`Revision string `json:"revision"`}diff --git a/internal/service/answer_common/answer.go b/internal/service/answer_common/answer.goindex 94797016..4d8959fe 100644--- a/internal/service/answer_common/answer.go+++ b/internal/service/answer_common/answer.go@@ -41,7 +41,7 @@ type AnswerRepo interface {GetByID(ctx context.Context, answerID string) (*entity.Answer, bool, error)GetCountByQuestionID(ctx context.Context, questionID string) (int64, error)GetCountByUserID(ctx context.Context, userID string) (int64, error)- GetByUserIDQuestionID(ctx context.Context, userID string, questionID string) (*entity.Answer, bool, error)+ GetIDsByUserIDAndQuestionID(ctx context.Context, userID string, questionID string) ([]string, error)SearchList(ctx context.Context, search *entity.AnswerSearch) ([]*entity.Answer, int64, error)AdminSearchList(ctx context.Context, search *schema.AdminAnswerPageReq) ([]*entity.Answer, int64, error)UpdateAnswerStatus(ctx context.Context, answerID string, status int) (err error)@@ -60,12 +60,12 @@ func NewAnswerCommon(answerRepo AnswerRepo) *AnswerCommon {}}-func (as *AnswerCommon) SearchAnswered(ctx context.Context, userID, questionID string) (bool, error) {- _, has, err := as.answerRepo.GetByUserIDQuestionID(ctx, userID, questionID)+func (as *AnswerCommon) SearchAnswerIDs(ctx context.Context, userID, questionID string) ([]string, error) {+ ids, err := as.answerRepo.GetIDsByUserIDAndQuestionID(ctx, userID, questionID)if err != nil {- return has, err+ return nil, err}- return has, nil+ return ids, nil}func (as *AnswerCommon) AdminSearchList(ctx context.Context, req *schema.AdminAnswerPageReq) (diff --git a/internal/service/answer_service.go b/internal/service/answer_service.goindex ad5eab26..7da98582 100644--- a/internal/service/answer_service.go+++ b/internal/service/answer_service.go@@ -22,8 +22,6 @@ package serviceimport ("context""encoding/json"- "github.com/apache/incubator-answer/pkg/converter"- "github.com/apache/incubator-answer/pkg/token""time""github.com/apache/incubator-answer/internal/base/constant"@@ -42,6 +40,8 @@ import ("github.com/apache/incubator-answer/internal/service/revision_common""github.com/apache/incubator-answer/internal/service/role"usercommon "github.com/apache/incubator-answer/internal/service/user_common"+ "github.com/apache/incubator-answer/pkg/converter"+ "github.com/apache/incubator-answer/pkg/token""github.com/apache/incubator-answer/pkg/uid""github.com/segmentfault/pacman/errors""github.com/segmentfault/pacman/log"@@ -495,6 +495,10 @@ func (as *AnswerService) Get(ctx context.Context, answerID, loginUserID string)return info, questionInfo, has, nil}+func (as *AnswerService) GetCountByUserIDQuestionID(ctx context.Context, userId string, questionId string) (ids []string, err error) {+ return as.answerRepo.GetIDsByUserIDAndQuestionID(ctx, userId, questionId)+}+func (as *AnswerService) AdminSetAnswerStatus(ctx context.Context, req *schema.AdminUpdateAnswerStatusReq) error {setStatus, ok := entity.AdminAnswerSearchStatus[req.Status]if !ok {diff --git a/internal/service/collection_group_service.go b/internal/service/collection_group_service.goindex 0ca0236e..2620c54c 100644--- a/internal/service/collection_group_service.go+++ b/internal/service/collection_group_service.go@@ -33,6 +33,7 @@ import (type CollectionGroupRepo interface {AddCollectionGroup(ctx context.Context, collectionGroup *entity.CollectionGroup) (err error)AddCollectionDefaultGroup(ctx context.Context, userID string) (collectionGroup *entity.CollectionGroup, err error)+ CreateDefaultGroupIfNotExist(ctx context.Context, userID string) (collectionGroup *entity.CollectionGroup, err error)UpdateCollectionGroup(ctx context.Context, collectionGroup *entity.CollectionGroup, cols []string) (err error)GetCollectionGroup(ctx context.Context, id string) (collectionGroup *entity.CollectionGroup, exist bool, err error)GetCollectionGroupPage(ctx context.Context, page, pageSize int, collectionGroup *entity.CollectionGroup) (collectionGroupList []*entity.CollectionGroup, total int64, err error)diff --git a/internal/service/collection_service.go b/internal/service/collection_service.goindex d12fb829..1072d1ab 100644--- a/internal/service/collection_service.go+++ b/internal/service/collection_service.go@@ -21,14 +21,10 @@ package serviceimport ("context"- "fmt"-"github.com/apache/incubator-answer/internal/entity""github.com/apache/incubator-answer/internal/schema"collectioncommon "github.com/apache/incubator-answer/internal/service/collection_common"questioncommon "github.com/apache/incubator-answer/internal/service/question_common"- "github.com/segmentfault/pacman/errors"- "github.com/segmentfault/pacman/log")// CollectionService user service@@ -50,127 +46,40 @@ func NewCollectionService(}}-func (cs *CollectionService) CollectionSwitch(ctx context.Context, dto *schema.CollectionSwitchDTO) (resp *schema.CollectionSwitchResp, err error) {- resp = &schema.CollectionSwitchResp{}- dbData, has, err := cs.collectionRepo.GetOneByObjectIDAndUser(ctx, dto.UserID, dto.ObjectID)- if err != nil {- return- }- if has {- err = cs.collectionRepo.RemoveCollection(ctx, dbData.ID)- if err != nil {- return nil, err- }- err = cs.questionCommon.UpdateCollectionCount(ctx, dto.ObjectID, -1)- if err != nil {- log.Error("UpdateCollectionCount", err.Error())- }- var count int64- count, err = cs.objectCollectionCount(ctx, dto.ObjectID)- if err != nil {- return resp, err- }- resp.ObjectCollectionCount = fmt.Sprintf("%v", count)- resp.Switch = false- return resp, err- }-- if dto.GroupID == "" || dto.GroupID == "0" {- var (- defaultGroup *entity.CollectionGroup- has bool- )- defaultGroup, has, err = cs.collectionGroupRepo.GetDefaultID(ctx, dto.UserID)- if err != nil {- return nil, err- }- if !has {- var dbdefaultGroup *entity.CollectionGroup- dbdefaultGroup, err = cs.collectionGroupRepo.AddCollectionDefaultGroup(ctx, dto.UserID)- if err != nil {- return nil, err- }- dto.GroupID = dbdefaultGroup.ID- } else {- dto.GroupID = defaultGroup.ID- }- }- collection := &entity.Collection{- UserCollectionGroupID: dto.GroupID,- UserID: dto.UserID,- ObjectID: dto.ObjectID,- }-- err = cs.collectionRepo.AddCollection(ctx, collection)+func (cs *CollectionService) CollectionSwitch(ctx context.Context, req *schema.CollectionSwitchReq) (+ resp *schema.CollectionSwitchResp, err error) {+ collectionGroup, err := cs.collectionGroupRepo.CreateDefaultGroupIfNotExist(ctx, req.UserID)if err != nil {- return+ return nil, err}- err = cs.questionCommon.UpdateCollectionCount(ctx, dto.ObjectID, 1)- if err != nil {- log.Error("UpdateCollectionCount", err.Error())- }- count, err := cs.objectCollectionCount(ctx, dto.ObjectID)- if err != nil {- return- }- resp.ObjectCollectionCount = fmt.Sprintf("%d", count)- resp.Switch = true- return-}--func (cs *CollectionService) objectCollectionCount(ctx context.Context, objectID string) (int64, error) {- count, err := cs.collectionRepo.CountByObjectID(ctx, objectID)- return count, err-}-func (cs *CollectionService) add(ctx context.Context, collection *entity.Collection) error {- _, has, err := cs.collectionRepo.GetOneByObjectIDAndUser(ctx, collection.UserID, collection.ObjectID)+ collection, exist, err := cs.collectionRepo.GetOneByObjectIDAndUser(ctx, req.UserID, req.ObjectID)if err != nil {- return err+ return nil, err}- if has {- return errors.BadRequest("already collected")+ if (!req.Bookmark && !exist) || (req.Bookmark && exist) {+ return nil, nil}- if collection.UserCollectionGroupID == "" || collection.UserCollectionGroupID == "0" {- var (- defaultGroup *entity.CollectionGroup- has bool- )- defaultGroup, has, err = cs.collectionGroupRepo.GetDefaultID(ctx, collection.UserID)- if err != nil {- return err- }- if !has {- defaultGroup, err = cs.collectionGroupRepo.AddCollectionDefaultGroup(ctx, collection.UserID)- if err != nil {- return err- }- collection.UserCollectionGroupID = defaultGroup.ID-- } else {- collection.UserCollectionGroupID = defaultGroup.ID+ if req.Bookmark {+ collection = &entity.Collection{+ UserID: req.UserID,+ ObjectID: req.ObjectID,+ UserCollectionGroupID: collectionGroup.ID,}+ err = cs.collectionRepo.AddCollection(ctx, collection)+ } else {+ err = cs.collectionRepo.RemoveCollection(ctx, collection.ID)}- err = cs.collectionRepo.AddCollection(ctx, collection)if err != nil {- return err+ return nil, err}- return nil-}-// Cancel-func (cs *CollectionService) cancel(ctx context.Context, collection *entity.Collection) error {- dbData, has, err := cs.collectionRepo.GetOneByObjectIDAndUser(ctx, collection.UserID, collection.ObjectID)- if err != nil {- return err- }- if !has {- return errors.BadRequest("collected record does not exist")- }- err = cs.collectionRepo.RemoveCollection(ctx, dbData.ID)+ // For now, we only support bookmark for question, so we just update question collection count+ resp = &schema.CollectionSwitchResp{}+ resp.ObjectCollectionCount, err = cs.questionCommon.UpdateCollectionCount(ctx, req.ObjectID)if err != nil {- return err+ return nil, err}- return nil+ return resp, nil}diff --git a/internal/service/dashboard/dashboard_service.go b/internal/service/dashboard/dashboard_service.goindex 521776a7..5d3aa4ed 100644--- a/internal/service/dashboard/dashboard_service.go+++ b/internal/service/dashboard/dashboard_service.go@@ -23,10 +23,12 @@ import ("context""encoding/json""fmt"+ "github.com/apache/incubator-answer/pkg/converter""io""net/http""net/url""time"+ "xorm.io/xorm/schemas""github.com/apache/incubator-answer/internal/base/constant""github.com/apache/incubator-answer/internal/base/data"@@ -100,6 +102,8 @@ func (ds *dashboardService) Statistical(ctx context.Context) (*schema.DashboardIdashboardInfo.VoteCount = ds.voteCount(ctx)dashboardInfo.OccupyingStorageSpace = ds.calculateStorage()dashboardInfo.VersionInfo.RemoteVersion = ds.remoteVersion(ctx)+ dashboardInfo.DatabaseVersion = ds.getDatabaseInfo()+ dashboardInfo.DatabaseSize = ds.GetDatabaseSize()}dashboardInfo.SMTP = ds.smtpStatus(ctx)@@ -109,6 +113,10 @@ func (ds *dashboardService) Statistical(ctx context.Context) (*schema.DashboardIdashboardInfo.AppStartTime = fmt.Sprintf("%d", time.Now().Unix()-schema.AppStartTime.Unix())dashboardInfo.VersionInfo.Version = constant.VersiondashboardInfo.VersionInfo.Revision = constant.Revision+ dashboardInfo.GoVersion = constant.GoVersion+ if siteLogin, err := ds.siteInfoService.GetSiteLogin(ctx); err == nil {+ dashboardInfo.LoginRequired = siteLogin.LoginRequired+ }ds.setCache(ctx, dashboardInfo)return dashboardInfo, nil@@ -226,19 +234,22 @@ func (ds *dashboardService) remoteVersion(ctx context.Context) string {return remoteVersion.Release.Version}-func (ds *dashboardService) smtpStatus(ctx context.Context) (enabled bool) {+func (ds *dashboardService) smtpStatus(ctx context.Context) (smtpStatus string) {emailConf, err := ds.configService.GetStringValue(ctx, "email.config")if err != nil {log.Errorf("get email config failed: %s", err)- return false+ return "disabled"}ec := &export.EmailConfig{}err = json.Unmarshal([]byte(emailConf), ec)if err != nil {log.Errorf("parsing email config failed: %s", err)- return false+ return "disabled"}- return ec.SMTPHost != ""+ if ec.SMTPHost != "" {+ smtpStatus = "enabled"+ }+ return smtpStatus}func (ds *dashboardService) httpsStatus(ctx context.Context) (enabled bool) {@@ -271,3 +282,50 @@ func (ds *dashboardService) calculateStorage() string {}return dir.FormatFileSize(dirSize)}++func (ds *dashboardService) getDatabaseInfo() (versionDesc string) {+ dbVersion, err := ds.data.DB.DBVersion()+ if err != nil {+ log.Errorf("get db version failed: %s", err)+ } else {+ versionDesc = fmt.Sprintf("%s %s", ds.data.DB.Dialect().URI().DBType, dbVersion.Number)+ }+ return versionDesc+}++func (ds *dashboardService) GetDatabaseSize() (dbSize string) {+ switch ds.data.DB.Dialect().URI().DBType {+ case schemas.MYSQL:+ sql := fmt.Sprintf("SELECT SUM(DATA_LENGTH) as db_size FROM information_schema.TABLES WHERE table_schema = '%s'",+ ds.data.DB.Dialect().URI().DBName)+ res, err := ds.data.DB.QueryInterface(sql)+ if err != nil {+ log.Warnf("get db size failed: %s", err)+ } else {+ if res != nil && len(res) > 0 && res[0]["db_size"] != nil {+ dbSizeStr, _ := res[0]["db_size"].(string)+ dbSize = dir.FormatFileSize(converter.StringToInt64(dbSizeStr))+ }+ }+ case schemas.POSTGRES:+ sql := fmt.Sprintf("SELECT pg_database_size('%s') AS db_size",+ ds.data.DB.Dialect().URI().DBName)+ res, err := ds.data.DB.QueryInterface(sql)+ if err != nil {+ log.Warnf("get db size failed: %s", err)+ } else {+ if res != nil && len(res) > 0 && res[0]["db_size"] != nil {+ dbSizeStr, _ := res[0]["db_size"].(int32)+ dbSize = dir.FormatFileSize(int64(dbSizeStr))+ }+ }+ case schemas.SQLITE:+ dirSize, err := dir.DirSize(ds.data.DB.DataSourceName())+ if err != nil {+ log.Errorf("get upload dir size failed: %s", err)+ return ""+ }+ dbSize = dir.FormatFileSize(dirSize)+ }+ return dbSize+}diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.goindex 9a172c2e..72835731 100644--- a/internal/service/question_common/question.go+++ b/internal/service/question_common/question.go@@ -63,7 +63,7 @@ type QuestionRepo interface {GetQuestionsByTitle(ctx context.Context, title string, pageSize int) (questionList []*entity.Question, err error)UpdatePvCount(ctx context.Context, questionID string) (err error)UpdateAnswerCount(ctx context.Context, questionID string, num int) (err error)- UpdateCollectionCount(ctx context.Context, questionID string, num int) (err error)+ UpdateCollectionCount(ctx context.Context, questionID string) (count int64, err error)UpdateAccepted(ctx context.Context, question *entity.Question) (err error)UpdateLastAnswer(ctx context.Context, question *entity.Question) (err error)FindByID(ctx context.Context, id []string) (questionList []*entity.Question, err error)@@ -135,8 +135,8 @@ func (qs *QuestionCommon) UpdateAnswerCount(ctx context.Context, questionID strireturn qs.questionRepo.UpdateAnswerCount(ctx, questionID, int(count))}-func (qs *QuestionCommon) UpdateCollectionCount(ctx context.Context, questionID string, num int) error {- return qs.questionRepo.UpdateCollectionCount(ctx, questionID, num)+func (qs *QuestionCommon) UpdateCollectionCount(ctx context.Context, questionID string) (count int64, err error) {+ return qs.questionRepo.UpdateCollectionCount(ctx, questionID)}func (qs *QuestionCommon) UpdateAccepted(ctx context.Context, questionID, AnswerID string) error {@@ -297,11 +297,14 @@ func (qs *QuestionCommon) Info(ctx context.Context, questionID string, loginUserisFollowed, _ := qs.followCommon.IsFollowed(ctx, loginUserID, questionID)showinfo.IsFollowed = isFollowed- has, err = qs.AnswerCommon.SearchAnswered(ctx, loginUserID, dbinfo.ID)+ ids, err := qs.AnswerCommon.SearchAnswerIDs(ctx, loginUserID, dbinfo.ID)if err != nil {- log.Error("AnswerFunc.SearchAnswered", err)+ log.Error("AnswerFunc.SearchAnswerIDs", err)+ }+ showinfo.Answered = len(ids) > 0+ if showinfo.Answered {+ showinfo.FirstAnswerId = ids[0]}- showinfo.Answered = hascollectedMap, err := qs.collectionCommon.SearchObjectCollected(ctx, loginUserID, []string{dbinfo.ID})if err != nil {diff --git a/internal/service/user_external_login/user_external_login_service.go b/internal/service/user_external_login/user_external_login_service.goindex db2fb75e..ccd3b52d 100644--- a/internal/service/user_external_login/user_external_login_service.go+++ b/internal/service/user_external_login/user_external_login_service.go@@ -35,6 +35,7 @@ import ("github.com/apache/incubator-answer/internal/service/export""github.com/apache/incubator-answer/internal/service/siteinfo_common"usercommon "github.com/apache/incubator-answer/internal/service/user_common"+ "github.com/apache/incubator-answer/internal/service/user_notification_config""github.com/apache/incubator-answer/pkg/checker""github.com/apache/incubator-answer/pkg/random""github.com/apache/incubator-answer/pkg/token"@@ -56,12 +57,13 @@ type UserExternalLoginRepo interface {// UserExternalLoginService user external login servicetype UserExternalLoginService struct {- userRepo usercommon.UserRepo- userExternalLoginRepo UserExternalLoginRepo- userCommonService *usercommon.UserCommon- emailService *export.EmailService- siteInfoCommonService siteinfo_common.SiteInfoCommonService- userActivity activity.UserActiveActivityRepo+ userRepo usercommon.UserRepo+ userExternalLoginRepo UserExternalLoginRepo+ userCommonService *usercommon.UserCommon+ emailService *export.EmailService+ siteInfoCommonService siteinfo_common.SiteInfoCommonService+ userActivity activity.UserActiveActivityRepo+ userNotificationConfigService *user_notification_config.UserNotificationConfigService}// NewUserExternalLoginService new user external login service@@ -72,14 +74,16 @@ func NewUserExternalLoginService(emailService *export.EmailService,siteInfoCommonService siteinfo_common.SiteInfoCommonService,userActivity activity.UserActiveActivityRepo,+ userNotificationConfigService *user_notification_config.UserNotificationConfigService,) *UserExternalLoginService {return &UserExternalLoginService{- userRepo: userRepo,- userCommonService: userCommonService,- userExternalLoginRepo: userExternalLoginRepo,- emailService: emailService,- siteInfoCommonService: siteInfoCommonService,- userActivity: userActivity,+ userRepo: userRepo,+ userCommonService: userCommonService,+ userExternalLoginRepo: userExternalLoginRepo,+ emailService: emailService,+ siteInfoCommonService: siteInfoCommonService,+ userActivity: userActivity,+ userNotificationConfigService: userNotificationConfigService,}}@@ -165,6 +169,11 @@ func (us *UserExternalLoginService) ExternalLogin(log.Error(err)}+ // set default user notification config for external user+ if err := us.userNotificationConfigService.SetDefaultUserNotificationConfig(ctx, []string{oldUserInfo.ID}); err != nil {+ log.Errorf("set default user notification config failed, err: %v", err)+ }+accessToken, _, err := us.userCommonService.CacheLoginUserInfo(ctx, oldUserInfo.ID, newMailStatus, oldUserInfo.Status, oldExternalLoginUserInfo.ExternalID)return &schema.UserExternalLoginResp{AccessToken: accessToken}, errdiff --git a/internal/service/user_service.go b/internal/service/user_service.goindex df740731..a0e0dbb7 100644--- a/internal/service/user_service.go+++ b/internal/service/user_service.go@@ -134,6 +134,13 @@ func (us *UserService) GetOtherUserInfoByUsername(ctx context.Context, username// EmailLogin email loginfunc (us *UserService) EmailLogin(ctx context.Context, req *schema.UserEmailLoginReq) (resp *schema.UserLoginResp, err error) {+ siteLogin, err := us.siteInfoService.GetSiteLogin(ctx)+ if err != nil {+ return nil, err+ }+ if !siteLogin.AllowPasswordLogin {+ return nil, errors.BadRequest(reason.NotAllowedLoginViaPassword)+ }userInfo, exist, err := us.userRepo.GetByEmail(ctx, req.Email)if err != nil {return nil, err@@ -870,7 +877,7 @@ func (us *UserService) warpStatRankingResp(if stat.Rank <= 0 {continue}- if userInfo := userInfoMapping[stat.UserID]; userInfo != nil {+ if userInfo := userInfoMapping[stat.UserID]; userInfo != nil && userInfo.Status != entity.UserStatusDeleted {resp.UsersWithTheMostReputation = append(resp.UsersWithTheMostReputation, &schema.UserRankingSimpleInfo{Username: userInfo.Username,Rank: stat.Rank,@@ -883,7 +890,7 @@ func (us *UserService) warpStatRankingResp(if stat.VoteCount <= 0 {continue}- if userInfo := userInfoMapping[stat.UserID]; userInfo != nil {+ if userInfo := userInfoMapping[stat.UserID]; userInfo != nil && userInfo.Status != entity.UserStatusDeleted {resp.UsersWithTheMostVote = append(resp.UsersWithTheMostVote, &schema.UserRankingSimpleInfo{Username: userInfo.Username,VoteCount: stat.VoteCount,@@ -893,7 +900,7 @@ func (us *UserService) warpStatRankingResp(}}for _, rel := range userRoleRels {- if userInfo := userInfoMapping[rel.UserID]; userInfo != nil {+ if userInfo := userInfoMapping[rel.UserID]; userInfo != nil && userInfo.Status != entity.UserStatusDeleted {resp.Staffs = append(resp.Staffs, &schema.UserRankingSimpleInfo{Username: userInfo.Username,Rank: userInfo.Rank,diff --git a/ui/.eslintrc.js b/ui/.eslintrc.jsindex dfbfebec..46c00687 100644--- a/ui/.eslintrc.js+++ b/ui/.eslintrc.js@@ -24,8 +24,8 @@ module.exports = {es2021: true,},extends: [- 'react-app','react-app/jest',+ 'plugin:react/recommended','airbnb','airbnb-typescript','plugin:import/typescript',@@ -61,6 +61,7 @@ module.exports = {'jsx-a11y/no-static-element-interactions': 'off','jsx-a11y/label-has-associated-control': 'off','jsx-a11y/tabindex-no-positive': 'off',+ 'jsx-a11y/control-has-associated-label': 'off','func-names': 'off','no-alert': 'off','prefer-promise-reject-errors': 'off',diff --git a/ui/package.json b/ui/package.jsonindex cc863404..1ad29594 100644--- a/ui/package.json+++ b/ui/package.json@@ -7,7 +7,7 @@"start": "react-app-rewired start","build": "react-app-rewired build","lint": "eslint . --cache --fix --ext .ts,.tsx",- "prettier": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",+ "prettier": "prettier --write 'src/**/*.{js,jsx,ts,tsx,json,css,scss,md}' --config ./.prettierrc.json","pre-install": "node ./scripts/preinstall.js && pnpm install","prepare": "pnpm build:packages","pre-commit": "lint-staged",@@ -58,31 +58,31 @@"@types/qs": "^6.9.7","@types/react": "^18.0.17","@types/react-dom": "^18.0.6",- "@typescript-eslint/eslint-plugin": "^5.0.0",- "@typescript-eslint/parser": "^5.33.0",+ "@typescript-eslint/eslint-plugin": "^6.11.0",+ "@typescript-eslint/parser": "^6.11.0","customize-cra": "^1.0.0",- "eslint": "^8.0.1",+ "eslint": "^8.53.0","eslint-config-airbnb": "^19.0.4",- "eslint-config-airbnb-typescript": "^17.0.0",- "eslint-config-prettier": "^8.5.0",- "eslint-config-standard-with-typescript": "^22.0.0",+ "eslint-config-airbnb-typescript": "^17.1.0",+ "eslint-config-prettier": "^9.0.0",+ "eslint-config-standard-with-typescript": "^39.1.1","eslint-plugin-import": "^2.25.2",- "eslint-plugin-jsx-a11y": "^6.6.1",- "eslint-plugin-n": "^15.0.0",- "eslint-plugin-prettier": "^4.2.1",+ "eslint-plugin-jsx-a11y": "^6.8.0",+ "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",+ "eslint-plugin-prettier": "^5.0.0","eslint-plugin-promise": "^6.0.0",- "eslint-plugin-react": "^7.30.1",+ "eslint-plugin-react": "^7.33.2","eslint-plugin-react-hooks": "^4.6.0","humps": "^2.0.1","husky": "^8.0.1",- "lint-staged": "^13.0.3",+ "lint-staged": "^13.2.3","postcss": "^8.0.0",- "prettier": "^2.7.1",+ "prettier": "^3.1.0","purgecss-webpack-plugin": "^4.1.3","react-app-rewired": "^2.2.1","react-scripts": "5.0.1","sass": "^1.54.4",- "typescript": "^4.8.3",+ "typescript": "^4.9.5","yaml-loader": "^0.8.0"},"packageManager": "[email protected]",diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yamlindex a2cd8ea4..b1555ee7 100644--- a/ui/pnpm-lock.yaml+++ b/ui/pnpm-lock.yaml@@ -1,3 +1,20 @@+# Licensed to the Apache Software Foundation (ASF) under one+# or more contributor license agreements. See the NOTICE file+# distributed with this work for additional information+# regarding copyright ownership. The ASF licenses this file+# to you under the Apache License, Version 2.0 (the+# "License"); you may not use this file except in compliance+# with the License. You may obtain a copy of the License at+#+# http://www.apache.org/licenses/LICENSE-2.0+#+# Unless required by applicable law or agreed to in writing,+# software distributed under the License is distributed on an+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+# KIND, either express or implied. See the License for the+# specific language governing permissions and limitations+# under the License.+lockfileVersion: '6.0'settings:@@ -133,50 +150,50 @@ importers:specifier: ^18.0.6version: 18.0.6'@typescript-eslint/eslint-plugin':- specifier: ^5.0.0+ specifier: ^6.11.0'@typescript-eslint/parser':- specifier: ^5.33.0- version: 5.38.0([email protected])([email protected])+ specifier: ^6.11.0+ version: 6.11.0([email protected])([email protected])customize-cra:specifier: ^1.0.0version: 1.0.0eslint:- specifier: ^8.0.1- version: 8.23.1+ specifier: ^8.53.0+ version: 8.53.0eslint-config-airbnb:specifier: ^19.0.4- version: 19.0.4([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 19.0.4([email protected])([email protected])([email protected])([email protected])([email protected])eslint-config-airbnb-typescript:- specifier: ^17.0.0- version: 17.0.0(@typescript-eslint/[email protected])(@typescript-eslint/[email protected])([email protected])([email protected])+ specifier: ^17.1.0+ version: 17.1.0(@typescript-eslint/[email protected])(@typescript-eslint/[email protected])([email protected])([email protected])eslint-config-prettier:- specifier: ^8.5.0- version: 8.5.0([email protected])+ specifier: ^9.0.0+ version: 9.0.0([email protected])eslint-config-standard-with-typescript:- specifier: ^22.0.0- version: 22.0.0(@typescript-eslint/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ specifier: ^39.1.1+ version: 39.1.1(@typescript-eslint/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])eslint-plugin-import:specifier: ^2.25.2- version: 2.26.0(@typescript-eslint/[email protected])([email protected])+ version: 2.26.0(@typescript-eslint/[email protected])([email protected])eslint-plugin-jsx-a11y:- specifier: ^6.6.1- version: 6.6.1([email protected])+ specifier: ^6.8.0+ version: 6.8.0([email protected])eslint-plugin-n:- specifier: ^15.0.0- version: 15.2.5([email protected])+ specifier: '^15.0.0 || ^16.0.0 '+ version: 15.2.5([email protected])eslint-plugin-prettier:- specifier: ^4.2.1+ specifier: ^5.0.0eslint-plugin-promise:specifier: ^6.0.0- version: 6.0.1([email protected])+ version: 6.0.1([email protected])eslint-plugin-react:- specifier: ^7.30.1- version: 7.31.8([email protected])+ specifier: ^7.33.2+ version: 7.33.2([email protected])eslint-plugin-react-hooks:specifier: ^4.6.0- version: 4.6.0([email protected])+ version: 4.6.0([email protected])humps:specifier: ^2.0.1version: 2.0.1@@ -184,14 +201,14 @@ importers:specifier: ^8.0.1version: 8.0.1lint-staged:- specifier: ^13.0.3- version: 13.0.3+ specifier: ^13.2.3+ version: 13.3.0postcss:specifier: ^8.0.0version: 8.4.16prettier:- specifier: ^2.7.1- version: 2.7.1+ specifier: ^3.1.0+ version: 3.1.0purgecss-webpack-plugin:specifier: ^4.1.3version: 4.1.3([email protected])@@ -200,12 +217,12 @@ importers:version: 2.2.1([email protected])react-scripts:specifier: 5.0.1- version: 5.0.1(@babel/[email protected])(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 5.0.1(@babel/[email protected])(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])sass:specifier: ^1.54.4version: 1.54.9typescript:- specifier: ^4.8.3+ specifier: ^4.9.5version: 4.9.5yaml-loader:specifier: ^0.8.0@@ -219,22 +236,22 @@ importers:devDependencies:'@typescript-eslint/eslint-plugin':specifier: ^6.0.0'@typescript-eslint/parser':specifier: ^6.0.0- version: 6.12.0([email protected])([email protected])+ version: 6.11.0([email protected])([email protected])'@vitejs/plugin-react-swc':specifier: ^3.3.2version: 3.5.0([email protected])eslint:specifier: ^8.45.0- version: 8.54.0+ version: 8.53.0eslint-plugin-react-hooks:specifier: ^4.6.0- version: 4.6.0([email protected])+ version: 4.6.0([email protected])eslint-plugin-react-refresh:specifier: ^0.4.3- version: 0.4.4([email protected])+ version: 0.4.5([email protected])typescript:specifier: ^5.0.2version: 5.3.2@@ -247,7 +264,6 @@ packages:/@aashutoshrathi/[email protected]:resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}engines: {node: '>=0.10.0'}- dev: true/@ampproject/[email protected]:resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}@@ -295,11 +311,11 @@ packages:debug: 4.3.4gensync: 1.0.0-beta.2json5: 2.2.1- semver: 6.3.0+ semver: 6.3.1transitivePeerDependencies:- supports-colorresolution: {integrity: sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==}engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}peerDependencies:@@ -308,9 +324,9 @@ packages:dependencies:'@babel/core': 7.19.1'@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1- eslint: 8.23.1+ eslint: 8.53.0eslint-visitor-keys: 2.1.0- semver: 6.3.0+ semver: 6.3.1/@babel/[email protected]:resolution: {integrity: sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==}@@ -343,7 +359,7 @@ packages:'@babel/core': 7.19.1'@babel/helper-validator-option': 7.18.6browserslist: 4.21.4- semver: 6.3.0+ semver: 6.3.1/@babel/[email protected](@babel/[email protected]):resolution: {integrity: sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==}@@ -383,7 +399,7 @@ packages:debug: 4.3.4lodash.debounce: 4.0.8resolve: 1.22.1- semver: 6.3.0+ semver: 6.3.1transitivePeerDependencies:- supports-color@@ -1302,7 +1318,7 @@ packages:babel-plugin-polyfill-corejs2: 0.3.3(@babel/[email protected])babel-plugin-polyfill-corejs3: 0.6.0(@babel/[email protected])babel-plugin-polyfill-regenerator: 0.4.1(@babel/[email protected])- semver: 6.3.0+ semver: 6.3.1transitivePeerDependencies:- supports-color@@ -1465,7 +1481,7 @@ packages:babel-plugin-polyfill-corejs3: 0.6.0(@babel/[email protected])babel-plugin-polyfill-regenerator: 0.4.1(@babel/[email protected])core-js-compat: 3.25.2- semver: 6.3.0+ semver: 6.3.1transitivePeerDependencies:- supports-color@@ -1508,13 +1524,6 @@ packages:transitivePeerDependencies:- supports-color- /@babel/[email protected]:- resolution: {integrity: sha512-j2vJGnkopRzH+ykJ8h68wrHnEUmtK//E723jjixiAl/PPf6FhqY/vYRcMVlNydRKQjQsTsYEjpx+DZMIvnGk/g==}- engines: {node: '>=6.9.0'}- dependencies:- core-js-pure: 3.25.2- regenerator-runtime: 0.13.9-/@babel/[email protected]:resolution: {integrity: sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==}engines: {node: '>=6.9.0'}@@ -1527,6 +1536,12 @@ packages:dependencies:regenerator-runtime: 0.13.11+ /@babel/[email protected]:+ resolution: {integrity: sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==}+ engines: {node: '>=6.9.0'}+ dependencies:+ regenerator-runtime: 0.14.0+/@babel/[email protected]:resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}engines: {node: '>=6.9.0'}@@ -2084,36 +2099,18 @@ packages:dev: trueoptional: true- /@eslint-community/[email protected]([email protected]):+ /@eslint-community/[email protected]([email protected]):resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}peerDependencies:eslint: ^6.0.0 || ^7.0.0 || >=8.0.0dependencies:- eslint: 8.54.0+ eslint: 8.53.0eslint-visitor-keys: 3.4.3- dev: true/@eslint-community/[email protected]:resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==}engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}- dev: true-- /@eslint/[email protected]:- resolution: {integrity: sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==}- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- dependencies:- ajv: 6.12.6- debug: 4.3.4- espree: 9.4.0- globals: 13.17.0- ignore: 5.2.0- import-fresh: 3.3.0- js-yaml: 4.1.0- minimatch: 3.1.2- strip-json-comments: 3.1.1- transitivePeerDependencies:- - supports-color/@eslint/[email protected]:resolution: {integrity: sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==}@@ -2123,19 +2120,17 @@ packages:debug: 4.3.4espree: 9.6.1globals: 13.23.0- ignore: 5.2.0+ ignore: 5.2.4import-fresh: 3.3.0js-yaml: 4.1.0minimatch: 3.1.2strip-json-comments: 3.1.1transitivePeerDependencies:- supports-color- dev: true- /@eslint/[email protected]:- resolution: {integrity: sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==}+ /@eslint/[email protected]:+ resolution: {integrity: sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- dev: true/@fullhuman/[email protected]([email protected]):resolution: {integrity: sha512-jqcsyfvq09VOsMXxJMPLRF6Fhg/NNltzWKnC9qtzva+QKTxerCO4esG6je7hbnmkpZtaDyPTwMBj9bzfWorsrw==}@@ -2146,16 +2141,6 @@ packages:purgecss: 4.1.3dev: true- /@humanwhocodes/[email protected]:- resolution: {integrity: sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==}- engines: {node: '>=10.10.0'}- dependencies:- '@humanwhocodes/object-schema': 1.2.1- debug: 4.3.4- minimatch: 3.1.2- transitivePeerDependencies:- - supports-color-/@humanwhocodes/[email protected]:resolution: {integrity: sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==}engines: {node: '>=10.10.0'}@@ -2165,21 +2150,13 @@ packages:minimatch: 3.1.2transitivePeerDependencies:- supports-color- dev: true-- /@humanwhocodes/[email protected]:- resolution: {integrity: sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==}/@humanwhocodes/[email protected]:resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}engines: {node: '>=12.22'}- /@humanwhocodes/[email protected]:- resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}-/@humanwhocodes/[email protected]:resolution: {integrity: sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==}- dev: true/@istanbuljs/[email protected]:resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}@@ -2524,6 +2501,18 @@ packages:'@nodelib/fs.scandir': 2.1.5fastq: 1.13.0+ /@pkgr/[email protected]:+ resolution: {integrity: sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==}+ engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}+ dependencies:+ cross-spawn: 7.0.3+ fast-glob: 3.3.2+ is-glob: 4.0.3+ open: 9.1.0+ picocolors: 1.0.0+ tslib: 2.6.2+ dev: true+resolution: {integrity: sha512-bcKCAzF0DV2IIROp9ZHkRJa6O4jy7NlnHdWL3GmcUxYWNjLXkK5kfELELwEfSP5hXPfVL/qOGMAROuMQb9GG8Q==}engines: {node: '>= 10.13'}@@ -2778,8 +2767,8 @@ packages:transitivePeerDependencies:- supports-color- /@swc/[email protected]:- resolution: {integrity: sha512-Qj7Jct68q3ZKeuJrjPx7k8SxzWN6PqLh+VFxzA+KwLDpQDPzOlKRZwkIMzuFjLhITO4RHgSnXoDk/Syz0ZeN+Q==}+ /@swc/[email protected]:+ resolution: {integrity: sha512-XVWFsKe6ei+SsDbwmsuRkYck1SXRpO60Hioa4hoLwR8fxbA9eVp6enZtMxzVVMBi8ej5seZ4HZQeAWepbukiBw==}engines: {node: '>=10'}cpu: [arm64]os: [darwin]@@ -2787,8 +2776,8 @@ packages:dev: trueoptional: true- /@swc/[email protected]:- resolution: {integrity: sha512-wR7m9QVJjgiBu1PSOHy7s66uJPa45Kf9bZExXUL+JAa9OQxt5y+XVzr+n+F045VXQOwdGWplgPnWjgbUUHEVyw==}+ /@swc/[email protected]:+ resolution: {integrity: sha512-KF/MXrnH1nakm1wbt4XV8FS7kvqD9TGmVxeJ0U4bbvxXMvzeYUurzg3AJUTXYmXDhH/VXOYJE5N5RkwZZPs5iA==}engines: {node: '>=10'}cpu: [x64]os: [darwin]@@ -2796,8 +2785,8 @@ packages:dev: trueoptional: true- /@swc/[email protected]:- resolution: {integrity: sha512-gcGv1l5t0DScEONmw5OhdVmEI/o49HCe9Ik38zzH0NtDkc+PDYaCcXU5rvfZP2qJFaAAr8cua8iJcOunOSLmnA==}+ /@swc/[email protected]:+ resolution: {integrity: sha512-p8hikNnAEJrw5vHCtKiFT4hdlQxk1V7vqPmvUDgL/qe2menQDK/i12tbz7/3BEQ4UqUPnvwpmVn2d19RdEMNxw==}engines: {node: '>=10'}cpu: [arm64]os: [linux]@@ -2806,8 +2795,8 @@ packages:dev: trueoptional: true- /@swc/[email protected]:- resolution: {integrity: sha512-XL1/eUsTO8BiKsWq9i3iWh7H99iPO61+9HYiWVKhSavknfj4Plbn+XyajDpxsauln5o8t+BRGitymtnAWJM4UQ==}+ /@swc/[email protected]:+ resolution: {integrity: sha512-BWx/0EeY89WC4q3AaIaBSGfQxkYxIlS3mX19dwy2FWJs/O+fMvF9oLk/CyJPOZzbp+1DjGeeoGFuDYpiNO91JA==}engines: {node: '>=10'}cpu: [arm64]os: [linux]@@ -2816,8 +2805,8 @@ packages:dev: trueoptional: true- /@swc/[email protected]:- resolution: {integrity: sha512-fGrXYE6DbTfGNIGQmBefYxSk3rp/1lgbD0nVg4rl4mfFRQPi7CgGhrrqSuqZ/ezXInUIgoCyvYGWFSwjLXt/Qg==}+ /@swc/[email protected]:+ resolution: {integrity: sha512-XUdGu3dxAkjsahLYnm8WijPfKebo+jHgHphDxaW0ovI6sTdmEGFDew7QzKZRlbYL2jRkUuuKuDGvD6lO5frmhA==}engines: {node: '>=10'}cpu: [x64]os: [linux]@@ -2826,8 +2815,8 @@ packages:dev: trueoptional: true- /@swc/[email protected]:- resolution: {integrity: sha512-kvgZp/mqf3IJ806gUOL6gN6VU15+DfzM1Zv4Udn8GqgXiUAvbQehrtruid4Snn5pZTLj4PEpSCBbxgxK1jbssA==}+ /@swc/[email protected]:+ resolution: {integrity: sha512-PhoXKf+f0OaNW/GCuXjJ0/KfK9EJX7z2gko+7nVnEA0p3aaPtbP6cq1Ubbl6CMoPL+Ci3gZ7nYumDqXNc3CtLQ==}engines: {node: '>=10'}cpu: [x64]os: [linux]@@ -2836,8 +2825,8 @@ packages:dev: trueoptional: true- /@swc/[email protected]:- resolution: {integrity: sha512-yt8RtZ4W/QgFF+JUemOUQAkVW58cCST7mbfKFZ1v16w3pl3NcWd9OrtppFIXpbjU1rrUX2zp2R7HZZzZ2Zk/aQ==}+ /@swc/[email protected]:+ resolution: {integrity: sha512-PwLADZN6F9cXn4Jw52FeP/MCLVHm8vwouZZSOoOScDtihjY495SSjdPnlosMaRSR4wJQssGwiD/4MbpgQPqbAw==}engines: {node: '>=10'}cpu: [arm64]os: [win32]@@ -2845,8 +2834,8 @@ packages:dev: trueoptional: true- /@swc/[email protected]:- resolution: {integrity: sha512-62p5fWnOJR/rlbmbUIpQEVRconICy5KDScWVuJg1v3GPLBrmacjphyHiJC1mp6dYvvoEWCk/77c/jcQwlXrDXw==}+ /@swc/[email protected]:+ resolution: {integrity: sha512-0f6nicKSLlDKlyPRl2JEmkpBV4aeDfRQg6n8mPqgL7bliZIcDahG0ej+HxgNjZfS3e0yjDxsNRa6sAqWU2Z60A==}engines: {node: '>=10'}cpu: [ia32]os: [win32]@@ -2854,8 +2843,8 @@ packages:dev: trueoptional: true- /@swc/[email protected]:- resolution: {integrity: sha512-PdppWhkoS45VGdMBxvClVgF1hVjqamtvYd82Gab1i4IV45OSym2KinoDCKE1b6j3LwBLOn2J9fvChGSgGfDCHQ==}+ /@swc/[email protected]:+ resolution: {integrity: sha512-b7J0rPoMkRTa3XyUGt8PwCaIBuYWsL2DqbirrQKRESzgCvif5iNpqaM6kjIjI/5y5q1Ycv564CB51YDpiS8EtQ==}engines: {node: '>=10'}cpu: [x64]os: [win32]@@ -2863,8 +2852,8 @@ packages:dev: trueoptional: true- /@swc/[email protected]:- resolution: {integrity: sha512-8O996RfuPC4ieb4zbYMfbyCU9k4gSOpyCNnr7qBQ+o7IEmh8JCV6B8wwu+fT/Om/6Lp34KJe1IpJ/24axKS6TQ==}+ /@swc/[email protected]:+ resolution: {integrity: sha512-7dKgTyxJjlrMwFZYb1auj3Xq0D8ZBe+5oeIgfMlRU05doXZypYJe0LAk0yjj3WdbwYzpF+T1PLxwTWizI0pckw==}engines: {node: '>=10'}requiresBuild: truepeerDependencies:@@ -2876,15 +2865,15 @@ packages:'@swc/counter': 0.1.2'@swc/types': 0.1.5optionalDependencies:- '@swc/core-darwin-arm64': 1.3.99- '@swc/core-darwin-x64': 1.3.99- '@swc/core-linux-arm64-gnu': 1.3.99- '@swc/core-linux-arm64-musl': 1.3.99- '@swc/core-linux-x64-gnu': 1.3.99- '@swc/core-linux-x64-musl': 1.3.99- '@swc/core-win32-arm64-msvc': 1.3.99- '@swc/core-win32-ia32-msvc': 1.3.99- '@swc/core-win32-x64-msvc': 1.3.99+ '@swc/core-darwin-arm64': 1.3.100+ '@swc/core-darwin-x64': 1.3.100+ '@swc/core-linux-arm64-gnu': 1.3.100+ '@swc/core-linux-arm64-musl': 1.3.100+ '@swc/core-linux-x64-gnu': 1.3.100+ '@swc/core-linux-x64-musl': 1.3.100+ '@swc/core-win32-arm64-msvc': 1.3.100+ '@swc/core-win32-ia32-msvc': 1.3.100+ '@swc/core-win32-x64-msvc': 1.3.100dev: true/@swc/[email protected]:@@ -3057,7 +3046,7 @@ packages:resolution: {integrity: sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==}dependencies:'@types/estree': 1.0.0- '@types/json-schema': 7.0.11+ '@types/json-schema': 7.0.13/@types/[email protected]:resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==}@@ -3127,9 +3116,6 @@ packages:pretty-format: 27.5.1dev: true- /@types/[email protected]:- resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}-/@types/[email protected]:resolution: {integrity: sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==}@@ -3218,8 +3204,8 @@ packages:/@types/[email protected]:resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}- /@types/[email protected]:- resolution: {integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==}+ /@types/[email protected]:+ resolution: {integrity: sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==}dev: true/@types/[email protected]:@@ -3272,7 +3258,7 @@ packages:dependencies:'@types/yargs-parser': 21.0.0- /@typescript-eslint/[email protected](@typescript-eslint/[email protected])([email protected])([email protected]):+ /@typescript-eslint/[email protected](@typescript-eslint/[email protected])([email protected])([email protected]):resolution: {integrity: sha512-GgHi/GNuUbTOeoJiEANi0oI6fF3gBQc3bGFYj40nnAPCbhrtEDf2rjBmefFadweBmO1Du1YovHeDP2h5JLhtTQ==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}peerDependencies:@@ -3283,22 +3269,51 @@ packages:typescript:optional: truedependencies:- '@typescript-eslint/parser': 5.38.0([email protected])([email protected])+ '@typescript-eslint/parser': 5.38.0([email protected])([email protected])'@typescript-eslint/scope-manager': 5.38.0- '@typescript-eslint/type-utils': 5.38.0([email protected])([email protected])- '@typescript-eslint/utils': 5.38.0([email protected])([email protected])+ '@typescript-eslint/type-utils': 5.38.0([email protected])([email protected])+ '@typescript-eslint/utils': 5.38.0([email protected])([email protected])debug: 4.3.4- eslint: 8.23.1- ignore: 5.2.0+ eslint: 8.53.0+ ignore: 5.2.4regexpp: 3.2.0- semver: 7.3.8+ semver: 7.5.4tsutils: 3.21.0([email protected])typescript: 4.9.5transitivePeerDependencies:- supports-color- /@typescript-eslint/[email protected](@typescript-eslint/[email protected])([email protected])([email protected]):- resolution: {integrity: sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA==}+ /@typescript-eslint/[email protected](@typescript-eslint/[email protected])([email protected])([email protected]):+ resolution: {integrity: sha512-uXnpZDc4VRjY4iuypDBKzW1rz9T5YBBK0snMn8MaTSNd2kMlj50LnLBABELjJiOL5YHk7ZD8hbSpI9ubzqYI0w==}+ engines: {node: ^16.0.0 || >=18.0.0}+ peerDependencies:+ '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha+ eslint: ^7.0.0 || ^8.0.0+ typescript: '*'+ peerDependenciesMeta:+ typescript:+ optional: true+ dependencies:+ '@eslint-community/regexpp': 4.10.0+ '@typescript-eslint/parser': 6.11.0([email protected])([email protected])+ '@typescript-eslint/scope-manager': 6.11.0+ '@typescript-eslint/type-utils': 6.11.0([email protected])([email protected])+ '@typescript-eslint/utils': 6.11.0([email protected])([email protected])+ '@typescript-eslint/visitor-keys': 6.11.0+ debug: 4.3.4+ eslint: 8.53.0+ graphemer: 1.4.0+ ignore: 5.2.4+ natural-compare: 1.4.0+ semver: 7.5.4+ ts-api-utils: 1.0.3([email protected])+ typescript: 4.9.5+ transitivePeerDependencies:+ - supports-color+ dev: true++ /@typescript-eslint/[email protected](@typescript-eslint/[email protected])([email protected])([email protected]):+ resolution: {integrity: sha512-uXnpZDc4VRjY4iuypDBKzW1rz9T5YBBK0snMn8MaTSNd2kMlj50LnLBABELjJiOL5YHk7ZD8hbSpI9ubzqYI0w==}engines: {node: ^16.0.0 || >=18.0.0}peerDependencies:'@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha@@ -3309,15 +3324,15 @@ packages:optional: truedependencies:'@eslint-community/regexpp': 4.10.0- '@typescript-eslint/parser': 6.12.0([email protected])([email protected])- '@typescript-eslint/scope-manager': 6.12.0- '@typescript-eslint/type-utils': 6.12.0([email protected])([email protected])- '@typescript-eslint/utils': 6.12.0([email protected])([email protected])- '@typescript-eslint/visitor-keys': 6.12.0+ '@typescript-eslint/parser': 6.11.0([email protected])([email protected])+ '@typescript-eslint/scope-manager': 6.11.0+ '@typescript-eslint/type-utils': 6.11.0([email protected])([email protected])+ '@typescript-eslint/utils': 6.11.0([email protected])([email protected])+ '@typescript-eslint/visitor-keys': 6.11.0debug: 4.3.4- eslint: 8.54.0+ eslint: 8.53.0graphemer: 1.4.0- ignore: 5.3.0+ ignore: 5.2.4natural-compare: 1.4.0semver: 7.5.4ts-api-utils: 1.0.3([email protected])@@ -3326,19 +3341,19 @@ packages:- supports-colordev: trueresolution: {integrity: sha512-kzXBRfvGlicgGk4CYuRUqKvwc2s3wHXNssUWWJU18bhMRxriFm3BZWyQ6vEHBRpEIMKB6b7MIQHO+9lYlts19w==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}peerDependencies:eslint: ^6.0.0 || ^7.0.0 || ^8.0.0dependencies:- '@typescript-eslint/utils': 5.38.0([email protected])([email protected])- eslint: 8.23.1+ '@typescript-eslint/utils': 5.38.0([email protected])([email protected])+ eslint: 8.53.0transitivePeerDependencies:- supports-color- typescriptresolution: {integrity: sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}peerDependencies:@@ -3352,13 +3367,34 @@ packages:'@typescript-eslint/types': 5.38.0'@typescript-eslint/typescript-estree': 5.38.0([email protected])debug: 4.3.4- eslint: 8.23.1+ eslint: 8.53.0+ typescript: 4.9.5+ transitivePeerDependencies:+ - supports-color++ resolution: {integrity: sha512-+whEdjk+d5do5nxfxx73oanLL9ghKO3EwM9kBCkUtWMRwWuPaFv9ScuqlYfQ6pAD6ZiJhky7TZ2ZYhrMsfMxVQ==}+ engines: {node: ^16.0.0 || >=18.0.0}+ peerDependencies:+ eslint: ^7.0.0 || ^8.0.0+ typescript: '*'+ peerDependenciesMeta:+ typescript:+ optional: true+ dependencies:+ '@typescript-eslint/scope-manager': 6.11.0+ '@typescript-eslint/types': 6.11.0+ '@typescript-eslint/typescript-estree': 6.11.0([email protected])+ '@typescript-eslint/visitor-keys': 6.11.0+ debug: 4.3.4+ eslint: 8.53.0typescript: 4.9.5transitivePeerDependencies:- supports-color+ dev: true- resolution: {integrity: sha512-s8/jNFPKPNRmXEnNXfuo1gemBdVmpQsK1pcu+QIvuNJuhFzGrpD7WjOcvDc/+uEdfzSYpNu7U/+MmbScjoQ6vg==}+ resolution: {integrity: sha512-+whEdjk+d5do5nxfxx73oanLL9ghKO3EwM9kBCkUtWMRwWuPaFv9ScuqlYfQ6pAD6ZiJhky7TZ2ZYhrMsfMxVQ==}engines: {node: ^16.0.0 || >=18.0.0}peerDependencies:eslint: ^7.0.0 || ^8.0.0@@ -3367,12 +3403,12 @@ packages:typescript:optional: truedependencies:- '@typescript-eslint/scope-manager': 6.12.0- '@typescript-eslint/types': 6.12.0- '@typescript-eslint/typescript-estree': 6.12.0([email protected])- '@typescript-eslint/visitor-keys': 6.12.0+ '@typescript-eslint/scope-manager': 6.11.0+ '@typescript-eslint/types': 6.11.0+ '@typescript-eslint/typescript-estree': 6.11.0([email protected])+ '@typescript-eslint/visitor-keys': 6.11.0debug: 4.3.4- eslint: 8.54.0+ eslint: 8.53.0typescript: 5.3.2transitivePeerDependencies:- supports-color@@ -3385,15 +3421,15 @@ packages:'@typescript-eslint/types': 5.38.0'@typescript-eslint/visitor-keys': 5.38.0- /@typescript-eslint/[email protected]:- resolution: {integrity: sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==}+ /@typescript-eslint/[email protected]:+ resolution: {integrity: sha512-0A8KoVvIURG4uhxAdjSaxy8RdRE//HztaZdG8KiHLP8WOXSk0vlF7Pvogv+vlJA5Rnjj/wDcFENvDaHb+gKd1A==}engines: {node: ^16.0.0 || >=18.0.0}dependencies:- '@typescript-eslint/types': 6.12.0- '@typescript-eslint/visitor-keys': 6.12.0+ '@typescript-eslint/types': 6.11.0+ '@typescript-eslint/visitor-keys': 6.11.0dev: trueresolution: {integrity: sha512-iZq5USgybUcj/lfnbuelJ0j3K9dbs1I3RICAJY9NZZpDgBYXmuUlYQGzftpQA9wC8cKgtS6DASTvF3HrXwwozA==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}peerDependencies:@@ -3404,16 +3440,36 @@ packages:optional: truedependencies:'@typescript-eslint/typescript-estree': 5.38.0([email protected])- '@typescript-eslint/utils': 5.38.0([email protected])([email protected])+ '@typescript-eslint/utils': 5.38.0([email protected])([email protected])debug: 4.3.4- eslint: 8.23.1+ eslint: 8.53.0tsutils: 3.21.0([email protected])typescript: 4.9.5transitivePeerDependencies:- supports-color- resolution: {integrity: sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng==}+ resolution: {integrity: sha512-nA4IOXwZtqBjIoYrJcYxLRO+F9ri+leVGoJcMW1uqr4r1Hq7vW5cyWrA43lFbpRvQ9XgNrnfLpIkO3i1emDBIA==}+ engines: {node: ^16.0.0 || >=18.0.0}+ peerDependencies:+ eslint: ^7.0.0 || ^8.0.0+ typescript: '*'+ peerDependenciesMeta:+ typescript:+ optional: true+ dependencies:+ '@typescript-eslint/typescript-estree': 6.11.0([email protected])+ '@typescript-eslint/utils': 6.11.0([email protected])([email protected])+ debug: 4.3.4+ eslint: 8.53.0+ ts-api-utils: 1.0.3([email protected])+ typescript: 4.9.5+ transitivePeerDependencies:+ - supports-color+ dev: true++ resolution: {integrity: sha512-nA4IOXwZtqBjIoYrJcYxLRO+F9ri+leVGoJcMW1uqr4r1Hq7vW5cyWrA43lFbpRvQ9XgNrnfLpIkO3i1emDBIA==}engines: {node: ^16.0.0 || >=18.0.0}peerDependencies:eslint: ^7.0.0 || ^8.0.0@@ -3422,10 +3478,10 @@ packages:typescript:optional: truedependencies:- '@typescript-eslint/typescript-estree': 6.12.0([email protected])- '@typescript-eslint/utils': 6.12.0([email protected])([email protected])+ '@typescript-eslint/typescript-estree': 6.11.0([email protected])+ '@typescript-eslint/utils': 6.11.0([email protected])([email protected])debug: 4.3.4- eslint: 8.54.0+ eslint: 8.53.0ts-api-utils: 1.0.3([email protected])typescript: 5.3.2transitivePeerDependencies:@@ -3436,8 +3492,8 @@ packages:resolution: {integrity: sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- /@typescript-eslint/[email protected]:- resolution: {integrity: sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==}+ /@typescript-eslint/[email protected]:+ resolution: {integrity: sha512-ZbEzuD4DwEJxwPqhv3QULlRj8KYTAnNsXxmfuUXFCxZmO6CF2gM/y+ugBSAQhrqaJL3M+oe4owdWunaHM6beqA==}engines: {node: ^16.0.0 || >=18.0.0}dev: true@@ -3455,14 +3511,35 @@ packages:debug: 4.3.4globby: 11.1.0is-glob: 4.0.3- semver: 7.3.8+ semver: 7.5.4tsutils: 3.21.0([email protected])typescript: 4.9.5transitivePeerDependencies:- supports-color- /@typescript-eslint/[email protected]([email protected]):- resolution: {integrity: sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==}+ /@typescript-eslint/[email protected]([email protected]):+ resolution: {integrity: sha512-Aezzv1o2tWJwvZhedzvD5Yv7+Lpu1by/U1LZ5gLc4tCx8jUmuSCMioPFRjliN/6SJIvY6HpTtJIWubKuYYYesQ==}+ engines: {node: ^16.0.0 || >=18.0.0}+ peerDependencies:+ typescript: '*'+ peerDependenciesMeta:+ typescript:+ optional: true+ dependencies:+ '@typescript-eslint/types': 6.11.0+ '@typescript-eslint/visitor-keys': 6.11.0+ debug: 4.3.4+ globby: 11.1.0+ is-glob: 4.0.3+ semver: 7.5.4+ ts-api-utils: 1.0.3([email protected])+ typescript: 4.9.5+ transitivePeerDependencies:+ - supports-color+ dev: true++ /@typescript-eslint/[email protected]([email protected]):+ resolution: {integrity: sha512-Aezzv1o2tWJwvZhedzvD5Yv7+Lpu1by/U1LZ5gLc4tCx8jUmuSCMioPFRjliN/6SJIvY6HpTtJIWubKuYYYesQ==}engines: {node: ^16.0.0 || >=18.0.0}peerDependencies:typescript: '*'@@ -3470,8 +3547,8 @@ packages:typescript:optional: truedependencies:- '@typescript-eslint/types': 6.12.0- '@typescript-eslint/visitor-keys': 6.12.0+ '@typescript-eslint/types': 6.11.0+ '@typescript-eslint/visitor-keys': 6.11.0debug: 4.3.4globby: 11.1.0is-glob: 4.0.3@@ -3482,36 +3559,55 @@ packages:- supports-colordev: trueresolution: {integrity: sha512-6sdeYaBgk9Fh7N2unEXGz+D+som2QCQGPAf1SxrkEr+Z32gMreQ0rparXTNGRRfYUWk/JzbGdcM8NSSd6oqnTA==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}peerDependencies:eslint: ^6.0.0 || ^7.0.0 || ^8.0.0dependencies:- '@types/json-schema': 7.0.11+ '@types/json-schema': 7.0.13'@typescript-eslint/scope-manager': 5.38.0'@typescript-eslint/types': 5.38.0'@typescript-eslint/typescript-estree': 5.38.0([email protected])- eslint: 8.23.1+ eslint: 8.53.0eslint-scope: 5.1.1- eslint-utils: 3.0.0([email protected])+ eslint-utils: 3.0.0([email protected])+ transitivePeerDependencies:+ - supports-color+ - typescript++ resolution: {integrity: sha512-p23ibf68fxoZy605dc0dQAEoUsoiNoP3MD9WQGiHLDuTSOuqoTsa4oAy+h3KDkTcxbbfOtUjb9h3Ta0gT4ug2g==}+ engines: {node: ^16.0.0 || >=18.0.0}+ peerDependencies:+ eslint: ^7.0.0 || ^8.0.0+ dependencies:+ '@eslint-community/eslint-utils': 4.4.0([email protected])+ '@types/json-schema': 7.0.13+ '@types/semver': 7.5.5+ '@typescript-eslint/scope-manager': 6.11.0+ '@typescript-eslint/types': 6.11.0+ '@typescript-eslint/typescript-estree': 6.11.0([email protected])+ eslint: 8.53.0+ semver: 7.5.4transitivePeerDependencies:- supports-color- typescript+ dev: true- resolution: {integrity: sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==}+ resolution: {integrity: sha512-p23ibf68fxoZy605dc0dQAEoUsoiNoP3MD9WQGiHLDuTSOuqoTsa4oAy+h3KDkTcxbbfOtUjb9h3Ta0gT4ug2g==}engines: {node: ^16.0.0 || >=18.0.0}peerDependencies:eslint: ^7.0.0 || ^8.0.0dependencies:- '@eslint-community/eslint-utils': 4.4.0([email protected])+ '@eslint-community/eslint-utils': 4.4.0([email protected])'@types/json-schema': 7.0.13- '@types/semver': 7.5.6- '@typescript-eslint/scope-manager': 6.12.0- '@typescript-eslint/types': 6.12.0- '@typescript-eslint/typescript-estree': 6.12.0([email protected])- eslint: 8.54.0+ '@types/semver': 7.5.5+ '@typescript-eslint/scope-manager': 6.11.0+ '@typescript-eslint/types': 6.11.0+ '@typescript-eslint/typescript-estree': 6.11.0([email protected])+ eslint: 8.53.0semver: 7.5.4transitivePeerDependencies:- supports-color@@ -3523,26 +3619,25 @@ packages:engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}dependencies:'@typescript-eslint/types': 5.38.0- eslint-visitor-keys: 3.3.0+ eslint-visitor-keys: 3.4.3- /@typescript-eslint/[email protected]:- resolution: {integrity: sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==}+ /@typescript-eslint/[email protected]:+ resolution: {integrity: sha512-+SUN/W7WjBr05uRxPggJPSzyB8zUpaYo2hByKasWbqr3PM8AXfZt8UHdNpBS1v9SA62qnSSMF3380SwDqqprgQ==}engines: {node: ^16.0.0 || >=18.0.0}dependencies:- '@typescript-eslint/types': 6.12.0+ '@typescript-eslint/types': 6.11.0eslint-visitor-keys: 3.4.3dev: true/@ungap/[email protected]:resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}- dev: true/@vitejs/[email protected]([email protected]):resolution: {integrity: sha512-1PrOvAaDpqlCV+Up8RkAh9qaiUjoDUcjtttyhXDKw53XA6Ve16SOp6cCOpRs8Dj8DqUQs6eTW5YkLcLJjrXAig==}peerDependencies:vite: ^4 || ^5dependencies:- '@swc/core': 1.3.99+ '@swc/core': 1.3.100vite: 4.5.0(@types/[email protected])([email protected])transitivePeerDependencies:- '@swc/helpers'@@ -3796,14 +3891,6 @@ packages:acorn: ^6.0.0 || ^7.0.0 || ^8.0.0dependencies:acorn: 8.10.0- dev: true-- resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}- peerDependencies:- acorn: ^6.0.0 || ^7.0.0 || ^8.0.0- dependencies:- acorn: 8.8.0resolution: {integrity: sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==}@@ -3854,14 +3941,6 @@ packages:transitivePeerDependencies:- supports-color- resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}- engines: {node: '>=8'}- dependencies:- clean-stack: 2.2.0- indent-string: 4.0.0- dev: true-resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}peerDependencies:@@ -3909,6 +3988,13 @@ packages:dependencies:type-fest: 0.21.3+ resolution: {integrity: sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==}+ engines: {node: '>=12'}+ dependencies:+ type-fest: 1.4.0+ dev: true+resolution: {integrity: sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==}engines: {'0': node >= 0.8.0}@@ -3969,18 +4055,22 @@ packages:resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}- resolution: {integrity: sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==}- engines: {node: '>=6.0'}- dependencies:- '@babel/runtime': 7.19.0- '@babel/runtime-corejs3': 7.19.1-resolution: {integrity: sha512-eigU3vhqSO+Z8BKDnVLN/ompjhf3pYzecKXz8+whRy+9gZu8n1TCGfwzQUUPnqdHl9ax1Hr9031orZ+UOEYr7Q==}engines: {node: '>=6.0'}dev: true+ resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}+ dependencies:+ dequal: 2.0.3++ resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==}+ dependencies:+ call-bind: 1.0.5+ is-array-buffer: 3.0.2+resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}@@ -4001,6 +4091,16 @@ packages:get-intrinsic: 1.1.3is-string: 1.0.7+ resolution: {integrity: sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==}+ engines: {node: '>= 0.4'}+ dependencies:+ call-bind: 1.0.2+ define-properties: 1.2.1+ es-abstract: 1.22.3+ get-intrinsic: 1.2.2+ is-string: 1.0.7+resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}engines: {node: '>=8'}@@ -4014,13 +4114,22 @@ packages:es-abstract: 1.20.2es-shim-unscopables: 1.0.0- resolution: {integrity: sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==}+ resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}engines: {node: '>= 0.4'}dependencies:call-bind: 1.0.2- define-properties: 1.1.4- es-abstract: 1.20.2+ define-properties: 1.2.1+ es-abstract: 1.22.3+ es-shim-unscopables: 1.0.0++ resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}+ engines: {node: '>= 0.4'}+ dependencies:+ call-bind: 1.0.2+ define-properties: 1.2.1+ es-abstract: 1.22.3es-shim-unscopables: 1.0.0@@ -4033,6 +4142,27 @@ packages:es-array-method-boxes-properly: 1.0.0is-string: 1.0.7+ resolution: {integrity: sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==}+ dependencies:+ call-bind: 1.0.2+ define-properties: 1.2.1+ es-abstract: 1.22.3+ es-shim-unscopables: 1.0.0+ get-intrinsic: 1.2.2++ resolution: {integrity: sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==}+ engines: {node: '>= 0.4'}+ dependencies:+ array-buffer-byte-length: 1.0.0+ call-bind: 1.0.5+ define-properties: 1.2.1+ es-abstract: 1.22.3+ get-intrinsic: 1.2.2+ is-array-buffer: 3.0.2+ is-shared-array-buffer: 1.0.2+resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}engines: {node: '>=0.10.0'}@@ -4041,17 +4171,17 @@ packages:resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}- resolution: {integrity: sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==}-- resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}- engines: {node: '>=8'}- dev: true+ resolution: {integrity: sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==}resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==}+ resolution: {integrity: sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==}+ dependencies:+ has-symbols: 1.0.3+resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}@@ -4080,8 +4210,12 @@ packages:postcss: 8.4.16postcss-value-parser: 4.2.0- resolution: {integrity: sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w==}+ resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}+ engines: {node: '>= 0.4'}++ resolution: {integrity: sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==}engines: {node: '>=4'}@@ -4093,8 +4227,10 @@ packages:- debugdev: false- resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}+ resolution: {integrity: sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==}+ dependencies:+ dequal: 2.0.3/[email protected](@babel/[email protected]):resolution: {integrity: sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==}@@ -4158,7 +4294,7 @@ packages:resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}engines: {node: '>=10', npm: '>=6'}dependencies:- '@babel/runtime': 7.19.0+ '@babel/runtime': 7.22.5cosmiconfig: 7.0.1resolve: 1.22.1@@ -4177,7 +4313,7 @@ packages:'@babel/compat-data': 7.19.1'@babel/core': 7.19.1'@babel/helper-define-polyfill-provider': 0.3.3(@babel/[email protected])- semver: 6.3.0+ semver: 6.3.1transitivePeerDependencies:- supports-color@@ -4272,6 +4408,11 @@ packages:hoopy: 0.1.4tryer: 1.0.1+ resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==}+ engines: {node: '>=0.6'}+ dev: true+resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==}@@ -4324,6 +4465,13 @@ packages:'@popperjs/core': 2.11.8dev: false+ resolution: {integrity: sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==}+ engines: {node: '>= 5.10.0'}+ dependencies:+ big-integer: 1.6.51+ dev: true+resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}dependencies:@@ -4380,7 +4528,14 @@ packages:resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==}dependencies:- semver: 7.3.8+ semver: 7.5.4+ dev: true++ resolution: {integrity: sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==}+ engines: {node: '>=12'}+ dependencies:+ run-applescript: 5.0.0dev: true@@ -4397,6 +4552,13 @@ packages:function-bind: 1.1.1get-intrinsic: 1.1.3+ resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==}+ dependencies:+ function-bind: 1.1.2+ get-intrinsic: 1.2.2+ set-function-length: 1.1.1+resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}engines: {node: '>=6'}@@ -4462,6 +4624,11 @@ packages:ansi-styles: 4.3.0supports-color: 7.2.0+ resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}+ engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}+ dev: true+resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}engines: {node: '>=10'}@@ -4511,24 +4678,11 @@ packages:dependencies:source-map: 0.6.1- resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}- engines: {node: '>=6'}- dev: true-- resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}- engines: {node: '>=8'}- dependencies:- restore-cursor: 3.1.0- dev: true-- resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}- engines: {node: '>=8'}+ resolution: {integrity: sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==}+ engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}dependencies:- slice-ansi: 3.0.0- string-width: 4.2.3+ restore-cursor: 4.0.0dev: true@@ -4611,12 +4765,21 @@ packages:resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==}+ resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}+ dev: true+resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}engines: {node: '>= 0.8'}dependencies:delayed-stream: 1.0.0+ resolution: {integrity: sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==}+ engines: {node: '>=16'}+ dev: true+resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}@@ -4628,11 +4791,6 @@ packages:resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}engines: {node: '>= 12'}- resolution: {integrity: sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==}- engines: {node: ^12.20.0 || >=14}- dev: true-resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==}@@ -4861,7 +5019,7 @@ packages:postcss-modules-scope: 3.0.0([email protected])postcss-modules-values: 4.0.0([email protected])postcss-value-parser: 4.2.0- semver: 7.3.8+ semver: 7.5.4webpack: 5.74.0@@ -5412,16 +5570,47 @@ packages:resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}engines: {node: '>=0.10.0'}+ resolution: {integrity: sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==}+ engines: {node: '>=12'}+ dependencies:+ bplist-parser: 0.2.0+ untildify: 4.0.0+ dev: true++ resolution: {integrity: sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==}+ engines: {node: '>=14.16'}+ dependencies:+ bundle-name: 3.0.0+ default-browser-id: 3.0.0+ execa: 7.2.0+ titleize: 3.0.0+ dev: true+resolution: {integrity: sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==}engines: {node: '>= 10'}dependencies:execa: 5.1.1+ resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==}+ engines: {node: '>= 0.4'}+ dependencies:+ get-intrinsic: 1.2.2+ gopd: 1.0.1+ has-property-descriptors: 1.0.0+resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}engines: {node: '>=8'}+ resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==}+ engines: {node: '>=12'}+ dev: true+resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}engines: {node: '>= 0.4'}@@ -5429,6 +5618,14 @@ packages:has-property-descriptors: 1.0.0object-keys: 1.1.1+ resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}+ engines: {node: '>= 0.4'}+ dependencies:+ define-data-property: 1.1.1+ has-property-descriptors: 1.0.0+ object-keys: 1.1.1+resolution: {integrity: sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==}@@ -5453,7 +5650,6 @@ packages:resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}engines: {node: '>=6'}- dev: falseresolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}@@ -5734,9 +5930,71 @@ packages:string.prototype.trimstart: 1.0.5unbox-primitive: 1.0.2+ resolution: {integrity: sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==}+ engines: {node: '>= 0.4'}+ dependencies:+ array-buffer-byte-length: 1.0.0+ arraybuffer.prototype.slice: 1.0.2+ available-typed-arrays: 1.0.5+ call-bind: 1.0.5+ es-set-tostringtag: 2.0.2+ es-to-primitive: 1.2.1+ function.prototype.name: 1.1.6+ get-intrinsic: 1.2.2+ get-symbol-description: 1.0.0+ globalthis: 1.0.3+ gopd: 1.0.1+ has-property-descriptors: 1.0.0+ has-proto: 1.0.1+ has-symbols: 1.0.3+ hasown: 2.0.0+ internal-slot: 1.0.6+ is-array-buffer: 3.0.2+ is-callable: 1.2.7+ is-negative-zero: 2.0.2+ is-regex: 1.1.4+ is-shared-array-buffer: 1.0.2+ is-string: 1.0.7+ is-typed-array: 1.1.12+ is-weakref: 1.0.2+ object-inspect: 1.13.1+ object-keys: 1.1.1+ object.assign: 4.1.4+ regexp.prototype.flags: 1.5.1+ safe-array-concat: 1.0.1+ safe-regex-test: 1.0.0+ string.prototype.trim: 1.2.8+ string.prototype.trimend: 1.0.7+ string.prototype.trimstart: 1.0.7+ typed-array-buffer: 1.0.0+ typed-array-byte-length: 1.0.0+ typed-array-byte-offset: 1.0.0+ typed-array-length: 1.0.4+ unbox-primitive: 1.0.2+ which-typed-array: 1.1.13+resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==}+ resolution: {integrity: sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==}+ dependencies:+ asynciterator.prototype: 1.0.0+ call-bind: 1.0.2+ define-properties: 1.2.1+ es-abstract: 1.22.3+ es-set-tostringtag: 2.0.2+ function-bind: 1.1.1+ get-intrinsic: 1.2.2+ globalthis: 1.0.3+ has-property-descriptors: 1.0.0+ has-proto: 1.0.1+ has-symbols: 1.0.3+ internal-slot: 1.0.6+ iterator.prototype: 1.1.2+ safe-array-concat: 1.0.1+resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}@@ -5744,6 +6002,14 @@ packages:resolution: {integrity: sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==}dev: true+ resolution: {integrity: sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==}+ engines: {node: '>= 0.4'}+ dependencies:+ get-intrinsic: 1.2.2+ has-tostringtag: 1.0.0+ hasown: 2.0.0+resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==}dependencies:@@ -5753,7 +6019,7 @@ packages:resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}engines: {node: '>= 0.4'}dependencies:- is-callable: 1.2.6+ is-callable: 1.2.7is-date-object: 1.0.5is-symbol: 1.0.4@@ -5818,7 +6084,7 @@ packages:optionalDependencies:source-map: 0.6.1resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==}engines: {node: ^10.12.0 || >=12.0.0}peerDependencies:@@ -5826,29 +6092,29 @@ packages:eslint-plugin-import: ^2.25.2dependencies:confusing-browser-globals: 1.0.11- eslint: 8.23.1- eslint-plugin-import: 2.26.0(@typescript-eslint/[email protected])([email protected])+ eslint: 8.53.0+ eslint-plugin-import: 2.26.0(@typescript-eslint/[email protected])([email protected])object.assign: 4.1.4object.entries: 1.1.5- semver: 6.3.0+ semver: 6.3.1dev: true- /[email protected](@typescript-eslint/[email protected])(@typescript-eslint/[email protected])([email protected])([email protected]):- resolution: {integrity: sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==}+ /[email protected](@typescript-eslint/[email protected])(@typescript-eslint/[email protected])([email protected])([email protected]):+ resolution: {integrity: sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==}peerDependencies:- '@typescript-eslint/eslint-plugin': ^5.13.0- '@typescript-eslint/parser': ^5.0.0+ '@typescript-eslint/eslint-plugin': ^5.13.0 || ^6.0.0+ '@typescript-eslint/parser': ^5.0.0 || ^6.0.0eslint: ^7.32.0 || ^8.2.0eslint-plugin-import: ^2.25.3dependencies:- '@typescript-eslint/eslint-plugin': 5.38.0(@typescript-eslint/[email protected])([email protected])([email protected])- '@typescript-eslint/parser': 5.38.0([email protected])([email protected])- eslint: 8.23.1- eslint-config-airbnb-base: 15.0.0([email protected])([email protected])- eslint-plugin-import: 2.26.0(@typescript-eslint/[email protected])([email protected])+ '@typescript-eslint/eslint-plugin': 6.11.0(@typescript-eslint/[email protected])([email protected])([email protected])+ '@typescript-eslint/parser': 6.11.0([email protected])([email protected])+ eslint: 8.53.0+ eslint-config-airbnb-base: 15.0.0([email protected])([email protected])+ eslint-plugin-import: 2.26.0(@typescript-eslint/[email protected])([email protected])dev: true- /[email protected]([email protected])([email protected])([email protected])([email protected])([email protected]):+ /[email protected]([email protected])([email protected])([email protected])([email protected])([email protected]):resolution: {integrity: sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==}engines: {node: ^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0}peerDependencies:@@ -5858,26 +6124,26 @@ packages:eslint-plugin-react: ^7.28.0eslint-plugin-react-hooks: ^4.3.0dependencies:- eslint: 8.23.1- eslint-config-airbnb-base: 15.0.0([email protected])([email protected])- eslint-plugin-import: 2.26.0(@typescript-eslint/[email protected])([email protected])- eslint-plugin-jsx-a11y: 6.6.1([email protected])- eslint-plugin-react: 7.31.8([email protected])- eslint-plugin-react-hooks: 4.6.0([email protected])+ eslint: 8.53.0+ eslint-config-airbnb-base: 15.0.0([email protected])([email protected])+ eslint-plugin-import: 2.26.0(@typescript-eslint/[email protected])([email protected])+ eslint-plugin-jsx-a11y: 6.8.0([email protected])+ eslint-plugin-react: 7.33.2([email protected])+ eslint-plugin-react-hooks: 4.6.0([email protected])object.assign: 4.1.4object.entries: 1.1.5dev: true- resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==}+ resolution: {integrity: sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==}hasBin: truepeerDependencies:eslint: '>=7.0.0'dependencies:- eslint: 8.23.1+ eslint: 8.53.0dev: true- /[email protected](@babel/[email protected])(@babel/[email protected])([email protected])([email protected])([email protected]):+ /[email protected](@babel/[email protected])(@babel/[email protected])([email protected])([email protected])([email protected]):resolution: {integrity: sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==}engines: {node: '>=14.0.0'}peerDependencies:@@ -5888,20 +6154,20 @@ packages:optional: truedependencies:'@babel/core': 7.19.1- '@babel/eslint-parser': 7.19.1(@babel/[email protected])([email protected])+ '@babel/eslint-parser': 7.19.1(@babel/[email protected])([email protected])'@rushstack/eslint-patch': 1.2.0- '@typescript-eslint/eslint-plugin': 5.38.0(@typescript-eslint/[email protected])([email protected])([email protected])- '@typescript-eslint/parser': 5.38.0([email protected])([email protected])+ '@typescript-eslint/eslint-plugin': 5.38.0(@typescript-eslint/[email protected])([email protected])([email protected])+ '@typescript-eslint/parser': 5.38.0([email protected])([email protected])babel-preset-react-app: 10.0.1confusing-browser-globals: 1.0.11- eslint: 8.23.1- eslint-plugin-flowtype: 8.0.3(@babel/[email protected])(@babel/[email protected])([email protected])- eslint-plugin-import: 2.26.0(@typescript-eslint/[email protected])([email protected])- eslint-plugin-jest: 25.7.0(@typescript-eslint/[email protected])([email protected])([email protected])([email protected])- eslint-plugin-jsx-a11y: 6.6.1([email protected])- eslint-plugin-react: 7.31.8([email protected])- eslint-plugin-react-hooks: 4.6.0([email protected])- eslint-plugin-testing-library: 5.6.4([email protected])([email protected])+ eslint: 8.53.0+ eslint-plugin-flowtype: 8.0.3(@babel/[email protected])(@babel/[email protected])([email protected])+ eslint-plugin-import: 2.26.0(@typescript-eslint/[email protected])([email protected])+ eslint-plugin-jest: 25.7.0(@typescript-eslint/[email protected])([email protected])([email protected])([email protected])+ eslint-plugin-jsx-a11y: 6.8.0([email protected])+ eslint-plugin-react: 7.33.2([email protected])+ eslint-plugin-react-hooks: 4.6.0([email protected])+ eslint-plugin-testing-library: 5.6.4([email protected])([email protected])typescript: 4.9.5transitivePeerDependencies:- '@babel/plugin-syntax-flow'@@ -5911,40 +6177,41 @@ packages:- jest- supports-color- /[email protected](@typescript-eslint/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]):- resolution: {integrity: sha512-VA36U7UlFpwULvkdnh6MQj5GAV2Q+tT68ALLAwJP0ZuNXU2m0wX07uxX4qyLRdHgSzH4QJ73CveKBuSOYvh7vQ==}+ /[email protected](@typescript-eslint/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]):+ resolution: {integrity: sha512-t6B5Ep8E4I18uuoYeYxINyqcXb2UbC0SOOTxRtBSt2JUs+EzeXbfe2oaiPs71AIdnoWhXDO2fYOHz8df3kV84A==}peerDependencies:- '@typescript-eslint/eslint-plugin': ^5.0.0+ '@typescript-eslint/eslint-plugin': ^6.4.0eslint: ^8.0.1eslint-plugin-import: ^2.25.2- eslint-plugin-n: ^15.0.0+ eslint-plugin-n: '^15.0.0 || ^16.0.0 'eslint-plugin-promise: ^6.0.0typescript: '*'dependencies:- '@typescript-eslint/eslint-plugin': 5.38.0(@typescript-eslint/[email protected])([email protected])([email protected])- '@typescript-eslint/parser': 5.38.0([email protected])([email protected])- eslint: 8.23.1- eslint-config-standard: 17.0.0([email protected])([email protected])([email protected])([email protected])- eslint-plugin-import: 2.26.0(@typescript-eslint/[email protected])([email protected])- eslint-plugin-n: 15.2.5([email protected])- eslint-plugin-promise: 6.0.1([email protected])+ '@typescript-eslint/eslint-plugin': 6.11.0(@typescript-eslint/[email protected])([email protected])([email protected])+ '@typescript-eslint/parser': 6.11.0([email protected])([email protected])+ eslint: 8.53.0+ eslint-config-standard: 17.1.0([email protected])([email protected])([email protected])([email protected])+ eslint-plugin-import: 2.26.0(@typescript-eslint/[email protected])([email protected])+ eslint-plugin-n: 15.2.5([email protected])+ eslint-plugin-promise: 6.0.1([email protected])typescript: 4.9.5transitivePeerDependencies:- supports-colordev: true- resolution: {integrity: sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==}+ resolution: {integrity: sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==}+ engines: {node: '>=12.0.0'}peerDependencies:eslint: ^8.0.1eslint-plugin-import: ^2.25.2- eslint-plugin-n: ^15.0.0+ eslint-plugin-n: '^15.0.0 || ^16.0.0 'eslint-plugin-promise: ^6.0.0dependencies:- eslint: 8.23.1- eslint-plugin-import: 2.26.0(@typescript-eslint/[email protected])([email protected])- eslint-plugin-n: 15.2.5([email protected])- eslint-plugin-promise: 6.0.1([email protected])+ eslint: 8.53.0+ eslint-plugin-import: 2.26.0(@typescript-eslint/[email protected])([email protected])+ eslint-plugin-n: 15.2.5([email protected])+ eslint-plugin-promise: 6.0.1([email protected])dev: true@@ -5955,7 +6222,7 @@ packages:transitivePeerDependencies:- supports-colorresolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==}engines: {node: '>=4'}peerDependencies:@@ -5976,25 +6243,54 @@ packages:eslint-import-resolver-webpack:optional: truedependencies:- '@typescript-eslint/parser': 5.38.0([email protected])([email protected])+ '@typescript-eslint/parser': 5.38.0([email protected])([email protected])debug: 3.2.7- eslint: 8.23.1+ eslint: 8.53.0eslint-import-resolver-node: 0.3.6transitivePeerDependencies:- supports-color+ resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==}+ engines: {node: '>=4'}+ peerDependencies:+ '@typescript-eslint/parser': '*'+ eslint: '*'+ eslint-import-resolver-node: '*'+ eslint-import-resolver-typescript: '*'+ eslint-import-resolver-webpack: '*'+ peerDependenciesMeta:+ '@typescript-eslint/parser':+ optional: true+ eslint:+ optional: true+ eslint-import-resolver-node:+ optional: true+ eslint-import-resolver-typescript:+ optional: true+ eslint-import-resolver-webpack:+ optional: true+ dependencies:+ '@typescript-eslint/parser': 6.11.0([email protected])([email protected])+ debug: 3.2.7+ eslint: 8.53.0+ eslint-import-resolver-node: 0.3.6+ transitivePeerDependencies:+ - supports-color+ dev: true+resolution: {integrity: sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==}engines: {node: '>=8.10.0'}peerDependencies:eslint: '>=4.19.1'dependencies:- eslint: 8.23.1+ eslint: 8.53.0eslint-utils: 2.1.0regexpp: 3.2.0dev: trueresolution: {integrity: sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==}engines: {node: '>=12.0.0'}peerDependencies:@@ -6004,11 +6300,11 @@ packages:dependencies:'@babel/plugin-syntax-flow': 7.21.4(@babel/[email protected])'@babel/plugin-transform-react-jsx': 7.21.0(@babel/[email protected])- eslint: 8.23.1+ eslint: 8.53.0lodash: 4.17.21string-natural-compare: 3.0.1resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}engines: {node: '>=4'}peerDependencies:@@ -6018,14 +6314,14 @@ packages:'@typescript-eslint/parser':optional: truedependencies:- '@typescript-eslint/parser': 5.38.0([email protected])([email protected])+ '@typescript-eslint/parser': 5.38.0([email protected])([email protected])array-includes: 3.1.5array.prototype.flat: 1.3.0debug: 2.6.9doctrine: 2.1.0- eslint: 8.23.1+ eslint: 8.53.0eslint-import-resolver-node: 0.3.6- eslint-module-utils: 2.7.4(@typescript-eslint/[email protected])([email protected])([email protected])+ eslint-module-utils: 2.7.4(@typescript-eslint/[email protected])([email protected])([email protected])has: 1.0.3is-core-module: 2.10.0is-glob: 4.0.3@@ -6038,7 +6334,38 @@ packages:- eslint-import-resolver-webpack- supports-color- /[email protected](@typescript-eslint/[email protected])([email protected])([email protected])([email protected]):+ resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}+ engines: {node: '>=4'}+ peerDependencies:+ '@typescript-eslint/parser': '*'+ eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8+ peerDependenciesMeta:+ '@typescript-eslint/parser':+ optional: true+ dependencies:+ '@typescript-eslint/parser': 6.11.0([email protected])([email protected])+ array-includes: 3.1.5+ array.prototype.flat: 1.3.0+ debug: 2.6.9+ doctrine: 2.1.0+ eslint: 8.53.0+ eslint-import-resolver-node: 0.3.6+ eslint-module-utils: 2.7.4(@typescript-eslint/[email protected])([email protected])([email protected])+ has: 1.0.3+ is-core-module: 2.10.0+ is-glob: 4.0.3+ minimatch: 3.1.2+ object.values: 1.1.5+ resolve: 1.22.1+ tsconfig-paths: 3.14.1+ transitivePeerDependencies:+ - eslint-import-resolver-typescript+ - eslint-import-resolver-webpack+ - supports-color+ dev: true++ /[email protected](@typescript-eslint/[email protected])([email protected])([email protected])([email protected]):resolution: {integrity: sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==}engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}peerDependencies:@@ -6051,133 +6378,133 @@ packages:jest:optional: truedependencies:- '@typescript-eslint/eslint-plugin': 5.38.0(@typescript-eslint/[email protected])([email protected])([email protected])- '@typescript-eslint/experimental-utils': 5.38.0([email protected])([email protected])- eslint: 8.23.1+ '@typescript-eslint/eslint-plugin': 5.38.0(@typescript-eslint/[email protected])([email protected])([email protected])+ '@typescript-eslint/experimental-utils': 5.38.0([email protected])([email protected])+ eslint: 8.53.0jest: 27.5.1([email protected])transitivePeerDependencies:- supports-color- typescript- resolution: {integrity: sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==}+ resolution: {integrity: sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==}engines: {node: '>=4.0'}peerDependencies:eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8dependencies:- '@babel/runtime': 7.19.0- aria-query: 4.2.2- array-includes: 3.1.5- ast-types-flow: 0.0.7- axe-core: 4.4.3- axobject-query: 2.2.0+ '@babel/runtime': 7.23.2+ aria-query: 5.3.0+ array-includes: 3.1.7+ array.prototype.flatmap: 1.3.2+ ast-types-flow: 0.0.8+ axe-core: 4.7.0+ axobject-query: 3.2.1damerau-levenshtein: 1.0.8emoji-regex: 9.2.2- eslint: 8.23.1- has: 1.0.3- jsx-ast-utils: 3.3.3- language-tags: 1.0.5+ es-iterator-helpers: 1.0.15+ eslint: 8.53.0+ hasown: 2.0.0+ jsx-ast-utils: 3.3.5+ language-tags: 1.0.9minimatch: 3.1.2- semver: 6.3.0+ object.entries: 1.1.7+ object.fromentries: 2.0.7resolution: {integrity: sha512-8+BYsqiyZfpu6NXmdLOXVUfk8IocpCjpd8nMRRH0A9ulrcemhb2VI9RSJMEy5udx++A/YcVPD11zT8hpFq368g==}engines: {node: '>=12.22.0'}peerDependencies:eslint: '>=7.0.0'dependencies:builtins: 5.0.1- eslint: 8.23.1- eslint-plugin-es: 4.1.0([email protected])- eslint-utils: 3.0.0([email protected])- ignore: 5.2.0+ eslint: 8.53.0+ eslint-plugin-es: 4.1.0([email protected])+ eslint-utils: 3.0.0([email protected])+ ignore: 5.2.4is-core-module: 2.10.0minimatch: 3.1.2resolve: 1.22.1semver: 7.3.8dev: true- resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}- engines: {node: '>=12.0.0'}+ resolution: {integrity: sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==}+ engines: {node: ^14.18.0 || >=16.0.0}peerDependencies:- eslint: '>=7.28.0'+ '@types/eslint': '>=8.0.0'+ eslint: '>=8.0.0'eslint-config-prettier: '*'- prettier: '>=2.0.0'+ prettier: '>=3.0.0'peerDependenciesMeta:+ '@types/eslint':+ optional: trueeslint-config-prettier:optional: truedependencies:- eslint: 8.23.1- eslint-config-prettier: 8.5.0([email protected])- prettier: 2.7.1+ eslint: 8.53.0+ eslint-config-prettier: 9.0.0([email protected])+ prettier: 3.1.0prettier-linter-helpers: 1.0.0+ synckit: 0.8.5dev: trueresolution: {integrity: sha512-uM4Tgo5u3UWQiroOyDEsYcVMOo7re3zmno0IZmB5auxoaQNIceAbXEkSt8RNrKtaYehARHG06pYK6K1JhtP0Zw==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}peerDependencies:eslint: ^7.0.0 || ^8.0.0dependencies:- eslint: 8.23.1+ eslint: 8.53.0dev: true- resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==}- engines: {node: '>=10'}- peerDependencies:- eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0- dependencies:- eslint: 8.23.1-resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==}engines: {node: '>=10'}peerDependencies:eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0dependencies:- eslint: 8.54.0- dev: true+ eslint: 8.53.0- resolution: {integrity: sha512-eD83+65e8YPVg6603Om2iCIwcQJf/y7++MWm4tACtEswFLYMwxwVWAfwN+e19f5Ad/FOyyNg9Dfi5lXhH3Y3rA==}+ resolution: {integrity: sha512-D53FYKJa+fDmZMtriODxvhwrO+IOqrxoEo21gMA0sjHdU6dPVH4OhyFip9ypl8HOF5RV5KdTo+rBQLvnY2cO8w==}peerDependencies:eslint: '>=7'dependencies:- eslint: 8.54.0+ eslint: 8.53.0dev: true- resolution: {integrity: sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw==}+ resolution: {integrity: sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==}engines: {node: '>=4'}peerDependencies:eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8dependencies:- array-includes: 3.1.5- array.prototype.flatmap: 1.3.0+ array-includes: 3.1.7+ array.prototype.flatmap: 1.3.2+ array.prototype.tosorted: 1.1.2doctrine: 2.1.0- eslint: 8.23.1+ es-iterator-helpers: 1.0.15+ eslint: 8.53.0estraverse: 5.3.0jsx-ast-utils: 3.3.3minimatch: 3.1.2- object.entries: 1.1.5- object.fromentries: 2.0.5- object.hasown: 1.1.1- object.values: 1.1.5+ object.entries: 1.1.7+ object.fromentries: 2.0.7+ object.hasown: 1.1.3+ object.values: 1.1.7prop-types: 15.8.1resolve: 2.0.0-next.4- semver: 6.3.0- string.prototype.matchall: 4.0.7+ semver: 6.3.1+ string.prototype.matchall: 4.0.10resolution: {integrity: sha512-0oW3tC5NNT2WexmJ3848a/utawOymw4ibl3/NkwywndVAz2hT9+ab70imA7ccg3RaScQgMvJT60OL00hpmJvrg==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6'}peerDependencies:eslint: ^7.5.0 || ^8.0.0dependencies:- '@typescript-eslint/utils': 5.38.0([email protected])([email protected])- eslint: 8.23.1+ '@typescript-eslint/utils': 5.38.0([email protected])([email protected])+ eslint: 8.53.0transitivePeerDependencies:- supports-color- typescript@@ -6189,20 +6516,12 @@ packages:esrecurse: 4.3.0estraverse: 4.3.0- resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- dependencies:- esrecurse: 4.3.0- estraverse: 5.3.0-resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}dependencies:esrecurse: 4.3.0estraverse: 5.3.0- dev: trueresolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==}@@ -6211,13 +6530,13 @@ packages:eslint-visitor-keys: 1.3.0dev: trueresolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}peerDependencies:eslint: '>=5'dependencies:- eslint: 8.23.1+ eslint: 8.53.0eslint-visitor-keys: 2.1.0@@ -6229,16 +6548,11 @@ packages:resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}engines: {node: '>=10'}- resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}-resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- dev: trueresolution: {integrity: sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==}engines: {node: '>= 12.13.0'}peerDependencies:@@ -6246,69 +6560,22 @@ packages:webpack: ^5.0.0dependencies:'@types/eslint': 8.4.6- eslint: 8.23.1+ eslint: 8.53.0jest-worker: 28.1.3micromatch: 4.0.5normalize-path: 3.0.0schema-utils: 4.0.0webpack: 5.74.0- resolution: {integrity: sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==}- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- hasBin: true- dependencies:- '@eslint/eslintrc': 1.3.2- '@humanwhocodes/config-array': 0.10.4- '@humanwhocodes/gitignore-to-minimatch': 1.0.2- '@humanwhocodes/module-importer': 1.0.1- ajv: 6.12.6- chalk: 4.1.2- cross-spawn: 7.0.3- debug: 4.3.4- doctrine: 3.0.0- escape-string-regexp: 4.0.0- eslint-scope: 7.1.1- eslint-utils: 3.0.0([email protected])- eslint-visitor-keys: 3.3.0- espree: 9.4.0- esquery: 1.4.0- esutils: 2.0.3- fast-deep-equal: 3.1.3- file-entry-cache: 6.0.1- find-up: 5.0.0- glob-parent: 6.0.2- globals: 13.17.0- globby: 11.1.0- grapheme-splitter: 1.0.4- ignore: 5.2.0- import-fresh: 3.3.0- imurmurhash: 0.1.4- is-glob: 4.0.3- js-sdsl: 4.1.4- js-yaml: 4.1.0- json-stable-stringify-without-jsonify: 1.0.1- levn: 0.4.1- lodash.merge: 4.6.2- minimatch: 3.1.2- natural-compare: 1.4.0- optionator: 0.9.1- regexpp: 3.2.0- strip-ansi: 6.0.1- strip-json-comments: 3.1.1- text-table: 0.2.0- transitivePeerDependencies:- - supports-color-- resolution: {integrity: sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==}+ resolution: {integrity: sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}hasBin: truedependencies:- '@eslint-community/eslint-utils': 4.4.0([email protected])+ '@eslint-community/eslint-utils': 4.4.0([email protected])'@eslint-community/regexpp': 4.10.0'@eslint/eslintrc': 2.1.3- '@eslint/js': 8.54.0+ '@eslint/js': 8.53.0'@humanwhocodes/config-array': 0.11.13'@humanwhocodes/module-importer': 1.0.1'@nodelib/fs.walk': 1.2.8@@ -6330,7 +6597,7 @@ packages:glob-parent: 6.0.2globals: 13.23.0graphemer: 1.4.0- ignore: 5.2.0+ ignore: 5.2.4imurmurhash: 0.1.4is-glob: 4.0.3is-path-inside: 3.0.3@@ -6345,15 +6612,6 @@ packages:text-table: 0.2.0transitivePeerDependencies:- supports-color- dev: true-- resolution: {integrity: sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==}- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- dependencies:- acorn: 8.8.0- acorn-jsx: 5.3.2([email protected])- eslint-visitor-keys: 3.3.0resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}@@ -6362,25 +6620,17 @@ packages:acorn: 8.10.0acorn-jsx: 5.3.2([email protected])eslint-visitor-keys: 3.4.3- dev: trueresolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}engines: {node: '>=4'}hasBin: true- resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}- engines: {node: '>=0.10'}- dependencies:- estraverse: 5.3.0-resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}engines: {node: '>=0.10'}dependencies:estraverse: 5.3.0- dev: trueresolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}@@ -6410,6 +6660,10 @@ packages:resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}+ resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}+ dev: true+resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}engines: {node: '>=0.8.x'}@@ -6428,13 +6682,13 @@ packages:signal-exit: 3.0.7strip-final-newline: 2.0.0- resolution: {integrity: sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==}- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==}+ engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0}dependencies:cross-spawn: 7.0.3get-stream: 6.0.1- human-signals: 3.0.1+ human-signals: 4.3.1is-stream: 3.0.0merge-stream: 2.0.0npm-run-path: 5.1.0@@ -6511,6 +6765,16 @@ packages:merge2: 1.4.1micromatch: 4.0.5+ resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}+ engines: {node: '>=8.6.0'}+ dependencies:+ '@nodelib/fs.stat': 2.0.5+ '@nodelib/fs.walk': 1.2.8+ glob-parent: 5.1.2+ merge2: 1.4.1+ micromatch: 4.0.5+resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}@@ -6625,7 +6889,12 @@ packages:debug:optional: true+ resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}+ dependencies:+ is-callable: 1.2.7+resolution: {integrity: sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==}engines: {node: '>=10', yarn: '>=1.0.0'}peerDependencies:@@ -6645,13 +6914,13 @@ packages:chokidar: 3.5.3cosmiconfig: 6.0.0deepmerge: 4.2.2- eslint: 8.23.1+ eslint: 8.53.0fs-extra: 9.1.0glob: 7.2.3memfs: 3.4.7minimatch: 3.1.2schema-utils: 2.7.0- semver: 7.3.8+ semver: 7.5.4tapable: 1.1.3typescript: 4.9.5webpack: 5.74.0@@ -6717,6 +6986,9 @@ packages:resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}+ resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}+resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}engines: {node: '>= 0.4'}@@ -6726,6 +6998,15 @@ packages:es-abstract: 1.20.2functions-have-names: 1.2.3+ resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}+ engines: {node: '>= 0.4'}+ dependencies:+ call-bind: 1.0.5+ define-properties: 1.2.1+ es-abstract: 1.22.3+ functions-have-names: 1.2.3+resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}@@ -6744,6 +7025,14 @@ packages:has: 1.0.3has-symbols: 1.0.3+ resolution: {integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==}+ dependencies:+ function-bind: 1.1.2+ has-proto: 1.0.1+ has-symbols: 1.0.3+ hasown: 2.0.0+resolution: {integrity: sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==}@@ -6759,8 +7048,8 @@ packages:resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}engines: {node: '>= 0.4'}dependencies:- call-bind: 1.0.2- get-intrinsic: 1.1.3+ call-bind: 1.0.5+ get-intrinsic: 1.2.2resolution: {integrity: sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==}@@ -6824,18 +7113,17 @@ packages:resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}engines: {node: '>=4'}- resolution: {integrity: sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==}- engines: {node: '>=8'}- dependencies:- type-fest: 0.20.2-resolution: {integrity: sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==}engines: {node: '>=8'}dependencies:type-fest: 0.20.2- dev: true++ resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}+ engines: {node: '>= 0.4'}+ dependencies:+ define-properties: 1.2.1resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}@@ -6843,23 +7131,24 @@ packages:dependencies:array-union: 2.1.0dir-glob: 3.0.1- fast-glob: 3.2.12- ignore: 5.2.0+ fast-glob: 3.3.2+ ignore: 5.2.4merge2: 1.4.1slash: 3.0.0+ resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}+ dependencies:+ get-intrinsic: 1.2.2+resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}- resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}-resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}- dev: trueresolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==}@@ -6894,6 +7183,10 @@ packages:dependencies:get-intrinsic: 1.1.3+ resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}+ engines: {node: '>= 0.4'}+resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}engines: {node: '>= 0.4'}@@ -6910,6 +7203,12 @@ packages:dependencies:function-bind: 1.1.1+ resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==}+ engines: {node: '>= 0.4'}+ dependencies:+ function-bind: 1.1.2+resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}hasBin: true@@ -7069,9 +7368,9 @@ packages:resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}engines: {node: '>=10.17.0'}- resolution: {integrity: sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==}- engines: {node: '>=12.20.0'}+ resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==}+ engines: {node: '>=14.18.0'}dev: true@@ -7119,14 +7418,9 @@ packages:dependencies:harmony-reflect: 1.6.2- resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}- engines: {node: '>= 4'}-- resolution: {integrity: sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==}+ resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}engines: {node: '>= 4'}- dev: trueresolution: {integrity: sha512-2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ==}@@ -7181,6 +7475,14 @@ packages:has: 1.0.3side-channel: 1.0.4+ resolution: {integrity: sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==}+ engines: {node: '>= 0.4'}+ dependencies:+ get-intrinsic: 1.2.2+ hasown: 2.0.0+ side-channel: 1.0.4+resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}engines: {node: '>=12'}@@ -7200,6 +7502,13 @@ packages:resolution: {integrity: sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==}engines: {node: '>= 10'}+ resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}+ dependencies:+ call-bind: 1.0.5+ get-intrinsic: 1.2.2+ is-typed-array: 1.1.12+resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}@@ -7207,6 +7516,12 @@ packages:resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}dev: false+ resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==}+ engines: {node: '>= 0.4'}+ dependencies:+ has-tostringtag: 1.0.0+resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}dependencies:@@ -7222,7 +7537,7 @@ packages:resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}engines: {node: '>= 0.4'}dependencies:- call-bind: 1.0.2+ call-bind: 1.0.5has-tostringtag: 1.0.0@@ -7233,6 +7548,10 @@ packages:resolution: {integrity: sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q==}engines: {node: '>= 0.4'}+ resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}+ engines: {node: '>= 0.4'}+resolution: {integrity: sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==}dependencies:@@ -7249,10 +7568,21 @@ packages:engines: {node: '>=8'}hasBin: true+ resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==}+ engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ hasBin: true+ dev: true+resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}engines: {node: '>=0.10.0'}+ resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==}+ dependencies:+ call-bind: 1.0.2+resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}engines: {node: '>=8'}@@ -7266,12 +7596,29 @@ packages:resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}engines: {node: '>=6'}+ resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}+ engines: {node: '>= 0.4'}+ dependencies:+ has-tostringtag: 1.0.0+resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}engines: {node: '>=0.10.0'}dependencies:is-extglob: 2.1.1+ resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==}+ engines: {node: '>=14.16'}+ hasBin: true+ dependencies:+ is-docker: 3.0.0+ dev: true++ resolution: {integrity: sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==}+resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==}@@ -7301,7 +7648,6 @@ packages:resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}engines: {node: '>=8'}- dev: trueresolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}@@ -7319,7 +7665,7 @@ packages:resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}engines: {node: '>= 0.4'}dependencies:- call-bind: 1.0.2+ call-bind: 1.0.5has-tostringtag: 1.0.0@@ -7330,10 +7676,13 @@ packages:resolution: {integrity: sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==}engines: {node: '>=6'}+ resolution: {integrity: sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==}+resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}dependencies:- call-bind: 1.0.2+ call-bind: 1.0.5resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}@@ -7363,13 +7712,28 @@ packages:text-extensions: 1.9.0dev: true+ resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==}+ engines: {node: '>= 0.4'}+ dependencies:+ which-typed-array: 1.1.13+resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}+ resolution: {integrity: sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==}+resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}+ dependencies:+ call-bind: 1.0.5++ resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==}dependencies:call-bind: 1.0.2+ get-intrinsic: 1.2.2resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}@@ -7380,6 +7744,9 @@ packages:resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}+ resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}+resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}@@ -7395,7 +7762,7 @@ packages:'@babel/parser': 7.19.1'@istanbuljs/schema': 0.1.3istanbul-lib-coverage: 3.2.0- semver: 6.3.0+ semver: 6.3.1transitivePeerDependencies:- supports-color@@ -7424,6 +7791,15 @@ packages:html-escaper: 2.0.2istanbul-lib-report: 3.0.0+ resolution: {integrity: sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==}+ dependencies:+ define-properties: 1.2.1+ get-intrinsic: 1.2.2+ has-symbols: 1.0.3+ reflect.getprototypeof: 1.0.4+ set-function-name: 2.0.1+resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==}engines: {node: '>=10'}@@ -7853,7 +8229,7 @@ packages:jest-util: 27.5.1natural-compare: 1.4.0pretty-format: 27.5.1- semver: 7.3.8+ semver: 7.5.4transitivePeerDependencies:- supports-color@@ -7974,9 +8350,6 @@ packages:- ts-node- utf-8-validate- resolution: {integrity: sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==}-resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}@@ -8097,9 +8470,18 @@ packages:resolution: {integrity: sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==}engines: {node: '>=4.0'}dependencies:- array-includes: 3.1.5+ array-includes: 3.1.7object.assign: 4.1.4+ resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}+ engines: {node: '>=4.0'}+ dependencies:+ array-includes: 3.1.7+ array.prototype.flat: 1.3.2+ object.assign: 4.1.4+ object.values: 1.1.7+resolution: {integrity: sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==}dev: false@@ -8119,8 +8501,9 @@ packages:resolution: {integrity: sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==}- resolution: {integrity: sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==}+ resolution: {integrity: sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==}+ engines: {node: '>=0.10'}dependencies:language-subtag-registry: 0.3.22@@ -8150,58 +8533,53 @@ packages:prelude-ls: 1.2.1type-check: 0.4.0- resolution: {integrity: sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==}- engines: {node: '>=10'}- dev: true-resolution: {integrity: sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==}engines: {node: '>=10'}+ resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==}+ engines: {node: '>=10'}+ dev: true+resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}- resolution: {integrity: sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug==}- engines: {node: ^14.13.1 || >=16.0.0}+ resolution: {integrity: sha512-mPRtrYnipYYv1FEE134ufbWpeggNTo+O/UPzngoaKzbzHAthvR55am+8GfHTnqNRQVRRrYQLGW9ZyUoD7DsBHQ==}+ engines: {node: ^16.14.0 || >=18.0.0}hasBin: truedependencies:- cli-truncate: 3.1.0- colorette: 2.0.19- commander: 9.4.0+ chalk: 5.3.0+ commander: 11.0.0debug: 4.3.4- execa: 6.1.0- lilconfig: 2.0.5- listr2: 4.0.5+ execa: 7.2.0+ lilconfig: 2.1.0+ listr2: 6.6.1micromatch: 4.0.5- normalize-path: 3.0.0- object-inspect: 1.12.2pidtree: 0.6.0- string-argv: 0.3.1- yaml: 2.1.1+ string-argv: 0.3.2+ yaml: 2.3.1transitivePeerDependencies:- enquirer- supports-colordev: true- resolution: {integrity: sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==}- engines: {node: '>=12'}+ resolution: {integrity: sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==}+ engines: {node: '>=16.0.0'}peerDependencies:enquirer: '>= 2.3.0 < 3'peerDependenciesMeta:enquirer:optional: truedependencies:- cli-truncate: 2.1.0- colorette: 2.0.19- log-update: 4.0.0- p-map: 4.0.0+ cli-truncate: 3.1.0+ colorette: 2.0.20+ eventemitter3: 5.0.1+ log-update: 5.0.1rfdc: 1.3.0- rxjs: 7.5.6- through: 2.3.8- wrap-ansi: 7.0.0+ wrap-ansi: 8.1.0dev: true@@ -8265,14 +8643,15 @@ packages:resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}- resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}- engines: {node: '>=10'}+ resolution: {integrity: sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==}+ engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}dependencies:- ansi-escapes: 4.3.2- cli-cursor: 3.1.0- slice-ansi: 4.0.0- wrap-ansi: 6.2.0+ ansi-escapes: 5.0.0+ cli-cursor: 4.0.0+ slice-ansi: 5.0.0+ strip-ansi: 7.0.1+ wrap-ansi: 8.1.0dev: true@@ -8306,7 +8685,7 @@ packages:resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}engines: {node: '>=8'}dependencies:- semver: 6.3.0+ semver: 6.3.1resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}@@ -8538,7 +8917,7 @@ packages:jsonp: 0.2.1react: 18.2.0react-dom: 18.2.0([email protected])- react-scripts: 5.0.1(@babel/[email protected])(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ react-scripts: 5.0.1(@babel/[email protected])(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])transitivePeerDependencies:- supports-colordev: false@@ -8582,7 +8961,7 @@ packages:dependencies:hosted-git-info: 4.1.0is-core-module: 2.10.0- semver: 7.3.8+ semver: 7.5.4validate-npm-package-license: 3.0.4dev: true@@ -8635,6 +9014,9 @@ packages:resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==}+ resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}+resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}engines: {node: '>= 0.4'}@@ -8655,14 +9037,23 @@ packages:call-bind: 1.0.2define-properties: 1.1.4es-abstract: 1.20.2+ dev: true- resolution: {integrity: sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==}+ resolution: {integrity: sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==}engines: {node: '>= 0.4'}dependencies:call-bind: 1.0.2- define-properties: 1.1.4- es-abstract: 1.20.2+ define-properties: 1.2.1+ es-abstract: 1.22.3++ resolution: {integrity: sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==}+ engines: {node: '>= 0.4'}+ dependencies:+ call-bind: 1.0.2+ define-properties: 1.2.1+ es-abstract: 1.22.3resolution: {integrity: sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==}@@ -8673,11 +9064,11 @@ packages:define-properties: 1.1.4es-abstract: 1.20.2- resolution: {integrity: sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==}+ resolution: {integrity: sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==}dependencies:- define-properties: 1.1.4- es-abstract: 1.20.2+ define-properties: 1.2.1+ es-abstract: 1.22.3resolution: {integrity: sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==}@@ -8687,6 +9078,14 @@ packages:define-properties: 1.1.4es-abstract: 1.20.2+ resolution: {integrity: sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==}+ engines: {node: '>= 0.4'}+ dependencies:+ call-bind: 1.0.2+ define-properties: 1.2.1+ es-abstract: 1.22.3+resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==}@@ -8726,6 +9125,16 @@ packages:is-docker: 2.2.1is-wsl: 2.2.0+ resolution: {integrity: sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==}+ engines: {node: '>=14.16'}+ dependencies:+ default-browser: 4.0.0+ define-lazy-prop: 3.0.0+ is-inside-container: 1.0.0+ is-wsl: 2.2.0+ dev: true+resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==}engines: {node: '>= 0.8.0'}@@ -8737,17 +9146,6 @@ packages:type-check: 0.3.2word-wrap: 1.2.3- resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}- engines: {node: '>= 0.8.0'}- dependencies:- deep-is: 0.1.4- fast-levenshtein: 2.0.6- levn: 0.4.1- prelude-ls: 1.2.1- type-check: 0.4.0- word-wrap: 1.2.3-resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}engines: {node: '>= 0.8.0'}@@ -8758,7 +9156,6 @@ packages:levn: 0.4.1prelude-ls: 1.2.1type-check: 0.4.0- dev: trueresolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}@@ -8790,13 +9187,6 @@ packages:dependencies:p-limit: 3.1.0- resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}- engines: {node: '>=10'}- dependencies:- aggregate-error: 3.1.0- dev: true-resolution: {integrity: sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==}engines: {node: '>=8'}@@ -9203,7 +9593,7 @@ packages:cosmiconfig: 7.0.1klona: 2.0.5postcss: 8.4.16- semver: 7.3.8+ semver: 7.5.4webpack: 5.74.0@@ -9619,8 +10009,8 @@ packages:picocolors: 1.0.0source-map-js: 1.0.2- resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}+ resolution: {integrity: sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==}engines: {node: ^10 || ^12 || >=14}dependencies:nanoid: 3.3.7@@ -9643,9 +10033,9 @@ packages:fast-diff: 1.2.0dev: true- resolution: {integrity: sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==}- engines: {node: '>=10.13.0'}+ resolution: {integrity: sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==}+ engines: {node: '>=14'}hasBin: truedev: true@@ -9835,7 +10225,7 @@ packages:peerDependencies:react-scripts: '>=2.1.3'dependencies:- react-scripts: 5.0.1(@babel/[email protected])(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ react-scripts: 5.0.1(@babel/[email protected])(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])semver: 5.7.1dev: true@@ -9866,7 +10256,7 @@ packages:warning: 4.0.3dev: falseresolution: {integrity: sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==}engines: {node: '>=14'}peerDependencies:@@ -9885,7 +10275,7 @@ packages:escape-string-regexp: 4.0.0filesize: 8.0.7find-up: 5.0.0global-modules: 2.0.0globby: 11.1.0gzip-size: 6.0.0@@ -9998,7 +10388,7 @@ packages:react: 18.2.0dev: false- /[email protected](@babel/[email protected])(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]):+ /[email protected](@babel/[email protected])(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]):resolution: {integrity: sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==}engines: {node: '>=14.0.0'}hasBin: true@@ -10025,9 +10415,9 @@ packages:css-minimizer-webpack-plugin: 3.4.1([email protected])dotenv: 10.0.0dotenv-expand: 5.1.0- eslint: 8.23.1- eslint-config-react-app: 7.0.1(@babel/[email protected])(@babel/[email protected])([email protected])([email protected])([email protected])- eslint-webpack-plugin: 3.2.0([email protected])([email protected])+ eslint: 8.53.0+ eslint-config-react-app: 7.0.1(@babel/[email protected])(@babel/[email protected])([email protected])([email protected])([email protected])+ eslint-webpack-plugin: 3.2.0([email protected])([email protected])file-loader: 6.2.0([email protected])fs-extra: 10.1.0html-webpack-plugin: 5.5.0([email protected])@@ -10044,7 +10434,7 @@ packages:prompts: 2.4.2react: 18.2.0react-app-polyfill: 3.0.0react-refresh: 0.11.0resolve: 1.22.1resolve-url-loader: 4.0.0@@ -10177,6 +10567,17 @@ packages:strip-indent: 3.0.0dev: true+ resolution: {integrity: sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==}+ engines: {node: '>= 0.4'}+ dependencies:+ call-bind: 1.0.2+ define-properties: 1.2.1+ es-abstract: 1.22.3+ get-intrinsic: 1.2.2+ globalthis: 1.0.3+ which-builtin-type: 1.1.3+resolution: {integrity: sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==}engines: {node: '>=4'}@@ -10192,6 +10593,9 @@ packages:resolution: {integrity: sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==}+ resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==}+resolution: {integrity: sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==}dependencies:@@ -10208,6 +10612,14 @@ packages:define-properties: 1.1.4functions-have-names: 1.2.3+ resolution: {integrity: sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==}+ engines: {node: '>= 0.4'}+ dependencies:+ call-bind: 1.0.2+ define-properties: 1.2.1+ set-function-name: 2.0.1+resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}engines: {node: '>=8'}@@ -10324,9 +10736,9 @@ packages:path-parse: 1.0.7supports-preserve-symlinks-flag: 1.0.0- resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}- engines: {node: '>=8'}+ resolution: {integrity: sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==}+ engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}dependencies:onetime: 5.1.2signal-exit: 3.0.7@@ -10380,6 +10792,13 @@ packages:fsevents: 2.3.2dev: true+ resolution: {integrity: sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==}+ engines: {node: '>=12'}+ dependencies:+ execa: 5.1.1+ dev: true+resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}dependencies:@@ -10389,11 +10808,14 @@ packages:resolution: {integrity: sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==}dev: false- resolution: {integrity: sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==}+ resolution: {integrity: sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==}+ engines: {node: '>=0.4'}dependencies:- tslib: 2.4.0- dev: true+ call-bind: 1.0.2+ get-intrinsic: 1.2.2+ has-symbols: 1.0.3+ isarray: 2.0.5resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}@@ -10401,6 +10823,13 @@ packages:resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}+ resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}+ dependencies:+ call-bind: 1.0.5+ get-intrinsic: 1.2.2+ is-regex: 1.1.4+resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}@@ -10466,7 +10895,7 @@ packages:resolution: {integrity: sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==}engines: {node: '>= 8.9.0'}dependencies:- '@types/json-schema': 7.0.11+ '@types/json-schema': 7.0.13ajv: 6.12.6ajv-keywords: 3.5.2([email protected])@@ -10491,7 +10920,7 @@ packages:resolution: {integrity: sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==}engines: {node: '>= 12.13.0'}dependencies:- '@types/json-schema': 7.0.11+ '@types/json-schema': 7.0.13ajv: 8.11.0ajv-formats: 2.1.1([email protected])ajv-keywords: 5.1.0([email protected])@@ -10510,8 +10939,8 @@ packages:hasBin: truedev: true- resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}+ resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}hasBin: true@@ -10535,7 +10964,6 @@ packages:hasBin: truedependencies:lru-cache: 6.0.0- dev: trueresolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}@@ -10602,6 +11030,23 @@ packages:resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}dev: false+ resolution: {integrity: sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==}+ engines: {node: '>= 0.4'}+ dependencies:+ define-data-property: 1.1.1+ get-intrinsic: 1.2.2+ gopd: 1.0.1+ has-property-descriptors: 1.0.0++ resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==}+ engines: {node: '>= 0.4'}+ dependencies:+ define-data-property: 1.1.1+ functions-have-names: 1.2.3+ has-property-descriptors: 1.0.0+resolution: {integrity: sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==}@@ -10652,24 +11097,6 @@ packages:resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==}engines: {node: '>=12'}- resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}- engines: {node: '>=8'}- dependencies:- ansi-styles: 4.3.0- astral-regex: 2.0.0- is-fullwidth-code-point: 3.0.0- dev: true-- resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}- engines: {node: '>=10'}- dependencies:- ansi-styles: 4.3.0- astral-regex: 2.0.0- is-fullwidth-code-point: 3.0.0- dev: true-resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}engines: {node: '>=12'}@@ -10818,8 +11245,8 @@ packages:resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}engines: {node: '>= 0.8'}- resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==}+ resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==}engines: {node: '>=0.6.19'}dev: true@@ -10857,6 +11284,19 @@ packages:strip-ansi: 7.0.1dev: true+ resolution: {integrity: sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==}+ dependencies:+ call-bind: 1.0.2+ define-properties: 1.2.1+ es-abstract: 1.22.3+ get-intrinsic: 1.2.2+ has-symbols: 1.0.3+ internal-slot: 1.0.6+ regexp.prototype.flags: 1.5.1+ set-function-name: 2.0.1+ side-channel: 1.0.4+resolution: {integrity: sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==}dependencies:@@ -10869,6 +11309,14 @@ packages:regexp.prototype.flags: 1.4.3side-channel: 1.0.4+ resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==}+ engines: {node: '>= 0.4'}+ dependencies:+ call-bind: 1.0.5+ define-properties: 1.2.1+ es-abstract: 1.22.3+resolution: {integrity: sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==}dependencies:@@ -10876,6 +11324,13 @@ packages:define-properties: 1.1.4es-abstract: 1.20.2+ resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==}+ dependencies:+ call-bind: 1.0.5+ define-properties: 1.2.1+ es-abstract: 1.22.3+resolution: {integrity: sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==}dependencies:@@ -10883,6 +11338,13 @@ packages:define-properties: 1.1.4es-abstract: 1.20.2+ resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==}+ dependencies:+ call-bind: 1.0.5+ define-properties: 1.2.1+ es-abstract: 1.22.3+resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}dependencies:@@ -11043,6 +11505,14 @@ packages:resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}+ resolution: {integrity: sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==}+ engines: {node: ^14.18.0 || >=16.0.0}+ dependencies:+ '@pkgr/utils': 2.4.2+ tslib: 2.6.2+ dev: true+resolution: {integrity: sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==}engines: {node: '>=12.13.0'}@@ -11156,7 +11626,7 @@ packages:hasBin: truedependencies:'@jridgewell/source-map': 0.3.2- acorn: 8.8.0+ acorn: 8.10.0commander: 2.20.3source-map-support: 0.5.21@@ -11203,6 +11673,11 @@ packages:resolution: {integrity: sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==}+ resolution: {integrity: sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==}+ engines: {node: '>=12'}+ dev: true+resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}@@ -11252,6 +11727,15 @@ packages:resolution: {integrity: sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==}+ resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==}+ engines: {node: '>=16.13.0'}+ peerDependencies:+ typescript: '>=4.2.0'+ dependencies:+ typescript: 4.9.5+ dev: true+resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==}engines: {node: '>=16.13.0'}@@ -11310,6 +11794,10 @@ packages:resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}+ resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}+ dev: true+resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}engines: {node: '>= 6'}@@ -11362,6 +11850,11 @@ packages:engines: {node: '>=8'}dev: true+ resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==}+ engines: {node: '>=10'}+ dev: true+resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}engines: {node: '>= 0.6'}@@ -11369,6 +11862,40 @@ packages:media-typer: 0.3.0mime-types: 2.1.35+ resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==}+ engines: {node: '>= 0.4'}+ dependencies:+ call-bind: 1.0.5+ get-intrinsic: 1.2.2+ is-typed-array: 1.1.12++ resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==}+ engines: {node: '>= 0.4'}+ dependencies:+ call-bind: 1.0.5+ for-each: 0.3.3+ has-proto: 1.0.1+ is-typed-array: 1.1.12++ resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==}+ engines: {node: '>= 0.4'}+ dependencies:+ available-typed-arrays: 1.0.5+ call-bind: 1.0.5+ for-each: 0.3.3+ has-proto: 1.0.1+ is-typed-array: 1.1.12++ resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}+ dependencies:+ call-bind: 1.0.5+ for-each: 0.3.3+ is-typed-array: 1.1.12+resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}dependencies:@@ -11388,7 +11915,7 @@ packages:resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}dependencies:- call-bind: 1.0.2+ call-bind: 1.0.5has-bigints: 1.0.2has-symbols: 1.0.3which-boxed-primitive: 1.0.2@@ -11453,6 +11980,11 @@ packages:resolution: {integrity: sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==}+ resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}+ engines: {node: '>=8'}+ dev: true+resolution: {integrity: sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==}engines: {node: '>=4'}@@ -11581,7 +12113,7 @@ packages:dependencies:'@types/node': 16.11.59esbuild: 0.18.20- postcss: 8.4.31+ postcss: 8.4.32rollup: 3.29.4sass: 1.54.9optionalDependencies:@@ -11855,10 +12387,45 @@ packages:is-string: 1.0.7is-symbol: 1.0.4+ resolution: {integrity: sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==}+ engines: {node: '>= 0.4'}+ dependencies:+ function.prototype.name: 1.1.5+ has-tostringtag: 1.0.0+ is-async-function: 2.0.0+ is-date-object: 1.0.5+ is-finalizationregistry: 1.0.2+ is-generator-function: 1.0.10+ is-regex: 1.1.4+ is-weakref: 1.0.2+ isarray: 2.0.5+ which-boxed-primitive: 1.0.2+ which-collection: 1.0.1+ which-typed-array: 1.1.13++ resolution: {integrity: sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==}+ dependencies:+ is-map: 2.0.2+ is-set: 2.0.2+ is-weakmap: 2.0.1+ is-weakset: 2.0.2+resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==}dev: false+ resolution: {integrity: sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==}+ engines: {node: '>= 0.4'}+ dependencies:+ available-typed-arrays: 1.0.5+ call-bind: 1.0.5+ for-each: 0.3.3+ gopd: 1.0.1+ has-tostringtag: 1.0.0+resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}hasBin: true@@ -11894,7 +12461,7 @@ packages:'@apideck/better-ajv-errors': 0.3.6([email protected])'@babel/core': 7.19.1'@babel/preset-env': 7.19.1(@babel/[email protected])- '@babel/runtime': 7.19.0+ '@babel/runtime': 7.22.5'@rollup/plugin-babel': 5.3.1(@babel/[email protected])([email protected])'@rollup/plugin-node-resolve': 11.2.1([email protected])'@rollup/plugin-replace': 2.4.2([email protected])@@ -12029,6 +12596,7 @@ packages:ansi-styles: 4.3.0string-width: 4.2.3strip-ansi: 6.0.1+ dev: falseresolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}@@ -12038,6 +12606,15 @@ packages:string-width: 4.2.3strip-ansi: 6.0.1+ resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}+ engines: {node: '>=12'}+ dependencies:+ ansi-styles: 6.1.1+ string-width: 5.1.2+ strip-ansi: 7.0.1+ dev: true+resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}@@ -12112,6 +12689,11 @@ packages:engines: {node: '>= 14'}dev: true+ resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==}+ engines: {node: '>= 14'}+ dev: true+resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}engines: {node: '>=6'}diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.tsindex 47987606..68f3be95 100644--- a/ui/src/common/interface.ts+++ b/ui/src/common/interface.ts@@ -244,6 +244,7 @@ export interface QuestionDetailRes {user_info: UserInfoBase;answered: boolean;collected: boolean;+ answer_ids: string[];[prop: string]: any;}@@ -396,6 +397,7 @@ export interface SiteSettings {theme: AdminSettingsTheme;site_seo: AdminSettingsSeo;site_users: AdminSettingsUsers;+ site_write: AdminSettingsWrite;version: string;revision: string;}@@ -415,9 +417,10 @@ export interface AdminSettingsLegal {}export interface AdminSettingsWrite {- recommend_tags: string[];- required_tag: string;- reserved_tags: string[];+ restrict_answer?: boolean;+ recommend_tags?: string[];+ required_tag?: string;+ reserved_tags?: string[];}export interface AdminSettingsSeo {@@ -454,6 +457,7 @@ export interface AdminSettingsLogin {login_required: boolean;allow_email_registrations: boolean;allow_email_domains: string[];+ allow_password_login: boolean;}/**@@ -507,11 +511,15 @@ export interface AdminDashboard {user_count: number;report_count: number;uploading_files: boolean;- smtp: boolean;+ smtp: 'enabled' | 'disabled' | 'not_configured';time_zone: string;occupying_storage_space: string;app_start_time: number;https: boolean;+ login_required: boolean;+ go_version: string;+ database_version: string;+ database_size: string;version_info: {remote_version: string;version: string;diff --git a/ui/src/components/Actions/index.tsx b/ui/src/components/Actions/index.tsxindex 1ea00b0a..b8357105 100644--- a/ui/src/components/Actions/index.tsx+++ b/ui/src/components/Actions/index.tsx@@ -125,9 +125,10 @@ const Index: FC<Props> = ({ className, data, source }) => {bookmark({group_id: '0',object_id: data?.id,+ bookmark: !bookmarkState.state,}).then((res) => {setBookmark({- state: res.switch,+ state: !bookmarkState.state,count: res.object_collection_count,});});diff --git a/ui/src/components/Comment/index.scss b/ui/src/components/Comment/index.scssindex 90b76439..47254f57 100644--- a/ui/src/components/Comment/index.scss+++ b/ui/src/components/Comment/index.scss@@ -30,6 +30,7 @@}}}+ border-bottom: 1px solid var(--bs-colors-gray-200, #E9ECEF);}.fmt {display: inline;diff --git a/ui/src/components/Comment/index.tsx b/ui/src/components/Comment/index.tsxindex e9118356..9a2d4ab3 100644--- a/ui/src/components/Comment/index.tsx+++ b/ui/src/components/Comment/index.tsx@@ -328,16 +328,17 @@ const Comment = ({ objectId, mode, commentId }) => {);};return (- <div className="comments-wrap">- {comments.map((item, index) => {+ <div+ className={classNames(+ 'comments-wrap',+ comments.length > 0 && 'bg-light px-3 py-2 rounded',+ )}>+ {comments.map((item) => {return (<divkey={item.comment_id}id={item.comment_id}- className={classNames(- 'border-bottom py-2 comment-item',- index === 0 && 'border-top',- )}>+ className="py-2 comment-item">{item.showEdit ? (<FormclassName="mt-2"@@ -397,7 +398,7 @@ const Comment = ({ objectId, mode, commentId }) => {);})}- <div className="mt-2">+ <div className={classNames(comments.length > 0 && 'py-2')}><Buttonvariant="link"className="p-0 btn-no-border"@@ -409,23 +410,27 @@ const Comment = ({ objectId, mode, commentId }) => {}}>{t('btn_add_comment')}</Button>- {data && (pageIndex || 1) < Math.ceil((data?.count || 0) / pageSize) && (- <Button- variant="link"- size="sm"- className="p-0 ms-3 btn-no-border"- onClick={() => {- setPageIndex(pageIndex + 1);- }}>- {t('show_more')}- </Button>- )}+ {data &&+ (pageIndex || 1) < Math.ceil((data?.count || 0) / pageSize) && (+ <Button+ variant="link"+ size="sm"+ className="p-0 ms-3 btn-no-border"+ onClick={() => {+ setPageIndex(pageIndex + 1);+ }}>+ {t('show_more')}+ </Button>+ )}</div>{visibleComment && (<Formmode={mode}- className="mt-2"+ className={classNames(+ 'mt-2',+ comments.length <= 0 && 'bg-light p-3 rounded',+ )}onSendReply={(value) => handleSendReply({ value, type: 'comment' })}onCancel={() => setVisibleComment(!visibleComment)}/>diff --git a/ui/src/components/Editor/ToolBars/image.tsx b/ui/src/components/Editor/ToolBars/image.tsxindex a38e56fe..48f1b039 100644--- a/ui/src/components/Editor/ToolBars/image.tsx+++ b/ui/src/components/Editor/ToolBars/image.tsx@@ -29,8 +29,8 @@ import { IEditorContext } from '../types';import { uploadImage } from '@/services';let context: IEditorContext;-const Image = () => {- const [editor, setEditor] = useState<Editor>(null);+const Image = ({ editorInstance }) => {+ const [editor, setEditor] = useState<Editor>(editorInstance);const { t } = useTranslation('translation', { keyPrefix: 'editor' });const loadingText = `![${t('image.uploading')}...]()`;@@ -218,9 +218,6 @@ const Image = () => {const addLink = (ctx) => {context = ctx;setEditor(context.editor);- if (!editor) {- return;- }const text = context.editor?.getSelection();setImageName({ ...imageName, value: text });diff --git a/ui/src/components/Editor/index.tsx b/ui/src/components/Editor/index.tsxindex f3295e10..8d157a68 100644--- a/ui/src/components/Editor/index.tsx+++ b/ui/src/components/Editor/index.tsx@@ -126,7 +126,7 @@ const MDEditor: ForwardRefRenderFunction<EditorRef, Props> = (<Code /><LinkItem /><BlockQuote />- <Image />+ <Image editorInstance={editor} /><Table /><div className="toolbar-divider" /><OL />diff --git a/ui/src/components/Editor/utils/index.ts b/ui/src/components/Editor/utils/index.tsindex ca46dc99..4930c768 100644--- a/ui/src/components/Editor/utils/index.ts+++ b/ui/src/components/Editor/utils/index.ts@@ -17,7 +17,7 @@* under the License.*/-import { useEffect, useState } from 'react';+import { useEffect, useState, useRef } from 'react';import type { Editor, Position } from 'codemirror';import type CodeMirror from 'codemirror';@@ -148,6 +148,7 @@ export const useEditor = ({}) => {const [editor, setEditor] = useState<CodeMirror.Editor | null>(null);const [value, setValue] = useState<string>('');+ const isMountedRef = useRef(false);const onEnter = (cm) => {const cursor = cm.getCursor();@@ -178,6 +179,11 @@ export const useEditor = ({};const init = async () => {+ if (isMountedRef.current) {+ return false;+ }+ isMountedRef.current = true;+const { default: codeMirror } = await import('codemirror');await import('codemirror/mode/markdown/markdown');await import('codemirror/addon/display/placeholder');@@ -186,11 +192,13 @@ export const useEditor = ({mode: 'markdown',lineWrapping: true,placeholder,- focus: autoFocus,});- setEditor(cm);- createEditorUtils(codeMirror, cm);+ if (autoFocus) {+ setTimeout(() => {+ cm.focus();+ }, 10);+ }cm.on('change', (e) => {const newValue = e.getValue();@@ -203,6 +211,10 @@ export const useEditor = ({cm.on('blur', () => {onBlur?.();});++ setEditor(cm);+ createEditorUtils(codeMirror, cm);+cm.setSize('100%', '100%');cm.addKeyMap({Enter: onEnter,diff --git a/ui/src/components/Footer/index.tsx b/ui/src/components/Footer/index.tsxindex 6b832ba8..506e0cad 100644--- a/ui/src/components/Footer/index.tsx+++ b/ui/src/components/Footer/index.tsx@@ -34,10 +34,10 @@ const Index = () => {<Container className="py-3"><p className="text-center mb-0 small text-secondary"><Trans i18nKey="footer.build_on" values={{ cc }}>- Built on+ Powered by{/* eslint-disable-next-line react/jsx-no-target-blank */}<a href="https://answer.apache.org" target="_blank">- Answer+ Apache Answer</a>- the open-source software that powers Q&A communities.<br />diff --git a/ui/src/components/Header/components/NavItems/index.tsx b/ui/src/components/Header/components/NavItems/index.tsxindex e6b4e1cf..f3368b0f 100644--- a/ui/src/components/Header/components/NavItems/index.tsx+++ b/ui/src/components/Header/components/NavItems/index.tsx@@ -30,7 +30,7 @@ import { userCenterStore } from '@/stores';interface Props {redDot: Type.NotificationStatus | undefined;userInfo: Type.UserInfoRes;- logOut: () => void;+ logOut: (e) => void;}const Index: FC<Props> = ({ redDot, userInfo, logOut }) => {@@ -111,7 +111,7 @@ const Index: FC<Props> = ({ redDot, userInfo, logOut }) => {{t('header.nav.setting')}</Dropdown.Item><Dropdown.Divider />- <Dropdown.Item onClick={logOut}>+ <Dropdown.Item href="/users/logout" onClick={(e) => logOut(e)}>{t('header.nav.logout')}</Dropdown.Item></Dropdown.Menu>diff --git a/ui/src/components/Header/index.tsx b/ui/src/components/Header/index.tsxindex 9b3b1970..2f31af38 100644--- a/ui/src/components/Header/index.tsx+++ b/ui/src/components/Header/index.tsx@@ -72,7 +72,7 @@ const Header: FC = () => {const tagMatch = useMatch('/tags/:slugName');let askUrl = '/questions/ask';if (tagMatch && tagMatch.params.slugName) {- askUrl = `${askUrl}?tags=${tagMatch.params.slugName}`;+ askUrl = `${askUrl}?tags=${encodeURIComponent(tagMatch.params.slugName)}`;}useEffect(() => {@@ -94,7 +94,8 @@ const Header: FC = () => {navigate(searchUrl);};- const handleLogout = async () => {+ const handleLogout = async (evt) => {+ evt.preventDefault();await logout();clearUserStore();window.location.replace(window.location.href);@@ -167,7 +168,11 @@ const Header: FC = () => {{/* mobile nav */}<div className="d-flex lg-none align-items-center flex-lg-nowrap">{user?.username ? (- <NavItems redDot={redDot} userInfo={user} logOut={handleLogout} />+ <NavItems+ redDot={redDot}+ userInfo={user}+ logOut={(e) => handleLogout(e)}+ />) : (<><Buttondiff --git a/ui/src/components/Modal/Modal.tsx b/ui/src/components/Modal/Modal.tsxindex 8367f43f..4d66137a 100644--- a/ui/src/components/Modal/Modal.tsx+++ b/ui/src/components/Modal/Modal.tsx@@ -79,7 +79,9 @@ const Index: FC<Props> = ({<Modal.Footer>{showCancel && (<Button variant={cancelBtnVariant} onClick={onCancel}>- {cancelText || t('btns.cancel')}+ {cancelText === 'close'+ ? t('btns.close')+ : cancelText || t('btns.cancel')}</Button>)}{showConfirm && (diff --git a/ui/src/components/Operate/index.tsx b/ui/src/components/Operate/index.tsxindex 18ce6a22..e04416f2 100644--- a/ui/src/components/Operate/index.tsx+++ b/ui/src/components/Operate/index.tsx@@ -148,7 +148,7 @@ const Index: FC<IProps> = ({msg: t('tip_answer_deleted'),variant: 'success',});- callback?.('all');+ callback?.('delete_answer');}).catch((ex) => {if (ex.isError) {diff --git a/ui/src/components/SchemaForm/components/Check.tsx b/ui/src/components/SchemaForm/components/Check.tsxindex fbb06e9b..3ae1fa4f 100644--- a/ui/src/components/SchemaForm/components/Check.tsx+++ b/ui/src/components/SchemaForm/components/Check.tsx@@ -57,7 +57,6 @@ const Index: FC<Props> = ({},};if (typeof onChange === 'function') {- console.log('fieldName', fieldName, enumValues);onChange(state);}};diff --git a/ui/src/components/Tag/index.tsx b/ui/src/components/Tag/index.tsxindex dc151afe..44a5ae63 100644--- a/ui/src/components/Tag/index.tsx+++ b/ui/src/components/Tag/index.tsx@@ -38,7 +38,7 @@ const Index: FC<IProps> = ({className = '',textClassName = '',}) => {- href ||= pathFactory.tagLanding(data?.slug_name);+ href ||= pathFactory.tagLanding(encodeURIComponent(data.slug_name));return (<Linkdiff --git a/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx b/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsxindex 19a70fca..b2a04ffa 100644--- a/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx+++ b/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx@@ -36,11 +36,43 @@ const AnswerLinks = () => {{t('documents')}</a></Col>+ <Col xs={6}>+ <a+ href="https://answer.apache.org/plugins"+ target="_blank"+ rel="noreferrer">+ {t('plugins')}+ </a>+ </Col><Col xs={6}><a href="https://meta.answer.dev" target="_blank" rel="noreferrer">{t('support')}</a></Col>+ <Col xs={6}>+ <a+ href="https://github.com/apache/incubator-answer"+ target="_blank"+ rel="noreferrer">+ {t('github')}+ </a>+ </Col>+ <Col xs={6}>+ <a+ href="https://answer.apache.org/blog"+ target="_blank"+ rel="noreferrer">+ {t('blog')}+ </a>+ </Col>+ <Col xs={6}>+ <a+ href="https://answer.apache.org/contact"+ target="_blank"+ rel="noreferrer">+ {t('contact')}+ </a>+ </Col></Row></Card.Body></Card>diff --git a/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx b/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsxindex 129248ba..c77f0bb1 100644--- a/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx+++ b/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx@@ -76,29 +76,33 @@ const HealthStatus: FC<IProps> = ({ data }) => {)}</Col><Col xs={6} className="mb-1">- <span className="text-secondary me-1">{t('https')}</span>- <strong>{data.https ? t('yes') : t('no')}</strong>+ <span className="text-secondary me-1">{t('run_mode')}</span>+ <strong>{data.login_required ? t('private') : t('public')}</strong></Col><Col xs={6} className="mb-1">- <span className="text-secondary me-1">{t('uploading_files')}</span>+ <span className="text-secondary me-1">{t('upload_folder')}</span><strong>- {data.uploading_files ? t('allowed') : t('not_allowed')}+ {data.uploading_files ? t('writable') : t('not_writable')}</strong></Col>+ <Col xs={6} className="mb-1">+ <span className="text-secondary me-1">{t('https')}</span>+ <strong>{data.https ? t('yes') : t('no')}</strong>+ </Col>+ <Col xs={6}>+ <span className="text-secondary me-1">{t('timezone')}</span>+ <strong>{data.time_zone.split('/')?.[1]}</strong>+ </Col><Col xs={6}><span className="text-secondary me-1">{t('smtp')}</span>- {data.smtp ? (- <strong>{t('enabled')}</strong>+ {data.smtp !== 'not_configured' ? (+ <strong>{t(data.smtp)}</strong>) : (<Link to="/admin/smtp" className="ms-2">{t('config')}</Link>)}</Col>- <Col xs={6}>- <span className="text-secondary me-1">{t('timezone')}</span>- <strong>{data.time_zone}</strong>- </Col></Row></Card.Body></Card>diff --git a/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx b/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsxindex 3d293369..85262724 100644--- a/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx+++ b/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx@@ -52,7 +52,7 @@ const Statistics: FC<IProps> = ({ data }) => {<strong>{data.vote_count}</strong></Col><Col xs={6}>- <span className="text-secondary me-1">{t('active_users')}</span>+ <span className="text-secondary me-1">{t('users')}</span><strong>{data.user_count}</strong></Col><Col xs={6}>diff --git a/ui/src/pages/Admin/Dashboard/components/SystemInfo/index.tsx b/ui/src/pages/Admin/Dashboard/components/SystemInfo/index.tsxindex 9750fec1..b4314c71 100644--- a/ui/src/pages/Admin/Dashboard/components/SystemInfo/index.tsx+++ b/ui/src/pages/Admin/Dashboard/components/SystemInfo/index.tsx@@ -35,10 +35,22 @@ const SystemInfo: FC<IProps> = ({ data }) => {<Card.Body><h6 className="mb-3">{t('system_info')}</h6><Row>+ <Col xs={6}>+ <span className="text-secondary me-1">{t('go_version')}</span>+ <strong>{data.go_version}</strong>+ </Col>+ <Col xs={6}>+ <span className="text-secondary me-1">{t('database')}</span>+ <strong>{data.database_version}</strong>+ </Col><Col xs={6}><span className="text-secondary me-1">{t('storage_used')}</span><strong>{data.occupying_storage_space}</strong></Col>+ <Col xs={6}>+ <span className="text-secondary me-1">{t('database_size')}</span>+ <strong>{data.database_size}</strong>+ </Col>{data.app_start_time ? (<Col xs={6}><span className="text-secondary me-1">{t('uptime')}</span>diff --git a/ui/src/pages/Admin/Login/index.tsx b/ui/src/pages/Admin/Login/index.tsxindex ed2c08a7..7355a23e 100644--- a/ui/src/pages/Admin/Login/index.tsx+++ b/ui/src/pages/Admin/Login/index.tsx@@ -47,6 +47,12 @@ const Index: FC = () => {description: t('email_registration.text'),default: true,},+ allow_password_login: {+ type: 'boolean',+ title: t('password_login.title'),+ description: t('password_login.text'),+ default: true,+ },allow_email_domains: {type: 'string',title: t('allowed_email_domains.title'),@@ -73,6 +79,12 @@ const Index: FC = () => {label: t('email_registration.label'),},},+ allow_password_login: {+ 'ui:widget': 'switch',+ 'ui:options': {+ label: t('password_login.label'),+ },+ },allow_email_domains: {'ui:widget': 'textarea',},@@ -105,6 +117,7 @@ const Index: FC = () => {allow_email_registrations: formData.allow_email_registrations.value,allow_email_domains: allowedEmailDomains,login_required: formData.login_required.value,+ allow_password_login: formData.allow_password_login.value,};putLoginSetting(reqParams)@@ -137,6 +150,7 @@ const Index: FC = () => {setting.allow_email_domains.join('\n');}formMeta.login_required.value = setting.login_required;+ formMeta.allow_password_login.value = setting.allow_password_login;setFormData({ ...formMeta });}});diff --git a/ui/src/pages/Admin/Users/index.tsx b/ui/src/pages/Admin/Users/index.tsxindex 99b62a47..c119e864 100644--- a/ui/src/pages/Admin/Users/index.tsx+++ b/ui/src/pages/Admin/Users/index.tsx@@ -92,8 +92,8 @@ const Users: FC = () => {...(curFilter === 'all'? {}: curFilter === 'staff'- ? { staff: true }- : { status: curFilter }),+ ? { staff: true }+ : { status: curFilter }),});const userModal = useUserModal({diff --git a/ui/src/pages/Admin/Write/index.tsx b/ui/src/pages/Admin/Write/index.tsxindex 3819ff6f..7c837435 100644--- a/ui/src/pages/Admin/Write/index.tsx+++ b/ui/src/pages/Admin/Write/index.tsx@@ -17,7 +17,7 @@* under the License.*/-import React, { FC, useEffect, useState } from 'react';+import { FC, useEffect, useState } from 'react';import { useTranslation } from 'react-i18next';import { SchemaForm, JSONSchema, initFormData, UISchema } from '@/components';@@ -28,6 +28,7 @@ import {postRequireAndReservedTag,} from '@/services';import { handleFormError } from '@/utils';+import { writeSettingStore } from '@/stores';const Index: FC = () => {const { t } = useTranslation('translation', {@@ -38,6 +39,12 @@ const Index: FC = () => {const schema: JSONSchema = {title: t('page_title'),properties: {+ restrict_answer: {+ type: 'boolean',+ title: t('restrict_answer.title'),+ description: t('restrict_answer.text'),+ default: true,+ },recommend_tags: {type: 'string',title: t('recommend_tags.label'),@@ -56,6 +63,12 @@ const Index: FC = () => {},};const uiSchema: UISchema = {+ restrict_answer: {+ 'ui:widget': 'switch',+ 'ui:options': {+ label: t('restrict_answer.label'),+ },+ },recommend_tags: {'ui:widget': 'textarea','ui:options': {@@ -92,6 +105,7 @@ const Index: FC = () => {recommend_tags,reserved_tags,required_tag: formData.required_tag.value,+ restrict_answer: formData.restrict_answer.value,};postRequireAndReservedTag(reqParams).then(() => {@@ -99,6 +113,9 @@ const Index: FC = () => {msg: t('update', { keyPrefix: 'toast' }),variant: 'success',});+ writeSettingStore+ .getState()+ .update({ restrict_answer: reqParams.restrict_answer });}).catch((err) => {if (err.isError) {@@ -114,6 +131,7 @@ const Index: FC = () => {formData.recommend_tags.value = res.recommend_tags.join('\n');}formData.required_tag.value = res.required_tag;+ formData.restrict_answer.value = res.restrict_answer;if (Array.isArray(res.reserved_tags)) {formData.reserved_tags.value = res.reserved_tags.join('\n');}diff --git a/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx b/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsxindex 15c1b344..bda9112a 100644--- a/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx+++ b/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx@@ -46,16 +46,15 @@ const SearchQuestion = ({ similarQuestions }) => {<ListGroup.Itemactionas="a"- className="d-flex align-items-center link-dark"+ className="link-dark text-wrap text-break"key={item.id}href={pathFactory.questionLanding(item.id, item.url_title)}target="_blank">- <span className="text-wrap text-break">- {item.title}- {item.status === 'closed'- ? ` [${t('closed', { keyPrefix: 'question' })}]`- : null}- </span>+ {item.title}+ {item.status === 'closed'+ ? ` [${t('closed', { keyPrefix: 'question' })}]`+ : null}+{item.accepted_answer ? (<span className="small ms-3 text-success"><Icon type="bi" name="check-circle-fill" />diff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsxindex 3a465a63..1a852f11 100644--- a/ui/src/pages/Questions/Ask/index.tsx+++ b/ui/src/pages/Questions/Ask/index.tsx@@ -17,14 +17,14 @@* under the License.*/-import React, { useState, useEffect, useRef } from 'react';+import React, { useState, useEffect, useRef, useCallback } from 'react';import { Row, Col, Form, Button, Card } from 'react-bootstrap';import { useParams, useNavigate, useSearchParams } from 'react-router-dom';import { useTranslation } from 'react-i18next';import dayjs from 'dayjs';import classNames from 'classnames';-import { isEqual } from 'lodash';+import { isEqual, debounce } from 'lodash';import { usePageTags, usePromptWithUnload, useCaptchaModal } from '@/hooks';import { Editor, EditorRef, TagSelector } from '@/components';@@ -35,7 +35,7 @@ import {questionDetail,modifyQuestion,useQueryRevisions,- useQueryQuestionByTitle,+ queryQuestionByTitle,getTagsBySlugName,saveQuestionWithAnswer,} from '@/services';@@ -94,6 +94,7 @@ const Ask = () => {setCheckState(false);setForceType('');};+ const [similarQuestions, setSimilarQuestions] = useState([]);const editorRef = useRef<EditorRef>({getHtml: () => '',@@ -117,9 +118,6 @@ const Ask = () => {};const isEdit = qid !== undefined;- const { data: similarQuestions = { list: [] } } = useQueryQuestionByTitle(- isEdit ? '' : formData.title.value,- );const saveCaptcha = useCaptchaModal('question');const editCaptcha = useCaptchaModal('edit');@@ -221,11 +219,26 @@ const Ask = () => {});}, [qid]);+ const querySimilarQuestions = useCallback(+ debounce((title) => {+ queryQuestionByTitle(title).then((res) => {+ setSimilarQuestions(res);+ });+ }, 400),+ [],+ );+const handleTitleChange = (e: React.ChangeEvent<HTMLInputElement>) => {setFormData({...formData,title: { ...formData.title, value: e.currentTarget.value, errorMsg: '' },});+ if (e.currentTarget.value.length >= 10) {+ querySimilarQuestions(e.currentTarget.value);+ }+ if (e.currentTarget.value.length === 0) {+ setSimilarQuestions([]);+ }};const handleContentChange = (value: string) => {setFormData({diff --git a/ui/src/pages/Questions/Detail/components/WriteAnswer/index.tsx b/ui/src/pages/Questions/Detail/components/WriteAnswer/index.tsxindex 49d134f2..9bc8be44 100644--- a/ui/src/pages/Questions/Detail/components/WriteAnswer/index.tsx+++ b/ui/src/pages/Questions/Detail/components/WriteAnswer/index.tsx@@ -20,6 +20,7 @@import { memo, useState, FC, useEffect } from 'react';import { Form, Button, Alert } from 'react-bootstrap';import { useTranslation, Trans } from 'react-i18next';+import { Link } from 'react-router-dom';import { marked } from 'marked';import classNames from 'classnames';@@ -30,6 +31,7 @@ import { FormDataType, PostAnswerReq } from '@/common/interface';import { postAnswer } from '@/services';import { guard, handleFormError, SaveDraft, storageExpires } from '@/utils';import { DRAFT_ANSWER_STORAGE_KEY } from '@/common/constants';+import { writeSettingStore } from '@/stores';interface Props {visible?: boolean;@@ -38,6 +40,7 @@ interface Props {qid: string;answered?: boolean;loggedUserRank: number;+ first_answer_id?: string;};callback?: (obj) => void;}@@ -61,6 +64,7 @@ const Index: FC<Props> = ({ visible = false, data, callback }) => {const [hasDraft, setHasDraft] = useState(false);const [showTips, setShowTips] = useState(data.loggedUserRank < 100);const aCaptcha = useCaptchaModal('answer');+ const writeInfo = writeSettingStore((state) => state.write);usePromptWithUnload({when: Boolean(formData.content.value),@@ -195,6 +199,7 @@ const Index: FC<Props> = ({ visible = false, data, callback }) => {if (!guard.tryNormalLogged(true)) {return;}+if (data?.answered && !showEditor) {Modal.confirm({title: t('confirm_title'),@@ -223,6 +228,7 @@ const Index: FC<Props> = ({ visible = false, data, callback }) => {setShowEditor(true);setEditorFocusState(true);};+return (<Form noValidate className="mt-4">{(!data.answered || showEditor) && (@@ -306,10 +312,22 @@ const Index: FC<Props> = ({ visible = false, data, callback }) => {)}{data.answered && !showEditor ? (- <Button onClick={clickBtn}>{t('add_another_answer')}</Button>+ // the 0th answer is the oldest one+ <Link+ to={`/posts/${data.qid}/${data.first_answer_id}/edit`}+ className="btn btn-primary">+ {t('edit_answer')}+ </Link>) : (<Button onClick={clickBtn}>{t('btn_name')}</Button>)}++ {data.answered && !showEditor && !writeInfo.restrict_answer && (+ <Button onClick={clickBtn} className="ms-2 " variant="outline-primary">+ {t('add_another_answer')}+ </Button>+ )}+{hasDraft && (<Button variant="link" className="ms-2" onClick={deleteDraft}>{t('discard_draft', { keyPrefix: 'btns' })}diff --git a/ui/src/pages/Questions/Detail/index.tsx b/ui/src/pages/Questions/Detail/index.tsxindex d4a45130..3729fc8f 100644--- a/ui/src/pages/Questions/Detail/index.tsx+++ b/ui/src/pages/Questions/Detail/index.tsx@@ -181,6 +181,9 @@ const Index = () => {getDetail();return;}+ if (type === 'delete_answer') {+ getDetail();+ }requestAnswers();};@@ -194,6 +197,9 @@ const Index = () => {setQuestion({...question,answered: true,+ first_answer_id: question.first_answer_id+ ? question.first_answer_id+ : obj.id,});}};@@ -280,6 +286,7 @@ const Index = () => {qid,answered: question?.answered,loggedUserRank,+ first_answer_id: question?.first_answer_id,}}callback={writeAnswerCallback}/>diff --git a/ui/src/pages/Tags/Create/index.tsx b/ui/src/pages/Tags/Create/index.tsxindex bf41fd58..485c7cd6 100644--- a/ui/src/pages/Tags/Create/index.tsx+++ b/ui/src/pages/Tags/Create/index.tsx@@ -115,7 +115,7 @@ const Index = () => {};createTag(params).then((res) => {- navigate(`/tags/${res.slug_name}/info`, {+ navigate(`/tags/${encodeURIComponent(res.slug_name)}/info`, {replace: true,});})diff --git a/ui/src/pages/Tags/Edit/index.tsx b/ui/src/pages/Tags/Edit/index.tsxindex c737353c..e5ddc4b2 100644--- a/ui/src/pages/Tags/Edit/index.tsx+++ b/ui/src/pages/Tags/Edit/index.tsx@@ -164,7 +164,7 @@ const Index = () => {edit_summary: formData.editSummary.value,};modifyTag(params).then((res) => {- navigate(`/tags/${formData.slugName.value}/info`, {+ navigate(`/tags/${encodeURIComponent(formData.slugName.value)}/info`, {replace: true,state: { isReview: res.wait_for_review },});diff --git a/ui/src/pages/Timeline/index.tsx b/ui/src/pages/Timeline/index.tsxindex cd283616..e20d50ef 100644--- a/ui/src/pages/Timeline/index.tsx+++ b/ui/src/pages/Timeline/index.tsx@@ -86,8 +86,9 @@ const Index: FC = () => {if (timelineData?.object_info.object_type === 'tag') {linkUrl = `/tags/${- timelineData?.object_info.main_tag_slug_name ||- timelineData?.object_info.title+ timelineData?.object_info.main_tag_slug_name+ ? encodeURIComponent(timelineData?.object_info.main_tag_slug_name)+ : encodeURIComponent(timelineData?.object_info.title)}`;pageTitle = `${t('title_for_tag')} '${timelineData?.object_info.title}'`;}@@ -97,6 +98,8 @@ const Index: FC = () => {usePageTags({title: pageTitle,});++ console.log('timelineData', linkUrl);return (<div className="py-4 mb-5"><h5 className="mb-4">diff --git a/ui/src/pages/Users/Login/index.tsx b/ui/src/pages/Users/Login/index.tsxindex 518f5b38..549808bd 100644--- a/ui/src/pages/Users/Login/index.tsx+++ b/ui/src/pages/Users/Login/index.tsx@@ -45,7 +45,8 @@ const Index: React.FC = () => {ucAgentInfo = ucAgent.agent_info;}const canOriginalLogin =- !ucAgentInfo || ucAgentInfo.enabled_original_user_system;+ (!ucAgentInfo || ucAgentInfo.enabled_original_user_system) &&+ loginSetting.allow_password_login;const [formData, setFormData] = useState<FormDataType>({e_mail: {diff --git a/ui/src/pages/Users/Logout/index.tsx b/ui/src/pages/Users/Logout/index.tsxnew file mode 100644index 00000000..9da6e59d--- /dev/null+++ b/ui/src/pages/Users/Logout/index.tsx@@ -0,0 +1,68 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one+ * or more contributor license agreements. See the NOTICE file+ * distributed with this work for additional information+ * regarding copyright ownership. The ASF licenses this file+ * to you under the Apache License, Version 2.0 (the+ * "License"); you may not use this file except in compliance+ * with the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing,+ * software distributed under the License is distributed on an+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ * KIND, either express or implied. See the License for the+ * specific language governing permissions and limitations+ * under the License.+ */++import { useEffect } from 'react';+import { Spinner } from 'react-bootstrap';+import { useTranslation } from 'react-i18next';++import { usePageTags } from '@/hooks';+import { logout } from '@/services';+import { loggedUserInfoStore } from '@/stores';+import Storage from '@/utils/storage';+import { RouteAlias } from '@/router/alias';+import { REDIRECT_PATH_STORAGE_KEY } from '@/common/constants';++const Index = () => {+ const { t } = useTranslation('translation', { keyPrefix: 'page_title' });+ const { user: loggedUserInfo, clear: clearUserStore } = loggedUserInfoStore();++ usePageTags({+ title: t('logout'),+ });++ useEffect(() => {+ if (loggedUserInfo.username) {+ logout().then(() => {+ clearUserStore();+ const redirect =+ Storage.get(REDIRECT_PATH_STORAGE_KEY) || RouteAlias.home;+ Storage.remove(REDIRECT_PATH_STORAGE_KEY);+ window.location.replace(`${window.location.origin}${redirect}`);+ });+ }+ // auto height of container+ const pageWrap = document.querySelector('.page-wrap') as HTMLElement;+ if (pageWrap) {+ pageWrap.style.display = 'contents';+ }++ return () => {+ if (pageWrap) {+ pageWrap.style.display = 'block';+ }+ };+ }, []);+ return (+ <div className="d-flex flex-column flex-shrink-1 flex-grow-1 justify-content-center align-items-center">+ <Spinner variant="secondary" />+ </div>+ );+};++export default Index;diff --git a/ui/src/router/pathFactory.ts b/ui/src/router/pathFactory.tsindex 97d74afb..ec326acf 100644--- a/ui/src/router/pathFactory.ts+++ b/ui/src/router/pathFactory.ts@@ -20,12 +20,12 @@import { seoSettingStore } from '@/stores';const tagLanding = (slugName: string) => {- const r = slugName ? `/tags/${slugName}` : '/tags';+ const r = slugName ? `/tags/${encodeURIComponent(slugName)}` : '/tags';return r;};const tagInfo = (slugName: string) => {- const r = slugName ? `/tags/${slugName}/info` : '/tags';+ const r = slugName ? `/tags/${encodeURIComponent(slugName)}/info` : '/tags';return r;};diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.tsindex 0fb0b8f4..be558746 100644--- a/ui/src/router/routes.ts+++ b/ui/src/router/routes.ts@@ -246,6 +246,13 @@ const routes: RouteNode[] = [return notLogged;},},+ {+ path: 'users/logout',+ page: 'pages/Users/Logout',+ guard: () => {+ return guard.loggedRedirectHome();+ },+ },{path: 'users/account-recovery',page: 'pages/Users/AccountForgot',diff --git a/ui/src/services/client/tag.ts b/ui/src/services/client/tag.tsindex 8f6415d2..25741315 100644--- a/ui/src/services/client/tag.ts+++ b/ui/src/services/client/tag.ts@@ -37,8 +37,8 @@ export const useQuerySynonymsTags = (tagId, status) => {status === 'deleted'? '': tagId- ? `/answer/api/v1/tag/synonyms?tag_id=${tagId}`- : '';+ ? `/answer/api/v1/tag/synonyms?tag_id=${tagId}`+ : '';return useSWR<{synonyms: Type.SynonymsTag[];member_actions?: Type.MemberActionItem[];diff --git a/ui/src/services/common.ts b/ui/src/services/common.tsindex f4efca73..0130d69b 100644--- a/ui/src/services/common.ts+++ b/ui/src/services/common.ts@@ -30,11 +30,8 @@ export const uploadImage = (params: { file: File; type: Type.UploadType }) => {return request.post('/answer/api/v1/file', form);};-export const useQueryQuestionByTitle = (title) => {- return useSWR<Record<string, any>>(- title ? `/answer/api/v1/question/similar?title=${title}` : '',- request.instance.get,- );+export const queryQuestionByTitle = (title: string) => {+ return request.get(`/answer/api/v1/question/similar?title=${title}`);};export const useQueryTags = (params) => {@@ -200,7 +197,11 @@ export const postAnswer = (params: Type.PostAnswerReq) => {return request.post('/answer/api/v1/answer', params);};-export const bookmark = (params: { group_id: string; object_id: string }) => {+export const bookmark = (params: {+ group_id: string;+ object_id: string;+ bookmark: boolean;+}) => {return request.post('/answer/api/v1/collection/switch', params);};diff --git a/ui/src/stores/index.ts b/ui/src/stores/index.tsindex 82b0a3db..cc454263 100644--- a/ui/src/stores/index.ts+++ b/ui/src/stores/index.ts@@ -28,6 +28,7 @@ import brandingStore from './branding';import pageTagStore from './pageTags';import customizeStore from './customize';import themeSettingStore from './themeSetting';+import writeSettingStore from './writeSetting';import loginToContinueStore from './loginToContinue';import errorCodeStore from './errorCode';import sideNavStore from './sideNav';@@ -49,4 +50,5 @@ export {userCenterStore,sideNavStore,commentReplyStore,+ writeSettingStore,};diff --git a/ui/src/stores/loginSetting.ts b/ui/src/stores/loginSetting.tsindex c692915d..15d572f1 100644--- a/ui/src/stores/loginSetting.ts+++ b/ui/src/stores/loginSetting.ts@@ -32,6 +32,7 @@ const loginSetting = create<IType>((set) => ({login_required: false,allow_email_registrations: true,allow_email_domains: [],+ allow_password_login: true,},update: (params) =>set(() => {diff --git a/ui/src/stores/writeSetting.ts b/ui/src/stores/writeSetting.tsnew file mode 100644index 00000000..0ea04962--- /dev/null+++ b/ui/src/stores/writeSetting.ts@@ -0,0 +1,45 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one+ * or more contributor license agreements. See the NOTICE file+ * distributed with this work for additional information+ * regarding copyright ownership. The ASF licenses this file+ * to you under the Apache License, Version 2.0 (the+ * "License"); you may not use this file except in compliance+ * with the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing,+ * software distributed under the License is distributed on an+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ * KIND, either express or implied. See the License for the+ * specific language governing permissions and limitations+ * under the License.+ */++import create from 'zustand';++import { AdminSettingsWrite } from '@/common/interface';++interface IProps {+ write: AdminSettingsWrite;+ update: (params: AdminSettingsWrite) => void;+}++const Index = create<IProps>((set) => ({+ write: {+ restrict_answer: true,+ recommend_tags: [],+ required_tag: '',+ reserved_tags: [],+ },+ update: (params) =>+ set((state) => {+ const o = { ...state.write, ...params };+ return {+ write: o,+ };+ }),+}));++export default Index;diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.tsindex 9603ddbc..b6382a4e 100644--- a/ui/src/utils/common.ts+++ b/ui/src/utils/common.ts@@ -113,10 +113,14 @@ function formatUptime(value) {const second = parseInt(value, 10);if (second > 60 * 60 && second < 60 * 60 * 24) {- return `${Math.floor(second / 3600)} ${t('dates.hour')}`;+ const hour = second / 3600;+ return `${Math.floor(hour)} ${+ hour > 1 ? t('dates.hours') : t('dates.hour')+ }`;}if (second > 60 * 60 * 24) {- return `${Math.floor(second / 3600 / 24)} ${t('dates.day')}`;+ const day = second / 3600 / 24;+ return `${Math.floor(day)} ${day > 1 ? t('dates.days') : t('dates.day')}`;}return `< 1 ${t('dates.hour')}`;diff --git a/ui/src/utils/guard.ts b/ui/src/utils/guard.tsindex 0a4222fc..b424b87f 100644--- a/ui/src/utils/guard.ts+++ b/ui/src/utils/guard.ts@@ -29,6 +29,7 @@ import {seoSettingStore,loginToContinueStore,pageTagStore,+ writeSettingStore,} from '@/stores';import { RouteAlias } from '@/router/alias';import {@@ -163,6 +164,16 @@ export const logged = () => {return gr;};+export const loggedRedirectHome = () => {+ const gr: TGuardResult = { ok: true };+ const us = deriveLoginState();+ if (!us.isLogged) {+ gr.ok = false;+ gr.redirect = RouteAlias.home;+ }+ return gr;+};+export const notLogged = () => {const gr: TGuardResult = { ok: true };const us = deriveLoginState();@@ -398,6 +409,9 @@ export const initAppSettingsStore = async () => {customizeStore.getState().update(appSettings.custom_css_html);themeSettingStore.getState().update(appSettings.theme);seoSettingStore.getState().update(appSettings.site_seo);+ writeSettingStore+ .getState()+ .update({ restrict_answer: appSettings.site_write.restrict_answer });}};diff --git a/ui/src/utils/request.ts b/ui/src/utils/request.tsindex c2c4b587..48f50e6e 100644--- a/ui/src/utils/request.ts+++ b/ui/src/utils/request.ts@@ -136,8 +136,8 @@ class Request {// default error msg will show modalModal.confirm({content: msg,- showCancel: false,- confirmText: 'OK',+ showConfirm: false,+ cancelText: 'close',});return Promise.reject(false);}