@afeefa/vue-app 0.0.112 → 0.0.114

package/.afeefa/package/release/version.txt

@@ -1 +1 @@
-0.0.112
+0.0.114

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afeefa/vue-app",
-  "version": "0.0.112",
+  "version": "0.0.114",
   "description": "",
   "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
   "license": "MIT",

package/src-admin/AfeefaAdmin.js

@@ -0,0 +1,114 @@
+import './config/components'
+import './directives'
+
+import { apiResourcesPlugin } from '@a-vue/plugins/api-resources/ApiResourcesPlugin'
+import { eventBusPlugin } from '@a-vue/plugins/event-bus/EventBusPlugin'
+import { hasOptionsPlugin } from '@a-vue/plugins/has-options/HasOptionsPlugin'
+import { timeout } from '@a-vue/utils/timeout'
+import Vue from 'vue'
+
+import { adminConfig } from './config/AdminConfig'
+import routeConfigPlugin from './config/routing'
+import vuetify from './config/vuetify'
+import { authPlugin } from './plugins/AuthPlugin'
+
+Vue.config.productionTip = false
+
+export class AfeefaAdmin {
+  _appConfig = {}
+  _routeConfigCallback = null
+  _apiConfig = null
+  _authService = null
+  _initCallback = null
+  _components = {}
+
+  app (appConfig) {
+    this._appConfig = appConfig
+    return this
+  }
+
+  routing (routeConfigCallback) {
+    this._routeConfigCallback = routeConfigCallback
+    return this
+  }
+
+  api (apiConfig) {
+    this._apiConfig = apiConfig
+    return this
+  }
+
+  auth (authService) {
+    this._authService = authService
+    return this
+  }
+
+  init (initCallback) {
+    this._initCallback = initCallback
+    return this
+  }
+
+  async run () {
+    // set app config
+    adminConfig.app = this._appConfig
+
+    // authenticate current user before doing any gui-voodo
+    if (this._authService) {
+      adminConfig.authService = this._authService
+
+      const authenticated = await this._authService.authenticate()
+      if (!authenticated) {
+        return // redirects to login
+      }
+      Vue.use(authPlugin)
+    }
+
+    // auth went well, show splash screen
+    const splash = new Vue({
+      vuetify,
+      el: '#splash',
+      template: '<splash />',
+      components: {
+        Splash: adminConfig.app.components.Splash
+      }
+    })
+
+    // plugins
+    Vue.use(hasOptionsPlugin)
+    Vue.use(eventBusPlugin)
+
+    // load auth resources
+    if (this._authService) {
+      await this._authService.init()
+    }
+
+    // setup api resources
+    apiResourcesPlugin.register(this._apiConfig.models, this._apiConfig.apis)
+    Vue.use(apiResourcesPlugin)
+    await apiResourcesPlugin.schemasLoaded()
+
+    // load initial data
+    if (this._initCallback) {
+      await this._initCallback()
+    }
+
+    // setup router, routes and breadcrumb
+    this._routeConfigCallback(routeConfigPlugin)
+    const router = await routeConfigPlugin.getRouter()
+
+    // routeConfigPlugin.dumpRoutes()
+    // routeConfigPlugin.dumbBreadcrumbs()
+
+    // remove splash show app
+    timeout(() => {
+      new Vue({
+        vuetify,
+        router,
+        el: '#app',
+        template: '<start :splash="splash" />',
+        data: {
+          splash
+        }
+      })
+    }, 300)
+  }
+}

package/src-admin/components/App.vue

@@ -9,7 +9,7 @@
     >
       <v-container
         flex-column
-        align-start
+        align-center
         fill-height
       >
         <router-link
@@ -50,6 +50,9 @@
             <div>
               <div class="accountName">
                 {{ account.first_name }}
+                <template v-if="$auth.roles()[0]">
+                  ({{ $auth.roles()[0].title }})
+                </template>
               </div>
 
               <div class="body-2 d-flex align-center">
@@ -120,7 +123,7 @@
 <script>
 import { Component, Vue, Watch } from '@a-vue'
 import { LoadingEvent } from '@a-vue/events'
