From 025dd8bee4be2709bdd12a041d6dcc711410151d Mon Sep 17 00:00:00 2001
From: Ruben Lagerwerf <98549214+RubenLWF@users.noreply.github.com>
Date: Sun, 10 Nov 2024 23:13:25 +0100
Subject: [PATCH 1/4] fix(pos): incorrect remaining balance displayed (#446)

---
 apps/point-of-sale/src/components/Cart/CartComponent.vue        | 2 +-
 .../Cart/TransactionHistory/TransactionHistoryComponent.vue     | 2 +-
 apps/point-of-sale/src/stores/cart.store.ts                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/point-of-sale/src/components/Cart/CartComponent.vue b/apps/point-of-sale/src/components/Cart/CartComponent.vue
index db2ae654..87718fd1 100644
--- a/apps/point-of-sale/src/components/Cart/CartComponent.vue
+++ b/apps/point-of-sale/src/components/Cart/CartComponent.vue
@@ -68,7 +68,7 @@ const transactions = ref<BaseTransactionResponse[]>([]);
 
 const getUserRecentTransactions = () => {
   transactions.value = [];
-  if (cartStore.getBuyer) {
+  if (cartStore.getBuyer && (cartStore.getBuyer.id === authStore.getUser?.id || settings.isBorrelmode)) {
     // todo clean up
     apiService.user
       .getUsersTransactions(
diff --git a/apps/point-of-sale/src/components/Cart/TransactionHistory/TransactionHistoryComponent.vue b/apps/point-of-sale/src/components/Cart/TransactionHistory/TransactionHistoryComponent.vue
index 32a969b5..3528125e 100644
--- a/apps/point-of-sale/src/components/Cart/TransactionHistory/TransactionHistoryComponent.vue
+++ b/apps/point-of-sale/src/components/Cart/TransactionHistory/TransactionHistoryComponent.vue
@@ -8,7 +8,7 @@
 */
 <template>
   <div class="flex-column h-full gap-2 mt-2 overflow-y-auto">
-    <h class="font-medium text-xl">Recent Purchases:</h>
+    <h1 class="font-medium text-xl" v-if="transactions.length > 0">Recent Purchases:</h1>
     <TransactionHistoryRowComponent
       v-for="transaction in transactions"
       :key="transaction.id"
diff --git a/apps/point-of-sale/src/stores/cart.store.ts b/apps/point-of-sale/src/stores/cart.store.ts
index 620c558e..f7067ede 100644
--- a/apps/point-of-sale/src/stores/cart.store.ts
+++ b/apps/point-of-sale/src/stores/cart.store.ts
@@ -57,7 +57,7 @@ export const useCartStore = defineStore('cart', {
     async setBuyer(buyer: BaseUserResponse | null) {
       this.buyer = buyer;
       if (buyer) {
-        const response = await apiService.balance.getBalanceId(buyer.id);
+        const response = await apiService.balance.getBalanceId(buyer.id).catch(this.buyerBalance = null);
         this.buyerBalance = response.data.amount;
       } else {
         this.buyerBalance = null;

From 285f144327a407469e84e13e19f4bf71ed0bfa17 Mon Sep 17 00:00:00 2001
From: Samuel <samuel@gewis.nl>
Date: Mon, 11 Nov 2024 11:16:06 +0100
Subject: [PATCH 2/4] docs: add uptime badge to README.md (#448)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a22aac4b..3874d624 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@
 <!-- Centered Name Beneath Logo -->
 <h1>SudoSOS Frontend Monorepo</h1>
 
+[![Uptime](https://uptime.gewis.nl/api/badge/2/uptime)](https://sudosos.gewis.nl/api/v1/ping)
 [![Build](https://img.shields.io/github/actions/workflow/status/GEWIS/sudosos-frontend/semver.yml?branch=main&label=Build)](https://github.com/GEWIS/sudosos-frontend/actions/workflows/semver.yml)
 [![Latest Release](https://img.shields.io/github/v/tag/GEWIS/sudosos-frontend?label=Latest)](https://github.com/GEWIS/sudosos-frontend/releases)
 [![Issues](https://img.shields.io/github/issues/GEWIS/sudosos-frontend)](https://github.com/GEWIS/sudosos-frontend/issues)

From cf8acba188b1a9dde8e7d0694099482b913c56bc Mon Sep 17 00:00:00 2001
From: Samuel <samuel@gewis.nl>
Date: Tue, 12 Nov 2024 12:45:44 +0100
Subject: [PATCH 3/4] fix(dashboard): stripe key `[Object object]` (#449)

---
 apps/dashboard/src/stores/settings.store.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dashboard/src/stores/settings.store.ts b/apps/dashboard/src/stores/settings.store.ts
index 6de84a86..2a063d0c 100644
--- a/apps/dashboard/src/stores/settings.store.ts
+++ b/apps/dashboard/src/stores/settings.store.ts
@@ -22,7 +22,7 @@ export const useSettingsStore = defineStore('settings', {
     },
     async fetchStripe(){
       await apiService.stripe.getStripePublicKey().then((res) =>{
-        this.stripe = res.data;
+        this.stripe = (res.data as any).publicKey as string;
       });
     },
     async fetchKeys(){

From f54605b57d77164f47bdd6d4a4321cc997e5f688 Mon Sep 17 00:00:00 2001
From: Samuel <samuel@gewis.nl>
Date: Tue, 12 Nov 2024 16:03:56 +0100
Subject: [PATCH 4/4] fix(pos): mistake in vite config (#451)

---
 apps/point-of-sale/index.html     | 2 +-
 apps/point-of-sale/vite.config.ts | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/point-of-sale/index.html b/apps/point-of-sale/index.html
index f5b29321..18ba50df 100644
--- a/apps/point-of-sale/index.html
+++ b/apps/point-of-sale/index.html
@@ -8,7 +8,7 @@
       <link rel="manifest" href="favicon/manifest.json">
       <script>
           // @ts-ignore
-          window.__BASE_URL__ = ((path) => path !== '//' ? `/${path}/` : '/')
+          window.__BASE_URL__ = ((path) => path !== '' ? `/${path}/` : '')
           (window.location.pathname.split('/')[1] || '');
       </script>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"/>
diff --git a/apps/point-of-sale/vite.config.ts b/apps/point-of-sale/vite.config.ts
index b0fe0413..eabab869 100644
--- a/apps/point-of-sale/vite.config.ts
+++ b/apps/point-of-sale/vite.config.ts
@@ -36,7 +36,12 @@ export default defineConfig(({ mode }) => {
         '/api/v1': {
           target: PROXY_URL + '/api/v1',
           changeOrigin: true,
-          rewrite: (path) => path.replace(/^\/api/, ''),
+          rewrite: (path) => path.replace(/^\/api\/v1/, ''),
+        },
+        '/static': {
+          target:  PROXY_URL + '/static',
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/static/, ''),
         }
       }
     }