@afeefa/vue-app 0.0.64 → 0.0.67

package/src-admin/components/App.vue

@@ -3,8 +3,9 @@
     <v-navigation-drawer
       v-model="drawer"
       app
-      fixeds
       left
+      width="280"
+      class="menubar"
     >
       <v-container
         flex-column
@@ -72,68 +73,47 @@
       </v-container>
     </v-navigation-drawer>
 
-    <v-navigation-drawer
-      v-if="false"
-      app
-      clipped
-      right
-    >
-      <v-list>
-        <v-list-item
-          v-for="n in 5"
-          :key="n"
-          link
-        >
-          <v-list-item-content>
-            <v-list-item-title>Item {{ n }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-      </v-list>
-    </v-navigation-drawer>
-
-    <flying-context-container />
-
-    <v-app-bar
-      app
-      flat
-      dense
-      color="#FAFAFA"
-    >
-      <div class="d-flex align-start mt-n2">
+    <a-loading-indicator
+      fixed
+      top
+      left
+      class="loadingIndicator"
+      :isLoading="isLoading"
+      :color="loaderColor"
+    />
+
+    <v-main id="v-main">
+      <a-row
+        start
+        class="topbar"
+      >
         <v-app-bar-nav-icon
-          class="sidebarToggleButton mr-2 ml-n1"
+          class="sidebarToggleButton mr-2 ml-4"
           @click="toggleDrawer"
         />
-        <a-breadcrumbs class="mt-2" />
-      </div>
-
-      <a-loading-indicator
-        fixed
-        top
-        left
-        class="loadingIndicator"
-        :isLoading="isLoading"
-        :color="loaderColor"
-      />
-    </v-app-bar>
-
-    <v-main>
+
+        <a-breadcrumbs />
+      </a-row>
+
       <v-container
         fluid
-        class="pa-4"
+        class="pa-8 pt-4"
       >
-        <div class="d-flex align-center">
-          <app-bar-title-container class="flex-grow-1 mb-4" />
-          <app-bar-buttons class="mr-2  mb-4" />
-        </div>
+        <sticky-header />
 
         <router-view :class="{isLoading}" />
       </v-container>
+
+      <sticky-footer-container />
     </v-main>
 
     <a-dialog id="app" />
 
     <a-save-indicator />
+
+    <sidebar />
+
+    <flying-context-container />
   </div>
 </template>
 
@@ -145,18 +125,23 @@ import { sleep } from '@a-vue/utils/timeout'
 import AppBarButtons from './app/AppBarButtons'
 import AppBarTitleContainer from './app/AppBarTitleContainer'
 import FlyingContextContainer from './FlyingContextContainer'
+import StickyFooterContainer from './StickyFooterContainer'
+import Sidebar from './Sidebar'
+import StickyHeader from './StickyHeader'
 import '../styles.scss'
 
 @Component({
   components: {
     AppBarButtons,
     AppBarTitleContainer,
-    FlyingContextContainer
+    FlyingContextContainer,
+    StickyFooterContainer,
+    Sidebar,
+    StickyHeader
   }
 })
 export default class App extends Vue {
   drawer = true
-  mainDrawer = false
   isLoading = false
   account = null
 
@@ -203,16 +188,6 @@ export default class App extends Vue {
     this.drawer = !this.drawer
   }
 
-  @Watch('drawer')
-  async drawerChanged () {
-    if (this.drawer) {
-      this.mainDrawer = false
-    } else {
-      await sleep(0.1)
-      this.mainDrawer = true
-    }
-  }
-
   get hasAuthService () {
     return !!appConfig.authService
   }
@@ -248,4 +223,24 @@ export default class App extends Vue {
   height: 36px !important;
   margin-top: 1px;
 }
+
+.topbar {
+  position: relative;
+  width: 100%;
+  left: 0;
+  top: 0;
+  padding: .2rem 1rem;
+}
+
+.a-breadcrumbs {
+  margin-top: 7px;
+}
+
+.menubar {
+  // background: #666666 !important;
+}
+
+#sidebar {
+  // background: #F4F4F4 !important;
+}
 </style>

package/src-admin/components/Sidebar.vue

@@ -0,0 +1,66 @@
+<template>
+  <v-navigation-drawer
+    id="sidebar"
+    v-model="visible"
+    app
+    right
+    disable-resize-watcher
+    width="220"
+  >
+    <div id="sidebar__children">
+      <div class="top" />
+      <div class="bottom" />
+    </div>
+  </v-navigation-drawer>
+</template>
+
+<script>
+import { Component, Vue } from '@a-vue'
+
+@Component({
+  props: []
+})
+export default class Sidebar extends Vue {
+  visible = false
+
+  mounted () {
+    this.mutationWatcher = new MutationObserver(this.domChanged)
+    this.mutationWatcher.observe(this.$el.querySelector('#sidebar__children > .top'), { childList: true })
+    this.mutationWatcher.observe(this.$el.querySelector('#sidebar__children > .bottom'), { childList: true })
+
+    this.domChanged()
+  }
+
+  domChanged () {
+    this.visible = this.hasSidebarItems()
+  }
+
+  getChildrenContainer () {
+    return this.$el.querySelector('#sidebar__children')
+  }
+
+  hasSidebarItems () {
+    return !!(this.$el.querySelector('#sidebar__children .top').children.length +
+      this.$el.querySelector('#sidebar__children .bottom').children.length)
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+#sidebar {
+  &__children {
+    width: 100%;
+  }
+}
+
+#sidebar__children {
+  height: 100%;
+  padding: 2rem;
+  // padding-left: 4rem;
+
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+</style>

package/src-admin/components/SidebarItem.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="sidebarItem">
+    <div :class="contextId">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import { Component, Vue } from '@a-vue'
+import { randomCssClass } from '@a-vue/utils/random'
+
+@Component({
+  props: [
+    {
+      top: true,
+      bottom: false
+    }
+  ]
+})
+export default class SidebarItem extends Vue {
+  contextId = randomCssClass(10)
+
+  mounted () {
+    const container = this.getSidebarContainer()
+    console.log(container)
+    container.appendChild(this.getContent())
+  }
+
+  destroyed () {
+    const container = this.getSidebarContainer()
+    const el = this.getContent()
+    if (container.contains(el)) {
+      container.removeChild(el)
+    }
+  }
+
+  getContent () {
+    return document.querySelector('.' + this.contextId)
+  }
+
+  getSidebarContainer () {
+    console.log('toporbottom', this.$props)
+    return document.querySelector('#sidebar__children > .' + this.position)
+  }
+
+  get position () {
+    if (this.bottom) {
+      return 'bottom'
+    } else {
+      return 'top'
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+</style>

package/src-admin/components/StickyFooter.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="stickyFooter">
+    <div :class="contextId">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import { Component, Vue } from '@a-vue'
+import { randomCssClass } from '@a-vue/utils/random'
+
+@Component
+export default class StickyFooter extends Vue {
+  contextId = randomCssClass(10)
+
+  mounted () {
+    const container = this.getFooterContainer()
+    container.appendChild(this.getContent())
+  }
+
+  destroyed () {
+    const container = this.getFooterContainer()
+    const el = this.getContent()
+    if (container.contains(el)) {
+      container.removeChild(el)
+    }
+  }
+
+  getContent () {
+    return document.querySelector('.' + this.contextId)
+  }
+
+  getFooterContainer () {
+    return document.getElementById('stickyFooterContainer__children')
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+</style>

package/src-admin/components/StickyFooterContainer.vue

@@ -0,0 +1,66 @@
+<template>
+  <v-footer
+    id="stickyFooterContainer"
+    fixed
+    app
+    inset
+    :class="{visible}"
+  >
+    <div id="stickyFooterContainer__children" />
+  </v-footer>
+</template>
+
+<script>
+import { Component, Vue } from '@a-vue'
+
+@Component({
+  props: []
+})
+export default class StickyFooterContainer extends Vue {
+  visible = false
+
+  mounted () {
+    this.mutationWatcher = new MutationObserver(this.domChanged)
+    this.mutationWatcher.observe(this.getChildrenContainer(), { childList: true })
+  }
+
+  domChanged () {
+    const container = this.getChildrenContainer()
+    this.visible = !!container.children.length
+
+    this.$nextTick(() => {
+      const mainStyle = document.getElementById('v-main').style
+      if (this.visible) {
+        mainStyle.paddingBottom = this.$el.offsetHeight + 'px'
+      } else {
+        mainStyle.paddingBottom = '0px'
+      }
+    })
+  }
+
+  getChildrenContainer () {
+    return this.$el.querySelector('#stickyFooterContainer__children')
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+#stickyFooterContainer {
+  background: white;
+  padding: 0;
+
+  &:not(.visible) {
+    display: none;
+  }
+
+  &__children {
+    width: 100%;
+  }
+}
+
+#stickyFooterContainer__children {
+  background: #F5F5F5;
+  padding: 1rem;
+}
+</style>

package/src-admin/components/StickyHeader.vue

@@ -0,0 +1,73 @@
+<template>
+  <div
+    id="stickyHeader"
+    :class="['d-flex align-center gap-8', {visible}]"
+  >
+    <app-bar-title-container class="appBarTitle flex-grow-1" />
+    <app-bar-buttons class="appBarButtons mr-2" />
+  </div>
+</template>
+
+<script>
+import { Component, Vue } from '@a-vue'
+import AppBarButtons from './app/AppBarButtons'
+import AppBarTitleContainer from './app/AppBarTitleContainer'
+
+@Component({
+  components: {
+    AppBarButtons,
+    AppBarTitleContainer
+  }
+})
+export default class StickyHeader extends Vue {
+  visible = false
+
+  mounted () {
+    // watch mutation
+    this.mutationWatcher = new MutationObserver(this.domChanged)
+    this.mutationWatcher.observe(this.$el.querySelector('.appBarTitle'), { childList: true })
+    this.mutationWatcher.observe(this.$el.querySelector('.appBarButtons'), { childList: true })
+
+    // watch intersection
+    const el = document.querySelector('#stickyHeader')
+    const observer = new IntersectionObserver(
+      ([e]) => {
+        e.target.classList.toggle('is-pinned', e.intersectionRatio < 1)
+      },
+      { threshold: [1] }
+    )
+    observer.observe(el)
+
+    this.domChanged()
+  }
+
+  domChanged () {
+    this.visible = this.hasItems()
+  }
+
+  hasItems () {
+    return !!(this.$el.querySelector('.appBarTitle').children.length +
+      this.$el.querySelector('.appBarButtons').children.length)
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+#stickyHeader {
+  position: sticky;
+  top: -1px;
+  margin: -1rem -2rem 2rem;
+  padding: 1rem 2rem;
+
+  &:not(.visible) {
+    display: none !important;
+  }
+
+  &.is-pinned {
+    background: white;
+    z-index: 2;
+    box-shadow: 0 4px 7px -4px #00000033;
+  }
+}
+</style>

package/src-admin/components/app/AppBarButtons.vue

@@ -12,10 +12,3 @@ import { Component, Vue } from '@a-vue'
 export default class AppBarButtons extends Vue {
 }
 </script>
-
-
-<style lang="scss" scoped>
-#appBarButtons:empty {
-  display: none !important;
-}
-</style>

package/src-admin/components/app/AppBarTitle.vue

@@ -1,13 +1,36 @@
 <template>
-  <div class="d-flex align-center">
-    <v-icon
-      class="mr-2"
-      :color="icon.color"
-      size="1.8rem"
-      v-text="icon.icon"
-    />
-
-    <h2>{{ title }}</h2>
+  <div class="d-flex align-center gap-4">
+    <v-btn
+      v-if="back"
+      fab
+      x-small
+      color="#F4F4F4"
+      title="Zurück"
+      class="mr-n2"
+      @click="$router.push(back)"
+    >
+      <v-icon>
+        $arrowLeftIcon
+      </v-icon>
+    </v-btn>
+
+    <v-avatar
+      color="#F4F4F4"
+      size="3rem"
+    >
+      <v-icon
+        :color="icon.color"
+        size="2.2rem"
+        v-text="icon.icon"
+      />
+    </v-avatar>
+
+    <div class="titleContainer">
+      <h3 v-if="subtitle">
+        {{ subtitle }}
+      </h3>
+      <h2>{{ title }}</h2>
+    </div>
   </div>
 </template>
 
@@ -15,7 +38,7 @@
 import { Component, Vue } from '@a-vue'
 
 @Component({
-  props: ['icon', 'title']
+  props: ['back', 'icon', 'title', 'subtitle']
 })
 export default class appBarTitle extends Vue {
   mounted () {
@@ -41,8 +64,29 @@ export default class appBarTitle extends Vue {
 
 
 <style lang="scss" scoped>
+.titleContainer {
+  overflow: hidden;
+  margin-top: -.2rem;
+}
+
+h3 {
+  font-size: .9rem;
+  font-weight: normal;
+  margin-bottom: .1rem;
+  line-height: 1rem;
+  color: #999999;
+
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 h2 {
-  // white-space: nowrap;
+  font-size: 1.5rem;
   line-height: 1.5rem;
+
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 </style>

package/src-admin/components/app/AppBarTitleContainer.vue

@@ -11,9 +11,8 @@ export default class AppBarTitleContainer extends Vue {
 }
 </script>
 
-
 <style lang="scss" scoped>
-#appBarTitleContainer:empty {
-  display: none;
+#appBarTitleContainer {
+  min-width: 0; // https://stackoverflow.com/questions/38657688/text-overflow-ellipsis-not-working-in-a-nested-flex-container
 }
 </style>

package/src-admin/components/controls/SearchSelectFormField.vue

@@ -68,6 +68,7 @@
     >
       <template #activator>
         <a-icon-button
+          small
           icon="$plusIcon"
           :text="selectableConfig.addButtonTitle || 'Hinzufügen'"
           class="mt-4"

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

@@ -1,17 +1,23 @@
 <template>
   <div class="detailProperty">
     <div class="header">
-      <v-icon
+      <v-avatar
         v-if="_icon"
-        :color="_icon.color"
-        size="2rem"
+        color="#EEEEEE"
+        size="2.5rem"
       >
-        {{ _icon.icon }}
-      </v-icon>
-      <label :class="['label', {'label--withIcon': _icon != null}]">{{ label }}</label>
+        <v-icon
+          :color="_icon.color"
+          size="1.5rem"
+        >
+          {{ _icon.icon }}
+        </v-icon>
+      </v-avatar>
+
+      <label :class="['label', {'label--withIcon': !!_icon}]">{{ label }}</label>
     </div>
 
-    <div :class="['content', {'content--withIcon': _icon != null}]">
+    <div :class="['content', {'content--withIcon': !!_icon}]">
       <a-row
         vertical
         gap="6"
@@ -52,29 +58,27 @@ export default class DetailProperty extends Vue {
     flex-wrap: nowrap;
     align-items: center;
     height: 40px;
-    .v-icon {
+
+    .v-avatar {
       flex: 0 0 40px;
       margin-right: 15px;
     }
+
     .label {
       display: block;
       text-transform: uppercase;
       letter-spacing: 2px;
-      @media (max-width: 900px), (orientation : portrait) {
-        padding-left: 55px;
-        &--withIcon {
-          padding-left: 0;
-        }
+      padding-left: 55px;
+      &--withIcon {
+        padding-left: 0;
       }
     }
   }
   .content {
+    padding-left: 55px;
     &--withIcon {
       padding-left: 55px;
     }
-    @media (max-width: 900px), (orientation : portrait) {
-      padding-left: 55px;
-    }
   }
 }
 </style>