A continuation of HomeBox the inventory and organization system built for the Home User
Get front end tests passing (#299)
Tonyaec5b6bb8ff23
diff --git a/.github/workflows/partial-frontend.yaml b/.github/workflows/partial-frontend.yamlindex f8494064..c793c62a 100644--- a/.github/workflows/partial-frontend.yaml+++ b/.github/workflows/partial-frontend.yaml@@ -15,7 +15,7 @@ jobs:- uses: pnpm/[email protected]with:- version: 6.0.2+ version: 9.12.2- name: Install dependenciesrun: pnpm install --shamefully-hoist@@ -54,7 +54,7 @@ jobs:- uses: pnpm/[email protected]with:- version: 6.0.2+ version: 9.12.2- name: Install dependenciesrun: pnpm installdiff --git a/frontend/assets/css/main.css b/frontend/assets/css/main.cssindex 8a9d8fa7..185c47f5 100644--- a/frontend/assets/css/main.css+++ b/frontend/assets/css/main.css@@ -28,3 +28,61 @@::-webkit-scrollbar-thumb:hover {background-color: #9B9B9B;}++.scroll-bg::-webkit-scrollbar {+ width: 0.5rem;+}++.scroll-bg::-webkit-scrollbar-thumb {+ border-radius: 0.25rem;+ @apply bg-base-300;+}++.markdown > :first-child {+ margin-top: 0px !important;+}++.markdown :where(p, ul, ol, dl, blockquote, h1, h2, h3, h4, h5, h6) {+ margin-top: var(--y-gap);+ margin-bottom: var(--y-gap);+}++.markdown :where(ul) {+ list-style: disc;+ margin-left: 2rem;+}++.markdown :where(ol) {+ list-style: decimal;+ margin-left: 2rem;+}+/* Heading Styles */+.markdown :where(h1) {+ font-size: 2rem;+ font-weight: 700;+}++.markdown :where(h2) {+ font-size: 1.5rem;+ font-weight: 700;+}++.markdown :where(h3) {+ font-size: 1.25rem;+ font-weight: 700;+}++.markdown :where(h4) {+ font-size: 1rem;+ font-weight: 700;+}++.markdown :where(h5) {+ font-size: 0.875rem;+ font-weight: 700;+}++.markdown :where(h6) {+ font-size: 0.75rem;+ font-weight: 700;+}diff --git a/frontend/components/Base/SectionHeader.vue b/frontend/components/Base/SectionHeader.vueindex 387d160f..9f1a86f2 100644--- a/frontend/components/Base/SectionHeader.vue+++ b/frontend/components/Base/SectionHeader.vue@@ -4,7 +4,6 @@class="flex items-center text-3xl font-bold tracking-tight":class="{'text-neutral-content': dark,- 'text-content': !dark,}"><slot />diff --git a/frontend/components/Form/Autocomplete2.vue b/frontend/components/Form/Autocomplete2.vueindex 92fef222..552c5da5 100644--- a/frontend/components/Form/Autocomplete2.vue+++ b/frontend/components/Form/Autocomplete2.vue@@ -85,7 +85,10 @@type Props = {label: string;modelValue: SupportValues | null | undefined;- items: string[] | object[];+ items: {+ id: string;+ treeString: string;+ }[];display?: string;multiple?: boolean;};@@ -156,7 +159,7 @@const matches = index.value.search("*" + search.value + "*");- let resultIDs = []+ const resultIDs = [];for (let i = 0; i < matches.length; i++) {const match = matches[i];const item = props.items[parseInt(match.ref)];@@ -170,9 +173,11 @@* Resolve the issue of language not being supported*/for (let i = 0; i < props.items.length; i++) {- const item = props.items[i]- if(resultIDs.find(item_ => item_ === item.id) != undefined){continue}- if(item.treeString.indexOf(search.value) > -1){+ const item = props.items[i];+ if (resultIDs.find(item_ => item_ === item.id) !== undefined) {+ continue;+ }+ if (item.treeString.includes(search.value)) {const display = extractDisplay(item);list.push({ id: i, display, value: item });}diff --git a/frontend/components/Form/TextArea.vue b/frontend/components/Form/TextArea.vueindex f208b327..87207415 100644--- a/frontend/components/Form/TextArea.vue+++ b/frontend/components/Form/TextArea.vue@@ -6,10 +6,10 @@:class="{'text-red-600':typeof value === 'string' &&- ((maxLength && value.length > maxLength) || (minLength && value.length < minLength)),+ ((maxLength !== -1 && value.length > maxLength) || (minLength !== -1 && value.length < minLength)),}">- {{ typeof value === "string" && (maxLength || minLength) ? `${value.length}/${maxLength}` : "" }}+ {{ typeof value === "string" && (maxLength !== -1 || minLength !== -1) ? `${value.length}/${maxLength}` : "" }}</span></label><textarea ref="el" v-model="value" class="textarea textarea-bordered h-28 w-full" :placeholder="placeholder" />@@ -21,10 +21,10 @@:class="{'text-red-600':typeof value === 'string' &&- ((maxLength && value.length > maxLength) || (minLength && value.length < minLength)),+ ((maxLength !== -1 && value.length > maxLength) || (minLength !== -1 && value.length < minLength)),}">- {{ typeof value === "string" && (maxLength || minLength) ? `${value.length}/${maxLength}` : "" }}+ {{ typeof value === "string" && (maxLength !== -1 || minLength !== -1) ? `${value.length}/${maxLength}` : "" }}</span></label><textarea@@ -63,10 +63,12 @@},maxLength: {type: Number,+ default: -1,required: false,},minLength: {type: Number,+ default: -1,required: false,},});@@ -84,7 +86,4 @@});const value = useVModel(props, "modelValue", emit);- const valueLen = computed(() => {- return value.value ? value.value.length : 0;- });</script>diff --git a/frontend/components/Form/TextField.vue b/frontend/components/Form/TextField.vueindex d1aa2e46..7e63a215 100644--- a/frontend/components/Form/TextField.vue+++ b/frontend/components/Form/TextField.vue@@ -6,10 +6,10 @@:class="{'text-red-600':typeof value === 'string' &&- ((maxLength && value.length > maxLength) || (minLength && value.length < minLength)),+ ((maxLength !== -1 && value.length > maxLength) || (minLength !== -1 && value.length < minLength)),}">- {{ typeof value === "string" && (maxLength || minLength) ? `${value.length}/${maxLength}` : "" }}+ {{ typeof value === "string" && (maxLength !== -1 || minLength !== -1) ? `${value.length}/${maxLength}` : "" }}</span></label><input@@ -28,10 +28,10 @@:class="{'text-red-600':typeof value === 'string' &&- ((maxLength && value.length > maxLength) || (minLength && value.length < minLength)),+ ((maxLength !== -1 && value.length > maxLength) || (minLength !== -1 && value.length < minLength)),}">- {{ typeof value === "string" && (maxLength || minLength) ? `${value.length}/${maxLength}` : "" }}+ {{ typeof value === "string" && (maxLength !== -1 || minLength !== -1) ? `${value.length}/${maxLength}` : "" }}</span></label><input@@ -76,10 +76,12 @@},maxLength: {type: Number,+ default: -1,required: false,},minLength: {type: Number,+ default: -1,required: false,},});diff --git a/frontend/components/Item/Card.vue b/frontend/components/Item/Card.vueindex d4a51d7b..30751c4b 100644--- a/frontend/components/Item/Card.vue+++ b/frontend/components/Item/Card.vue@@ -19,7 +19,7 @@</div></div><div class="col-span-4 flex grow flex-col gap-y-1 rounded-b bg-base-100 p-4 pt-2">- <h2 class="line-clamp-2 text-ellipsis text-lg font-bold text-wrap">{{ item.name }}</h2>+ <h2 class="line-clamp-2 text-ellipsis text-wrap text-lg font-bold">{{ item.name }}</h2><div class="divider my-0"></div><div class="flex gap-2"><div v-if="item.insured" class="tooltip z-10" data-tip="Insured">diff --git a/frontend/components/Item/CreateModal.vue b/frontend/components/Item/CreateModal.vueindex 7708ba7a..5d01462b 100644--- a/frontend/components/Item/CreateModal.vue+++ b/frontend/components/Item/CreateModal.vue@@ -12,7 +12,11 @@:max-length="255":min-length="1"/>- <FormTextArea v-model="form.description" :label="$t('components.item.create_modal.item_description')" :max-length="1000" />+ <FormTextArea+ v-model="form.description"+ :label="$t('components.item.create_modal.item_description')"+ :max-length="1000"+ /><FormMultiselect v-model="form.labels" :label="$t('global.labels')" :items="labels ?? []" /><div class="modal-action mb-6">@@ -39,7 +43,7 @@<label tabindex="0" class="btn rounded-l-none rounded-r-xl"><MdiChevronDown class="size-5" name="mdi-chevron-down" /></label>- <ul tabindex="0" class="dropdown-content menu rounded-box bg-base-100 right-0 w-64 p-2 shadow">+ <ul tabindex="0" class="dropdown-content menu rounded-box right-0 w-64 bg-base-100 p-2 shadow"><li><button type="button" @click="create(false)">{{ $t("global.create_and_add") }}</button></li>diff --git a/frontend/components/Item/View/Table.vue b/frontend/components/Item/View/Table.vueindex a8d594f5..53d2f173 100644--- a/frontend/components/Item/View/Table.vue+++ b/frontend/components/Item/View/Table.vue@@ -83,7 +83,7 @@</label><ul tabindex="0" class="dropdown-content rounded-box flex w-64 flex-col gap-2 bg-base-100 p-2 pl-3 shadow"><li>Headers:</li>- <li v-for="(h, i) in headers" class="flex flex-row items-center gap-1">+ <li v-for="(h, i) in headers" :key="h.value" class="flex flex-row items-center gap-1"><buttonclass="btn btn-square btn-ghost btn-xs":class="{@@ -150,7 +150,10 @@const defaultHeaders = [{- text: "items.name", value: "name", enabled: true, type: "name"+ text: "items.name",+ value: "name",+ enabled: true,+ type: "name",},{ text: "items.quantity", value: "quantity", align: "center", enabled: true },{ text: "items.insured", value: "insured", align: "center", enabled: true, type: "boolean" },@@ -162,16 +165,13 @@] satisfies TableHeader[];const headers = ref<TableHeader[]>(- (preferences.value.tableHeaders ?? []).concat(- defaultHeaders.filter(h => !preferences.value.tableHeaders?.find(h2 => h2.value === h.value))- )- // this is a hack to make sure that any changes to the defaultHeaders are reflected in the preferences- .map(h => (- {- ...defaultHeaders.find(h2 => h2.value === h.value) as TableHeader,- enabled: h.enabled- }- ))+ (preferences.value.tableHeaders ?? [])+ .concat(defaultHeaders.filter(h => !preferences.value.tableHeaders?.find(h2 => h2.value === h.value)))+ // this is a hack to make sure that any changes to the defaultHeaders are reflected in the preferences+ .map(h => ({+ ...(defaultHeaders.find(h2 => h2.value === h.value) as TableHeader),+ enabled: h.enabled,+ })));console.log(headers.value);diff --git a/frontend/components/Label/CreateModal.vue b/frontend/components/Label/CreateModal.vueindex cabfd768..89d74354 100644--- a/frontend/components/Label/CreateModal.vue+++ b/frontend/components/Label/CreateModal.vue@@ -11,7 +11,11 @@:max-length="255":min-length="1"/>- <FormTextArea v-model="form.description" :label="$t('components.label.create_modal.label_description')" :max-length="255" />+ <FormTextArea+ v-model="form.description"+ :label="$t('components.label.create_modal.label_description')"+ :max-length="255"+ /><div class="modal-action"><div class="flex justify-center"><BaseButton class="rounded-r-none" :loading="loading" type="submit"> {{ $t("global.create") }} </BaseButton>diff --git a/frontend/components/Location/CreateModal.vue b/frontend/components/Location/CreateModal.vueindex 0c5c4a94..0552194a 100644--- a/frontend/components/Location/CreateModal.vue+++ b/frontend/components/Location/CreateModal.vue@@ -12,7 +12,11 @@:max-length="255":min-length="1"/>- <FormTextArea v-model="form.description" :label="$t('components.location.create_modal.location_description')" :max-length="1000" />+ <FormTextArea+ v-model="form.description"+ :label="$t('components.location.create_modal.location_description')"+ :max-length="1000"+ /><LocationSelector v-model="form.parent" /><div class="modal-action"><div class="flex justify-center">@@ -21,7 +25,7 @@<label tabindex="0" class="btn rounded-l-none rounded-r-xl"><MdiChevronDown class="size-5" /></label>- <ul tabindex="0" class="dropdown-content menu rounded-box bg-base-100 right-0 w-64 p-2 shadow">+ <ul tabindex="0" class="dropdown-content menu rounded-box right-0 w-64 bg-base-100 p-2 shadow"><li><button type="button" @click="create(false)">{{ $t("global.create_and_add") }}</button></li>diff --git a/frontend/components/Location/Selector.vue b/frontend/components/Location/Selector.vueindex 65a82b83..bbb4997d 100644--- a/frontend/components/Location/Selector.vue+++ b/frontend/components/Location/Selector.vue@@ -1,5 +1,11 @@<template>- <FormAutocomplete2 v-if="locations" v-model="value" :items="locations" display="name" :label="$t('components.location.selector.parent_location')">+ <FormAutocomplete2+ v-if="locations"+ v-model="value"+ :items="locations"+ display="name"+ :label="$t('components.location.selector.parent_location')"+ ><template #display="{ item, selected, active }"><div><div class="flex w-full">diff --git a/frontend/components/Location/Tree/Root.vue b/frontend/components/Location/Tree/Root.vueindex d1b7b1ed..523e0676 100644--- a/frontend/components/Location/Tree/Root.vue+++ b/frontend/components/Location/Tree/Root.vue@@ -10,6 +10,7 @@</script><template>+ <!-- eslint-disable-next-line tailwindcss/no-custom-classname --><div class="root border-2 p-4"><p v-if="locs.length === 0" class="text-center text-sm">{{ $t("location.tree.no_locations") }}diff --git a/frontend/components/Maintenance/ListView.vue b/frontend/components/Maintenance/ListView.vueindex e9160550..da87230a 100644--- a/frontend/components/Maintenance/ListView.vue+++ b/frontend/components/Maintenance/ListView.vue@@ -25,17 +25,17 @@},});- const { data: maintenanceDataList, refresh: refreshList } = useAsyncData<MaintenanceEntryWithDetails[]>(+ const { data: maintenanceDataList, refresh: refreshList } = useAsyncData(async () => {const { data } =props.currentItemId !== undefined? await api.items.maintenance.getLog(props.currentItemId, { status: maintenanceFilterStatus.value }): await api.maintenance.getAll({ status: maintenanceFilterStatus.value });console.log(data);- return data as MaintenanceEntryWithDetails[];+ return data;},{- watch: maintenanceFilterStatus,+ watch: [maintenanceFilterStatus],});@@ -80,7 +80,7 @@<StatCardv-for="stat in stats":key="stat.id"- class="stats border-l-primary block shadow-xl"+ class="stats block border-l-primary shadow-xl":title="stat.title":value="stat.value":type="stat.type"@@ -189,7 +189,7 @@<div v-if="props.currentItemId" class="hidden first:block"><buttontype="button"- class="border-base-content relative block w-full rounded-lg border-2 border-dashed p-12 text-center"+ class="relative block w-full rounded-lg border-2 border-dashed border-base-content p-12 text-center"@click="maintenanceEditModal?.openCreateModal(props.currentItemId)"><MdiWrenchClock class="inline size-16" />diff --git a/frontend/components/global/Markdown.vue b/frontend/components/global/Markdown.vueindex 0408c690..40ad484d 100644--- a/frontend/components/global/Markdown.vue+++ b/frontend/components/global/Markdown.vue@@ -24,6 +24,7 @@</script><template>+ <!-- eslint-disable-next-line vue/no-v-html --><div class="markdown text-wrap" v-html="raw"></div></template>@@ -31,53 +32,4 @@* {--y-gap: 0.65rem;}-- .markdown > :first-child {- margin-top: 0px !important;- }-- .markdown :where(p, ul, ol, dl, blockquote, h1, h2, h3, h4, h5, h6) {- margin-top: var(--y-gap);- margin-bottom: var(--y-gap);- }-- .markdown :where(ul) {- list-style: disc;- margin-left: 2rem;- }-- .markdown :where(ol) {- list-style: decimal;- margin-left: 2rem;- }- /* Heading Styles */- .markdown :where(h1) {- font-size: 2rem;- font-weight: 700;- }-- .markdown :where(h2) {- font-size: 1.5rem;- font-weight: 700;- }-- .markdown :where(h3) {- font-size: 1.25rem;- font-weight: 700;- }-- .markdown :where(h4) {- font-size: 1rem;- font-weight: 700;- }-- .markdown :where(h5) {- font-size: 0.875rem;- font-weight: 700;- }-- .markdown :where(h6) {- font-size: 0.75rem;- font-weight: 700;- }</style>diff --git a/frontend/composables/use-formatters.ts b/frontend/composables/use-formatters.tsindex d21617c1..602a7108 100644--- a/frontend/composables/use-formatters.ts+++ b/frontend/composables/use-formatters.ts@@ -45,8 +45,8 @@ export function useLocaleTimeAgo(date: Date) {const I18N_MESSAGES: UseTimeAgoMessages<UseTimeAgoUnitNamesDefault> = {justNow: t("components.global.date_time.just-now"),- past: (n) => (n.match(/\d/) ? t("components.global.date_time.ago", [n]) : n),- future: (n) => (n.match(/\d/) ? t("components.global.date_time.in", [n]) : n),+ past: n => (n.match(/\d/) ? t("components.global.date_time.ago", [n]) : n),+ future: n => (n.match(/\d/) ? t("components.global.date_time.in", [n]) : n),month: (n, past) =>n === 1? past@@ -71,17 +71,9 @@ export function useLocaleTimeAgo(date: Date) {? t("components.global.date_time.last-week"): t("components.global.date_time.next-week"): `${n} ${t(`components.global.date_time.weeks`)}`,- hour: (n) => `${n} ${- n === 1 ? t("components.global.date_time.hour") : t("components.global.date_time.hours")- }`,- minute: (n) => `${n} ${- n === 1 ? t("components.global.date_time.minute") : t("components.global.date_time.minutes")- }`,- second: (n) => `${n} ${- n === 1- ? t("components.global.date_time.second")- : t("components.global.date_time.seconds")- }`,+ hour: n => `${n} ${n === 1 ? t("components.global.date_time.hour") : t("components.global.date_time.hours")}`,+ minute: n => `${n} ${n === 1 ? t("components.global.date_time.minute") : t("components.global.date_time.minutes")}`,+ second: n => `${n} ${n === 1 ? t("components.global.date_time.second") : t("components.global.date_time.seconds")}`,invalid: "",};@@ -91,10 +83,7 @@ export function useLocaleTimeAgo(date: Date) {});}-export function fmtDate(- value: string | Date,- fmt: DateTimeFormat = "human"-): string {+export function fmtDate(value: string | Date, fmt: DateTimeFormat = "human"): string {const months = ["January","February",diff --git a/frontend/composables/use-preferences.ts b/frontend/composables/use-preferences.tsindex fecb4c12..5ef71707 100644--- a/frontend/composables/use-preferences.ts+++ b/frontend/composables/use-preferences.ts@@ -1,5 +1,5 @@import type { Ref } from "vue";-import type { TableHeader } from "components/Item/View/Table.types";+import type { TableHeader } from "~/components/Item/View/Table.types";import type { DaisyTheme } from "~~/lib/data/themes";export type ViewType = "table" | "card" | "tree";diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vueindex 9ece67c0..c207d7ad 100644--- a/frontend/layouts/default.vue+++ b/frontend/layouts/default.vue@@ -12,15 +12,15 @@<AppToast /><div class="drawer drawer-mobile"><input id="my-drawer-2" v-model="drawerToggle" type="checkbox" class="drawer-toggle" />- <div class="drawer-content bg-base-300 justify-center pt-20 lg:pt-0">+ <div class="drawer-content justify-center bg-base-300 pt-20 lg:pt-0"><AppHeaderDecor v-if="preferences.displayHeaderDecor" class="-mt-10 hidden lg:block" /><!-- Button -->- <div class="navbar drawer-button bg-primary fixed top-0 z-[99] shadow-md lg:hidden">+ <div class="navbar drawer-button fixed top-0 z-[99] bg-primary shadow-md lg:hidden"><label for="my-drawer-2" class="btn btn-square btn-ghost drawer-button text-base-100 lg:hidden"><MdiMenu class="size-6" /></label><NuxtLink to="/home">- <h2 class="text-base-100 flex text-3xl font-bold tracking-tight">+ <h2 class="flex text-3xl font-bold tracking-tight text-base-100">HomeB<AppLogo class="-mb-3 w-8" />x@@ -29,7 +29,7 @@</div><slot></slot>- <footer v-if="status" class="bg-base-300 text-secondary-content bottom-0 w-full pb-4 text-center">+ <footer v-if="status" class="bottom-0 w-full bg-base-300 pb-4 text-center text-secondary-content"><p class="text-center text-sm">{{ $t("global.version", { version: status.build.version }) }} ~{{ $t("global.build", { build: status.build.commit }) }}@@ -42,17 +42,17 @@<label for="my-drawer-2" class="drawer-overlay"></label><!-- Top Section -->- <div class="bg-base-200 flex min-w-40 max-w-min flex-col p-5 md:py-10">+ <div class="flex min-w-40 max-w-min flex-col bg-base-200 p-5 md:py-10"><div class="space-y-8"><div class="flex flex-col items-center gap-4"><p>{{ $t("global.welcome", { username: username }) }}</p><NuxtLink class="avatar placeholder" to="/home">- <div class="bg-base-300 text-neutral-content w-24 rounded-full p-4">+ <div class="w-24 rounded-full bg-base-300 p-4 text-neutral-content"><AppLogo /></div></NuxtLink></div>- <div class="bg-base-200 flex flex-col">+ <div class="flex flex-col bg-base-200"><div class="mb-6"><div class="dropdown visible w-full"><label tabindex="0" class="text-no-transform btn btn-primary btn-block text-lg">@@ -61,7 +61,7 @@</span>{{ $t("global.create") }}</label>- <ul tabindex="0" class="dropdown-content menu rounded-box bg-base-100 w-full p-2 shadow">+ <ul tabindex="0" class="dropdown-content menu rounded-box w-full bg-base-100 p-2 shadow"><li v-for="btn in dropdown" :key="btn.id"><button @click="btn.action">{{ btn.name.value }}@@ -89,7 +89,7 @@</div><!-- Bottom -->- <button class="rounded-btn hover:bg-base-300 mx-2 mt-auto p-3" @click="logout">+ <button class="rounded-btn mx-2 mt-auto p-3 hover:bg-base-300" @click="logout">{{ $t("global.sign_out") }}</button></div>diff --git a/frontend/lib/api/__test__/user/items.test.ts b/frontend/lib/api/__test__/user/items.test.tsindex 4f8973f9..74153f14 100644--- a/frontend/lib/api/__test__/user/items.test.ts+++ b/frontend/lib/api/__test__/user/items.test.ts@@ -148,9 +148,7 @@ describe("user should be able to create an item and add an attachment", () => {{const { response, data } = await api.items.maintenance.getLog(item.id);expect(response.status).toBe(200);- expect(data.entries).toHaveLength(maintenanceEntries.length);- expect(data.costAverage).toBeGreaterThan(0);- expect(data.costTotal).toBeGreaterThan(0);+ expect(data).toHaveLength(maintenanceEntries.length);}cleanup();diff --git a/frontend/lib/api/classes/items.ts b/frontend/lib/api/classes/items.tsindex cd321e18..b27b65e2 100644--- a/frontend/lib/api/classes/items.ts+++ b/frontend/lib/api/classes/items.ts@@ -12,7 +12,7 @@ import type {MaintenanceEntryCreate,MaintenanceEntryWithDetails,} from "../types/data-contracts";-import type { AttachmentTypes, PaginationResult } from "../types/non-generated";+import type { AttachmentTypes, ItemSummaryPaginationResult } from "../types/non-generated";import type { MaintenanceFilters } from "./maintenance.ts";import type { Requests } from "~~/lib/requests";@@ -98,7 +98,7 @@ export class ItemsApi extends BaseAPI {}getAll(q: ItemsQuery = {}) {- return this.http.get<PaginationResult<ItemSummary>>({ url: route("/items", q) });+ return this.http.get<ItemSummaryPaginationResult<ItemSummary>>({ url: route("/items", q) });}create(item: ItemCreate) {diff --git a/frontend/lib/api/types/non-generated.ts b/frontend/lib/api/types/non-generated.tsindex bc920de3..ad6569f8 100644--- a/frontend/lib/api/types/non-generated.ts+++ b/frontend/lib/api/types/non-generated.ts@@ -16,3 +16,7 @@ export interface PaginationResult<T> {pageSize: number;total: number;}++export interface ItemSummaryPaginationResult<T> extends PaginationResult<T> {+ totalPrice: number;+}diff --git a/frontend/package.json b/frontend/package.jsonindex 3b8ffbe6..70a145f0 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -8,7 +8,7 @@"lint": "eslint --ext \".ts,.js,.vue\" --ignore-path ../.gitignore .","lint:fix": "eslint --ext \".ts,.js,.vue\" --ignore-path ../.gitignore . --fix","lint:ci": "eslint --ext \".ts,.js,.vue\" --ignore-path ../.gitignore . --max-warnings 1",- "typecheck": "nuxi typecheck",+ "typecheck": "pnpm dlx [email protected] --noEmit","test:ci": "TEST_SHUTDOWN_API_SERVER=true vitest --run --config ./test/vitest.config.ts","test:local": "TEST_SHUTDOWN_API_SERVER=false && vitest --run --config ./test/vitest.config.ts","test:watch": " TEST_SHUTDOWN_API_SERVER=false vitest --config ./test/vitest.config.ts"@@ -23,6 +23,7 @@"@typescript-eslint/eslint-plugin": "^6.21.0","@typescript-eslint/parser": "^6.21.0","@vite-pwa/nuxt": "^0.5.0",+ "@vue/runtime-core": "^3.5.12","eslint": "^8.57.1","eslint-config-prettier": "^9.1.0","eslint-plugin-prettier": "^5.2.1",diff --git a/frontend/pages/item/[id]/index.vue b/frontend/pages/item/[id]/index.vueindex 002fd0dc..c51b9836 100644--- a/frontend/pages/item/[id]/index.vue+++ b/frontend/pages/item/[id]/index.vue@@ -234,7 +234,7 @@details.push({name,text: "",- slot: slot,+ slot,});};@@ -624,13 +624,4 @@dialog::backdrop {background: rgba(0, 0, 0, 0.5);}-- .scroll-bg::-webkit-scrollbar {- width: 0.5rem;- }-- .scroll-bg::-webkit-scrollbar-thumb {- border-radius: 0.25rem;- @apply bg-base-300;- }</style>diff --git a/frontend/pages/item/[id]/index/edit.vue b/frontend/pages/item/[id]/index/edit.vueindex 664205c0..a4c0b602 100644--- a/frontend/pages/item/[id]/index/edit.vue+++ b/frontend/pages/item/[id]/index/edit.vue@@ -106,7 +106,7 @@if (item.value.soldPrice) {soldPrice = item.value.soldPrice;}- if (item.value.purchaseTime) {+ if (item.value.purchaseTime && typeof item.value.purchaseTime !== "string") {purchaseTime = new Date(item.value.purchaseTime.getTime() - item.value.purchaseTime.getTimezoneOffset() * 60000);}@@ -121,7 +121,7 @@assetId: item.value.assetId,purchasePrice,soldPrice,- purchaseTime,+ purchaseTime: purchaseTime as Date,};const { error } = await api.items.update(itemId.value, payload);@@ -611,7 +611,7 @@</div></div><div class="mt-4 flex justify-end px-5 pb-4">- <BaseButton size="sm" @click="addField"> {{$t("global.add")}} </BaseButton>+ <BaseButton size="sm" @click="addField"> {{ $t("global.add") }} </BaseButton></div></BaseCard>@@ -621,7 +621,7 @@class="card overflow-visible bg-base-100 shadow-xl sm:rounded-lg"><div class="px-4 py-5 sm:px-6">- <h3 class="text-lg font-medium leading-6"> {{ $t("items.attachments") }} </h3>+ <h3 class="text-lg font-medium leading-6">{{ $t("items.attachments") }}</h3><p class="text-xs">{{ $t("items.changes_persisted_immediately") }}</p></div><div class="border-t border-gray-300 p-4">diff --git a/frontend/pages/label/[id].vue b/frontend/pages/label/[id].vueindex 90d8818b..36a1fb3b 100644--- a/frontend/pages/label/[id].vue+++ b/frontend/pages/label/[id].vue@@ -76,7 +76,10 @@const items = computedAsync(async () => {if (!label.value) {- return [];+ return {+ items: [],+ totalPrice: null,+ };}const resp = await api.items.getAll({@@ -85,7 +88,10 @@if (resp.error) {toast.error("Failed to load items");- return [];+ return {+ items: [],+ totalPrice: null,+ };}return resp.data;@@ -104,9 +110,13 @@:max-length="255":min-length="1"/>- <FormTextArea v-model="updateData.description" :label="$t('components.label.create_modal.label_description')" :max-length="255" />+ <FormTextArea+ v-model="updateData.description"+ :label="$t('components.label.create_modal.label_description')"+ :max-length="255"+ /><div class="modal-action">- <BaseButton type="submit" :loading="updating"> {{$t("global.update")}} </BaseButton>+ <BaseButton type="submit" :loading="updating"> {{ $t("global.update") }} </BaseButton></div></form></BaseModal>diff --git a/frontend/pages/location/[id].vue b/frontend/pages/location/[id].vueindex 73871a44..6be2ef99 100644--- a/frontend/pages/location/[id].vue+++ b/frontend/pages/location/[id].vue@@ -111,8 +111,18 @@<BaseModal v-model="updateModal"><template #title> {{ $t("locations.update_location") }} </template><form v-if="location" @submit.prevent="update">- <FormTextField v-model="updateData.name" :autofocus="true" :label="$t('components.location.create_modal.location_name')" :max-length="255" :min-length="1" />- <FormTextArea v-model="updateData.description" :label="$t('components.location.create_modal.location_description')" :max-length="1000" />+ <FormTextField+ v-model="updateData.name"+ :autofocus="true"+ :label="$t('components.location.create_modal.location_name')"+ :max-length="255"+ :min-length="1"+ />+ <FormTextArea+ v-model="updateData.description"+ :label="$t('components.location.create_modal.location_description')"+ :max-length="1000"+ /><LocationSelector v-model="parent" /><div class="modal-action"><BaseButton type="submit" :loading="updating"> {{ $t("global.update") }} </BaseButton>@@ -180,7 +190,7 @@</section><section v-if="location && location.children.length > 0" class="mt-6">- <BaseSectionHeader class="mb-5"> {{ t("locations.child_locations") }} </BaseSectionHeader>+ <BaseSectionHeader class="mb-5"> {{ $t("locations.child_locations") }} </BaseSectionHeader><div class="grid grid-cols-1 gap-2 sm:grid-cols-3"><LocationCard v-for="item in location.children" :key="item.id" :location="item" /></div>diff --git a/frontend/pages/profile.vue b/frontend/pages/profile.vueindex 2e88a46a..d13301b3 100644--- a/frontend/pages/profile.vue+++ b/frontend/pages/profile.vue@@ -8,7 +8,6 @@import MdiFill from "~icons/mdi/fill";import MdiPencil from "~icons/mdi/pencil";import MdiAccountMultiple from "~icons/mdi/account-multiple";-import { useI18n } from "vue-i18n";definePageMeta({middleware: ["auth"],@@ -20,7 +19,6 @@ import { useI18n } from "vue-i18n";const api = useUserApi();const confirm = useConfirm();const notify = useNotifier();- const { t } = useI18n();const currencies = computedAsync(async () => {const resp = await api.group.currencies();@@ -378,8 +376,15 @@ import { useI18n } from "vue-i18n";<label class="label"><span class="label-text">{{ $t("profile.language") }}</span></label>- <select v-model="$i18n.locale" @change="(event) => {setLanguage((event.target as HTMLSelectElement).value )}"- class="select select-bordered">+ <select+ v-model="$i18n.locale"+ class="select select-bordered"+ @change="+ event => {+ setLanguage((event.target as HTMLSelectElement).value);+ }+ "+ ><option v-for="lang in $i18n.availableLocales" :key="lang" :value="lang">{{ $t(`languages.${lang}`) }} ({{ $t(`languages.${lang}`, 1, { locale: lang }) }})</option>@@ -447,7 +452,7 @@ import { useI18n } from "vue-i18n";<div v-if="group && currencies && currencies.length > 0" class="p-5 pt-0"><FormSelect v-model="currency" :label="$t('profile.currency_format')" :items="currencies" />- <p class="m-2 text-sm">{{$t("profile.example")}}: {{ currencyExample }}</p>+ <p class="m-2 text-sm">{{ $t("profile.example") }}: {{ currencyExample }}</p><div class="mt-4"><BaseButton size="sm" @click="updateGroup"> {{ $t("profile.update_group") }} </BaseButton>diff --git a/frontend/pages/reports/label-generator.vue b/frontend/pages/reports/label-generator.vueindex 2e8470c8..2ce40903 100644--- a/frontend/pages/reports/label-generator.vue+++ b/frontend/pages/reports/label-generator.vue@@ -200,7 +200,9 @@const { data, error } = await api.items.getAll();if (error) {- return [];+ return {+ items: [],+ };}return data;@@ -219,7 +221,12 @@const items: LabelData[] = [];for (let i = displayProperties.assetRange; i < displayProperties.assetRangeMax; i++) {- items.push(getItem(i, allFields?.value?.items?.[i] ?? null));+ const item = allFields?.value?.items?.[i];+ if (item?.location) {+ items.push(getItem(i, item as { location: { name: string }; name: string }));+ } else {+ items.push(getItem(i, null));+ }}return items;});diff --git a/frontend/pages/tools.vue b/frontend/pages/tools.vueindex 97ce8867..c4597314 100644--- a/frontend/pages/tools.vue+++ b/frontend/pages/tools.vue@@ -39,6 +39,7 @@<div class="divide-y divide-gray-300 border-t border-gray-300 px-6 pb-3"><DetailAction @action="modals.import = true"><template #title> {{ $t("tools.import_export_set.import") }} </template>+ <!-- eslint-disable-next-line vue/no-v-html --><div v-html="$t('tools.import_export_set.import_sub')"></div><template #button> {{ $t("tools.import_export_set.import_button") }} </template></DetailAction>@@ -55,6 +56,7 @@<MdiAlert class="mr-2" /><span> {{ $t("tools.actions") }} </span><template #description>+ <!-- eslint-disable-next-line vue/no-v-html --><div v-html="$t('tools.actions_sub')"></div></template></BaseSectionHeader>@@ -72,11 +74,13 @@</DetailAction><DetailAction @action="resetItemDateTimes"><template #title> {{ $t("tools.actions_set.zero_datetimes") }} </template>+ <!-- eslint-disable-next-line vue/no-v-html --><div v-html="$t('tools.actions_set.zero_datetimes_sub')"></div><template #button> {{ $t("tools.actions_set.zero_datetimes_button") }} </template></DetailAction><DetailAction @action="setPrimaryPhotos"><template #title> {{ $t("tools.actions_set.set_primary_photo") }} </template>+ <!-- eslint-disable-next-line vue/no-v-html --><div v-html="$t('tools.actions_set.set_primary_photo_sub')"></div><template #button> {{ $t("tools.actions_set.set_primary_photo_button") }} </template></DetailAction>diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yamlindex 14acc73e..ba4165a8 100644--- a/frontend/pnpm-lock.yaml+++ b/frontend/pnpm-lock.yaml@@ -105,6 +105,9 @@ importers:'@vite-pwa/nuxt':specifier: ^0.5.0version: 0.5.0([email protected])([email protected])([email protected](@types/[email protected])([email protected]))([email protected])([email protected])([email protected])+ '@vue/runtime-core':+ specifier: ^3.5.12+ version: 3.5.12eslint:specifier: ^8.57.1version: 8.57.1@@ -2083,9 +2086,15 @@ packages:'@vue/[email protected]':resolution: {integrity: sha512-UJYMQ3S2rqIGw9IvKomD4Xw2uS5VlcKEEmwcfboGOdrI79oqebxnCgTvXWLMClvg3M5SF0Cyn+9eDQoyGMLu9Q==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-UzaN3Da7xnJXdz4Okb/BGbAaomRHc3RdoWqTzlvd9+WBR5m3J39J1fGcHes7U3za0ruYn/iYy/a1euhMEHvTAg==}+'@vue/[email protected]':resolution: {integrity: sha512-sMRXOy89KnwY6fWG5epgPOsCWzpo/64FrA0QkjIeNeGnoA2YyZ6bBUxpFUyqhJ8VbrDhXEFH+6LHMOYrpzX/ZQ==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-hrMUYV6tpocr3TL3Ad8DqxOdpDe4zuQY4HPY3X/VRh+L2myQO8MFXPAMarIOSGNu0bFAjh1yBkMPXZBqCk62Uw==}+'@vue/[email protected]':resolution: {integrity: sha512-L4gZcYo8f3d7rQqQIHkPvyczkjjQ55cJqz2G0v6Ptmqa1mO2zkqN9F8lBT6aGPYy3hd0RDiINbs4jxhSvvy10Q==}@@ -2100,6 +2109,9 @@ packages:'@vue/[email protected]':resolution: {integrity: sha512-W8GgysJVnFo81FthhzurdRAWP/byq3q2qIw70e0JWblzVhjgOMiC2GyovXrZTFQJnFVryYaKGP3Tc9vYzYm6PQ==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==}+'@vuepic/[email protected]':resolution: {integrity: sha512-8ehfUz1m69Vuc16Pm4ukgb3Mg1VT14x4EsG1ag4O/qbSNRWztTo+pUV4JnFt0FGLl5gGb6NXlxIvR7EjLgD7Gg==}peerDependencies:@@ -7271,7 +7283,7 @@ snapshots:dependencies:- '@nuxtjs/eslint-config': 12.0.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])+ '@nuxtjs/eslint-config': 12.0.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])'@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])'@typescript-eslint/parser': 6.21.0([email protected])([email protected])eslint: 8.57.1@@ -7285,10 +7297,10 @@ snapshots:- supports-color- typescript- '@nuxtjs/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])':+ '@nuxtjs/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])':dependencies:eslint: 8.57.1- eslint-config-standard: 17.1.0([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected]([email protected]))([email protected]([email protected]))([email protected])+ eslint-config-standard: 17.1.0([email protected])([email protected]([email protected]))([email protected]([email protected]))([email protected])eslint-plugin-import: 2.31.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])eslint-plugin-n: 15.7.0([email protected])eslint-plugin-node: 11.1.0([email protected])@@ -7953,11 +7965,20 @@ snapshots:dependencies:'@vue/shared': 3.4.8+ '@vue/[email protected]':+ dependencies:+ '@vue/shared': 3.5.12+'@vue/[email protected]':dependencies:'@vue/reactivity': 3.4.8'@vue/shared': 3.4.8+ '@vue/[email protected]':+ dependencies:+ '@vue/reactivity': 3.5.12+ '@vue/shared': 3.5.12+'@vue/[email protected]':dependencies:'@vue/runtime-core': 3.4.8@@ -7974,6 +7995,8 @@ snapshots:'@vue/[email protected]': {}+ '@vue/[email protected]': {}+dependencies:date-fns: 3.6.0@@ -8981,7 +9004,7 @@ snapshots:dependencies:eslint: 8.57.1- [email protected]([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected]([email protected]))([email protected]([email protected]))([email protected]):+ [email protected]([email protected])([email protected]([email protected]))([email protected]([email protected]))([email protected]):dependencies:eslint: 8.57.1eslint-plugin-import: 2.31.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])@@ -9002,7 +9025,7 @@ snapshots:debug: 4.3.7enhanced-resolve: 5.17.1eslint: 8.57.1- eslint-module-utils: 2.12.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])+ eslint-module-utils: 2.12.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])([email protected])fast-glob: 3.3.2get-tsconfig: 4.8.1is-bun-module: 1.2.1@@ -9015,7 +9038,7 @@ snapshots:- eslint-import-resolver-webpack- supports-color- [email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected]):+ [email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])([email protected]):dependencies:debug: 3.2.7optionalDependencies:@@ -9049,7 +9072,7 @@ snapshots:doctrine: 2.1.0eslint: 8.57.1eslint-import-resolver-node: 0.3.9- eslint-module-utils: 2.12.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])+ eslint-module-utils: 2.12.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])([email protected])hasown: 2.0.2is-core-module: 2.15.1is-glob: 4.0.3diff --git a/frontend/test/vitest.config.ts b/frontend/test/vitest.config.tsindex 11fe560d..5f236103 100644--- a/frontend/test/vitest.config.ts+++ b/frontend/test/vitest.config.ts@@ -2,6 +2,7 @@ import path from "path";import { defineConfig } from "vite";export default defineConfig({+ // @ts-ignoretest: {globalSetup: "./test/setup.ts",},