Release (#629)

* fix: bug №41 * fix: open menu item in a new tab * fix: spinners color palette * 1-4, 6-7 * fix: bug №9 (additional tweaks) * fix: bug №17 * fix: bug №21 * fix: bug №22 * fix: bug №23 * fix: bug №24 * fix: bug №15 * fix: "Show All" button alignment * fix: bug №6 * Fix/bugs (#622) * fix: bug №8, bug №10, bug №16, bug №28, bug №36 * revert google map changes * fix: bug #91, 12 * Fix/bugs (#623) * fix: dropdown regression * fix: bug №20 * fix: №89 and №56 * get rid of unnecessary anymore overriding styles * fix: restore default selection for medium-editor * fix: dropdown problem * fix: bug №37 (charts) * fix: bug №90 * fix: bug №93 * fix: bug №94 * fix: bug №95 * Fix/bugs #34 & #37 (#624) * chore: remove old component va-pre-loader * fix: dashboard info block alignment and text wrapping * chore: remove vee-validate (not used) * minor * chore: remove unused deps * chore: update risky deps * fix: VaSelect-mutli chips * Fix/bug #92 (#625) * fix: bugs №46 and №47 * fix: bugs №48 and №49 * fix: bug №52 * fix: bug №84 * Fix/bugs #54, #55, #59, #77, #78 (#626) * fix: bug №71 * fix: bug №87 * Fix/bugs #65, #66, #72, #74, #82, #83 (#627) * Fix/bugs #53, #68 (#628) * fix: bug №42
epicmaxco · Aug 3, 2019 · 6fa4ed9 · 6fa4ed9
1 parent 41e57cb
commit 6fa4ed9
Show file tree

Hide file tree

Showing 78 changed files with 3,422 additions and 3,830 deletions.
diff --git a/package.json b/package.json
@@ -20,37 +20,30 @@
     "asva-executors": "^0.1.22",
     "babel-polyfill": "^6.26.0",
     "chart.js": "^2.6.0",
-    "detect-browser": "^3.0.0",
+    "detect-browser": "^4.6.0",
     "element-resize-detector": "^1.1.12",
     "epic-spinners": "^1.1.0",
     "es6-promise": "^4.2.5",
-    "extend": "3.0.2",
     "flag-icon-css": "^3.0.0",
     "font-awesome": "^4.7.0",
-    "gemini-scrollbar": "^1.5.1",
     "google-maps": "^3.3.0",
     "ionicons": "^3.0.0",
-    "kewler": "^1.0.8",
     "leaflet-map": "^0.2.1",
-    "lodash": "4.17.11",
+    "lodash": "4.17.15",
     "medium-editor": "^5.23.3",
-    "nanoid": "^2.0.1",
     "normalize.css": "^8.0.1",
     "popper.js": "^1.15.0",
     "v-tooltip": "^2.0.0-rc.30",
-    "vee-validate": "2.0.9",
     "vue": "^2.6.10",
     "vue-bulma-expanding": "0.0.1",
     "vue-chartjs": "^3.4.0",
-    "vue-clipboard2": "^0.2.1",
+    "vue-clipboard2": "^0.3.0",
     "vue-color": "^2.7.0",
     "vue-epic-bus": "^0.1.2",
     "vue-flatpickr-component": "^8.0.0",
     "vue-router": "^3.0.6",
-    "vue-slider-component": "2.7.8",
     "vue-toasted": "^1.1.25",
-    "vue-yandex-maps": "^0.7.9",
-    "vue2-circle-progress": "^1.0.3",
+    "vue-yandex-maps": "^0.8.14",
     "vuetable-2": "1.7.5",
     "vuex": "^3.1.0",
     "vuex-i18n": "^1.11.0",
@@ -63,28 +56,17 @@
     "@vue/cli-service": "^3.0.5",
     "@vue/eslint-config-standard": "^4.0.0",
     "@vue/test-utils": "^1.0.0-beta.20",
-    "autoprefixer": "9.5.1",
+    "autoprefixer": "9.6.1",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^24.7.1",
-    "chalk": "2.4.1",
-    "connect-history-api-fallback": "1.5.0",
-    "copy-webpack-plugin": "4.5.3",
-    "eslint-friendly-formatter": "4.0.1",
-    "eventsource-polyfill": "0.9.6",
-    "express": "^4.16.3",
+    "copy-webpack-plugin": "5.0.4",
     "extract-text-webpack-plugin": "3.0.2",
-    "file-loader": "2.0.0",
-    "lint-staged": "^8.1.5",
+    "file-loader": "4.1.0",
+    "lint-staged": "^9.2.1",
     "node-sass": "^4.9.0",
-    "opn": "5.4.0",
-    "optimize-css-assets-webpack-plugin": "5.0.1",
-    "ora": "3.0.0",
-    "portfinder": "1.0.17",
-    "rimraf": "2.6.2",
+    "optimize-css-assets-webpack-plugin": "5.0.3",
     "sass-loader": "^7.0.1",
-    "sass-resources-loader": "^1.3.3",
-    "semver": "5.5.1",
-    "shelljs": "0.8.3",
+    "sass-resources-loader": "^2.0.1",
     "vue-book": "0.1.0-alpha.17",
     "vue-template-compiler": "^2.6.10"
   },

diff --git a/src/app/main.js b/src/app/main.js
@@ -4,7 +4,6 @@ import 'babel-polyfill'
 // The Vue build version to load with the `import` command
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 import Vue from 'vue'
-import VeeValidate from 'vee-validate'
 import App from './App'
 import { ColorThemePlugin } from '../services/ColorThemePlugin'
 import store from '../store/index'
@@ -27,9 +26,6 @@ Vue.use(ColorThemePlugin,
     },
   })
 
