From 61728f3044c59c5c6f0661081b8b678ce28e1554 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 21 Nov 2024 15:43:35 +0100
Subject: [PATCH] dashboard & widgets: template cleanup; property definiton
 cleanup; delete unwrapInjectedRef -> resolved since vue3.3;

---
 public/js/apps/Cis/RoomInformation.js               | 1 -
 public/js/apps/Cis/Stundenplan.js                   | 1 -
 public/js/apps/Dashboard/Admin.js                   | 1 -
 public/js/apps/Dashboard/Fhc.js                     | 1 -
 public/js/components/Calendar/Minimized.js          | 1 -
 public/js/components/Cis/Cms/ContentModal.js        | 8 +++-----
 public/js/components/Cis/Menu/Entry.js              | 2 +-
 public/js/components/Dashboard/Section.js           | 2 +-
 public/js/components/DashboardWidget/Stundenplan.js | 8 ++++----
 public/js/components/Drop/Grid.js                   | 2 +-
 public/js/plugin/Phrasen.js                         | 2 +-
 11 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index 8f9ad2583..51b63030d 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -15,6 +15,5 @@ const app = Vue.createApp({
 
 setScrollbarWidth();
 
-app.config.unwrapInjectedRef = true;
 app.use(Phrasen);
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 7405bf98d..441d83f35 100644
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -143,6 +143,5 @@ const app = Vue.createApp({
 	</fhc-calendar>
 	`
 });
-app.config.unwrapInjectedRef = true;
 app.use(Phrasen, {reload: true});
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
index 9d64998a8..0470f82a7 100644
--- a/public/js/apps/Dashboard/Admin.js
+++ b/public/js/apps/Dashboard/Admin.js
@@ -13,7 +13,6 @@ const app = Vue.createApp({
     DashboardAdmin
   }
 });
-app.config.unwrapInjectedRef = true;
 app.use(FhcApi);
 app.use(Phrasen);
 app.mount('#main');
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index b060e1b59..d096d4cde 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -15,7 +15,6 @@ const app = Vue.createApp({
 
 setScrollbarWidth();
 
-app.config.unwrapInjectedRef = true;
 app.use(FhcApi);
 app.use(Phrasen);
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/components/Calendar/Minimized.js b/public/js/components/Calendar/Minimized.js
index fc0f96785..ace5dce48 100644
--- a/public/js/components/Calendar/Minimized.js
+++ b/public/js/components/Calendar/Minimized.js
@@ -17,7 +17,6 @@ export default {
 	},
 	methods: {
 		maximize() {
-			// NOTE(chris): set "app.config.unwrapInjectedRef = true" for this to work
 			this.minimized = false;
 		}
 	},
diff --git a/public/js/components/Cis/Cms/ContentModal.js b/public/js/components/Cis/Cms/ContentModal.js
index 7a8d9beb8..b1b46530f 100644
--- a/public/js/components/Cis/Cms/ContentModal.js
+++ b/public/js/components/Cis/Cms/ContentModal.js
@@ -13,12 +13,10 @@ export default {
     },
     props:{
         contentID:{
-            type: Number,
-            required: true,
+            type: Number
         },
         ort_kurzbz:{
-            type: String,
-            required: true,
+            type: String
         }
     },
     data(){
@@ -51,7 +49,7 @@ export default {
     },
     
     template:/*html*/`
-    <bs-modal @hideBsModal="modalHidden" dialogClass="modal-xl" @showBsModal="modalShown" ref="modalContainer" dialogClass="modal-lg">
+    <bs-modal @hideBsModal="modalHidden" dialogClass="modal-xl" @showBsModal="modalShown" ref="modalContainer">
         <template #title>
             <span v-if="ort_kurzbz">{{ort_kurzbz}}</span>
             <span v-else>Raum Informationen</span>
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index c29fbb9ac..3176fe178 100644
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -6,7 +6,7 @@ export default {
             type: Number,
             default: 1
         },
-		activeContent: String,
+		activeContent: [String, Number],
 		highestMatchingUrlCount: Number,
     },
     data: () => {
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index d4ecf9244..91c978a63 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -195,7 +195,7 @@ export default {
 	template: `
 	<div class="dashboard-section" ref="container" :style="getSectionStyle">
 		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
-			<template #default="item" #default>
+			<template #default="item">
 				
 				<dashboard-item v-if="!item.placeholder"
 					:id="item.widget"
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 71ce60ebf..f7cc1b8ca 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -188,8 +188,8 @@ export default {
 	template: /*html*/`
 	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
 		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  />
-		<content-modal :contentID="roomInfoContentID" :ort_kurzbz="" dialogClass="modal-lg" ref="contentModal"/>
-		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" widget="true" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
+		<content-modal :contentID="roomInfoContentID" dialogClass="modal-lg" ref="contentModal"/>
+		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" :widget="true" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
 			<template #minimizedPage >
 				<div class="flex-grow-1" style="overflow-y: auto; overflow-x: hidden">
 					<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
@@ -218,6 +218,6 @@ export default {
 				</div>
 			</template>
 		</fhc-calendar>
-		</div>
-	</div>`
+	</div>
+`
 }
\ No newline at end of file
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 06e8f535e..1cbe9c3d1 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -376,7 +376,7 @@ export default {
 				paddingRight: 'var(--fhc-dg-item-padding-horizontal)'
 			}">
 			<template v-slot="item">
-				<slot v-bind="item.data" v-bind="item" :x="item.x" :y="item.y" ></slot>
+				<slot v-bind="item.data" :x="item.x" :y="item.y" ></slot>
 			</template>
 		</grid-item>
 		
diff --git a/public/js/plugin/Phrasen.js b/public/js/plugin/Phrasen.js
index 3539b9f6e..2cfcebb15 100644
--- a/public/js/plugin/Phrasen.js
+++ b/public/js/plugin/Phrasen.js
@@ -83,6 +83,6 @@ export default {
 			setLanguage: phrasen.setLanguage,
 			t_ref: phrasen.t_ref
 		};
-                app.provide('$p', app.config.globalProperties.$p);
+		app.provide('$p', app.config.globalProperties.$p);
 	}
 }
\ No newline at end of file