NoRoutes/vibetree
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolidate Item Types, Users, and Settings into one Settings section

Browse Source 
The navbar previously listed Item Types, Users, and Settings as three
separate top-level links. They now live under a single "Settings" entry
in the navbar, backed by one unified section with a left sub-nav (General,
Item Types, Users) shared across all three areas so it reads as one
settings panel rather than three disconnected admin pages.

- New templates/partials/settings_nav.html shared sub-nav, included by
  settings.html, itemtypes_list/form.html, and users_list/form.html.
- Routes moved under /settings/: /item-types* -> /settings/item-types*,
  /users* -> /settings/users*. All redirects, form actions, and the
  item-type custom-field JS base action updated to match.
This commit is contained in:
Owen
2026-08-17 15:30:50 -05:00
parent 4ceb1cbc03
commit 62bdcb2428
10 changed files with 186 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/handlers_itemtypes.go
+7 -7
View File
@@ -46,7 +46,7 @@ func (a *App) handleItemTypeCreate(w http.ResponseWriter, r *http.Request) {
a.Render(w, http.StatusBadRequest, "itemtypes_form", itemTypeFormData{User: currentUser(r), ItemType: it, FieldTypes: models.AllFieldTypes, Error: err.Error()})
return
}
http.Redirect(w, r, "/item-types/"+strconv.FormatInt(it.ID, 10)+"/edit", http.StatusSeeOther)
http.Redirect(w, r, "/settings/item-types/"+strconv.FormatInt(it.ID, 10)+"/edit", http.StatusSeeOther)
}
func (a *App) handleItemTypeEditForm(w http.ResponseWriter, r *http.Request) {
@@ -87,7 +87,7 @@ func (a *App) handleItemTypeUpdate(w http.ResponseWriter, r *http.Request) {
a.Render(w, http.StatusBadRequest, "itemtypes_form", itemTypeFormData{User: currentUser(r), ItemType: it, FieldTypes: models.AllFieldTypes, Error: err.Error()})
return
}
http.Redirect(w, r, "/item-types/"+strconv.FormatInt(id, 10)+"/edit", http.StatusSeeOther)
http.Redirect(w, r, "/settings/item-types/"+strconv.FormatInt(id, 10)+"/edit", http.StatusSeeOther)
}
func (a *App) handleItemTypeDelete(w http.ResponseWriter, r *http.Request) {
@@ -97,10 +97,10 @@ func (a *App) handleItemTypeDelete(w http.ResponseWriter, r *http.Request) {
return
}
if err := a.ItemTypes.Delete(r.Context(), id); err != nil {
http.Redirect(w, r, "/item-types/"+strconv.FormatInt(id, 10)+"/edit?error="+err.Error(), http.StatusSeeOther)
http.Redirect(w, r, "/settings/item-types/"+strconv.FormatInt(id, 10)+"/edit?error="+err.Error(), http.StatusSeeOther)
return
}
http.Redirect(w, r, "/item-types", http.StatusSeeOther)
http.Redirect(w, r, "/settings/item-types", http.StatusSeeOther)
}
func (a *App) handleFieldCreate(w http.ResponseWriter, r *http.Request) {
@@ -124,7 +124,7 @@ func (a *App) handleFieldCreate(w http.ResponseWriter, r *http.Request) {
if err := a.ItemTypes.CreateField(r.Context(), f); err != nil {
a.Log.Warn("create field failed", "error", err)
}
http.Redirect(w, r, "/item-types/"+strconv.FormatInt(id, 10)+"/edit", http.StatusSeeOther)
http.Redirect(w, r, "/settings/item-types/"+strconv.FormatInt(id, 10)+"/edit", http.StatusSeeOther)
}
func (a *App) handleFieldUpdate(w http.ResponseWriter, r *http.Request) {
@@ -159,7 +159,7 @@ func (a *App) handleFieldUpdate(w http.ResponseWriter, r *http.Request) {
if err := a.ItemTypes.UpdateField(r.Context(), f); err != nil {
a.Log.Warn("update field failed", "error", err)
}
http.Redirect(w, r, "/item-types/"+strconv.FormatInt(itemTypeID, 10)+"/edit", http.StatusSeeOther)
http.Redirect(w, r, "/settings/item-types/"+strconv.FormatInt(itemTypeID, 10)+"/edit", http.StatusSeeOther)
}
func (a *App) handleFieldDelete(w http.ResponseWriter, r *http.Request) {
@@ -176,7 +176,7 @@ func (a *App) handleFieldDelete(w http.ResponseWriter, r *http.Request) {
if err := a.ItemTypes.DeleteField(r.Context(), fieldID); err != nil {
a.Log.Warn("delete field failed", "error", err)
}
http.Redirect(w, r, "/item-types/"+strconv.FormatInt(itemTypeID, 10)+"/edit", http.StatusSeeOther)
http.Redirect(w, r, "/settings/item-types/"+strconv.FormatInt(itemTypeID, 10)+"/edit", http.StatusSeeOther)
}
func atoiDefault(s string, def int) int {
internal/web/handlers_users.go
+4 -4
View File
@@ -50,7 +50,7 @@ func (a *App) handleUserCreate(w http.ResponseWriter, r *http.Request) {
a.Render(w, http.StatusBadRequest, "users_form", userFormData{User: currentUser(r), EditUser: u, Error: err.Error()})
return
}
http.Redirect(w, r, "/users", http.StatusSeeOther)
http.Redirect(w, r, "/settings/users", http.StatusSeeOther)
}
func (a *App) handleUserEditForm(w http.ResponseWriter, r *http.Request) {
@@ -92,7 +92,7 @@ func (a *App) handleUserUpdate(w http.ResponseWriter, r *http.Request) {
a.Render(w, http.StatusBadRequest, "users_form", userFormData{User: currentUser(r), EditUser: u, Error: err.Error()})
return
}
http.Redirect(w, r, "/users", http.StatusSeeOther)
http.Redirect(w, r, "/settings/users", http.StatusSeeOther)
}
func (a *App) handleUserPassword(w http.ResponseWriter, r *http.Request) {
@@ -111,7 +111,7 @@ func (a *App) handleUserPassword(w http.ResponseWriter, r *http.Request) {
a.Log.Warn("set password failed", "error", err)
}
}
http.Redirect(w, r, "/users/"+strconv.FormatInt(id, 10)+"/edit", http.StatusSeeOther)
http.Redirect(w, r, "/settings/users/"+strconv.FormatInt(id, 10)+"/edit", http.StatusSeeOther)
}
func (a *App) handleUserDelete(w http.ResponseWriter, r *http.Request) {
@@ -123,5 +123,5 @@ func (a *App) handleUserDelete(w http.ResponseWriter, r *http.Request) {
if err := a.Users.Delete(r.Context(), id); err != nil {
a.Log.Warn("delete user failed", "error", err)
}
http.Redirect(w, r, "/users", http.StatusSeeOther)
http.Redirect(w, r, "/settings/users", http.StatusSeeOther)
}
internal/web/router.go
+21 -21
View File
@@ -59,27 +59,9 @@ func (a *App) Router() http.Handler {
mux.HandleFunc("GET /export/assets.csv", a.requireLogin(a.handleExportCSV))
mux.HandleFunc("POST /import/assets.csv", a.requireAdmin(a.handleImportCSV))
// Item types (admin, traditional pages)
mux.HandleFunc("GET /item-types", a.requireAdmin(a.handleItemTypesList))
mux.HandleFunc("GET /item-types/new", a.requireAdmin(a.handleItemTypeNewForm))
mux.HandleFunc("POST /item-types", a.requireAdmin(a.handleItemTypeCreate))
mux.HandleFunc("GET /item-types/{id}/edit", a.requireAdmin(a.handleItemTypeEditForm))
mux.HandleFunc("POST /item-types/{id}", a.requireAdmin(a.handleItemTypeUpdate))
mux.HandleFunc("POST /item-types/{id}/delete", a.requireAdmin(a.handleItemTypeDelete))
mux.HandleFunc("POST /item-types/{id}/fields", a.requireAdmin(a.handleFieldCreate))
mux.HandleFunc("POST /item-types/{id}/fields/{fieldID}", a.requireAdmin(a.handleFieldUpdate))
mux.HandleFunc("POST /item-types/{id}/fields/{fieldID}/delete", a.requireAdmin(a.handleFieldDelete))
// Users (admin, traditional pages)
mux.HandleFunc("GET /users", a.requireAdmin(a.handleUsersList))
mux.HandleFunc("GET /users/new", a.requireAdmin(a.handleUserNewForm))
mux.HandleFunc("POST /users", a.requireAdmin(a.handleUserCreate))
mux.HandleFunc("GET /users/{id}/edit", a.requireAdmin(a.handleUserEditForm))
mux.HandleFunc("POST /users/{id}", a.requireAdmin(a.handleUserUpdate))
mux.HandleFunc("POST /users/{id}/password", a.requireAdmin(a.handleUserPassword))
mux.HandleFunc("POST /users/{id}/delete", a.requireAdmin(a.handleUserDelete))
// Settings (admin, traditional page)
// Settings (admin, traditional pages) - Item Types, Users, and general
// settings all live under one unified /settings section with shared
// sub-navigation, rather than as separate top-level nav items.
mux.HandleFunc("GET /settings", a.requireAdmin(a.handleSettingsPage))
mux.HandleFunc("POST /settings/general", a.requireAdmin(a.handleSettingsGeneral))
mux.HandleFunc("POST /settings/statuses", a.requireAdmin(a.handleStatusCreate))
@@ -87,6 +69,24 @@ func (a *App) Router() http.Handler {
mux.HandleFunc("POST /settings/statuses/{id}/delete", a.requireAdmin(a.handleStatusDelete))
mux.HandleFunc("POST /settings/statuses/{id}/reorder", a.requireAdmin(a.handleStatusReorder))
mux.HandleFunc("GET /settings/item-types", a.requireAdmin(a.handleItemTypesList))
mux.HandleFunc("GET /settings/item-types/new", a.requireAdmin(a.handleItemTypeNewForm))
mux.HandleFunc("POST /settings/item-types", a.requireAdmin(a.handleItemTypeCreate))
mux.HandleFunc("GET /settings/item-types/{id}/edit", a.requireAdmin(a.handleItemTypeEditForm))
mux.HandleFunc("POST /settings/item-types/{id}", a.requireAdmin(a.handleItemTypeUpdate))
mux.HandleFunc("POST /settings/item-types/{id}/delete", a.requireAdmin(a.handleItemTypeDelete))
mux.HandleFunc("POST /settings/item-types/{id}/fields", a.requireAdmin(a.handleFieldCreate))
mux.HandleFunc("POST /settings/item-types/{id}/fields/{fieldID}", a.requireAdmin(a.handleFieldUpdate))
mux.HandleFunc("POST /settings/item-types/{id}/fields/{fieldID}/delete", a.requireAdmin(a.handleFieldDelete))
mux.HandleFunc("GET /settings/users", a.requireAdmin(a.handleUsersList))
mux.HandleFunc("GET /settings/users/new", a.requireAdmin(a.handleUserNewForm))
mux.HandleFunc("POST /settings/users", a.requireAdmin(a.handleUserCreate))
mux.HandleFunc("GET /settings/users/{id}/edit", a.requireAdmin(a.handleUserEditForm))
mux.HandleFunc("POST /settings/users/{id}", a.requireAdmin(a.handleUserUpdate))
mux.HandleFunc("POST /settings/users/{id}/password", a.requireAdmin(a.handleUserPassword))
mux.HandleFunc("POST /settings/users/{id}/delete", a.requireAdmin(a.handleUserDelete))
return a.loadSession(mux)
}