@afeefa/vue-app 0.0.134 → 0.0.136

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

@@ -1 +1 @@
-0.0.134
+0.0.136

package/package.json

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

package/src/components/ADatePicker.vue

@@ -75,7 +75,7 @@ export default class ADatePicker extends Mixins(ComponentWidthMixin, UsesPositio
   }
 
   get clearable () {
-    if (this.validator && this.validator.param('null') === false) {
+    if (this.validator && this.validator.getParam('filled')) {
       return false
     }
     return true

package/src/components/ARichTextArea.vue

@@ -1,126 +1,127 @@
 <template>
-  <div :class="['a-rich-text-editor a-text-input', {'a-text-input-focused': editorFocus}]">
-    <div
-      v-if="editor"
-      class="menu-bar"
-    >
-      <div>
-        <v-btn
-          small
-          :class="['menu-button', {'is-active': editorFocus && editor.isActive('bold')}]"
-          title="fett"
-          @click="editor.chain().focus().toggleBold().run()"
-        >
-          <v-icon>{{ boldIcon }}</v-icon>
-        </v-btn>
-
-        <v-btn
-          small
-          :class="['menu-button', {'is-active': editorFocus && editor.isActive('italic')}]"
-          title="kursiv"
-          @click="editor.chain().focus().toggleItalic().run()"
-        >
-          <v-icon>{{ italicIcon }}</v-icon>
-        </v-btn>
-
-        <v-btn
-          small
-          :class="['menu-button', 'strike', {'is-active': editorFocus && editor.isActive('strike')}]"
-          title="durchgestrichen"
-          @click="editor.chain().focus().toggleStrike().run()"
-        >
-          <v-icon>{{ strikeIcon }}</v-icon>
-        </v-btn>
-
-        <v-btn
-          small
-          :class="['menu-button', {'is-active': editorFocus && editor.isActive('bulletList')}]"
-          title="punkt-liste"
-          @click="editor.chain().focus().toggleBulletList().run()"
-        >
-          <v-icon>{{ ulIcon }}</v-icon>
-        </v-btn>
-
-        <v-btn
-          small
-          :class="['menu-button', {'is-active': editorFocus && editor.isActive('orderedList')}]"
-          title="nummerierte liste"
-          @click="editor.chain().focus().toggleOrderedList().run()"
-        >
-          <v-icon>{{ olIcon }}</v-icon>
-        </v-btn>
-
-        <v-btn
-          small
-          :class="['menu-button', {'is-active': editorFocus && editor.isActive('blockquote')}]"
-          title="zitat"
-          @click="editor.chain().focus().toggleBlockquote().run()"
-        >
-          <v-icon>{{ commentIcon }}</v-icon>
-        </v-btn>
-
-        <v-btn
-          small
-          class="menu-button"
-          :class="{ 'is-active': editorFocus && editor.isActive('highlight', { color: '#00FF00' })}"
-          title="grün"
-          color="green--text"
-          @click="editor.chain().focus().toggleHighlight({ color: '#00FF00' }).run()"
-        >
-          <v-icon>$paletteIcon</v-icon>
-        </v-btn>
-
-        <v-btn
-          small
-          class="menu-button"
-          :class="{ 'is-active': editorFocus && editor.isActive('highlight', { color: '#FF0000' })}"
-          title="rot"
-          color="red--text"
-          @click="editor.chain().focus().toggleHighlight({ color: '#FF0000' }).run()"
-        >
-          <v-icon>$paletteIcon</v-icon>
-        </v-btn>
-
-        <v-btn
-          small
-          class="menu-button"
-          :class="{ 'is-active': editorFocus && editor.isActive('highlight', { color: '#FFFF00' })}"
-          title="gelb"
-          color="yellow--text"
-          @click="editor.chain().focus().toggleHighlight({ color: '#FFFF00' }).run()"
-        >
-          <v-icon>$paletteIcon</v-icon>
-        </v-btn>
-
-        <v-btn
-          small
-          class="menu-button undo-button"
-          :disabled="initialValue === editor.getHTML()"
-          title="rückgängig"
-          @click="editor.chain().focus().undo().run()"
-        >
-          <v-icon>{{ undoIcon }}</v-icon>
-        </v-btn>
+  <div>
+    <div :class="['editorWrapper', {hasError: !isValid, focused: editorFocus}]">
+      <div
+        v-if="editor"
+        class="menu-bar"
+      >
+        <div>
+          <v-btn
+            small
+            :class="['menu-button', {'is-active': editorFocus && editor.isActive('bold')}]"
+            title="fett"
+            @click="editor.chain().focus().toggleBold().run()"
+          >
+            <v-icon>{{ boldIcon }}</v-icon>
+          </v-btn>
+
+          <v-btn
+            small
+            :class="['menu-button', {'is-active': editorFocus && editor.isActive('italic')}]"
+            title="kursiv"
+            @click="editor.chain().focus().toggleItalic().run()"
+          >
+            <v-icon>{{ italicIcon }}</v-icon>
+          </v-btn>
+
+          <v-btn
+            small
+            :class="['menu-button', 'strike', {'is-active': editorFocus && editor.isActive('strike')}]"
+            title="durchgestrichen"
+            @click="editor.chain().focus().toggleStrike().run()"
+          >
+            <v-icon>{{ strikeIcon }}</v-icon>
+          </v-btn>
+
+          <v-btn
+            small
+            :class="['menu-button', {'is-active': editorFocus && editor.isActive('bulletList')}]"
+            title="punkt-liste"
+            @click="editor.chain().focus().toggleBulletList().run()"
+          >
+            <v-icon>{{ ulIcon }}</v-icon>
+          </v-btn>
+
+          <v-btn
+            small
+            :class="['menu-button', {'is-active': editorFocus && editor.isActive('orderedList')}]"
+            title="nummerierte liste"
+            @click="editor.chain().focus().toggleOrderedList().run()"
+          >
+            <v-icon>{{ olIcon }}</v-icon>
+          </v-btn>
+
+          <v-btn
+            small
+            :class="['menu-button', {'is-active': editorFocus && editor.isActive('blockquote')}]"
+            title="zitat"
+            @click="editor.chain().focus().toggleBlockquote().run()"
+          >
+            <v-icon>{{ commentIcon }}</v-icon>
+          </v-btn>
+
+          <v-btn
+            small
+            class="menu-button"
+            :class="{ 'is-active': editorFocus && editor.isActive('highlight', { color: '#00FF00' })}"
+            title="grün"
+            color="green--text"
+            @click="editor.chain().focus().toggleHighlight({ color: '#00FF00' }).run()"
+          >
+            <v-icon>$paletteIcon</v-icon>
+          </v-btn>
+
+          <v-btn
+            small
+            class="menu-button"
+            :class="{ 'is-active': editorFocus && editor.isActive('highlight', { color: '#FF0000' })}"
+            title="rot"
+            color="red--text"
+            @click="editor.chain().focus().toggleHighlight({ color: '#FF0000' }).run()"
+          >
+            <v-icon>$paletteIcon</v-icon>
+          </v-btn>
+
+          <v-btn
+            small
+            class="menu-button"
+            :class="{ 'is-active': editorFocus && editor.isActive('highlight', { color: '#FFFF00' })}"
+            title="gelb"
+            color="yellow--text"
+            @click="editor.chain().focus().toggleHighlight({ color: '#FFFF00' }).run()"
+          >
+            <v-icon>$paletteIcon</v-icon>
+          </v-btn>
+
+          <v-btn
+            small
+            class="menu-button undo-button"
+            :disabled="initialValue === editor.getHTML()"
+            title="rückgängig"
+            @click="editor.chain().focus().undo().run()"
+          >
+            <v-icon>{{ undoIcon }}</v-icon>
+          </v-btn>
+        </div>
+
+
+        <div>
+          <slot name="buttons" />
+        </div>
       </div>
 
-
-      <div>
-        <slot name="buttons" />
-      </div>
+      <editor-content
+        :editor="editor"
+        :class="['a-rich-text-editor', {editorFocus}]"
+      />
     </div>
 
-    <editor-content
-      :editor="editor"
-      :class="['a-rich-text-editor', {editorFocus}]"
-    />
-    <v-text-field
-      v-show="false"
-      ref="input"
-      v-model="currentValueStripped"
+    <a-text-field
+      :value="currentValueStripped"
+      class="validationInput"
       :label="label"
       :rules="validationRules"
-      v-bind="$attrs"
-      v-on="$listeners"
+      :valid.sync="isValid"
     />
   </div>
 </template>
@@ -156,6 +157,7 @@ export default class ARichTextArea extends Vue {
   internalValue = null
   initialValue = null
   editorFocus = false
+  isValid = false
 
   boldIcon = mdiFormatBold
   italicIcon = mdiFormatItalic
@@ -226,15 +228,14 @@ export default class ARichTextArea extends Vue {
   }
 
   get validationRules () {
-    const label = this.$attrs.label
-    return (this.validator && this.validator.getRules(label)) || []
+    return (this.validator && this.validator.getRules(this.label)) || []
   }
 
   get counter () {
     if (!this.validator) {
       return false
     }
-    return this.validator.getParams().max || false
+    return this.validator.getParam('max') || false
   }
 
   get currentValueStripped () {
@@ -247,9 +248,25 @@ export default class ARichTextArea extends Vue {
 
 
 <style lang="scss" scoped>
-.a-rich-text-editor {
+.editorWrapper {
+  padding: .5rem;
+
+  border: 1px solid white;
+  outline: 1px solid rgb(0 0 0 / 38%);
+  border-radius: 4px !important;
+
   :deep(.ProseMirror-focused) {
-      outline: none;
+    outline: none;
+  }
+
+  &.focused {
+    border: 1px solid #1975D2;
+    outline: 1px solid #1975D2;
+  }
+
+  &.hasError {
+    border: 1px solid #FF5252;
+    outline: 1px solid #FF5252;
   }
 }
 
@@ -271,6 +288,7 @@ export default class ARichTextArea extends Vue {
   border: none;
   box-shadow: none;
   border-radius: 0;
+  margin-right: 2px;
 
   :deep(.v-icon) {
     font-size: 20px;
@@ -290,6 +308,7 @@ export default class ARichTextArea extends Vue {
 
   &:disabled {
     background: none !important;
+
     :deep(*) {
       color: #CCCCCC !important;
     }
@@ -319,4 +338,12 @@ export default class ARichTextArea extends Vue {
     margin: 16px 0;
   }
 }
+
+.validationInput {
+  margin-top: .3rem;
+
+  :deep(.v-input__slot) {
+    display: none;
+  }
+}
 </style>

package/src/components/ATextArea.vue

@@ -31,7 +31,7 @@ export default class ATextArea extends Vue {
     if (!this.validator) {
       return false
     }
-    return this.validator.getParams().max || false
+    return this.validator.getParam('max') || false
   }
 }
 </script>

package/src/components/ATextField.vue

@@ -121,6 +121,10 @@ export default class ATextField extends Mixins(ComponentWidthMixin) {
       } else {
         value = this.internalValue.match(/^-?\d*(\.\d+)?$/) ? parseFloat(this.internalValue) : NaN
       }
+    } else {
+      if (!value) {
+        value = this.emptyValue
+      }
     }
     return value
   }
@@ -146,6 +150,7 @@ export default class ATextField extends Mixins(ComponentWidthMixin) {
     }
 
     this.errorMessages = [errorMessage].filter(e => e)
+    this.$emit('update:valid', !this.errorMessages.length)
     return !this.errorMessages.length
   }
 

package/src/components/form/FormFieldMixin.js

@@ -64,7 +64,7 @@ export class FormFieldMixin extends Vue {
 
       const options = []
 
-      if (!this.validator || !this.validator.getParams().filled) {
+      if (!this.validator || !this.validator.getParam('filled')) {
         options.push({
           itemText: 'Keine Auswahl',
           itemValue: null

package/src-admin/components/App.vue

@@ -12,6 +12,19 @@
         align-center
         fill-height
       >
+        <a-row
+          justify-end
+          width="100%"
+        >
+          <v-app-bar-nav-icon
+            class="sidebarToggleButton mt-1 mr-2 ml-3"
+            title="Menu schließen"
+            @click="toggleDrawer"
+          >
+            <v-icon>{{ closeMenuIcon }}</v-icon>
+          </v-app-bar-nav-icon>
+        </a-row>
+
         <router-link
           :to="{name: rootRouteName}"
           class="logoContainer d-flex flex-column align-center pa-6"
@@ -91,7 +104,9 @@
         align-start
       >
         <v-app-bar-nav-icon
+          v-if="!drawer"
           class="sidebarToggleButton mr-2 ml-3"
+          title="Menu öffnen"
           @click="toggleDrawer"
         />
 
@@ -132,6 +147,7 @@ import StickyFooterContainer from './StickyFooterContainer'
 import Sidebar from './Sidebar'
 import StickyHeader from './StickyHeader'
 import '../styles.scss'
+import { mdiBackburger } from '@mdi/js'
 
 @Component({
   components: {
@@ -147,6 +163,7 @@ export default class App extends Vue {
   $hasOptions = ['settings']
 
   drawer = true
+  closeMenuIcon = mdiBackburger
   isLoading = false
 
   created () {
@@ -235,6 +252,7 @@ export default class App extends Vue {
   width: 100%;
   left: 0;
   top: 0;
+  height:40px;
   padding: .2rem 1.1rem;
   background-color: white;
 }