diff --git a/web/components.d.ts b/web/components.d.ts index 79bb902..f34dcd4 100644 --- a/web/components.d.ts +++ b/web/components.d.ts @@ -5,14 +5,15 @@ // Read more: https://github.com/vuejs/core/pull/3399 export {} -declare module "vue" { +declare module 'vue' { export interface GlobalComponents { - CategoryContainer: typeof import("./src/components/CategoryContainer.vue")["default"]; - Clipboard: typeof import("./src/components/Clipboard.vue")["default"]; - HeaderBar: typeof import("./src/components/HeaderBar.vue")["default"]; - ListViewElement: typeof import("./src/components/ListViewElement.vue")["default"]; - LoginPage: typeof import("./src/components/loginPage.vue")["default"]; - MainPage: typeof import("./src/components/MainPage.vue")["default"]; - UsersDialog: typeof import("./src/components/NavBarIcons/UsersDialog.vue")["default"]; + CategoryContainer: typeof import('./src/components/CategoryContainer.vue')['default'] + Clipboard: typeof import('./src/components/Clipboard.vue')['default'] + HeaderBar: typeof import('./src/components/HeaderBar.vue')['default'] + ListViewElement: typeof import('./src/components/ListViewElement.vue')['default'] + LoginPage: typeof import('./src/components/loginPage.vue')['default'] + MainPage: typeof import('./src/components/MainPage.vue')['default'] + UpdateDialog: typeof import('./src/components/UpdateDialog.vue')['default'] + UsersDialog: typeof import('./src/components/NavBarIcons/UsersDialog.vue')['default'] } } diff --git a/web/src/components/CategoryContainer.vue b/web/src/components/CategoryContainer.vue index f458970..7dc5064 100644 --- a/web/src/components/CategoryContainer.vue +++ b/web/src/components/CategoryContainer.vue @@ -2,25 +2,8 @@

{{ props.licenseGroupName }}:

  • - +
  • -
    diff --git a/web/src/components/HeaderBar.vue b/web/src/components/HeaderBar.vue index e4e3a2c..ba39074 100644 --- a/web/src/components/HeaderBar.vue +++ b/web/src/components/HeaderBar.vue @@ -267,7 +267,7 @@ async function submit(event: SubmitEventPromise) { key: addLicenseKey.value, start: addStartDate.value ?? null, end: addStopDate.value ?? null, - notes: addNotes.value, + note: addNotes.value, }; console.log(data); licenseMutate(data); diff --git a/web/src/components/ListViewElement.vue b/web/src/components/ListViewElement.vue index 5376117..1c32a65 100644 --- a/web/src/components/ListViewElement.vue +++ b/web/src/components/ListViewElement.vue @@ -4,7 +4,7 @@
    - {{ props.licenseName }} + {{ license.name }}
    - {{ props.licenseKey }} + {{ license.key }}
    {{ - props.startDate - ? props.startDate.toLocaleDateString() + license.start + ? new Date(license.start).toLocaleDateString() : "Indefinitely" }} @@ -36,8 +36,8 @@ {{ - props.endDate - ? props.endDate.toLocaleDateString() + license.end + ? new Date(license.end).toLocaleDateString() : "Indefinitely" }} @@ -53,11 +53,11 @@ class="logo mr-1" width="24" /> - + - {{ props.amount }} + {{ license.amount }}
    @@ -68,16 +68,14 @@ class="flex-grow-1 overflow-x-auto border-e-md align-self-end" cols="10" > - {{ props.notes }} + {{ license.note }}
    - - - + @@ -93,29 +91,26 @@ diff --git a/web/src/types.ts b/web/src/types.ts index 70897af..11e2599 100644 --- a/web/src/types.ts +++ b/web/src/types.ts @@ -11,6 +11,8 @@ export interface License { end?: string; key: string; amount?: number; + note?: string; + group_id: string; } export interface CreateLicenseDto { @@ -20,6 +22,9 @@ export interface CreateLicenseDto { key: string; amount?: number; group_id: string; + note?: string; } export type CreateGroupDto = Omit; + +export type UpdateLicenseDto = Omit;