move datepicker buttons to bottom

.github/workflows/partial-publish.yaml

@@ -60,7 +60,6 @@ jobs:
             --tag ghcr.io/hay-kot/homebox:nightly \
             --tag ghcr.io/hay-kot/homebox:latest \
             --tag ghcr.io/hay-kot/homebox:${{ inputs.tag }} \
-            --build-arg VERSION=${{ inputs.tag }} \
             --build-arg COMMIT=$(git rev-parse HEAD) \
             --build-arg BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --platform linux/amd64,linux/arm64,linux/arm/v7 .

Dockerfile

@@ -12,7 +12,6 @@ RUN pnpm build
 FROM golang:alpine AS builder
 ARG BUILD_TIME
 ARG COMMIT
-ARG VERSION
 RUN apk update && \
     apk upgrade && \
     apk add --update git build-base gcc g++
@@ -23,7 +22,7 @@ RUN go get -d -v ./...
 RUN rm -rf ./app/api/public
 COPY --from=frontend-builder /app/.output/public ./app/api/public
 RUN CGO_ENABLED=1 GOOS=linux go build \
-    -ldflags "-s -w -X main.commit=$COMMIT -X main.buildTime=$BUILD_TIME -X main.version=$VERSION"  \
+    -ldflags "-s -w -X main.Commit=$COMMIT -X main.BuildTime=$BUILD_TIME" \
     -o /go/bin/api \
     -v ./app/api/*.go
 

backend/app/api/demo.go

@@ -21,7 +21,7 @@ func (a *app) SetupDemo() {
 
 	var (
 		registration = services.UserRegistration{
-			Email:    "demo@example.com",
+			Email:    "demo@email.com",
 			Name:     "Demo",
 			Password: "demo",
 		}

backend/app/api/docs/docs.go

@@ -70,51 +70,26 @@ const docTemplate = `{
                     "Items"
                 ],
                 "summary": "Get All Items",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "search string",
-                        "name": "q",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "page number",
-                        "name": "page",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "items per page",
-                        "name": "pageSize",
-                        "in": "query"
-                    },
-                    {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        },
-                        "collectionFormat": "multi",
-                        "description": "label Ids",
-                        "name": "labels",
-                        "in": "query"
-                    },
-                    {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        },
-                        "collectionFormat": "multi",
-                        "description": "location Ids",
-                        "name": "locations",
-                        "in": "query"
-                    }
-                ],
                 "responses": {
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/repo.PaginationResult-repo_ItemSummary"
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/server.Results"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "items": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/repo.ItemSummary"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
                         }
                     }
                 }
@@ -178,7 +153,7 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -279,7 +254,7 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -379,7 +354,7 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "200": {
-                        "description": "OK"
+                        "description": ""
                     }
                 }
             }
@@ -495,7 +470,7 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -659,7 +634,7 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -823,7 +798,7 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -871,7 +846,7 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -928,7 +903,7 @@ const docTemplate = `{
                 "summary": "User Logout",
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -947,7 +922,7 @@ const docTemplate = `{
                 "summary": "User Token Refresh",
                 "responses": {
                     "200": {
-                        "description": "OK"
+                        "description": ""
                     }
                 }
             }
@@ -974,7 +949,7 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -1074,7 +1049,7 @@ const docTemplate = `{
                 "summary": "Deletes the user account",
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -1095,7 +1070,7 @@ const docTemplate = `{
                 "summary": "Update the current user's password // TODO:",
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -1513,26 +1488,6 @@ const docTemplate = `{
                 }
             }
         },
-        "repo.PaginationResult-repo_ItemSummary": {
-            "type": "object",
-            "properties": {
-                "items": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/repo.ItemSummary"
-                    }
-                },
-                "page": {
-                    "type": "integer"
-                },
-                "pageSize": {
-                    "type": "integer"
-                },
-                "total": {
-                    "type": "integer"
-                }
-            }
-        },
         "repo.UserOut": {
             "type": "object",
             "properties": {
@@ -1586,7 +1541,9 @@ const docTemplate = `{
         "server.Results": {
             "type": "object",
             "properties": {
-                "items": {}
+                "items": {
+                    "type": "any"
+                }
             }
         },
         "server.ValidationError": {

backend/app/api/docs/swagger.json

@@ -62,51 +62,26 @@
                     "Items"
                 ],
                 "summary": "Get All Items",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "search string",
-                        "name": "q",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "page number",
-                        "name": "page",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "items per page",
-                        "name": "pageSize",
-                        "in": "query"
-                    },
-                    {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        },
-                        "collectionFormat": "multi",
-                        "description": "label Ids",
-                        "name": "labels",
-                        "in": "query"
-                    },
-                    {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        },
-                        "collectionFormat": "multi",
-                        "description": "location Ids",
-                        "name": "locations",
-                        "in": "query"
-                    }
-                ],
                 "responses": {
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/repo.PaginationResult-repo_ItemSummary"
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/server.Results"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "items": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/repo.ItemSummary"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
                         }
                     }
                 }
@@ -170,7 +145,7 @@
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -271,7 +246,7 @@
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -371,7 +346,7 @@
                 ],
                 "responses": {
                     "200": {
-                        "description": "OK"
+                        "description": ""
                     }
                 }
             }
@@ -487,7 +462,7 @@
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -651,7 +626,7 @@
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -815,7 +790,7 @@
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -863,7 +838,7 @@
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -920,7 +895,7 @@
                 "summary": "User Logout",
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -939,7 +914,7 @@
                 "summary": "User Token Refresh",
                 "responses": {
                     "200": {
-                        "description": "OK"
+                        "description": ""
                     }
                 }
             }
@@ -966,7 +941,7 @@
                 ],
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -1066,7 +1041,7 @@
                 "summary": "Deletes the user account",
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -1087,7 +1062,7 @@
                 "summary": "Update the current user's password // TODO:",
                 "responses": {
                     "204": {
-                        "description": "No Content"
+                        "description": ""
                     }
                 }
             }
@@ -1505,26 +1480,6 @@
                 }
             }
         },
-        "repo.PaginationResult-repo_ItemSummary": {
-            "type": "object",
-            "properties": {
-                "items": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/repo.ItemSummary"
-                    }
-                },
-                "page": {
-                    "type": "integer"
-                },
-                "pageSize": {
-                    "type": "integer"
-                },
-                "total": {
-                    "type": "integer"
-                }
-            }
-        },
         "repo.UserOut": {
             "type": "object",
             "properties": {
@@ -1578,7 +1533,9 @@
         "server.Results": {
             "type": "object",
             "properties": {
-                "items": {}
+                "items": {
+                    "type": "any"
+                }
             }
         },
         "server.ValidationError": {

backend/app/api/docs/swagger.yaml

@@ -275,19 +275,6 @@ definitions:
       updatedAt:
         type: string
     type: object
-  repo.PaginationResult-repo_ItemSummary:
-    properties:
-      items:
-        items:
-          $ref: '#/definitions/repo.ItemSummary'
-        type: array
-      page:
-        type: integer
-      pageSize:
-        type: integer
-      total:
-        type: integer
-    type: object
   repo.UserOut:
     properties:
       email:
@@ -323,7 +310,8 @@ definitions:
     type: object
   server.Results:
     properties:
-      items: {}
+      items:
+        type: any
     type: object
   server.ValidationError:
     properties:
@@ -438,40 +426,20 @@ paths:
       - User
   /v1/items:
     get:
-      parameters:
-      - description: search string
-        in: query
-        name: q
-        type: string
-      - description: page number
-        in: query
-        name: page
-        type: integer
-      - description: items per page
-        in: query
-        name: pageSize
-        type: integer
-      - collectionFormat: multi
-        description: label Ids
-        in: query
-        items:
-          type: string
-        name: labels
-        type: array
-      - collectionFormat: multi
-        description: location Ids
-        in: query
-        items:
-          type: string
-        name: locations
-        type: array
       produces:
       - application/json
       responses:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/repo.PaginationResult-repo_ItemSummary'
+            allOf:
+            - $ref: '#/definitions/server.Results'
+            - properties:
+                items:
+                  items:
+                    $ref: '#/definitions/repo.ItemSummary'
+                  type: array
+              type: object
       security:
       - Bearer: []
       summary: Get All Items
@@ -509,7 +477,7 @@ paths:
       - application/json
       responses:
         "204":
-          description: No Content
+          description: ""
       security:
       - Bearer: []
       summary: deletes a item
@@ -615,7 +583,7 @@ paths:
         type: string
       responses:
         "204":
-          description: No Content
+          description: ""
       security:
       - Bearer: []
       summary: retrieves an attachment for an item
@@ -690,7 +658,7 @@ paths:
       - application/octet-stream
       responses:
         "200":
-          description: OK
+          description: ""
       security:
       - Bearer: []
       summary: retrieves an attachment for an item
@@ -708,7 +676,7 @@ paths:
       - application/json
       responses:
         "204":
-          description: No Content
+          description: ""
       security:
       - Bearer: []
       summary: imports items into the database
@@ -767,7 +735,7 @@ paths:
       - application/json
       responses:
         "204":
-          description: No Content
+          description: ""
       security:
       - Bearer: []
       summary: deletes a label
@@ -864,7 +832,7 @@ paths:
       - application/json
       responses:
         "204":
-          description: No Content
+          description: ""
       security:
       - Bearer: []
       summary: deletes a location
@@ -931,7 +899,7 @@ paths:
           $ref: '#/definitions/v1.ChangePassword'
       responses:
         "204":
-          description: No Content
+          description: ""
       security:
       - Bearer: []
       summary: Updates the users password
@@ -967,7 +935,7 @@ paths:
     post:
       responses:
         "204":
-          description: No Content
+          description: ""
       security:
       - Bearer: []
       summary: User Logout
@@ -980,7 +948,7 @@ paths:
         This does not validate that the user still exists within the database.
       responses:
         "200":
-          description: OK
+          description: ""
       security:
       - Bearer: []
       summary: User Token Refresh
@@ -999,7 +967,7 @@ paths:
       - application/json
       responses:
         "204":
-          description: No Content
+          description: ""
       summary: Get the current user
       tags:
       - User
@@ -1009,7 +977,7 @@ paths:
       - application/json
       responses:
         "204":
-          description: No Content
+          description: ""
       security:
       - Bearer: []
       summary: Deletes the user account
@@ -1064,7 +1032,7 @@ paths:
       - application/json
       responses:
         "204":
-          description: No Content
+          description: ""
       security:
       - Bearer: []
       summary: 'Update the current user''s password // TODO:'

backend/app/api/main.go

@@ -20,21 +20,21 @@ import (
 )
 
 var (
-	version   = "nightly"
+	Version   = "0.1.0"
-	commit    = "HEAD"
+	Commit    = "HEAD"
-	buildTime = "now"
+	BuildTime = "now"
 )
 
-// @title                      Go API Templates
+// @title                       Go API Templates
-// @version                    1.0
+// @version                     1.0
-// @description                This is a simple Rest API Server Template that implements some basic User and Authentication patterns to help you get started and bootstrap your next project!.
+// @description                 This is a simple Rest API Server Template that implements some basic User and Authentication patterns to help you get started and bootstrap your next project!.
-// @contact.name               Don't
+// @contact.name                Don't
-// @license.name               MIT
+// @license.name                MIT
-// @BasePath                   /api
+// @BasePath                    /api
-// @securityDefinitions.apikey Bearer
+// @securityDefinitions.apikey  Bearer
-// @in                         header
+// @in                          header
-// @name                       Authorization
+// @name                        Authorization
-// @description                "Type 'Bearer TOKEN' to correctly set the API Key"
+// @description                 "Type 'Bearer TOKEN' to correctly set the API Key"
 func main() {
 	cfg, err := config.New()
 	if err != nil {

backend/app/api/routes.go

@@ -47,9 +47,9 @@ func (a *app) newRouter(repos *repo.AllRepos) *chi.Mux {
 		v1.WithDemoStatus(a.conf.Demo), // Disable Password Change in Demo Mode
 	)
 	r.Get(v1Base("/status"), v1Ctrl.HandleBase(func() bool { return true }, v1.Build{
-		Version:   version,
+		Version:   Version,
-		Commit:    commit,
+		Commit:    Commit,
-		BuildTime: buildTime,
+		BuildTime: BuildTime,
 	}))
 
 	r.Post(v1Base("/users/register"), v1Ctrl.HandleUserRegistration())

backend/app/api/v1/controller.go

@@ -66,11 +66,11 @@ func NewControllerV1(svc *services.AllServices, options ...func(*V1Controller))
 type ReadyFunc func() bool
 
 // HandleBase godoc
-// @Summary Retrieves the basic information about the API
+// @Summary  Retrieves the basic information about the API
-// @Tags    Base
+// @Tags     Base
-// @Produce json
+// @Produce  json
-// @Success 200 {object} ApiSummary
+// @Success  200  {object}  ApiSummary
-// @Router  /v1/status [GET]
+// @Router   /v1/status [GET]
 func (ctrl *V1Controller) HandleBase(ready ReadyFunc, build Build) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		server.Respond(w, http.StatusOK, ApiSummary{

backend/app/api/v1/v1_ctrl_auth.go

@@ -23,15 +23,15 @@ type (
 )
 
 // HandleAuthLogin godoc
-// @Summary User Login
+// @Summary  User Login
-// @Tags    Authentication
+// @Tags     Authentication
-// @Accept  x-www-form-urlencoded
+// @Accept   x-www-form-urlencoded
-// @Accept  application/json
+// @Accept   application/json
-// @Param   username formData string false "string" example(admin@admin.com)
+// @Param    username  formData  string  false  "string"  example(admin@admin.com)
-// @Param   password formData string false "string" example(admin)
+// @Param    password  formData  string  false  "string"  example(admin)
-// @Produce json
+// @Produce  json
-// @Success 200 {object} TokenResponse
+// @Success  200  {object}  TokenResponse
-// @Router  /v1/users/login [POST]
+// @Router   /v1/users/login [POST]
 func (ctrl *V1Controller) HandleAuthLogin() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		loginForm := &LoginForm{}
@@ -80,11 +80,11 @@ func (ctrl *V1Controller) HandleAuthLogin() http.HandlerFunc {
 }
 
 // HandleAuthLogout godoc
-// @Summary  User Logout
+// @Summary   User Logout
-// @Tags     Authentication
+// @Tags      Authentication
-// @Success  204
+// @Success   204
-// @Router   /v1/users/logout [POST]
+// @Router    /v1/users/logout [POST]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleAuthLogout() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		token := services.UseTokenCtx(r.Context())
@@ -106,13 +106,13 @@ func (ctrl *V1Controller) HandleAuthLogout() http.HandlerFunc {
 }
 
 // HandleAuthLogout godoc
-// @Summary     User Token Refresh
+// @Summary      User Token Refresh
-// @Description handleAuthRefresh returns a handler that will issue a new token from an existing token.
+// @Description  handleAuthRefresh returns a handler that will issue a new token from an existing token.
-// @Description This does not validate that the user still exists within the database.
+// @Description  This does not validate that the user still exists within the database.
-// @Tags        Authentication
+// @Tags         Authentication
-// @Success     200
+// @Success      200
-// @Router      /v1/users/refresh [GET]
+// @Router       /v1/users/refresh [GET]
-// @Security    Bearer
+// @Security     Bearer
 func (ctrl *V1Controller) HandleAuthRefresh() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		requestToken := services.UseTokenCtx(r.Context())

backend/app/api/v1/v1_ctrl_group.go

@@ -23,13 +23,13 @@ type (
 )
 
 // HandleUserSelf godoc
-// @Summary  Get the current user
+// @Summary   Get the current user
-// @Tags     User
+// @Tags      User
-// @Produce  json
+// @Produce   json
-// @Param    payload body     GroupInvitationCreate true "User Data"
+// @Param     payload  body      GroupInvitationCreate  true  "User Data"
-// @Success  200     {object} GroupInvitation
+// @Success   200      {object}  GroupInvitation
-// @Router   /v1/groups/invitations [Post]
+// @Router    /v1/groups/invitations [Post]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleGroupInvitationsCreate() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		data := GroupInvitationCreate{}

backend/app/api/v1/v1_ctrl_items.go

@@ -3,84 +3,41 @@ package v1
 import (
 	"encoding/csv"
 	"net/http"
-	"net/url"
-	"strconv"
 
-	"github.com/google/uuid"
 	"github.com/hay-kot/homebox/backend/internal/repo"
 	"github.com/hay-kot/homebox/backend/internal/services"
 	"github.com/hay-kot/homebox/backend/pkgs/server"
 	"github.com/rs/zerolog/log"
 )
 
-func uuidList(params url.Values, key string) []uuid.UUID {
-	var ids []uuid.UUID
-	for _, id := range params[key] {
-		uid, err := uuid.Parse(id)
-		if err != nil {
-			continue
-		}
-		ids = append(ids, uid)
-	}
-	return ids
-}
-
-func intOrNegativeOne(s string) int {
-	i, err := strconv.Atoi(s)
-	if err != nil {
-		return -1
-	}
-	return i
-}
-
-func extractQuery(r *http.Request) repo.ItemQuery {
-	params := r.URL.Query()
-
-	page := intOrNegativeOne(params.Get("page"))
-	perPage := intOrNegativeOne(params.Get("perPage"))
-
-	return repo.ItemQuery{
-		Page:        page,
-		PageSize:    perPage,
-		Search:      params.Get("q"),
-		LocationIDs: uuidList(params, "locations"),
-		LabelIDs:    uuidList(params, "labels"),
-	}
-}
-
 // HandleItemsGetAll godoc
-// @Summary  Get All Items
+// @Summary   Get All Items
-// @Tags     Items
+// @Tags      Items
-// @Produce  json
+// @Produce   json
-// @Param    q         query    string   false "search string"
+// @Success   200  {object}  server.Results{items=[]repo.ItemSummary}
-// @Param    page      query    int      false "page number"
+// @Router    /v1/items [GET]
-// @Param    pageSize  query    int      false "items per page"
+// @Security  Bearer
-// @Param    labels    query    []string false "label Ids"    collectionFormat(multi)
-// @Param    locations query    []string false "location Ids" collectionFormat(multi)
-// @Success  200       {object} repo.PaginationResult[repo.ItemSummary]{}
-// @Router   /v1/items [GET]
-// @Security Bearer
 func (ctrl *V1Controller) HandleItemsGetAll() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		ctx := services.NewContext(r.Context())
+		user := services.UseUserCtx(r.Context())
-		items, err := ctrl.svc.Items.Query(ctx, extractQuery(r))
+		items, err := ctrl.svc.Items.GetAll(r.Context(), user.GroupID)
 		if err != nil {
 			log.Err(err).Msg("failed to get items")
 			server.RespondServerError(w)
 			return
 		}
-		server.Respond(w, http.StatusOK, items)
+		server.Respond(w, http.StatusOK, server.Results{Items: items})
 	}
 }
 
 // HandleItemsCreate godoc
-// @Summary  Create a new item
+// @Summary   Create a new item
-// @Tags     Items
+// @Tags      Items
-// @Produce  json
+// @Produce   json
-// @Param    payload body     repo.ItemCreate true "Item Data"
+// @Param     payload  body      repo.ItemCreate  true  "Item Data"
-// @Success  200     {object} repo.ItemSummary
+// @Success   200      {object}  repo.ItemSummary
-// @Router   /v1/items [POST]
+// @Router    /v1/items [POST]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleItemsCreate() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		createData := repo.ItemCreate{}
@@ -103,13 +60,13 @@ func (ctrl *V1Controller) HandleItemsCreate() http.HandlerFunc {
 }
 
 // HandleItemDelete godocs
-// @Summary  deletes a item
+// @Summary   deletes a item
-// @Tags     Items
+// @Tags      Items
-// @Produce  json
+// @Produce   json
-// @Param    id path string true "Item ID"
+// @Param     id  path  string  true  "Item ID"
-// @Success  204
+// @Success   204
-// @Router   /v1/items/{id} [DELETE]
+// @Router    /v1/items/{id} [DELETE]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleItemDelete() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		uid, user, err := ctrl.partialParseIdAndUser(w, r)
@@ -128,13 +85,13 @@ func (ctrl *V1Controller) HandleItemDelete() http.HandlerFunc {
 }
 
 // HandleItemGet godocs
-// @Summary  Gets a item and fields
+// @Summary   Gets a item and fields
-// @Tags     Items
+// @Tags      Items
-// @Produce  json
+// @Produce   json
-// @Param    id  path     string true "Item ID"
+// @Param     id   path      string  true  "Item ID"
-// @Success  200 {object} repo.ItemOut
+// @Success   200      {object}  repo.ItemOut
-// @Router   /v1/items/{id} [GET]
+// @Router    /v1/items/{id} [GET]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleItemGet() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		uid, user, err := ctrl.partialParseIdAndUser(w, r)
@@ -153,14 +110,14 @@ func (ctrl *V1Controller) HandleItemGet() http.HandlerFunc {
 }
 
 // HandleItemUpdate godocs
-// @Summary  updates a item
+// @Summary   updates a item
-// @Tags     Items
+// @Tags      Items
-// @Produce  json
+// @Produce   json
-// @Param    id      path     string          true "Item ID"
+// @Param     id       path      string           true  "Item ID"
-// @Param    payload body     repo.ItemUpdate true "Item Data"
+// @Param     payload  body      repo.ItemUpdate  true  "Item Data"
-// @Success  200     {object} repo.ItemOut
+// @Success   200  {object}  repo.ItemOut
-// @Router   /v1/items/{id} [PUT]
+// @Router    /v1/items/{id} [PUT]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleItemUpdate() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		body := repo.ItemUpdate{}
@@ -186,13 +143,13 @@ func (ctrl *V1Controller) HandleItemUpdate() http.HandlerFunc {
 }
 
 // HandleItemsImport godocs
-// @Summary  imports items into the database
+// @Summary   imports items into the database
-// @Tags     Items
+// @Tags      Items
-// @Produce  json
+// @Produce   json
-// @Success  204
+// @Success   204
-// @Param    csv formData file true "Image to upload"
+// @Param     csv  formData  file  true  "Image to upload"
-// @Router   /v1/items/import [Post]
+// @Router    /v1/items/import [Post]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleItemsImport() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 

backend/app/api/v1/v1_ctrl_items_attachments.go

@@ -21,17 +21,17 @@ type (
 )
 
 // HandleItemsImport godocs
-// @Summary  imports items into the database
+// @Summary   imports items into the database
-// @Tags     Items
+// @Tags      Items
-// @Produce  json
+// @Produce   json
-// @Param    id   path     string true "Item ID"
+// @Param     id    path      string  true  "Item ID"
-// @Param    file formData file   true "File attachment"
+// @Param     file  formData  file    true  "File attachment"
-// @Param    type formData string true "Type of file"
+// @Param     type  formData  string  true  "Type of file"
-// @Param    name formData string true "name of the file including extension"
+// @Param     name  formData  string  true  "name of the file including extension"
-// @Success  200  {object} repo.ItemOut
+// @Success   200   {object}  repo.ItemOut
-// @Failure  422  {object} []server.ValidationError
+// @Failure   422   {object}  []server.ValidationError
-// @Router   /v1/items/{id}/attachments [POST]
+// @Router    /v1/items/{id}/attachments [POST]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleItemAttachmentCreate() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		err := r.ParseMultipartForm(ctrl.maxUploadSize << 20)
@@ -98,14 +98,14 @@ func (ctrl *V1Controller) HandleItemAttachmentCreate() http.HandlerFunc {
 }
 
 // HandleItemAttachmentGet godocs
-// @Summary  retrieves an attachment for an item
+// @Summary   retrieves an attachment for an item
-// @Tags     Items
+// @Tags      Items
-// @Produce  application/octet-stream
+// @Produce   application/octet-stream
-// @Param    id    path  string true "Item ID"
+// @Param     id     path   string  true  "Item ID"
-// @Param    token query string true "Attachment token"
+// @Param     token  query  string  true  "Attachment token"
-// @Success  200
+// @Success   200
-// @Router   /v1/items/{id}/attachments/download [GET]
+// @Router    /v1/items/{id}/attachments/download [GET]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleItemAttachmentDownload() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		token := server.GetParam(r, "token", "")
@@ -125,39 +125,39 @@ func (ctrl *V1Controller) HandleItemAttachmentDownload() http.HandlerFunc {
 }
 
 // HandleItemAttachmentToken godocs
-// @Summary  retrieves an attachment for an item
+// @Summary   retrieves an attachment for an item
-// @Tags     Items
+// @Tags      Items
-// @Produce  application/octet-stream
+// @Produce   application/octet-stream
-// @Param    id            path     string true "Item ID"
+// @Param     id             path      string  true  "Item ID"
-// @Param    attachment_id path     string true "Attachment ID"
+// @Param     attachment_id  path      string  true  "Attachment ID"
-// @Success  200           {object} ItemAttachmentToken
+// @Success   200            {object}  ItemAttachmentToken
-// @Router   /v1/items/{id}/attachments/{attachment_id} [GET]
+// @Router    /v1/items/{id}/attachments/{attachment_id} [GET]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleItemAttachmentToken() http.HandlerFunc {
 	return ctrl.handleItemAttachmentsHandler
 }
 
 // HandleItemAttachmentDelete godocs
-// @Summary  retrieves an attachment for an item
+// @Summary   retrieves an attachment for an item
-// @Tags     Items
+// @Tags      Items
-// @Param    id            path string true "Item ID"
+// @Param     id             path  string  true  "Item ID"
-// @Param    attachment_id path string true "Attachment ID"
+// @Param     attachment_id  path  string  true  "Attachment ID"
-// @Success  204
+// @Success   204
-// @Router   /v1/items/{id}/attachments/{attachment_id} [DELETE]
+// @Router    /v1/items/{id}/attachments/{attachment_id} [DELETE]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleItemAttachmentDelete() http.HandlerFunc {
 	return ctrl.handleItemAttachmentsHandler
 }
 
 // HandleItemAttachmentUpdate godocs
-// @Summary  retrieves an attachment for an item
+// @Summary   retrieves an attachment for an item
-// @Tags     Items
+// @Tags      Items
-// @Param    id            path     string                    true "Item ID"
+// @Param     id             path      string                     true  "Item ID"
-// @Param    attachment_id path     string                    true "Attachment ID"
+// @Param     attachment_id  path      string                     true  "Attachment ID"
-// @Param    payload       body     repo.ItemAttachmentUpdate true "Attachment Update"
+// @Param     payload        body      repo.ItemAttachmentUpdate  true  "Attachment Update"
-// @Success  200           {object} repo.ItemOut
+// @Success   200            {object}  repo.ItemOut
-// @Router   /v1/items/{id}/attachments/{attachment_id} [PUT]
+// @Router    /v1/items/{id}/attachments/{attachment_id} [PUT]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleItemAttachmentUpdate() http.HandlerFunc {
 	return ctrl.handleItemAttachmentsHandler
 }

backend/app/api/v1/v1_ctrl_labels.go

@@ -11,12 +11,12 @@ import (
 )
 
 // HandleLabelsGetAll godoc
-// @Summary  Get All Labels
+// @Summary   Get All Labels
-// @Tags     Labels
+// @Tags      Labels
-// @Produce  json
+// @Produce   json
-// @Success  200 {object} server.Results{items=[]repo.LabelOut}
+// @Success   200  {object}  server.Results{items=[]repo.LabelOut}
-// @Router   /v1/labels [GET]
+// @Router    /v1/labels [GET]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleLabelsGetAll() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		user := services.UseUserCtx(r.Context())
@@ -31,13 +31,13 @@ func (ctrl *V1Controller) HandleLabelsGetAll() http.HandlerFunc {
 }
 
 // HandleLabelsCreate godoc
-// @Summary  Create a new label
+// @Summary   Create a new label
-// @Tags     Labels
+// @Tags      Labels
-// @Produce  json
+// @Produce   json
-// @Param    payload body     repo.LabelCreate true "Label Data"
+// @Param     payload  body      repo.LabelCreate  true  "Label Data"
-// @Success  200     {object} repo.LabelSummary
+// @Success   200      {object}  repo.LabelSummary
-// @Router   /v1/labels [POST]
+// @Router    /v1/labels [POST]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleLabelsCreate() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		createData := repo.LabelCreate{}
@@ -61,13 +61,13 @@ func (ctrl *V1Controller) HandleLabelsCreate() http.HandlerFunc {
 }
 
 // HandleLabelDelete godocs
-// @Summary  deletes a label
+// @Summary   deletes a label
-// @Tags     Labels
+// @Tags      Labels
-// @Produce  json
+// @Produce   json
-// @Param    id path string true "Label ID"
+// @Param     id   path      string  true  "Label ID"
-// @Success  204
+// @Success   204
-// @Router   /v1/labels/{id} [DELETE]
+// @Router    /v1/labels/{id} [DELETE]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleLabelDelete() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		uid, user, err := ctrl.partialParseIdAndUser(w, r)
@@ -86,13 +86,13 @@ func (ctrl *V1Controller) HandleLabelDelete() http.HandlerFunc {
 }
 
 // HandleLabelGet godocs
-// @Summary  Gets a label and fields
+// @Summary   Gets a label and fields
-// @Tags     Labels
+// @Tags      Labels
-// @Produce  json
+// @Produce   json
-// @Param    id  path     string true "Label ID"
+// @Param     id   path      string  true  "Label ID"
-// @Success  200 {object} repo.LabelOut
+// @Success   200  {object}  repo.LabelOut
-// @Router   /v1/labels/{id} [GET]
+// @Router    /v1/labels/{id} [GET]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleLabelGet() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		uid, user, err := ctrl.partialParseIdAndUser(w, r)
@@ -118,13 +118,13 @@ func (ctrl *V1Controller) HandleLabelGet() http.HandlerFunc {
 }
 
 // HandleLabelUpdate godocs
-// @Summary  updates a label
+// @Summary   updates a label
-// @Tags     Labels
+// @Tags      Labels
-// @Produce  json
+// @Produce   json
-// @Param    id  path     string true "Label ID"
+// @Param     id  path  string  true  "Label ID"
-// @Success  200 {object} repo.LabelOut
+// @Success   200  {object}  repo.LabelOut
-// @Router   /v1/labels/{id} [PUT]
+// @Router    /v1/labels/{id} [PUT]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleLabelUpdate() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		body := repo.LabelUpdate{}

backend/app/api/v1/v1_ctrl_locations.go

@@ -11,12 +11,12 @@ import (
 )
 
 // HandleLocationGetAll godoc
-// @Summary  Get All Locations
+// @Summary   Get All Locations
-// @Tags     Locations
+// @Tags      Locations
-// @Produce  json
+// @Produce   json
-// @Success  200 {object} server.Results{items=[]repo.LocationOutCount}
+// @Success   200  {object}  server.Results{items=[]repo.LocationOutCount}
-// @Router   /v1/locations [GET]
+// @Router    /v1/locations [GET]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleLocationGetAll() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		user := services.UseUserCtx(r.Context())
@@ -32,13 +32,13 @@ func (ctrl *V1Controller) HandleLocationGetAll() http.HandlerFunc {
 }
 
 // HandleLocationCreate godoc
-// @Summary  Create a new location
+// @Summary   Create a new location
-// @Tags     Locations
+// @Tags      Locations
-// @Produce  json
+// @Produce   json
-// @Param    payload body     repo.LocationCreate true "Location Data"
+// @Param     payload  body      repo.LocationCreate  true  "Location Data"
-// @Success  200     {object} repo.LocationSummary
+// @Success   200      {object}  repo.LocationSummary
-// @Router   /v1/locations [POST]
+// @Router    /v1/locations [POST]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleLocationCreate() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		createData := repo.LocationCreate{}
@@ -61,13 +61,13 @@ func (ctrl *V1Controller) HandleLocationCreate() http.HandlerFunc {
 }
 
 // HandleLocationDelete godocs
-// @Summary  deletes a location
+// @Summary   deletes a location
-// @Tags     Locations
+// @Tags      Locations
-// @Produce  json
+// @Produce   json
-// @Param    id path string true "Location ID"
+// @Param     id   path      string  true  "Location ID"
-// @Success  204
+// @Success   204
-// @Router   /v1/locations/{id} [DELETE]
+// @Router    /v1/locations/{id} [DELETE]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleLocationDelete() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		uid, user, err := ctrl.partialParseIdAndUser(w, r)
@@ -86,13 +86,13 @@ func (ctrl *V1Controller) HandleLocationDelete() http.HandlerFunc {
 }
 
 // HandleLocationGet godocs
-// @Summary  Gets a location and fields
+// @Summary   Gets a location and fields
-// @Tags     Locations
+// @Tags      Locations
-// @Produce  json
+// @Produce   json
-// @Param    id  path     string true "Location ID"
+// @Param     id   path      string  true  "Location ID"
-// @Success  200 {object} repo.LocationOut
+// @Success   200  {object}  repo.LocationOut
-// @Router   /v1/locations/{id} [GET]
+// @Router    /v1/locations/{id} [GET]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleLocationGet() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		uid, user, err := ctrl.partialParseIdAndUser(w, r)
@@ -123,13 +123,13 @@ func (ctrl *V1Controller) HandleLocationGet() http.HandlerFunc {
 }
 
 // HandleLocationUpdate godocs
-// @Summary  updates a location
+// @Summary   updates a location
-// @Tags     Locations
+// @Tags      Locations
-// @Produce  json
+// @Produce   json
-// @Param    id  path     string true "Location ID"
+// @Param     id  path  string  true  "Location ID"
-// @Success  200 {object} repo.LocationOut
+// @Success   200  {object}  repo.LocationOut
-// @Router   /v1/locations/{id} [PUT]
+// @Router    /v1/locations/{id} [PUT]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleLocationUpdate() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		body := repo.LocationUpdate{}

backend/app/api/v1/v1_ctrl_user.go

@@ -11,12 +11,12 @@ import (
 )
 
 // HandleUserSelf godoc
-// @Summary Get the current user
+// @Summary  Get the current user
-// @Tags    User
+// @Tags     User
-// @Produce json
+// @Produce  json
-// @Param   payload body services.UserRegistration true "User Data"
+// @Param    payload  body  services.UserRegistration  true  "User Data"
-// @Success 204
+// @Success  204
-// @Router  /v1/users/register [Post]
+// @Router   /v1/users/register [Post]
 func (ctrl *V1Controller) HandleUserRegistration() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		regData := services.UserRegistration{}
@@ -39,12 +39,12 @@ func (ctrl *V1Controller) HandleUserRegistration() http.HandlerFunc {
 }
 
 // HandleUserSelf godoc
-// @Summary  Get the current user
+// @Summary   Get the current user
-// @Tags     User
+// @Tags      User
-// @Produce  json
+// @Produce   json
-// @Success  200 {object} server.Result{item=repo.UserOut}
+// @Success   200  {object}  server.Result{item=repo.UserOut}
-// @Router   /v1/users/self [GET]
+// @Router    /v1/users/self [GET]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleUserSelf() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		token := services.UseTokenCtx(r.Context())
@@ -60,13 +60,13 @@ func (ctrl *V1Controller) HandleUserSelf() http.HandlerFunc {
 }
 
 // HandleUserSelfUpdate godoc
-// @Summary  Update the current user
+// @Summary   Update the current user
-// @Tags     User
+// @Tags      User
-// @Produce  json
+// @Produce   json
-// @Param    payload body     repo.UserUpdate true "User Data"
+// @Param     payload  body      repo.UserUpdate  true  "User Data"
-// @Success  200     {object} server.Result{item=repo.UserUpdate}
+// @Success   200      {object}  server.Result{item=repo.UserUpdate}
-// @Router   /v1/users/self [PUT]
+// @Router    /v1/users/self [PUT]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleUserSelfUpdate() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		updateData := repo.UserUpdate{}
@@ -90,31 +90,26 @@ func (ctrl *V1Controller) HandleUserSelfUpdate() http.HandlerFunc {
 }
 
 // HandleUserUpdatePassword godoc
-// @Summary  Update the current user's password // TODO:
+// @Summary   Update the current user's password // TODO:
-// @Tags     User
+// @Tags      User
-// @Produce  json
+// @Produce   json
-// @Success  204
+// @Success   204
-// @Router   /v1/users/self/password [PUT]
+// @Router    /v1/users/self/password [PUT]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleUserUpdatePassword() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
 // HandleUserSelfDelete godoc
-// @Summary  Deletes the user account
+// @Summary   Deletes the user account
-// @Tags     User
+// @Tags      User
-// @Produce  json
+// @Produce   json
-// @Success  204
+// @Success   204
-// @Router   /v1/users/self [DELETE]
+// @Router    /v1/users/self [DELETE]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleUserSelfDelete() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if ctrl.isDemo {
-			server.RespondError(w, http.StatusForbidden, nil)
-			return
-		}
-
 		actor := services.UseUserCtx(r.Context())
 		if err := ctrl.svc.User.DeleteSelf(r.Context(), actor.ID); err != nil {
 			server.RespondError(w, http.StatusInternalServerError, err)
@@ -133,12 +128,12 @@ type (
 )
 
 // HandleUserSelfChangePassword godoc
-// @Summary  Updates the users password
+// @Summary   Updates the users password
-// @Tags     User
+// @Tags      User
-// @Success  204
+// @Success   204
-// @Param    payload body ChangePassword true "Password Payload"
+// @Param     payload  body  ChangePassword  true  "Password Payload"
-// @Router   /v1/users/change-password [PUT]
+// @Router    /v1/users/change-password [PUT]
-// @Security Bearer
+// @Security  Bearer
 func (ctrl *V1Controller) HandleUserSelfChangePassword() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		if ctrl.isDemo {

backend/internal/repo/pagination.go

@@ -1,12 +0,0 @@
-package repo
-
-type PaginationResult[T any] struct {
-	Page     int `json:"page"`
-	PageSize int `json:"pageSize"`
-	Total    int `json:"total"`
-	Items    []T `json:"items"`
-}
-
-func calculateOffset(page, pageSize int) int {
-	return (page - 1) * pageSize
-}

backend/internal/repo/repo_items.go

@@ -8,8 +8,6 @@ import (
 	"github.com/hay-kot/homebox/backend/ent"
 	"github.com/hay-kot/homebox/backend/ent/group"
 	"github.com/hay-kot/homebox/backend/ent/item"
-	"github.com/hay-kot/homebox/backend/ent/label"
-	"github.com/hay-kot/homebox/backend/ent/location"
 	"github.com/hay-kot/homebox/backend/ent/predicate"
 )
 
@@ -18,14 +16,6 @@ type ItemsRepository struct {
 }
 
 type (
-	ItemQuery struct {
-		Page        int
-		PageSize    int
-		Search      string      `json:"search"`
-		LocationIDs []uuid.UUID `json:"locationIds"`
-		LabelIDs    []uuid.UUID `json:"labelIds"`
-	}
-
 	ItemCreate struct {
 		ImportRef   string `json:"-"`
 		Name        string `json:"name"`
@@ -216,64 +206,6 @@ func (e *ItemsRepository) GetOneByGroup(ctx context.Context, gid, id uuid.UUID)
 	return e.getOne(ctx, item.ID(id), item.HasGroupWith(group.ID(gid)))
 }
 
-// QueryByGroup returns a list of items that belong to a specific group based on the provided query.
-func (e *ItemsRepository) QueryByGroup(ctx context.Context, gid uuid.UUID, q ItemQuery) (PaginationResult[ItemSummary], error) {
-	qb := e.db.Item.Query().Where(item.HasGroupWith(group.ID(gid)))
-
-	if len(q.LabelIDs) > 0 {
-		labels := make([]predicate.Item, 0, len(q.LabelIDs))
-		for _, l := range q.LabelIDs {
-			labels = append(labels, item.HasLabelWith(label.ID(l)))
-		}
-		qb = qb.Where(item.Or(labels...))
-	}
-
-	if len(q.LocationIDs) > 0 {
-		locations := make([]predicate.Item, 0, len(q.LocationIDs))
-		for _, l := range q.LocationIDs {
-			locations = append(locations, item.HasLocationWith(location.ID(l)))
-		}
-		qb = qb.Where(item.Or(locations...))
-	}
-
-	if q.Search != "" {
-		qb.Where(
-			item.Or(
-				item.NameContainsFold(q.Search),
-				item.DescriptionContainsFold(q.Search),
-			),
-		)
-	}
-
-	if q.Page != -1 || q.PageSize != -1 {
-		qb = qb.
-			Offset(calculateOffset(q.Page, q.PageSize)).
-			Limit(q.PageSize)
-	}
-
-	items, err := mapItemsSummaryErr(
-		qb.WithLabel().
-			WithLocation().
-			All(ctx),
-	)
-	if err != nil {
-		return PaginationResult[ItemSummary]{}, err
-	}
-
-	count, err := qb.Count(ctx)
-	if err != nil {
-		return PaginationResult[ItemSummary]{}, err
-	}
-
-	return PaginationResult[ItemSummary]{
-		Page:     q.Page,
-		PageSize: q.PageSize,
-		Total:    count,
-		Items:    items,
-	}, nil
-
-}
-
 // GetAll returns all the items in the database with the Labels and Locations eager loaded.
 func (e *ItemsRepository) GetAll(ctx context.Context, gid uuid.UUID) ([]ItemSummary, error) {
 	return mapItemsSummaryErr(e.db.Item.Query().

backend/internal/services/service_items.go

@@ -28,10 +28,6 @@ func (svc *ItemService) GetOne(ctx context.Context, gid uuid.UUID, id uuid.UUID)
 	return svc.repo.Items.GetOneByGroup(ctx, gid, id)
 }
 
-func (svc *ItemService) Query(ctx Context, q repo.ItemQuery) (repo.PaginationResult[repo.ItemSummary], error) {
-	return svc.repo.Items.QueryByGroup(ctx, ctx.GID, q)
-}
-
 func (svc *ItemService) GetAll(ctx context.Context, gid uuid.UUID) ([]repo.ItemSummary, error) {
 	return svc.repo.Items.GetAll(ctx, gid)
 }

backend/pkgs/faker/random.go

@@ -33,7 +33,7 @@ func (f *Faker) Path() string {
 }
 
 func (f *Faker) Email() string {
-	return f.Str(10) + "@example.com"
+	return f.Str(10) + "@email.com"
 }
 
 func (f *Faker) Bool() bool {

frontend/components/App/Header.vue

@@ -18,10 +18,6 @@
       name: "Home",
       href: "/home",
     },
-    {
-      name: "Items",
-      href: "/items",
-    },
     {
       name: "Logout",
       action: logout,

frontend/components/Form/Multiselect.vue

@@ -11,8 +11,7 @@
       </div>
       <ul
         tabindex="0"
-        style="display: inline"
+        class="dropdown-content mb-1 menu shadow border border-gray-400 rounded bg-base-100 w-full z-[9999] max-h-60 overflow-y-scroll scroll-bar"
-        class="dropdown-content mb-1 menu shadow border border-gray-400 rounded bg-base-100 w-full z-[9999] max-h-60 overflow-y-scroll"
       >
         <li
           v-for="(obj, idx) in items"

frontend/components/Form/Select.vue

@@ -42,31 +42,54 @@
       default: null,
       required: false,
     },
+    selectFirst: {
+      type: Boolean,
+      default: false,
+    },
   });
 
-  const selectedIdx = ref(-1);
+  function syncSelect() {
-  const internalSelected = useVModel(props, "modelValue", emit);
+    if (!props.modelValue) {
-
+      if (props.selectFirst) {
-  watch(selectedIdx, newVal => {
+        selectedIdx.value = 0;
-    internalSelected.value = props.items[newVal];
+      }
-  });
+      return;
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  function compare(a: any, b: any): boolean {
-    if (props.value != null) {
-      return a[props.value] === b[props.value];
     }
-    return a === b;
+    // Check if we're already synced
+    if (props.value) {
+      if (props.modelValue[props.value] === props.items[selectedIdx.value][props.value]) {
+        return;
+      }
+    } else if (props.modelValue === props.items[selectedIdx.value]) {
+      return;
+    }
+
+    const idx = props.items.findIndex(item => {
+      if (props.value) {
+        return item[props.value] === props.modelValue;
+      }
+      return item === props.modelValue;
+    });
+
+    selectedIdx.value = idx;
   }
 
   watch(
-    internalSelected,
+    () => props.modelValue,
     () => {
-      const idx = props.items.findIndex(item => compare(item, internalSelected.value));
+      syncSelect();
-      selectedIdx.value = idx;
+    }
-    },
+  );
-    {
+
-      immediate: true,
+  const selectedIdx = ref(0);
+  watch(
+    () => selectedIdx.value,
+    () => {
+      if (props.value) {
+        emit("update:modelValue", props.items[selectedIdx.value][props.value]);
+        return;
+      }
+      emit("update:modelValue", props.items[selectedIdx.value]);
     }
   );
 </script>

frontend/components/Form/TextField.vue

@@ -3,13 +3,13 @@
     <label class="label">
       <span class="label-text">{{ label }}</span>
     </label>
-    <input ref="input" v-model="value" :placeholder="placeholder" :type="type" class="input input-bordered w-full" />
+    <input ref="input" v-model="value" :type="type" class="input input-bordered w-full" />
   </div>
   <div v-else class="sm:grid sm:grid-cols-4 sm:items-start sm:gap-4">
     <label class="label">
       <span class="label-text">{{ label }}</span>
     </label>
-    <input v-model="value" :placeholder="placeholder" class="input input-bordered col-span-3 w-full mt-2" />
+    <input v-model="value" class="input input-bordered col-span-3 w-full mt-2" />
   </div>
 </template>
 
@@ -35,10 +35,6 @@
       type: Boolean,
       default: false,
     },
-    placeholder: {
-      type: String,
-      default: "",
-    },
   });
 
   const input = ref<HTMLElement | null>(null);

frontend/components/Item/CreateModal.vue

@@ -2,7 +2,7 @@
   <BaseModal v-model="modal">
     <template #title> Create Item </template>
     <form @submit.prevent="create">
-      <FormSelect v-model="form.location" label="Location" :items="locations ?? []" />
+      <FormSelect v-model="form.location" label="Location" :items="locations ?? []" select-first />
       <FormTextField
         ref="locationNameRef"
         v-model="form.name"

frontend/composables/use-min-loader.ts

@@ -1,32 +0,0 @@
-import { WritableComputedRef } from "vue";
-
-export function useMinLoader(ms = 500): WritableComputedRef<boolean> {
-  const loading = ref(false);
-
-  const locked = ref(false);
-
-  const minLoading = computed({
-    get: () => loading.value,
-    set: value => {
-      if (value) {
-        loading.value = true;
-
-        if (!locked.value) {
-          locked.value = true;
-          setTimeout(() => {
-            locked.value = false;
-          }, ms);
-        }
-      }
-
-      if (!value && !locked.value) {
-        loading.value = false;
-      } else if (!value && locked.value) {
-        setTimeout(() => {
-          loading.value = false;
-        }, ms);
-      }
-    },
-  });
-  return minLoading;
-}

frontend/lib/api/classes/items.ts

@@ -8,19 +8,12 @@ import {
   ItemSummary,
   ItemUpdate,
 } from "../types/data-contracts";
-import { AttachmentTypes, PaginationResult } from "../types/non-generated";
+import { AttachmentTypes } from "../types/non-generated";
-
+import { Results } from "./types";
-export type ItemsQuery = {
-  page?: number;
-  pageSize?: number;
-  locations?: string[];
-  labels?: string[];
-  q?: string;
-};
 
 export class ItemsApi extends BaseAPI {
-  getAll(q: ItemsQuery = {}) {
+  getAll() {
-    return this.http.get<PaginationResult<ItemSummary>>({ url: route("/items", q) });
+    return this.http.get<Results<ItemSummary>>({ url: route("/items") });
   }
 
   create(item: ItemCreate) {

frontend/lib/api/classes/labels.ts

@@ -1,6 +1,6 @@
 import { BaseAPI, route } from "../base";
 import { LabelCreate, LabelOut } from "../types/data-contracts";
-import { Results } from "../types/non-generated";
+import { Results } from "./types";
 
 export class LabelsApi extends BaseAPI {
   getAll() {

frontend/lib/api/classes/locations.ts

@@ -1,6 +1,6 @@
 import { BaseAPI, route } from "../base";
 import { LocationOutCount, LocationCreate, LocationOut } from "../types/data-contracts";
-import { Results } from "../types/non-generated";
+import { Results } from "./types";
 
 export type LocationUpdate = LocationCreate;
 

frontend/lib/api/classes/types/index.ts

@@ -0,0 +1,3 @@
+export type Results<T> = {
+  items: T[];
+};

frontend/lib/api/types/data-contracts.ts

@@ -187,7 +187,6 @@ export interface LocationSummary {
   updatedAt: Date;
 }
 
-
 export interface UserOut {
   email: string;
   groupId: string;

frontend/lib/api/types/non-generated.ts

@@ -8,14 +8,3 @@ export enum AttachmentTypes {
 export type Result<T> = {
   item: T;
 };
-
-export type Results<T> = {
-  items: T[];
-};
-
-export interface PaginationResult<T> {
-  items: T[];
-  page: number;
-  pageSize: number;
-  total: number;
-}

frontend/pages/home.vue

@@ -157,6 +157,13 @@
         </BaseCard>
       </section>
 
+      <section>
+        <BaseSectionHeader class="mb-5"> Labels </BaseSectionHeader>
+        <div class="flex gap-2 flex-wrap">
+          <LabelChip v-for="label in labels" :key="label.id" size="lg" :label="label" />
+        </div>
+      </section>
+
       <section>
         <BaseSectionHeader class="mb-5"> Storage Locations </BaseSectionHeader>
         <div class="grid grid-cols-1 sm:grid-cols-2 card md:grid-cols-3 gap-4">
@@ -165,9 +172,9 @@
       </section>
 
       <section>
-        <BaseSectionHeader class="mb-5"> Labels </BaseSectionHeader>
+        <BaseSectionHeader class="mb-5"> Items </BaseSectionHeader>
-        <div class="flex gap-2 flex-wrap">
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
-          <LabelChip v-for="label in labels" :key="label.id" size="lg" :label="label" />
+          <ItemCard v-for="item in items" :key="item.id" :item="item" />
         </div>
       </section>
     </BaseContainer>

frontend/pages/index.vue

@@ -15,7 +15,8 @@
     const { data } = await api.status();
 
     if (data) {
-      username.value = "demo@example.com";
+      console.log(data);
+      username.value = "demo@email.com";
       password.value = "demo";
     }
     return data;
@@ -23,7 +24,7 @@
 
   whenever(status, status => {
     if (status?.demo) {
-      email.value = "demo@example.com";
+      email.value = "demo@email.com";
       loginPassword.value = "demo";
     }
   });
@@ -197,7 +198,7 @@
                   </h2>
                   <template v-if="status && status.demo">
                     <p class="text-xs italic text-center">This is a demo instance</p>
-                    <p class="text-xs text-center"><b>Email</b> demo@example.com</p>
+                    <p class="text-xs text-center"><b>Email</b> demo@email.com</p>
                     <p class="text-xs text-center"><b>Password</b> demo</p>
                   </template>
                   <FormTextField v-model="email" label="Email" />
@@ -222,9 +223,6 @@
         </div>
       </div>
     </div>
-    <footer v-if="status" class="absolute text-center w-full bottom-0 pb-4">
-      <p class="text-center text-sm">Version: {{ status.build.version }} ~ Build: {{ status.build.commit }}</p>
-    </footer>
   </div>
 </template>
 

frontend/pages/item/[id]/edit.vue

@@ -30,13 +30,6 @@
       return;
     }
 
-    if (locations) {
-      const location = locations.value.find(l => l.id === data.location.id);
-      if (location) {
-        data.location = location;
-      }
-    }
-
     return data;
   });
   onMounted(() => {
@@ -315,7 +308,7 @@
             </template>
           </BaseSectionHeader>
           <div class="px-5 mb-6 grid md:grid-cols-2 gap-4">
-            <FormSelect v-if="item" v-model="item.location" label="Location" :items="locations ?? []" />
+            <FormSelect v-model="item.location" label="Location" :items="locations ?? []" select-first />
             <FormMultiselect v-model="item.labels" label="Labels" :items="labels ?? []" />
           </div>
 

frontend/pages/items.vue

@@ -1,109 +0,0 @@
-<script setup lang="ts">
-  import { ItemSummary } from "~~/lib/api/types/data-contracts";
-  import { useLabelStore } from "~~/stores/labels";
-  import { useLocationStore } from "~~/stores/locations";
-
-  definePageMeta({
-    layout: "home",
-  });
-  useHead({
-    title: "Homebox | Home",
-  });
-
-  const api = useUserApi();
-
-  const query = ref("");
-  const loading = useMinLoader(2000);
-  const results = ref<ItemSummary[]>([]);
-
-  async function search() {
-    loading.value = true;
-
-    const locations = selectedLocations.value.map(l => l.id);
-    const labels = selectedLabels.value.map(l => l.id);
-
-    const { data, error } = await api.items.getAll({ q: query.value, locations, labels });
-    if (error) {
-      loading.value = false;
-      return;
-    }
-
-    results.value = data.items;
-    loading.value = false;
-  }
-
-  onMounted(() => {
-    search();
-  });
-
-  const locationsStore = useLocationStore();
-  const locations = computed(() => locationsStore.locations);
-
-  const labelStore = useLabelStore();
-  const labels = computed(() => labelStore.labels);
-
-  const advanced = ref(false);
-  const selectedLocations = ref([]);
-  const selectedLabels = ref([]);
-
-  watchEffect(() => {
-    if (!advanced.value) {
-      selectedLocations.value = [];
-      selectedLabels.value = [];
-    }
-  });
-
-  watchDebounced(query, search, { debounce: 250, maxWait: 1000 });
-  watchDebounced(selectedLocations, search, { debounce: 250, maxWait: 1000 });
-  watchDebounced(selectedLabels, search, { debounce: 250, maxWait: 1000 });
-</script>
-
-<template>
-  <BaseContainer class="mb-16">
-    <FormTextField v-model="query" placeholder="Search" />
-    <div class="flex mt-1">
-      <label class="ml-auto label cursor-pointer">
-        <input v-model="advanced" type="checkbox" class="toggle toggle-primary" />
-        <span class="label-text text-neutral-content ml-2"> Filters </span>
-      </label>
-    </div>
-    <BaseCard v-if="advanced" class="my-1 overflow-visible">
-      <template #title> Filters </template>
-      <template #subtitle>
-        Location and label filters use the 'OR' operation. If more than one is selected only one will be required for a
-        match
-      </template>
-      <div class="px-4 pb-4">
-        <FormMultiselect v-model="selectedLabels" label="Labels" :items="labels ?? []" />
-        <FormMultiselect v-model="selectedLocations" label="Labels" :items="locations ?? []" />
-      </div>
-    </BaseCard>
-    <section class="mt-10">
-      <BaseSectionHeader class="mb-5"> Items </BaseSectionHeader>
-      <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
-        <TransitionGroup name="list">
-          <ItemCard v-for="item in results" :key="item.id" :item="item" />
-        </TransitionGroup>
-        <div class="hidden first:inline text-xl">No Items Found</div>
-      </div>
-    </section>
-  </BaseContainer>
-</template>
-
-<style lang="css">
-  .list-move,
-  .list-enter-active,
-  .list-leave-active {
-    transition: all 0.25s ease;
-  }
-
-  .list-enter-from,
-  .list-leave-to {
-    opacity: 0;
-    transform: translateY(30px);
-  }
-
-  .list-leave-active {
-    position: absolute;
-  }
-</style>

frontend/pages/profile.vue

@@ -10,13 +10,6 @@
     title: "Homebox | Profile",
   });
 
-  const pubApi = usePublicApi();
-  const { data: status } = useAsyncData(async () => {
-    const { data } = await pubApi.status();
-
-    return data;
-  });
-
   const { setTheme } = useTheme();
 
   type ThemeOption = {
@@ -348,9 +341,6 @@
         </template>
       </BaseCard>
     </BaseContainer>
-    <footer v-if="status" class="text-center w-full bottom-0 pb-4">
-      <p class="text-center text-sm">Version: {{ status.build.version }} ~ Build: {{ status.build.commit }}</p>
-    </footer>
   </div>
 </template>
 

scripts/process-types.py

@@ -22,7 +22,6 @@ def date_types(*names: list[str]) -> dict[re.Pattern, str]:
 
 
 regex_replace: dict[re.Pattern, str] = {
-    re.compile(r" PaginationResultRepo"): "PaginationResult",
     re.compile(r" Repo"): " ",
     re.compile(r" Services"): " ",
     re.compile(r" V1"): " ",