@oxygen-cms/ui 1.6.1 → 1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxygen-cms/ui",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "Various utilities for UI-building in Vue.js",
   "main": "none",
   "repository": {

package/src/components/App.vue

@@ -1,22 +1,23 @@
 <template>
     <div style="height: 100%;">
-<!--        <transition name="slide-left" mode="out-in">-->
             <router-view @logout="signOut">
                 <template #main-navigation>
-                    <slot name="app-navigation"></slot>
+                    <MainMenu :items="mainMenuItems" />
                 </template>
             </router-view>
-<!--        </transition>-->
     </div>
 </template>
 
 <script>
     import AuthApi from "../AuthApi";
+    import MainMenu from "./MainMenu.vue";
     export default {
         name: "App",
+        components: {MainMenu},
         props: {
             appTitle: { type: String, required: true },
             defaultRouteTitle: { type: String, required: true },
+            mainMenuItems: { type: Object, required: true },
             impersonating: {
                 type: Boolean,
                 default: false

package/src/components/AuthenticationLog.vue

@@ -84,7 +84,7 @@
 <script>
 import {FetchBuilder} from "../api";
 import Internationalize from "../Internationalize";
-import UAParser from 'ua-parser-js';
+import { UAParser } from 'ua-parser-js';
 import AuthApi from "../AuthApi";
 import {getApiRoot} from "../CrudApi";
 

package/src/components/LegacyPage.vue

@@ -134,7 +134,7 @@ export default {
             }
         },
         vuePathToURL(path) {
-            return getApiHost() + this.legacyPrefix + path;
+            return getApiHost() + this.legacyPrefix.replace(/^\//, '') + path;
         },
         // We detect when the iframe url changes, and update our window accordingly...
         onNavigated(newURL) {

package/src/main.js

@@ -28,7 +28,6 @@ export default class OxygenUI {
         this.authenticatedRoutes = []
         this.unauthenticatedRoutes = []
         this.mainMenuItems = {}
-        this.rootComponents = { App, MainMenu }
         this.beforeMountHooks = []
     }
 
@@ -110,11 +109,13 @@ export default class OxygenUI {
 
         this.app = new this.Vue({
             router: router,
-            data: {
-                existingAppTitle: document.title,
-                mainMenuItems: this.mainMenuItems
-            },
-            components: this.rootComponents,
+            render: (h) => h(App, {
+                props: {
+                    appTitle: document.title,
+                    defaultRouteTitle: 'Administration Panel',
+                    mainMenuItems: this.mainMenuItems
+                }
+            }),
             store
         });