@afeefa/vue-app 0.0.175 → 0.0.177

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

@@ -1 +1 @@
-0.0.175
+0.0.177

package/package.json

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

package/src/components/ATimePicker.vue

@@ -67,7 +67,7 @@
 </template>
 
 <script>
-import { Component, Watch, Vue } from 'vue-property-decorator'
+import { Component, Watch, Vue } from '@a-vue'
 import moment from 'moment'
 import formatHour from '@a-vue/utils/format-hour'
 import formatMinutes from '@a-vue/utils/format-minutes'

package/src/components/form/fields/FormFieldSearchSelect.vue

@@ -46,14 +46,18 @@
     </template>
 
     <template #row="{ model, on }">
-      <v-icon
+      <div
         v-if="$has.icon"
-        :color="model.getIcon().color"
-        size="1.5rem"
-        class="mr-2"
-        v-on="on"
-        v-text="model.getIcon().icon"
-      />
+        class="pr-0"
+      >
+        <v-icon
+          :color="model.getIcon().color"
+          size="1.5rem"
+          class="mr-2"
+          v-on="on"
+          v-text="model.getIcon().icon"
+        />
+      </div>
 
       <div
         style="width:100%;"

package/src/components/list/filters/ListFilterSearchSelect.vue

@@ -46,14 +46,18 @@
     </template>
 
     <template #row="{ model, on }">
-      <v-icon
+      <div
         v-if="$has.icon"
-        :color="model.getIcon().color"
-        size="1.5rem"
-        class="mr-2"
-        v-on="on"
-        v-text="model.getIcon().icon"
-      />
+        class="pr-0"
+      >
+        <v-icon
+          :color="model.getIcon().color"
+          size="1.5rem"
+          class="mr-2"
+          v-on="on"
+          v-text="model.getIcon().icon"
+        />
+      </div>
 
       <div
         style="width:100%;"

package/src-admin/AfeefaAdmin.js

@@ -12,6 +12,7 @@ import routeConfigPlugin from './config/routing'
 import vuetify from './config/vuetify'
 import { authPlugin } from './plugins/AuthPlugin'
 import { configPlugin } from './plugins/ConfigPlugin'
+import { iconsPlugin } from './plugins/IconsPlugin'
 
 Vue.config.productionTip = false
 
@@ -58,6 +59,7 @@ export class AfeefaAdmin {
     adminConfig.app = this._appConfig
 
     Vue.use(configPlugin)
+    Vue.use(iconsPlugin)
 
     // authenticate current user before doing any gui-voodo
     if (this._authService) {

package/src-admin/components/detail/DetailProperty.vue

@@ -2,11 +2,11 @@
   <div class="detailProperty">
     <div class="header">
       <v-icon
-        v-if="_icon"
-        :color="_icon.color"
+        v-if="icon"
+        :color="icon.color"
         size="3rem"
       >
-        {{ _icon.icon }}
+        {{ icon.icon }}
       </v-icon>
 
       <div
@@ -37,19 +37,9 @@
 import { Component, Vue } from '@a-vue'
 
 @Component({
-  props: ['icon', 'iconModelType', 'label']
+  props: ['icon', 'label']
 })
 export default class DetailProperty extends Vue {
-  get _icon () {
-    if (this.icon) {
-      return this.icon
-    }
-
-    if (this.iconModelType) {
-      const ModelClass = this.$apiResources.getModelClass(this.iconModelType)
-      return ModelClass.icon
-    }
-  }
 }
 </script>
 

package/src-admin/components/sidebar/InformationBarItem.vue

@@ -10,11 +10,11 @@
           @click="derail"
         >
           <v-icon
-            v-if="_icon"
-            :color="_icon.color"
+            v-if="icon"
+            :color="icon.color"
             size="2rem"
           >
-            {{ _icon.icon }}
+            {{ icon.icon }}
           </v-icon>
 
           <div
@@ -62,7 +62,6 @@ import { SidebarEvent } from '@a-admin/events'
 @Component({
   props: [
     'icon',
-    'iconModelType',
     'label',
     {
       top: true,
@@ -97,17 +96,6 @@ export default class InformationBarItem extends Vue {
     this.$events.off(SidebarEvent.STATUS, this.railChanged)
   }
 
-  get _icon () {
-    if (this.icon) {
-      return this.icon
-    }
-
-    if (this.iconModelType) {
-      const ModelClass = this.$apiResources.getModelClass(this.iconModelType)
-      return ModelClass.icon
-    }
-  }
-
   railChanged ({payload: {informationRailed}}) {
     if (this.rail === informationRailed) {
       return

package/src-admin/config/AdminConfig.js

@@ -12,7 +12,9 @@ class AdminConfig {
     components: {
       Splash: null,
       SidebarMenu: null
-    }
+    },
+
+    icons: {}
   }
 
   config = {}

package/src-admin/models/Model.js

@@ -1,5 +1,5 @@
 import { translationService } from '@a-admin/services/TranslationService'
-import { Model as ApiResourcesModel, apiResources } from '@afeefa/api-resources-client'
+import { Model as ApiResourcesModel } from '@afeefa/api-resources-client'
 import { mdiAlphaMCircle } from '@mdi/js'
 
 import { ModelAdminConfig } from './ModelAdminConfig'
@@ -7,7 +7,6 @@ import { ModelAdminConfig } from './ModelAdminConfig'
 export { ModelAdminConfig }
 
 export class Model extends ApiResourcesModel {
-  static resourceType = null
   static routeName = null
   static routeIdKey = 'id'
 
@@ -17,17 +16,6 @@ export class Model extends ApiResourcesModel {
     return (new this()).getLink(action)
   }
 
-  static getAction (actionName) {
-    if (this.resourceType) {
-      return apiResources.getAction({
-        resourceType: this.resourceType,
-        actionName
-      })
-    }
-    console.warn('You can\'t get an action out of a model without resourceType:', this.type)
-    return null
-  }
-
   static get adminConfig () {
     return new ModelAdminConfig()
       .setIcon({
@@ -53,10 +41,6 @@ export class Model extends ApiResourcesModel {
     }
   }
 
-  getAction (action) {
-    return this.constructor.getAction(action)
-  }
-
   getIcon () {
     return this.constructor.icon
   }

package/src-admin/plugins/IconsPlugin.js

@@ -0,0 +1,13 @@
+import { adminConfig } from '../config/AdminConfig'
+
+class IconsPlugin {
+  install (Vue) {
+    Object.defineProperty(Vue.prototype, '$icons', {
+      get () {
+        return adminConfig.app.icons
+      }
+    })
+  }
+}
+
+export const iconsPlugin = new IconsPlugin()