From 962af6a0d694c19b516690cea2fe8d22dbb49055 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Thu, 18 Apr 2024 19:43:18 +0300 Subject: user perf: drop useflags preferences Signed-off-by: Arthur Zamarin --- pkg/app/handler/useflags/index.go | 19 -------- pkg/app/handler/user/preferences.templ | 7 --- pkg/app/handler/user/useflags.templ | 89 ---------------------------------- pkg/app/serve.go | 7 +-- pkg/app/utils/userdata.go | 9 +--- 5 files changed, 2 insertions(+), 129 deletions(-) delete mode 100644 pkg/app/handler/useflags/index.go delete mode 100644 pkg/app/handler/user/useflags.templ (limited to 'pkg/app') diff --git a/pkg/app/handler/useflags/index.go b/pkg/app/handler/useflags/index.go deleted file mode 100644 index d08d62b..0000000 --- a/pkg/app/handler/useflags/index.go +++ /dev/null @@ -1,19 +0,0 @@ -// Used to display the landing page of the USE flag section - -package useflags - -import ( - "net/http" - "soko/pkg/app/utils" -) - -// Index renders a template to show the index page of the USE flags -// section containing a bubble chart of popular USE flags -func Default(w http.ResponseWriter, r *http.Request) { - userPreferences := utils.GetUserPreferences(r) - if userPreferences.Useflags.Layout == "bubble" { - http.Redirect(w, r, "/useflags/popular", http.StatusSeeOther) - } else { - http.Redirect(w, r, "/useflags/search", http.StatusSeeOther) - } -} diff --git a/pkg/app/handler/user/preferences.templ b/pkg/app/handler/user/preferences.templ index b0277ce..5119635 100644 --- a/pkg/app/handler/user/preferences.templ +++ b/pkg/app/handler/user/preferences.templ @@ -23,11 +23,6 @@ var viewTabs = []layout.SubTab{ Link: "/user/preferences/maintainers", Icon: "fa fa-users mr-1", }, - { - Name: "USE flags", - Link: "/user/preferences/useflags", - Icon: "fa fa-sliders mr-1", - }, } templ show(currentSubTab string, preferences models.UserPreferences) { @@ -39,8 +34,6 @@ templ show(currentSubTab string, preferences models.UserPreferences) { @packages(preferences.Packages) case "Maintainers": @maintainers(preferences.Maintainers) - case "USE flags": - @useflags(preferences.Useflags) } diff --git a/pkg/app/handler/user/useflags.templ b/pkg/app/handler/user/useflags.templ deleted file mode 100644 index d47f931..0000000 --- a/pkg/app/handler/user/useflags.templ +++ /dev/null @@ -1,89 +0,0 @@ -package user - -import "encoding/base64" -import "encoding/json" -import "net/http" -import "time" -import "soko/pkg/app/utils" -import "soko/pkg/models" - -templ useflags(preferences models.UseflagsPreferences) { -
-
-
-
-
- Popular USE flags (default) -
-
-
-
- - -
-
-
-
-
-
- USE flags search -
-
-
-
- - -
-
-
-
- - Reset to Defaults -
-
-
- -} - -func Useflags(w http.ResponseWriter, r *http.Request) { - userPreferences := utils.GetUserPreferences(r) - r.ParseForm() - // default use flag page - layout := r.Form.Get("useflag-default-page") - if layout == "bubble" || layout == "search" { - userPreferences.Useflags.Layout = layout - } - // store cookie - encodedUserPreferences, err := json.Marshal(&userPreferences.Useflags) - if err == nil { - sEnc := base64.StdEncoding.EncodeToString(encodedUserPreferences) - addCookie(w, "userpref_useflags", "/", sEnc, 365*24*time.Hour) - } - http.Redirect(w, r, "/user/preferences/useflags", http.StatusSeeOther) -} - -func ResetUseflags(w http.ResponseWriter, r *http.Request) { - userPreferences := utils.GetDefaultUserPreferences() - encodedUserPreferences, err := json.Marshal(&userPreferences.Useflags) - if err == nil { - sEnc := base64.StdEncoding.EncodeToString(encodedUserPreferences) - addCookie(w, "userpref_useflags", "/", sEnc, 365*24*time.Hour) - } - http.Redirect(w, r, "/user/preferences/useflags", http.StatusSeeOther) -} diff --git a/pkg/app/serve.go b/pkg/app/serve.go index 1f09b17..b54d4f2 100644 --- a/pkg/app/serve.go +++ b/pkg/app/serve.go @@ -44,6 +44,7 @@ func Serve() { setRoute("GET /categories/{category}/stabilization.list", categories.ShowStabilizationFile) setRoute("GET /categories/{category}/stabilization.xml", categories.ShowStabilizationFile) + redirect("GET /useflags", "/useflags/popular") setRoute("GET /useflags/popular.json", useflags.Popular) setRoute("GET /useflags/suggest.json", useflags.Suggest) setRoute("GET /useflags/search", useflags.Search) @@ -51,7 +52,6 @@ func Serve() { setRoute("GET /useflags/local", useflags.Local) setRoute("GET /useflags/expand", useflags.Expand) setRoute("GET /useflags/popular", useflags.PopularPage) - setRoute("GET /useflags", useflags.Default) setRoute("GET /useflags/{useflag}", useflags.Show) redirect("GET /arches", "/arches/amd64/keyworded") @@ -110,8 +110,6 @@ func Serve() { setRoute("GET /user/preferences/general", user.Preferences("General")) setRoute("GET /user/preferences/packages", user.Preferences("Packages")) setRoute("GET /user/preferences/maintainers", user.Preferences("Maintainers")) - setRoute("GET /user/preferences/useflags", user.Preferences("USE flags")) - setRoute("GET /user/preferences/arches", user.Preferences("Architectures")) setRoute("/user/preferences/general/layout", user.General) setRoute("/user/preferences/general/reset", user.ResetGeneral) @@ -119,9 +117,6 @@ func Serve() { setRoute("/user/preferences/packages/edit", user.EditPackagesPreferences) setRoute("/user/preferences/packages/reset", user.ResetPackages) - setRoute("/user/preferences/useflags/edit", user.Useflags) - setRoute("/user/preferences/useflags/reset", user.ResetUseflags) - setRoute("/user/preferences/maintainers/edit", user.Maintainers) setRoute("/user/preferences/maintainers/reset", user.ResetMaintainers) diff --git a/pkg/app/utils/userdata.go b/pkg/app/utils/userdata.go index acff520..dc4258b 100644 --- a/pkg/app/utils/userdata.go +++ b/pkg/app/utils/userdata.go @@ -38,14 +38,7 @@ func GetUserPreferences(r *http.Request) models.UserPreferences { } } - cookie, err = r.Cookie("userpref_useflags") - if err == nil { - cookieValue, err := b64.StdEncoding.DecodeString(cookie.Value) - if err == nil { - json.Unmarshal(cookieValue, &userPreferences.Useflags) - } - } - + // old cookie: userpref_useflags // old cookie: userpref_arches userPreferences.Sanitize() -- cgit v1.2.3-65-gdbad