Merge branch 'dev'

LugsoIn2 · Jan 26, 2023 · 8265b27 · 8265b27
2 parents 186d8bf + 8e33c76
commit 8265b27
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/src/components/EventCard.vue b/src/components/EventCard.vue
@@ -30,7 +30,7 @@ export default {
             <div class="flex w-full">
                 <div class="flex flex-col items-center">
                     <div class="text-6xl">
-                        {{ eventDate.getDate() }}
+                        {{( "0" + eventDate.getDate()).slice(-2) }}
                     </div>
                     <div>
                         {{ monthNames[eventDate.getMonth()] }}

diff --git a/src/stores/eventStore.ts b/src/stores/eventStore.ts
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import type {WasGehtEvent} from '@/models/event';
 import router from '@/router';
+import { tenantStore } from './tenantStore';
 
 export const eventStore = defineStore({
   id: 'eventStore',
@@ -14,9 +15,10 @@ export const eventStore = defineStore({
   actions: {
     async getEvents() {
       this.isLoading = true;
+      const tStore = tenantStore();
       let endpoint = `${import.meta.env.VITE_API_ENDPOINT}/events`;
       endpoint += "?" + new URLSearchParams({
-        'city': this.selectedTenant ? this.selectedTenant!.toString() : "",
+        'city': tStore.tenant ? tStore.tenant.city : this.selectedTenant ? this.selectedTenant!.toString() : "",
         'date': this.selectedDay ? this.selectedDay.toString() : ""
     }).toString();
       const res = await fetch(endpoint);