-import { appConfig } from '@a-admin/config/AppConfig'
+import { adminConfig } from '@a-admin/config/AdminConfig'
 import { sleep } from '@a-vue/utils/timeout'
 import AppBarButtons from './app/AppBarButtons'
 import AppBarTitleContainer from './app/AppBarTitleContainer'
@@ -151,11 +154,11 @@ export default class App extends Vue {
   }
 
   get SidebarMenu () {
-    return appConfig.components.SidebarMenu
+    return adminConfig.app.components.SidebarMenu
   }
 
   get logoUrl () {
-    return appConfig.app.logo
+    return adminConfig.app.logo
   }
 
   get account () {
@@ -166,15 +169,15 @@ export default class App extends Vue {
   }
 
   get title () {
-    return appConfig.app.title
+    return adminConfig.app.title
   }
 
   get loaderColor () {
-    return appConfig.app.loaderColor
+    return adminConfig.app.loaderColor
   }
 
   get rootRouteName () {
-    return appConfig.app.rootRouteName || 'root'
+    return adminConfig.app.rootRouteName || 'root'
   }
 
   startLoading () {

package/src-admin/config/{AppConfig.js → AdminConfig.js}

@@ -1,4 +1,4 @@
-class AppConfig {
+class AdminConfig {
   authService = null
 
   app = {
@@ -14,4 +14,4 @@ class AppConfig {
   }
 }
 
-export const appConfig = new AppConfig()
+export const adminConfig = new AdminConfig()

package/src-admin/plugins/AuthPlugin.js

@@ -1,8 +1,8 @@
-import { appConfig } from '../config/AppConfig'
+import { adminConfig } from '../config/AdminConfig'
 
 class AuthPlugin {
   install (Vue) {
-    const authService = appConfig.authService
+    const authService = adminConfig.authService
     const $auth = {
       account: authService.getCurrentAccount(),
 
@@ -10,6 +10,8 @@ class AuthPlugin {
 
       hasRole: name => authService.currentAccountHasRole(name),
 
+      roles: () => authService.getCurrentAccountRoles(),
+
       logout: () => authService.forwardToLogoutEndpoint()
     }
 

package/src-admin/bootstrap.js

@@ -1,74 +0,0 @@
-import './config/event-bus'
-import './config/components'
-import './directives'
-
-import { authPlugin } from '@a-admin/plugins/AuthPlugin'
-import { translationPlugin } from '@a-admin/plugins/translation/TranslationPlugin'
-import { apiResourcesPlugin } from '@a-vue/plugins/api-resources/ApiResourcesPlugin'
-import { hasOptionsPlugin } from '@a-vue/plugins/has-options/HasOptionsPlugin'
-import { timeout } from '@a-vue/utils/timeout'
-import Vue from 'vue'
-
-import { appConfig } from './config/AppConfig'
-import routeConfigPlugin from './config/routing'
-import vuetify from './config/vuetify'
-
-Vue.use(apiResourcesPlugin)
-Vue.use(hasOptionsPlugin)
-Vue.use(translationPlugin)
-
-Vue.config.productionTip = false
-
-export async function bootstrap ({ apis, models, routing, authService, getTranslations, app, components }) {
-  appConfig.authService = authService
-  appConfig.app = app
-  appConfig.components = components
-
-  if (authService) {
-    const authenticated = await authService.authenticate()
-    if (!authenticated) {
-      return
-    }
-    Vue.use(authPlugin)
-  }
-
-  const splash = new Vue({
-    vuetify,
-    el: '#splash',
-    template: '<splash />',
-    components: {
-      Splash: components.Splash
-    }
-  })
-
-  if (authService) {
-    await authService.init()
-  }
-
-  apiResourcesPlugin.register(models, apis)
-
-  routing(routeConfigPlugin)
-  const router = await routeConfigPlugin.getRouter()
-
-  await apiResourcesPlugin.schemasLoaded()
-
-  if (getTranslations) {
-    const translations = await getTranslations(apiResourcesPlugin.apiResources)
-    translationPlugin.setTranslations(translations.models)
-  }
-
-  // routeConfigPlugin.dumpRoutes()
-  // routeConfigPlugin.dumbBreadcrumbs()
-
-  timeout(() => {
-    new Vue({
-      vuetify,
-      router,
-      el: '#app',
-      template: '<start :splash="splash" />',
-      data: {
-        splash
-      }
-    })
-  }, 300)
-}