From 9918c3926065a47b681030b66122fbb9fed21fd4 Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Wed, 5 Jul 2023 09:18:01 -0400 Subject: [PATCH] Initial single printer page --- src/controllers/PrinterController.ts | 3 ++- web/src/components/PrinterCard.vue | 7 ++++++- web/src/layouts/single/View.vue | 7 ------- web/src/views/Home.vue | 2 +- web/src/views/Printer.vue | 28 ++++++++++++++++++++++++++-- 5 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/controllers/PrinterController.ts b/src/controllers/PrinterController.ts index 66e12eb..191af18 100644 --- a/src/controllers/PrinterController.ts +++ b/src/controllers/PrinterController.ts @@ -69,7 +69,8 @@ class PrinterController { orderBy: { timestamp: 'desc' } - } + }, + network: true } }) diff --git a/web/src/components/PrinterCard.vue b/web/src/components/PrinterCard.vue index 941b24d..0d5f4a2 100644 --- a/web/src/components/PrinterCard.vue +++ b/web/src/components/PrinterCard.vue @@ -3,7 +3,11 @@ variant="outlined" class="printer-card" :class="{ 'printer-alert': printerAlert }" - :to="{ name: 'Printer', params: { serialNumber: printer.serialNumber } }" + :to=" + nav + ? { name: 'Printer', params: { serialNumber: printer.serialNumber } } + : undefined + " > @@ -93,6 +97,7 @@ import { computed } from 'vue' const props = defineProps<{ printer: any + nav?: boolean }>() const printerAlert = computed(() => { diff --git a/web/src/layouts/single/View.vue b/web/src/layouts/single/View.vue index cf83217..8e6c50c 100644 --- a/web/src/layouts/single/View.vue +++ b/web/src/layouts/single/View.vue @@ -8,13 +8,6 @@ /> - diff --git a/web/src/views/Home.vue b/web/src/views/Home.vue index 264462d..b58da29 100644 --- a/web/src/views/Home.vue +++ b/web/src/views/Home.vue @@ -16,7 +16,7 @@ v-for="printer in appStore.filteredPrinters" :key="printer.id" > - + diff --git a/web/src/views/Printer.vue b/web/src/views/Printer.vue index 5312993..1acb9ca 100644 --- a/web/src/views/Printer.vue +++ b/web/src/views/Printer.vue @@ -1,4 +1,28 @@ - +