Chore: update main from develop

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)

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(){

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"/>

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(

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"

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;

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/, ''),
         }
       }
     }