diff --git a/application/views/Nachrichten.php b/application/views/Nachrichten.php index cf34bfd53..faa15bbf8 100644 --- a/application/views/Nachrichten.php +++ b/application/views/Nachrichten.php @@ -22,7 +22,7 @@ $includesArray = array( #'vendor/npm-asset/primevue/toast/toast.min.js' ], 'customJSModules' => [ - 'public/js/apps/Nachrichten.js' + 'public/js/apps/Messages/NewMessage.js' ] ); diff --git a/public/js/apps/Messages/NewMessage.js b/public/js/apps/Messages/NewMessage.js index 693c8b0e2..b0484e312 100644 --- a/public/js/apps/Messages/NewMessage.js +++ b/public/js/apps/Messages/NewMessage.js @@ -1,20 +1,22 @@ -//TODO Manu -//use this instead of Nachrichten.js import NewMessage from "../../components/Messages/Details/NewMessage/NewDiv.js"; import Phrasen from "../../plugin/Phrasen.js"; +import ApiMessages from "../../api/factory/messages/messages.js"; + const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router; const router = VueRouter.createRouter({ history: VueRouter.createWebHistory(), routes: [ - { path: `/${ciPath}/NeueNachricht`, component: NewMessage }, - { path: `/${ciPath}/NeueNachricht/:id`, component: NewMessage }, - { path: `/${ciPath}/NeueNachricht/:id/:typeId`, component: NewMessage }, + { path: `/${ciPath}/NeueNachricht`, component: NewMessage, props: { endpoint: ApiMessages } }, + { path: `/${ciPath}/NeueNachricht/:id`, component: NewMessage, props: { endpoint: ApiMessages } }, + { path: `/${ciPath}/NeueNachricht/:id/:typeId`, component: NewMessage, props: { endpoint: ApiMessages } }, ] }); -const app = Vue.createApp(); +const app = Vue.createApp({ + name: 'NewMessageApp' +}); app .use(router) diff --git a/public/js/apps/Nachrichten.js b/public/js/apps/Nachrichten.js deleted file mode 100644 index 84b9ddee5..000000000 --- a/public/js/apps/Nachrichten.js +++ /dev/null @@ -1,26 +0,0 @@ -import NewMessage from "../components/Messages/Details/NewMessage/NewDiv.js"; - -import Phrasen from "../plugin/Phrasen.js"; - -const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router; - -const router = VueRouter.createRouter({ - history: VueRouter.createWebHistory(), - routes: [ - { path: `/${ciPath}/NeueNachricht/:id/:typeId`, component: NewMessage }, - { path: `/${ciPath}/NeueNachricht/:id/:typeId/:messageId`, component: NewMessage }, - ] -}); - - -const app = Vue.createApp(); - -app - .use(router) - .use(primevue.config.default, { - zIndex: { - overlay: 1100 - } - }) - .use(Phrasen) - .mount('#main'); \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js index 59650eaab..d45e04f3f 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js @@ -16,6 +16,7 @@ export default { }, template: `