Merge branch 'dev'

BT3103AppDev1 · Apr 24, 2024 · 9c2c55a · 9c2c55a
2 parents c6bfb6f + 84b5036
commit 9c2c55a
Show file tree

Hide file tree

Showing 53 changed files with 3,907 additions and 2,431 deletions.
diff --git a/src/assets/.DS_Store b/src/assets/.DS_Store
diff --git a/src/assets/approve.png b/src/assets/approve.png
diff --git a/src/assets/buy_icon.png b/src/assets/buy_icon.png
diff --git a/src/assets/close.png b/src/assets/close.png
diff --git a/src/assets/googlelogo.png b/src/assets/googlelogo.png
diff --git a/src/assets/icon1.png b/src/assets/icon1.png
diff --git a/src/assets/icon1old.png b/src/assets/icon1old.png
diff --git a/src/assets/icon2.png b/src/assets/icon2.png
diff --git a/src/assets/icon2old.png b/src/assets/icon2old.png
diff --git a/src/assets/icon3.png b/src/assets/icon3.png
diff --git a/src/assets/maillogo.png b/src/assets/maillogo.png
diff --git a/src/assets/sell_icon.png b/src/assets/sell_icon.png
diff --git a/src/assets/shopping_cart.png b/src/assets/shopping_cart.png
diff --git a/src/assets/warn.png b/src/assets/warn.png
diff --git a/src/components/CreateEventForm.vue b/src/components/CreateEventForm.vue
@@ -179,6 +179,8 @@ export default {
             } catch (error) {
                 console.error("Error adding event to group: ", error);
             }
+
+            this.$emit("eventCreated");
         },
 
         async generateEventID() {

diff --git a/src/components/CreateGroupForm.vue b/src/components/CreateGroupForm.vue
@@ -176,7 +176,7 @@ export default {
     display: flex;
     flex-direction: column;
     width: 90vw; 
-    max-width: 500px; 
+    max-width: 400px; 
 }
 
 .file-input {