-
{{ displayName() }}
diff --git a/apps/point-of-sale/src/main.ts b/apps/point-of-sale/src/main.ts
index e3b74fa4..30dc6c9a 100644
--- a/apps/point-of-sale/src/main.ts
+++ b/apps/point-of-sale/src/main.ts
@@ -1,4 +1,3 @@
-// import "bootstrap/dist/css/bootstrap.css";
import 'primeflex/primeflex.css';
import 'primeicons/primeicons.css';
@@ -13,16 +12,19 @@ import Panel from "primevue/panel";
import Dialog from "primevue/dialog";
import OverlayPanel from "primevue/overlaypanel";
import Dropdown from "primevue/dropdown";
+import Toast from "primevue/toast";
-import router from './router';
-import App from './App.vue';
+import router from '@/router';
+import App from '@/App.vue';
import { useSettingStore } from "@/stores/settings.store";
import Message from "primevue/message";
+import ToastService from "primevue/toastservice";
const app = createApp(App);
app.use(router);
app.use(PrimeVue);
+app.use(ToastService);
// eslint-disable-next-line
app.component('Button', Button);
@@ -36,7 +38,8 @@ app.component('OverlayPanel', OverlayPanel);
app.component('Dropdown', Dropdown);
// eslint-disable-next-line
app.component('Message', Message);
-
+// eslint-disable-next-line
+app.component('Toast', Toast);
app.use(createPinia());
app.mount('#app');
diff --git a/apps/point-of-sale/src/router/index.ts b/apps/point-of-sale/src/router/index.ts
index 9ffb54b2..879646a3 100644
--- a/apps/point-of-sale/src/router/index.ts
+++ b/apps/point-of-sale/src/router/index.ts
@@ -2,6 +2,7 @@ import { createRouter, createWebHistory } from 'vue-router';
import { clearTokenInStorage, useAuthStore } from '@sudosos/sudosos-frontend-common';
import LoginView from '@/views/LoginView.vue';
import CashierView from '../views/CashierView.vue';
+import { getBasePath } from '@/utils/basePathUtils';
const authGuard = (to: any, from: any, next: any) => {
const authStore = useAuthStore();
@@ -16,8 +17,10 @@ const authGuard = (to: any, from: any, next: any) => {
}
};
+const baseUrl = getBasePath();
+
const router = createRouter({
- history: createWebHistory(import.meta.env.BASE_URL),
+ history: createWebHistory(baseUrl),
routes: [
{
path: '/cashier',
@@ -29,7 +32,7 @@ const router = createRouter({
path: '/',
name: 'login',
component: LoginView
- }
+ },
]
});
diff --git a/apps/point-of-sale/src/services/ApiService.ts b/apps/point-of-sale/src/services/ApiService.ts
index 76f306e9..b02a33e0 100644
--- a/apps/point-of-sale/src/services/ApiService.ts
+++ b/apps/point-of-sale/src/services/ApiService.ts
@@ -1,6 +1,6 @@
import { ApiService } from '@sudosos/sudosos-frontend-common';
const apiService = new ApiService(
- import.meta.env.VITE_APP_API_BASE
+ window.location.origin + "/api/v1"
);
export default apiService;
diff --git a/apps/point-of-sale/src/utils/basePathUtils.ts b/apps/point-of-sale/src/utils/basePathUtils.ts
new file mode 100644
index 00000000..0845d896
--- /dev/null
+++ b/apps/point-of-sale/src/utils/basePathUtils.ts
@@ -0,0 +1,4 @@
+export function getBasePath(): string {
+ // @ts-ignore
+ return window.__BASE_URL__ || '/';
+}
diff --git a/apps/point-of-sale/src/utils/imageUtils.ts b/apps/point-of-sale/src/utils/imageUtils.ts
index 65f4e763..e7f55117 100644
--- a/apps/point-of-sale/src/utils/imageUtils.ts
+++ b/apps/point-of-sale/src/utils/imageUtils.ts
@@ -4,8 +4,8 @@ export function getProductImageSrc(product: ProductResponse): string {
if (!product.image) {
return 'https://imgur.com/CS0aauU.png';
}
- return `${import.meta.env.VITE_APP_IMAGE_BASE}products/${product.image}`;
+ return `${window.location.origin}/static/products/${product.image}`;
}
export function getBannerImageSrc(banner: BannerResponse): string {
- return `${import.meta.env.VITE_APP_IMAGE_BASE}banners/${banner.image}`;
+ return `${window.location.origin}/static/banners/${banner.image}`;
}
diff --git a/apps/point-of-sale/src/views/CashierView.vue b/apps/point-of-sale/src/views/CashierView.vue
index bac5c444..8a99c526 100644
--- a/apps/point-of-sale/src/views/CashierView.vue
+++ b/apps/point-of-sale/src/views/CashierView.vue
@@ -19,6 +19,7 @@
+