rename database package -> query

This commit is contained in:
2025-03-10 14:50:57 -04:00
parent 78aac7093f
commit 5dc875107b
9 changed files with 114 additions and 73 deletions

View File

@@ -9,7 +9,7 @@ import (
. "maragu.dev/gomponents"
. "maragu.dev/gomponents/html"
"maxwarden/database"
"maxwarden/query"
"maxwarden/entries"
"maxwarden/middleware"
@@ -20,7 +20,7 @@ import (
func VaultHxHandler(w http.ResponseWriter, r *http.Request) {
identity := middleware.GetIdentity(r)
filter := database.ParseFilterFromRequest(r)
filter := query.ParseFilterFromRequest(r)
filter.Pagination.Enabled = true
entryFilter := entries.EntryFilter{
@@ -32,7 +32,7 @@ func VaultHxHandler(w http.ResponseWriter, r *http.Request) {
// fetch entities from filter function
// this first counts the possible items before pagination
searchFilter := entries.EntryFilter{
Filter: database.NewFilterFromSearch(filter.Search),
Filter: query.NewFilterFromSearch(filter.Search),
UserId: identity.UserID,
MasterKey: identity.MasterKey,
}
@@ -46,7 +46,7 @@ func VaultHxHandler(w http.ResponseWriter, r *http.Request) {
entryFilter.Filter.Pagination.GeneratePagination(len(searchItems), len(entryList))
// Col header names and referenced database col names
cols := []database.ColInfo{
cols := []query.ColInfo{
{DbName: "Description", DisplayName: "Description", Sortable: true},
{DisplayName: "Username"},
{DisplayName: "Password"},