diff --git a/frontend/src/components/Bills/BillModal.vue b/frontend/src/components/Bills/BillModal.vue index 8a8d388..4c53a61 100644 --- a/frontend/src/components/Bills/BillModal.vue +++ b/frontend/src/components/Bills/BillModal.vue @@ -31,7 +31,7 @@ diff --git a/frontend/src/components/Tables/TableOverview.vue b/frontend/src/components/Tables/TableOverview.vue index d2febf0..9eeec8b 100644 --- a/frontend/src/components/Tables/TableOverview.vue +++ b/frontend/src/components/Tables/TableOverview.vue @@ -3,8 +3,13 @@
- - + +
@@ -56,7 +61,7 @@ import { computed, defineComponent, provide, ref } from "vue"; import BaseCard from "@/components/UI/BaseCard.vue"; import { useStore } from "vuex"; -import { OrdersService, service_Order, service_OrderItem, types_ItemType } from "@/services/openapi"; +import { OrdersService, controller_Order, controller_OrderItem, controller_ItemType } from "@/services/openapi"; import BottomNavigation from "@/components/UI/BottomNavigation.vue"; import Button from "primevue/button"; import { convertToEur } from "@/utils"; @@ -82,7 +87,7 @@ export default defineComponent({ const total = ref(0); const orderItems = computed(() => store.getters.getOrderItems); const options = ref(); - const orders = ref([]); + const orders = ref([]); store.dispatch("getAllOrderItems"); @@ -110,13 +115,13 @@ export default defineComponent({ total.value = temp; } - function addBeverage(itemType: types_ItemType[]) { + function addBeverage(itemType: controller_ItemType[]) { newOrderModal.value = true; options.value = []; itemType.forEach((type) => { options.value = options.value.concat(orderItems.value.get(type)); }); - options.value.sort((a: service_OrderItem, b: service_OrderItem) => { + options.value.sort((a: controller_OrderItem, b: controller_OrderItem) => { const x = a.description.toLowerCase(); const y = b.description.toLowerCase(); if (x < y) return -1; @@ -142,7 +147,7 @@ export default defineComponent({ total, convertToEur, addBeverage, - types_ItemType, + controller_ItemType, postOrder, orders, getData, diff --git a/frontend/src/components/UI/TheNavigation.vue b/frontend/src/components/UI/TheNavigation.vue index 476d0c0..e784958 100644 --- a/frontend/src/components/UI/TheNavigation.vue +++ b/frontend/src/components/UI/TheNavigation.vue @@ -24,7 +24,7 @@ import Menubar from "primevue/menubar"; import { useStore } from "vuex"; import Button from "primevue/button"; import { useRoute } from "vue-router"; -import { TablesService, types_ItemType } from "@/services/openapi"; +import { TablesService, controller_ItemType } from "@/services/openapi"; import { detailedItemTypeString, errorToast } from "@/utils"; import { useToast } from "primevue/usetoast"; import { visible } from "@/keys"; @@ -84,9 +84,9 @@ export default defineComponent({ label: "Artikel", icon: "pi pi-fw pi-shopping-cart", items: [ - { label: detailedItemTypeString(types_ItemType.Food), icon: "pi pi-fw pi-shopping-cart", to: "/items/" + types_ItemType.Food }, - { label: detailedItemTypeString(types_ItemType.ColdDrink), icon: "pi pi-fw pi-shopping-cart", to: "/items/" + types_ItemType.ColdDrink }, - { label: detailedItemTypeString(types_ItemType.HotDrink), icon: "pi pi-fw pi-shopping-cart", to: "/items/" + types_ItemType.HotDrink }, + { label: detailedItemTypeString(controller_ItemType.Food), icon: "pi pi-fw pi-shopping-cart", to: "/items/" + controller_ItemType.Food }, + { label: detailedItemTypeString(controller_ItemType.ColdDrink), icon: "pi pi-fw pi-shopping-cart", to: "/items/" + controller_ItemType.ColdDrink }, + { label: detailedItemTypeString(controller_ItemType.HotDrink), icon: "pi pi-fw pi-shopping-cart", to: "/items/" + controller_ItemType.HotDrink }, ], visible: () => editor.value, }, diff --git a/frontend/src/components/User/UserSettings.vue b/frontend/src/components/User/UserSettings.vue index a22bd9b..7b4ab66 100644 --- a/frontend/src/components/User/UserSettings.vue +++ b/frontend/src/components/User/UserSettings.vue @@ -16,7 +16,7 @@ import { computed, defineComponent, inject, ref } from "vue"; import Sidebar from "primevue/sidebar"; import { visible } from "@/keys"; -import { user_User, UsersService } from "@/services/openapi"; +import { controller_User, UsersService } from "@/services/openapi"; import InputSwitch from "primevue/inputswitch"; import { useStore } from "vuex"; import { errorToast } from "@/utils"; @@ -30,7 +30,7 @@ export default defineComponent({ const toast = useToast(); const isLoading = ref(false); const isVisible = inject(visible, ref(false)); - const user = computed(() => store.getters.getUser); + const user = computed(() => store.getters.getUser); function updateUser() { isLoading.value = true; diff --git a/frontend/src/store/index.ts b/frontend/src/store/index.ts index 08f2cd8..28b8201 100644 --- a/frontend/src/store/index.ts +++ b/frontend/src/store/index.ts @@ -1,10 +1,10 @@ import { createStore } from "vuex"; import tableStore from "@/store/tables"; import orderItemStore from "@/store/orderItems"; -import { user_User } from "@/services/openapi"; +import { controller_User } from "@/services/openapi"; interface AppStateModel { - user: user_User; + user: controller_User; groups: string[]; } export default createStore({ @@ -28,7 +28,7 @@ export default createStore({ }, }, mutations: { - setUser(state: AppStateModel, _user: user_User) { + setUser(state: AppStateModel, _user: controller_User) { state.user = _user; }, setGroups(state: AppStateModel, groups: string[]) { diff --git a/frontend/src/store/orderItems/index.ts b/frontend/src/store/orderItems/index.ts index f46fefb..0cfa31c 100644 --- a/frontend/src/store/orderItems/index.ts +++ b/frontend/src/store/orderItems/index.ts @@ -1,17 +1,17 @@ -import { OrderItemsService, service_OrderItem, types_ItemType } from "@/services/openapi"; +import { OrderItemsService, controller_OrderItem, controller_ItemType } from "@/services/openapi"; interface AppStateModel { - orderItems: Map; + orderItems: Map; } interface mutationOrderItems { - orderItems: service_OrderItem[]; - orderType: types_ItemType; + orderItems: controller_OrderItem[]; + orderType: controller_ItemType; } const orderItemStore = { state: () => ({ - orderItems: new Map(), + orderItems: new Map(), }), getters: { getOrderItems(state: AppStateModel) { @@ -22,52 +22,52 @@ const orderItemStore = { setOrderItems(state: AppStateModel, payload: mutationOrderItems) { state.orderItems.set(payload.orderType, payload.orderItems); }, - pushOrderItem(state: AppStateModel, orderItem: service_OrderItem) { + pushOrderItem(state: AppStateModel, orderItem: controller_OrderItem) { const tempOrderItems = state.orderItems.get(orderItem.item_type); tempOrderItems && tempOrderItems.push(orderItem); }, - filterOrderItem(state: AppStateModel, orderItem: service_OrderItem) { + filterOrderItem(state: AppStateModel, orderItem: controller_OrderItem) { const tempOrderItems = state.orderItems.get(orderItem.item_type); tempOrderItems && state.orderItems.set( orderItem.item_type, - tempOrderItems.filter((origItem: service_OrderItem) => origItem.id !== orderItem.id) + tempOrderItems.filter((origItem: controller_OrderItem) => origItem.id !== orderItem.id) ); }, - putOrderItem(state: AppStateModel, orderItem: service_OrderItem) { + putOrderItem(state: AppStateModel, orderItem: controller_OrderItem) { const tempOrderItems = state.orderItems.get(orderItem.item_type); tempOrderItems && state.orderItems.set( orderItem.item_type, - tempOrderItems.map((origItem: service_OrderItem) => (origItem.id === orderItem.id ? orderItem : origItem)) + tempOrderItems.map((origItem: controller_OrderItem) => (origItem.id === orderItem.id ? orderItem : origItem)) ); }, }, actions: { // eslint-disable-next-line async getAllOrderItems(context: any) { - await context.dispatch("getOrderItems", types_ItemType.Food); - await context.dispatch("getOrderItems", types_ItemType.ColdDrink); - await context.dispatch("getOrderItems", types_ItemType.HotDrink); + await context.dispatch("getOrderItems", controller_ItemType.Food); + await context.dispatch("getOrderItems", controller_ItemType.ColdDrink); + await context.dispatch("getOrderItems", controller_ItemType.HotDrink); }, // eslint-disable-next-line - async getOrderItems(context: any, orderType: types_ItemType) { + async getOrderItems(context: any, orderType: controller_ItemType) { const orderTypeArray = context.getters.getOrderItems; if (!orderTypeArray.get(orderType)) { - const orderItems: service_OrderItem[] | null = await OrderItemsService.getOrdersItems(orderType); + const orderItems: controller_OrderItem[] | null = await OrderItemsService.getOrdersItems(orderType); context.commit("setOrderItems", { orderItems, orderType }); } }, // eslint-disable-next-line - addOrderItem(context: any, orderItem: service_OrderItem) { + addOrderItem(context: any, orderItem: controller_OrderItem) { context.commit("pushOrderItem", orderItem); }, // eslint-disable-next-line - deleteOrderItem(context: any, orderItem: service_OrderItem) { + deleteOrderItem(context: any, orderItem: controller_OrderItem) { context.commit("filterOrderItem", orderItem); }, // eslint-disable-next-line - updateOrderItem(context: any, orderItem: service_OrderItem) { + updateOrderItem(context: any, orderItem: controller_OrderItem) { context.commit("putOrderItem", orderItem); }, }, diff --git a/frontend/src/store/tables/index.ts b/frontend/src/store/tables/index.ts index 031d243..b3fcd00 100644 --- a/frontend/src/store/tables/index.ts +++ b/frontend/src/store/tables/index.ts @@ -1,7 +1,7 @@ -import { service_Table, TablesService } from "@/services/openapi"; +import { controller_Table, TablesService } from "@/services/openapi"; interface AppStateModel { - tables: service_Table[] | null; + tables: controller_Table[] | null; } const tableStore = { @@ -17,13 +17,13 @@ const tableStore = { }, }, mutations: { - setTables(state: AppStateModel, tables: service_Table[]) { + setTables(state: AppStateModel, tables: controller_Table[]) { state.tables = tables; }, popTables(state: AppStateModel) { state.tables && state.tables.pop(); }, - pushTable(state: AppStateModel, table: service_Table) { + pushTable(state: AppStateModel, table: controller_Table) { state.tables && state.tables.push(table); }, }, @@ -38,7 +38,7 @@ const tableStore = { context.commit("popTables"); }, // eslint-disable-next-line - addTable(context: any, table: service_Table) { + addTable(context: any, table: controller_Table) { context.commit("pushTable", table); }, }, diff --git a/frontend/src/utils.ts b/frontend/src/utils.ts index 7c38943..a500c10 100644 --- a/frontend/src/utils.ts +++ b/frontend/src/utils.ts @@ -1,44 +1,44 @@ -import { service_Bill, service_Order, types_ItemType } from "@/services/openapi"; +import { controller_Bill, controller_Order, controller_ItemType } from "@/services/openapi"; export function convertToEur(value: number | undefined) { const temp: number = value ? value : 0; return temp.toLocaleString("de-DE", { style: "currency", currency: "EUR" }); } -export function detailedItemTypeString(type: types_ItemType | undefined) { +export function detailedItemTypeString(type: controller_ItemType | undefined) { switch (type) { - case types_ItemType.Food: + case controller_ItemType.Food: return "Speisen"; - case types_ItemType.ColdDrink: + case controller_ItemType.ColdDrink: return "Kaltgetränke"; default: return "Heiß/Eiskaffee"; } } -export function generalItemTypeString(type: types_ItemType[]) { - if (type.includes(types_ItemType.Food)) { +export function generalItemTypeString(type: controller_ItemType[]) { + if (type.includes(controller_ItemType.Food)) { return "Speisen"; } else { return "Getränke"; } } -export function detailedItemTypeIcon(type: types_ItemType | undefined) { +export function detailedItemTypeIcon(type: controller_ItemType | undefined) { switch (type) { - case types_ItemType.Food: + case controller_ItemType.Food: return "fa-cheese"; - case types_ItemType.ColdDrink: + case controller_ItemType.ColdDrink: return "fa-champagne-glasses"; - case types_ItemType.HotDrink: + case controller_ItemType.HotDrink: return "fa-mug-hot"; default: return ""; } } -export function generalItemTypeIcon(type: types_ItemType[]) { - if (type.includes(types_ItemType.Food)) { +export function generalItemTypeIcon(type: controller_ItemType[]) { + if (type.includes(controller_ItemType.Food)) { return "fa-cheese"; } else { return "fa-champagne-glasses"; @@ -47,7 +47,7 @@ export function generalItemTypeIcon(type: types_ItemType[]) { export interface WebSocketMsg { type: NotifierType; - payload: service_Order[]; + payload: controller_Order[]; } export enum NotifierType { @@ -75,4 +75,4 @@ export function lessThan15SecondsAgo(updated_at: number | undefined) { return moment().diff(updated, "seconds") < 15; } -export const emptyBill: service_Bill = { table_id: 0, total: 0 }; +export const emptyBill: controller_Bill = { table_id: 0, total: 0 }; diff --git a/frontend/src/views/Bills.vue b/frontend/src/views/Bills.vue index f0152e2..26dad42 100644 --- a/frontend/src/views/Bills.vue +++ b/frontend/src/views/Bills.vue @@ -59,7 +59,7 @@ import { defineComponent, ref, watch } from "vue"; import BaseCard from "@/components/UI/BaseCard.vue"; import Calendar from "primevue/calendar"; -import { BillsService, service_Bill } from "@/services/openapi"; +import { BillsService, controller_Bill } from "@/services/openapi"; import Sidebar from "primevue/sidebar"; import BillModal from "@/components/Bills/BillModal.vue"; import { convertToEur, emptyBill, errorToast } from "@/utils"; @@ -80,11 +80,11 @@ export default defineComponent({ const confirm = useConfirm(); const toast = useToast(); const today = ref(new Date()); - const bills = ref([]); + const bills = ref([]); const isLoading = ref(false); const isDisabled = ref(false); const billModal = ref(false); - const bill = ref({ ...emptyBill }); + const bill = ref({ ...emptyBill }); const filters = ref({ global: { value: null, matchMode: FilterMatchMode.CONTAINS }, }); @@ -104,7 +104,7 @@ export default defineComponent({ function openBill(billId: number) { if (isDisabled.value) return; - const temp: service_Bill | undefined = bills.value.find((bill) => bill.id === billId); + const temp: controller_Bill | undefined = bills.value.find((bill) => bill.id === billId); temp && (bill.value = temp); billModal.value = true; } diff --git a/frontend/src/views/Checkout.vue b/frontend/src/views/Checkout.vue index 6b09703..81d2cb0 100644 --- a/frontend/src/views/Checkout.vue +++ b/frontend/src/views/Checkout.vue @@ -55,7 +55,7 @@