diff --git a/index.html b/index.html index 58f46b7a..47623bbf 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ + Truck Wash diff --git a/src/components/displays/FormDisplay.vue b/src/components/displays/FormDisplay.vue index f2c14415..47ae3d7a 100644 --- a/src/components/displays/FormDisplay.vue +++ b/src/components/displays/FormDisplay.vue @@ -6,7 +6,7 @@ import ShowErrorField from "@/components/global/ShowErrorField.vue"; import bulmaCalendar from "bulma-calendar"; import 'bulma-calendar/src/scss/index.scss'; import Swal from "sweetalert2"; -import {IS_DEV} from "@/main.js"; +import {IS_DEV} from "@/config.js"; const props = defineProps({ form_identifier: { @@ -743,4 +743,4 @@ const debugGetForm = () => { \ No newline at end of file + diff --git a/src/components/displays/department/pos/steps/PosDepartmentStep1.vue b/src/components/displays/department/pos/steps/PosDepartmentStep1.vue index 9e7c8b8a..6c775d97 100644 --- a/src/components/displays/department/pos/steps/PosDepartmentStep1.vue +++ b/src/components/displays/department/pos/steps/PosDepartmentStep1.vue @@ -10,7 +10,7 @@ import ButtonsBox from "@/components/displays/boxes/ButtonsBox.vue"; import { isCustomerSelected, department_id, getDepartment, reg_1 } from "@/components/shop/POSDepartmentProcess.vue"; import {computed, onMounted, ref} from "vue"; import ElementTabsBox from "@/components/displays/boxes/ElementTabsBox.vue"; -import {POS_STEP_1_VERSION} from "@/main.js"; +import {POS_STEP_1_VERSION} from "@/config.js"; import SelectVehicleFormPOS from "@/components/forms/department/pos/SelectVehicleFormPOS.vue"; import PosLastScannedLicensePlatesV2 from "@/components/displays/department/pos/PosLastScannedLicensePlatesV2.vue"; import { deleteEverything } from "@/components/shop/POSDepartmentProcess.vue"; @@ -371,4 +371,4 @@ const getPotentialDuplicateOrders = computed(() => { \ No newline at end of file + diff --git a/src/components/displays/permissionbased/RequiresPermission.vue b/src/components/displays/permissionbased/RequiresPermission.vue index ec9f8607..e62c38cd 100644 --- a/src/components/displays/permissionbased/RequiresPermission.vue +++ b/src/components/displays/permissionbased/RequiresPermission.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/numberplatescanners/Scans.vue b/src/components/numberplatescanners/Scans.vue index 3791adbe..a397019f 100644 --- a/src/components/numberplatescanners/Scans.vue +++ b/src/components/numberplatescanners/Scans.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/pagination/paginatedList.vue b/src/components/pagination/paginatedList.vue index 412d291b..b6b8dfbc 100644 --- a/src/components/pagination/paginatedList.vue +++ b/src/components/pagination/paginatedList.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/search/economic/customerSearch.vue b/src/components/search/economic/customerSearch.vue index 592f3d43..d0e0941e 100644 --- a/src/components/search/economic/customerSearch.vue +++ b/src/components/search/economic/customerSearch.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/session/Session.vue b/src/components/session/Session.vue index 0e1538c4..0701de3a 100644 --- a/src/components/session/Session.vue +++ b/src/components/session/Session.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/session/authenticatedRequest.vue b/src/components/session/authenticatedRequest.vue index 67e4144d..c562e27c 100644 --- a/src/components/session/authenticatedRequest.vue +++ b/src/components/session/authenticatedRequest.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/session/unauthenticatedRequest.vue b/src/components/session/unauthenticatedRequest.vue index abd8f0a9..1431b170 100644 --- a/src/components/session/unauthenticatedRequest.vue +++ b/src/components/session/unauthenticatedRequest.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/shop/CustomerAttributes.vue b/src/components/shop/CustomerAttributes.vue index c4d5b522..b8e8d199 100644 --- a/src/components/shop/CustomerAttributes.vue +++ b/src/components/shop/CustomerAttributes.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/shop/CustomerNotes.vue b/src/components/shop/CustomerNotes.vue index ca868daf..72af492c 100644 --- a/src/components/shop/CustomerNotes.vue +++ b/src/components/shop/CustomerNotes.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/shop/DownloadWashCertificate.vue b/src/components/shop/DownloadWashCertificate.vue index af330e33..24d0d076 100644 --- a/src/components/shop/DownloadWashCertificate.vue +++ b/src/components/shop/DownloadWashCertificate.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/shop/Orders.vue b/src/components/shop/Orders.vue index 5dcd8974..bd9f205b 100644 --- a/src/components/shop/Orders.vue +++ b/src/components/shop/Orders.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/shop/OrdersItems.vue b/src/components/shop/OrdersItems.vue index d634c5aa..1528c8db 100644 --- a/src/components/shop/OrdersItems.vue +++ b/src/components/shop/OrdersItems.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/shop/POSDepartmentProcess.vue b/src/components/shop/POSDepartmentProcess.vue index 39939988..8ed1361c 100644 --- a/src/components/shop/POSDepartmentProcess.vue +++ b/src/components/shop/POSDepartmentProcess.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/shop/Products.vue b/src/components/shop/Products.vue index 4e80f1a5..8a525a75 100644 --- a/src/components/shop/Products.vue +++ b/src/components/shop/Products.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/components/viewport/page/headers/menu/NavigationMenuUpdates.vue b/src/components/viewport/page/headers/menu/NavigationMenuUpdates.vue index 14837929..2365dc78 100644 --- a/src/components/viewport/page/headers/menu/NavigationMenuUpdates.vue +++ b/src/components/viewport/page/headers/menu/NavigationMenuUpdates.vue @@ -3,7 +3,7 @@ import { ref } from "vue"; import { parseError, getError, removeError } from "@/components/request/HandleGlobalError.vue"; import GenericButton from "@/components/viewport/page/templates/generic/graphics/GenericButton.vue"; import ShowErrorField from "@/components/global/ShowErrorField.vue"; -import { API_URL } from "@/main"; // Import API_URL from main configuration +import { API_URL } from "@/config"; // Import API_URL from config configuration /** Define reactive state variables */ const isCheckingUpdates = ref(false); const updateAvailable = ref(false); diff --git a/src/main.js b/src/main.js index 3ebf3b55..cfde46c7 100644 --- a/src/main.js +++ b/src/main.js @@ -13,11 +13,8 @@ import App from "@/App.vue"; import Buefy from 'buefy' import 'buefy/dist/css/buefy.css' -export const IS_DEV = import.meta.env.VITE_IS_DEV; // Set to false in production - -// Development mode -export const POS_STEP_1_VERSION = 2; //(IS_DEV ? 2 : 1); -export const API_URL = (IS_DEV ? 'https://api.truckwash.dk:4433' : 'https://api.truckwash.dk'); +import { API_URL, IS_DEV, POS_STEP_1_VERSION } from './config'; +export { API_URL, IS_DEV, POS_STEP_1_VERSION }; // Service worker update handling if ('serviceWorker' in navigator) { diff --git a/src/views/dashboards/DefaultPageWrapper.vue b/src/views/dashboards/DefaultPageWrapper.vue index f2215e0e..7eea368c 100644 --- a/src/views/dashboards/DefaultPageWrapper.vue +++ b/src/views/dashboards/DefaultPageWrapper.vue @@ -4,7 +4,7 @@ import { Colors } from "@/ThemeConfig.vue"; import {defineProps, ref} from "vue"; import { defineSlots } from "vue"; import UserNavigationTop from "@/components/displays/user/UserNavigationTop.vue"; -import {IS_DEV} from "@/main.js"; +import {IS_DEV} from "@/config.js"; defineProps({ title: String, @@ -146,4 +146,4 @@ const applyScreenDependingClasses = (shouldApply, classes) => { \ No newline at end of file + diff --git a/src/views/dashboards/departmentDashboard/modules/time-bookings/DepartmentTimeBookings.vue b/src/views/dashboards/departmentDashboard/modules/time-bookings/DepartmentTimeBookings.vue index 6e9a466a..a4dd07a9 100644 --- a/src/views/dashboards/departmentDashboard/modules/time-bookings/DepartmentTimeBookings.vue +++ b/src/views/dashboards/departmentDashboard/modules/time-bookings/DepartmentTimeBookings.vue @@ -4,7 +4,7 @@ import { SessionUser } from "@/components/session/token/SessionUser.vue"; import DepartmentDashboardPageWrapper from "@/views/dashboards/departmentDashboard/DepartmentDashboardPageWrapper.vue"; import NotFoundFallBackPageWrapper from "@/components/page/wrappers/NotFoundFallBackPageWrapper.vue"; import Calendar from "@/components/timebookings/TimeBookingsCalendar.vue"; -import {IS_DEV} from "@/main.js"; +import {IS_DEV} from "@/config.js"; import TimeBookingsPagination from "@/components/displays/pagination/models/DepartmentPos/TimeBookingsPagination.vue"; @@ -26,4 +26,4 @@ import TimeBookingsPagination from "@/components/displays/pagination/models/Depa \ No newline at end of file +