From 95e006963c92ef53f92d6f10ee829f63406d211c Mon Sep 17 00:00:00 2001 From: Hamidreza Ghavami <70919649+hamid-gh98@users.noreply.github.com> Date: Fri, 12 May 2023 19:32:04 +0430 Subject: add searchDatafiles route --- web/controller/index.go | 1 - web/controller/setting.go | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'web/controller') diff --git a/web/controller/index.go b/web/controller/index.go index 802f3f7d..5b97a7cc 100644 --- a/web/controller/index.go +++ b/web/controller/index.go @@ -101,5 +101,4 @@ func (a *IndexController) getSecretStatus(c *gin.Context) { if err == nil { jsonObj(c, status, nil) } - } diff --git a/web/controller/setting.go b/web/controller/setting.go index bd9c2a5f..248f3ee5 100644 --- a/web/controller/setting.go +++ b/web/controller/setting.go @@ -3,6 +3,7 @@ package controller import ( "errors" "time" + "x-ui/util/common" "x-ui/web/entity" "x-ui/web/service" "x-ui/web/session" @@ -44,6 +45,7 @@ func (a *SettingController) initRouter(g *gin.RouterGroup) { g.GET("/getDefaultJsonConfig", a.getDefaultJsonConfig) g.POST("/updateUserSecret", a.updateSecret) g.POST("/getUserSecret", a.getUserSecret) + g.GET("/searchDatafiles", a.searchDatafiles) } func (a *SettingController) getAllSetting(c *gin.Context) { @@ -149,6 +151,7 @@ func (a *SettingController) updateSecret(c *gin.Context) { } jsonMsg(c, I18n(c, "pages.settings.toasts.modifyUser"), err) } + func (a *SettingController) getUserSecret(c *gin.Context) { loginUser := session.GetLoginUser(c) user := a.userService.GetUserSecret(loginUser.Id) @@ -156,3 +159,18 @@ func (a *SettingController) getUserSecret(c *gin.Context) { jsonObj(c, user, nil) } } + +func (a *SettingController) searchDatafiles(c *gin.Context) { + searchString := c.Query("query") + if searchString == "" { + err := common.NewError("data query parameter is empty") + jsonMsg(c, "Invalid query:", err) + return + } + found, err := a.settingService.SearchDatafiles(searchString) + if err != nil { + jsonMsg(c, "Something went wrong!", err) + return + } + jsonObj(c, found, nil) +} -- cgit v1.2.3 From b0871a6ef650e3776fd0f76799e698c20bed1fd2 Mon Sep 17 00:00:00 2001 From: Hamidreza Ghavami <70919649+hamid-gh98@users.noreply.github.com> Date: Fri, 12 May 2023 22:36:05 +0430 Subject: Change route path '/xui' to '/panel' --- web/controller/index.go | 2 +- web/controller/xui.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'web/controller') diff --git a/web/controller/index.go b/web/controller/index.go index 5b97a7cc..b0ee83f8 100644 --- a/web/controller/index.go +++ b/web/controller/index.go @@ -39,7 +39,7 @@ func (a *IndexController) initRouter(g *gin.RouterGroup) { func (a *IndexController) index(c *gin.Context) { if session.IsLogin(c) { - c.Redirect(http.StatusTemporaryRedirect, "xui/") + c.Redirect(http.StatusTemporaryRedirect, "panel/") return } html(c, "login.html", "pages.login.title", nil) diff --git a/web/controller/xui.go b/web/controller/xui.go index 1844181d..700bd52c 100644 --- a/web/controller/xui.go +++ b/web/controller/xui.go @@ -18,7 +18,7 @@ func NewXUIController(g *gin.RouterGroup) *XUIController { } func (a *XUIController) initRouter(g *gin.RouterGroup) { - g = g.Group("/xui") + g = g.Group("/panel") g.Use(a.checkLogin) g.GET("/", a.index) -- cgit v1.2.3