-// NOTE: workaround for VeeValidate + vuetable-2
-Vue.use(VeeValidate, { fieldsBagName: 'formFields' })
-
 router.beforeEach((to, from, next) => {
   store.commit('setLoading', true)
   next()

diff --git a/src/components/admin/AppLayout.vue b/src/components/admin/AppLayout.vue
@@ -13,12 +13,9 @@
       slot="content"
       id="content"
       class="layout gutter--xl fluid"
+      :class="{'app-layout__main--full-width-sidebar': !minimized}"
       role="main"
     >
-      <va-pre-loader
-        v-show="isLoading"
-        class="pre-loader"
-      />
       <router-view/>
     </main>
   </va-page-layout>
@@ -57,3 +54,15 @@ export default {
   },
 }
 </script>
+
+<style lang="scss">
+  .app-layout {
+    &__main {
+      &--full-width-sidebar {
+        @include media-breakpoint-down(xs) {
+          display: none;
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/components/admin/app-navbar/components/dropdowns/ColorDropdown.vue b/src/components/admin/app-navbar/components/dropdowns/ColorDropdown.vue
@@ -1,62 +1,65 @@
 <template>
-  <va-dropdown class="color-dropdown">
+  <va-dropdown
+    class="color-dropdown"
+    offset="0, 13px"
+  >
     <va-icon
       name="i-nav-color"
       slot="anchor"
       class="color-dropdown__icon"
     />
 
-    <div class="color-dropdown__content px-3 py-2">
-      <va-dropdown class="color-picker-dropdown py-1">
+    <div class="color-dropdown__content pl-4 pr-4 pt-2 pb-2">
+      <va-dropdown class="color-picker-dropdown mt-1 mb-1">
         <va-badge class="color-picker-dropdown__badge" color="primary" slot="anchor">
           Primary
         </va-badge>
         <va-advanced-color-picker class="my-1" v-model="$themes.primary" :value="$themes.primary"/>
       </va-dropdown>
 
-      <va-dropdown class="color-picker-dropdown py-1">
+      <va-dropdown class="color-picker-dropdown mt-1 mb-1">
         <va-badge class="color-picker-dropdown__badge" color="secondary" slot="anchor">
           Secondary
         </va-badge>
         <va-advanced-color-picker class="my-1" v-model="$themes.secondary" :value="$themes.secondary"/>
       </va-dropdown>
 
-      <va-dropdown class="color-picker-dropdown py-1">
+      <va-dropdown class="color-picker-dropdown mt-1 mb-1">
         <va-badge class="color-picker-dropdown__badge" color="success" slot="anchor">
           Success
         </va-badge>
         <va-advanced-color-picker class="my-1" v-model="$themes.success" :value="$themes.success"/>
       </va-dropdown>
 
-      <va-dropdown class="color-picker-dropdown py-1">
+      <va-dropdown class="color-picker-dropdown mt-1 mb-1">
         <va-badge class="color-picker-dropdown__badge" color="info" slot="anchor">
           Info
         </va-badge>
         <va-advanced-color-picker class="my-1" v-model="$themes.info" :value="$themes.info"/>
       </va-dropdown>
 
-      <va-dropdown class="color-picker-dropdown py-1">
+      <va-dropdown class="color-picker-dropdown mt-1 mb-1">
         <va-badge class="color-picker-dropdown__badge" color="danger" slot="anchor">
           Danger
         </va-badge>
         <va-advanced-color-picker class="my-1" v-model="$themes.danger" :value="$themes.danger"/>
       </va-dropdown>
 
-      <va-dropdown class="color-picker-dropdown py-1">
+      <va-dropdown class="color-picker-dropdown mt-1 mb-1">
         <va-badge class="color-picker-dropdown__badge" color="warning" slot="anchor">
           Warning
         </va-badge>
         <va-advanced-color-picker class="my-1" v-model="$themes.warning" :value="$themes.warning"/>
       </va-dropdown>
 
-      <va-dropdown class="color-picker-dropdown py-1">
+      <va-dropdown class="color-picker-dropdown mt-1 mb-1">
         <va-badge class="color-picker-dropdown__badge" color="gray" slot="anchor">
           Gray
         </va-badge>
         <va-advanced-color-picker class="my-1" v-model="$themes.gray" :value="$themes.gray"/>
       </va-dropdown>
 
-      <va-dropdown class="color-picker-dropdown py-1">
+      <va-dropdown class="color-picker-dropdown mt-1 mb-1">
         <va-badge class="color-picker-dropdown__badge" color="dark" slot="anchor">
           Dark
         </va-badge>
@@ -88,6 +91,7 @@ export default {
 
 .color-dropdown {
   cursor: pointer;
+  margin-top: 0.3rem;
 
   &__icon {
     position: relative;
@@ -110,5 +114,9 @@ export default {
       }
     }
   }
+
+  .va-dropdown__anchor {
+    display: inline-block;
+  }
 }
 </style>
diff --git a/src/components/admin/app-navbar/components/dropdowns/LanguageDropdown.vue b/src/components/admin/app-navbar/components/dropdowns/LanguageDropdown.vue
@@ -1,12 +1,12 @@
 <template>
   <va-dropdown
     class="language-dropdown"
-    offset="0, 15"
+    offset="0, 16px"
     fixed
   >
     <va-icon slot="anchor" :name="['flag-icon flag-icon-large', flagIconClass(currentLanguage())]"/>
-    <div class="language-dropdown__content py-3 px-2">
-      <div class="language-dropdown__item row align--center"
+    <div class="language-dropdown__content pl-4 pr-4 pt-2 pb-2">
+      <div class="language-dropdown__item row align--center pt-1 pb-1 mt-2 mb-2"
          v-for="(option, id) in options"
          :key="id"
          :class="{ active: option.code === currentLanguage() }"
@@ -71,11 +71,13 @@ export default {
 
 .language-dropdown {
   cursor: pointer;
+  margin-top: 0.3rem;
+
   &__content {
     background-color: $dropdown-background;
     box-shadow: $gray-box-shadow;
     border-radius: .5rem;
-    max-width: 9rem !important;
+    width: 12rem;
     .flag-icon-small {
       min-width: 1.5rem;
       min-height: 1.5rem;
@@ -93,11 +95,18 @@ export default {
       color: $vue-green;
     }
   }
+
+  .flag-icon:before {
+    content: "";
+  }
   .flag-icon-large {
     display: block;
     width: 31px;
     height: 23px;
   }
 
+  .va-dropdown__anchor {
+    display: inline-block;
+  }
 }
 </style>
diff --git a/src/components/admin/app-navbar/components/dropdowns/MessageDropdown.vue b/src/components/admin/app-navbar/components/dropdowns/MessageDropdown.vue
@@ -1,28 +1,28 @@
 <template>
   <va-dropdown
     class="message-dropdown"
-    offset="15px, 0"
+    offset="0, 16px"
   >
     <va-icon
       name="i-nav-messages"
       slot="anchor"
       class="message-dropdown__icon"
       :class="{'message-dropdown__icon--unread': !allRead}"
     />
-    <div class="message-dropdown__content py-3 px-2">
+    <div class="message-dropdown__content pl-4 pr-4 pt-2 pb-2">
       <div
         v-for="option in computedOptions"
         :key="option.id"
-        class="message-dropdown__item pr-3 row"
+        class="message-dropdown__item row pt-1 pb-1 mt-2 mb-2"
         :class="{'message-dropdown__item--unread': option.unread}"
         @click="option.unread = false"
       >
-        <img :src="option.details.avatar" class="message-dropdown__item__avatar mr-1"/>
-        <span class="ellipsis">{{ $t(`messages.${option.name}`, { name: option.details.name})}}</span>
+        <img :src="option.details.avatar" class="message-dropdown__item__avatar mr-2"/>
+        <span class="ellipsis" style="max-width: 85%;">{{ $t(`messages.${option.name}`, { name: option.details.name})}}</span>
       </div>
       <div class="row justify--space-between">
-        <va-button class="m-0 mr-1" small>{{ $t('messages.all') }}</va-button>
-        <va-button class="m-0" small outline @click="markAllAsRead" :disabled="allRead">{{ $t('messages.mark_as_read') }}</va-button>
+        <va-button class="ma-0 mb-2 mt-1 mr-2" small>{{ $t('messages.all') }}</va-button>
+        <va-button class="ma-0 mb-2 mt-1" small outline @click="markAllAsRead" :disabled="allRead">{{ $t('messages.mark_as_read') }}</va-button>
       </div>
     </div>
   </va-dropdown>
@@ -73,6 +73,7 @@ export default {
 
 .message-dropdown {
   cursor: pointer;
+  margin-top: 0.3rem;
 
   .message-dropdown__icon {
     position: relative;
@@ -127,5 +128,9 @@ export default {
       height: 1.5rem;
     }
   }
+
+  .va-dropdown__anchor {
+    display: inline-block;
+  }
 }
 </style>
diff --git a/src/components/admin/app-navbar/components/dropdowns/NotificationDropdown.vue b/src/components/admin/app-navbar/components/dropdowns/NotificationDropdown.vue
@@ -1,7 +1,7 @@
 <template>
   <va-dropdown
     class="notification-dropdown"
-    offset="15px, 0"
+    offset="0, 16px"
     boundary-body
   >
     <va-icon
@@ -10,22 +10,22 @@
       class="notification-dropdown__icon"
       :class="{'notification-dropdown__icon--unread': !allRead}"
     />
-    <div class="notification-dropdown__content py-3 px-2">
+    <div class="notification-dropdown__content pl-3 pr-3 pt-2 pb-2">
       <div
         v-for="option in computedOptions"
         :key="option.id"
-        class="notification-dropdown__item pr-3 row"
+        class="notification-dropdown__item row pt-1 pb-1 mt-2 mb-2"
         :class="{'notification-dropdown__item--unread': option.unread}"
         @click="option.unread = false"
       >
-        <img v-if="option.details.avatar" class="mr-1 notification-dropdown__item__avatar" :src="option.details.avatar"/>
-        <span class="ellipsis">
+        <img v-if="option.details.avatar" class="mr-2 notification-dropdown__item__avatar" :src="option.details.avatar"/>
+        <span class="ellipsis" style="max-width: 85%;">
           <span class="text--bold" v-if="option.details.name">{{option.details.name}}</span> {{$t(`notifications.${option.name}`, { type: option.details.type })}}
         </span>
       </div>
       <div class="row justify--space-between">
-        <va-button class="m-0 mr-1" small>{{ $t('notifications.all') }}</va-button>
-        <va-button class="m-0" small outline @click="markAllAsRead" :disabled="allRead">{{ $t('notifications.mark_as_read') }}</va-button>
+        <va-button class="ma-0 mb-2 mt-1" small>{{ $t('notifications.all') }}</va-button>
+        <va-button class="ma-0 mb-2 mt-1" small outline @click="markAllAsRead" :disabled="allRead">{{ $t('notifications.mark_as_read') }}</va-button>
       </div>
     </div>
   </va-dropdown>
@@ -89,6 +89,7 @@ export default {
 
 .notification-dropdown {
   cursor: pointer;
+  margin-top: 0.3rem;
 
   .notification-dropdown__icon {
     position: relative;
@@ -151,5 +152,9 @@ export default {
       min-width: 1.5rem;
     }
   }
+
+  .va-dropdown__anchor {
+    display: inline-block;
+  }
 }
 </style>