diff --git a/backend/go.sum b/backend/go.sum index ae832532..d9bc858d 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -110,8 +110,6 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/ github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= -github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM= github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= @@ -121,8 +119,6 @@ github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJm github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/olahol/melody v1.2.1 h1:xdwRkzHxf+B0w4TKbGpUSSkV516ZucQZJIWLztOWICQ= github.com/olahol/melody v1.2.1/go.mod h1:GgkTl6Y7yWj/HtfD48Q5vLKPVoZOH+Qqgfa7CvJgJM4= -github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU= github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts= github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= @@ -140,10 +136,6 @@ github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= diff --git a/docs/docs/api/openapi-2.0.json b/docs/docs/api/openapi-2.0.json index 3077c6cc..4b84c8ed 100644 --- a/docs/docs/api/openapi-2.0.json +++ b/docs/docs/api/openapi-2.0.json @@ -559,9 +559,6 @@ "Bearer": [] } ], - "consumes": [ - "multipart/form-data" - ], "produces": [ "application/json" ], @@ -733,9 +730,6 @@ "Bearer": [] } ], - "consumes": [ - "multipart/form-data" - ], "produces": [ "application/json" ], @@ -920,13 +914,6 @@ ], "summary": "Get Maintenance Log", "parameters": [ - { - "type": "string", - "description": "Item ID", - "name": "id", - "in": "path", - "required": true - }, { "enum": [ "scheduled", @@ -969,13 +956,6 @@ ], "summary": "Create Maintenance Entry", "parameters": [ - { - "type": "string", - "description": "Item ID", - "name": "id", - "in": "path", - "required": true - }, { "description": "Entry Data", "name": "payload", @@ -1447,13 +1427,6 @@ ], "summary": "Update Maintenance Entry", "parameters": [ - { - "type": "string", - "description": "Maintenance ID", - "name": "id", - "in": "path", - "required": true - }, { "description": "Entry Data", "name": "payload", @@ -1486,15 +1459,6 @@ "Maintenance" ], "summary": "Delete Maintenance Entry", - "parameters": [ - { - "type": "string", - "description": "Maintenance ID", - "name": "id", - "in": "path", - "required": true - } - ], "responses": { "204": { "description": "No Content" @@ -1577,6 +1541,13 @@ ], "summary": "Test Notifier", "parameters": [ + { + "type": "string", + "description": "Notifier ID", + "name": "id", + "in": "path", + "required": true + }, { "type": "string", "description": "URL", @@ -1774,6 +1745,20 @@ ], "summary": "User Login", "parameters": [ + { + "type": "string", + "example": "admin@admin.com", + "description": "string", + "name": "username", + "in": "formData" + }, + { + "type": "string", + "example": "admin", + "description": "string", + "name": "password", + "in": "formData" + }, { "description": "Login Data", "name": "payload", @@ -2250,9 +2235,6 @@ "soldTo": { "type": "string" }, - "syncChildItemsLocations": { - "type": "boolean" - }, "updatedAt": { "type": "string" }, @@ -2455,9 +2437,6 @@ "type": "string", "maxLength": 255 }, - "syncChildItemsLocations": { - "type": "boolean" - }, "warrantyDetails": { "type": "string" }, @@ -3064,15 +3043,13 @@ "type": "object", "properties": { "password": { - "type": "string", - "example": "admin" + "type": "string" }, "stayLoggedIn": { "type": "boolean" }, "username": { - "type": "string", - "example": "admin@admin.com" + "type": "string" } } }, diff --git a/frontend/lib/api/types/data-contracts.ts b/frontend/lib/api/types/data-contracts.ts index b4ee1d5a..bac152df 100644 --- a/frontend/lib/api/types/data-contracts.ts +++ b/frontend/lib/api/types/data-contracts.ts @@ -444,10 +444,8 @@ export interface ItemAttachmentToken { } export interface LoginForm { - /** @example "admin" */ password: string; stayLoggedIn: boolean; - /** @example "admin@admin.com" */ username: string; } diff --git a/frontend/lib/datelib/datelib.test.ts b/frontend/lib/datelib/datelib.test.ts index d2353bed..171d2cc1 100644 --- a/frontend/lib/datelib/datelib.test.ts +++ b/frontend/lib/datelib/datelib.test.ts @@ -25,19 +25,13 @@ describe("zeroTime", () => { describe("factorRange", () => { test("should return a range of dates", () => { const [start, end] = factorRange(10); - // Start should be today expect(start).toBeInstanceOf(Date); expect(start.getFullYear()).toBe(new Date().getFullYear()); // End should be 10 days from now expect(end).toBeInstanceOf(Date); - - // Set the future date so it works even in late December when the year changes - const futureDate = new Date(); - futureDate.setDate(futureDate.getDate() + 10); // Adds 10 days to the current date - - expect(end.getFullYear()).toBe(futureDate.getFullYear()); + expect(end.getFullYear()).toBe(new Date().getFullYear()); }); }); diff --git a/frontend/nuxt.config.ts b/frontend/nuxt.config.ts index 91be9372..e9c49bfe 100644 --- a/frontend/nuxt.config.ts +++ b/frontend/nuxt.config.ts @@ -8,7 +8,13 @@ export default defineNuxtConfig({ transpile: ["vue-i18n"], }, - modules: ["@nuxtjs/tailwindcss", "@pinia/nuxt", "@vueuse/nuxt", "@vite-pwa/nuxt", "unplugin-icons/nuxt"], + modules: [ + "@nuxtjs/tailwindcss", + "@pinia/nuxt", + "@vueuse/nuxt", + "@vite-pwa/nuxt", + "unplugin-icons/nuxt", + ], nitro: { devProxy: { diff --git a/frontend/pages/item/[id]/index.vue b/frontend/pages/item/[id]/index.vue index d93e7dee..473072c8 100644 --- a/frontend/pages/item/[id]/index.vue +++ b/frontend/pages/item/[id]/index.vue @@ -486,7 +486,6 @@
- No labels