Merge branch 'dev'

coreui · Oct 31, 2021 · 0712ea9 · 0712ea9
2 parents a11e5df + 863efa0
commit 0712ea9
Show file tree

Hide file tree

Showing 45 changed files with 1,004 additions and 1,335 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,8 +1,3 @@
 node_modules/*
-./node_modules/**
-**/node_modules/**
 /dist/**
 .eslintrc.js
-/Users/lukaszholeczek/CoreUI/@coreui/icons-vue/**/*
-/Users/lukaszholeczek/CoreUI/@coreui/icons-vue/
-**/*
diff --git a/babel.config.js b/babel.config.js
@@ -1,3 +1,3 @@
 module.exports = {
-  presets: ['@vue/cli-plugin-babel/preset']
+  presets: ['@vue/cli-plugin-babel/preset'],
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coreui/coreui-free-vue-admin-template",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "CoreUI Free Vue Admin Template",
   "bugs": {
     "url": "https://github.com/coreui/coreui-free-vue-admin-template/issues"
@@ -27,7 +27,7 @@
     "@coreui/icons": "^2.1.0",
     "@coreui/icons-vue": "2.0.0",
     "@coreui/utils": "^1.3.1",
-    "@coreui/vue": "^4.0.0",
+    "@coreui/vue": "^4.0.1",
     "@coreui/vue-chartjs": "2.0.0",
     "core-js": "^3.19.0",
     "vue": "^3.2.19",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.14",
-    "@vue/cli-plugin-e2e-nightwatch": "~4.5.14",
+    "@vue/cli-plugin-e2e-cypress": "~4.5.14",
     "@vue/cli-plugin-eslint": "~4.5.14",
     "@vue/cli-plugin-router": "~4.5.14",
     "@vue/cli-plugin-unit-jest": "~4.5.14",
@@ -49,7 +49,6 @@
     "eslint": "^7.32.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-vue": "^7.20.0",
-    "geckodriver": "^2.0.4",
     "prettier": "^2.4.1",
     "sass": "^1.43.3",
     "sass-loader": "^10.2.0",

diff --git a/public/index.html b/public/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
 * CoreUI Vue.js Admin Template
-* @version v4.0.0
+* @version v4.0.1
 * @link https://coreui.io/vue/
 * Copyright (c) 2021 creativeLabs Łukasz Holeczek
 * License (https://coreui.io/pro/license)

diff --git a/src/App.vue b/src/App.vue
@@ -3,7 +3,6 @@
 </template>
 
 <style lang="scss">
-  // Import Main styles for this application
-  @import 'styles/style';
+// Import Main styles for this application
+@import 'styles/style';
 </style>
-
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
@@ -22,9 +22,9 @@ import {
   cibCcStripe,
   cibCcPaypal,
   cibCcApplePay,
-  cibCcAmex
-} from "@coreui/icons";
-import { cifUs, cifBr, cifIn, cifFr, cifEs, cifPl } from "@coreui/icons";
+  cibCcAmex,
+} from '@coreui/icons'
+import { cifUs, cifBr, cifIn, cifFr, cifEs, cifPl } from '@coreui/icons'
 import {
   cilArrowBottom,
   cilArrowRight,
@@ -76,8 +76,8 @@ import {
   cilUser,
   cilUserFemale,
   cilUserFollow,
-  cilXCircle
-} from "@coreui/icons";
+  cilXCircle,
+} from '@coreui/icons'
 
 export const iconsSet = Object.assign(
   {},
@@ -132,15 +132,15 @@ export const iconsSet = Object.assign(
     cilUser,
     cilUserFemale,
     cilUserFollow,
-    cilXCircle
+    cilXCircle,
   },
   {
     cifUs,
     cifBr,
     cifIn,
     cifFr,
     cifEs,
-    cifPl
+    cifPl,
   },
   {
     cibFacebook,
@@ -166,6 +166,6 @@ export const iconsSet = Object.assign(
     cibCcStripe,
     cibCcPaypal,
     cibCcApplePay,
-    cibCcAmex
-  }
-);
+    cibCcAmex,
+  },
+)
diff --git a/src/components/AppBreadcrumb.vue b/src/components/AppBreadcrumb.vue
@@ -2,9 +2,9 @@
   <CBreadcrumb class="d-md-down-none me-auto mb-0">
     <CBreadcrumbItem
       v-for="item in breadcrumbs"
+      :key="item"
       :href="item.active ? '' : item.path"
       :active="item.active"
-      :key="item"
     >
       {{ item.name }}
     </CBreadcrumbItem>

diff --git a/src/components/AppHeader.vue b/src/components/AppHeader.vue
@@ -55,7 +55,6 @@ export default {
     AppHeaderDropdownAccnt,
   },
   setup() {
-
     return {
       logo,
     }

diff --git a/src/components/AppSidebar.vue b/src/components/AppSidebar.vue
@@ -13,12 +13,12 @@
   >
     <CSidebarBrand>
       <CIcon
-        customClassName="sidebar-brand-full"
+        custom-class-name="sidebar-brand-full"
         :icon="logoNegative"
         :height="35"
       />
       <CIcon
-        customClassName="sidebar-brand-narrow"
+        custom-class-name="sidebar-brand-narrow"
         :icon="sygnet"
         :height="35"
       />

diff --git a/src/components/AppSidebarNav.js b/src/components/AppSidebarNav.js
@@ -1,39 +1,45 @@
 import { defineComponent, h, onMounted, ref, resolveComponent } from 'vue'
 import { RouterLink, useRoute } from 'vue-router'
 
-import { CBadge, CSidebarNav, CNavItem, CNavGroup, CNavTitle } from '@coreui/vue'
+import {
+  CBadge,
+  CSidebarNav,
+  CNavItem,
+  CNavGroup,
+  CNavTitle,
+} from '@coreui/vue'
 import nav from '@/_nav.js'
 
 const normalizePath = (path) =>
-decodeURI(path)
-  .replace(/#.*$/, '')
-  .replace(/(index)?\.(html)$/, '')
+  decodeURI(path)
+    .replace(/#.*$/, '')
+    .replace(/(index)?\.(html)$/, '')
 
 const isActiveLink = (route, link) => {
-if (link === undefined) {
-  return false
-}
+  if (link === undefined) {
+    return false
+  }
 
-if (route.hash === link) {
-  return true
-}
+  if (route.hash === link) {
+    return true
+  }
 
-const currentPath = normalizePath(route.path)
-const targetPath = normalizePath(link)
+  const currentPath = normalizePath(route.path)
+  const targetPath = normalizePath(link)
 
-return currentPath === targetPath
+  return currentPath === targetPath
 }
 
 const isActiveItem = (route, item) => {
-if (isActiveLink(route, item.to)) {
-  return true
-}
+  if (isActiveLink(route, item.to)) {
+    return true
+  }
 
-if (item.items) {
-  return item.items.some((child) => isActiveItem(route, child))
-}
+  if (item.items) {
+    return item.items.some((child) => isActiveItem(route, child))
+  }
 
-return false
+  return false
 }
 
 const AppSidebarNav = defineComponent({
@@ -56,7 +62,9 @@ const AppSidebarNav = defineComponent({
         return h(
           CNavGroup,
           {
-            ...firstRender.value && { visible: item.items.some((child) => isActiveItem(route, child))}
+            ...(firstRender.value && {
+              visible: item.items.some((child) => isActiveItem(route, child)),
+            }),
           },
           {
             togglerContent: () => [

diff --git a/src/components/DocsCallout.vue b/src/components/DocsCallout.vue
@@ -1,16 +1,20 @@
 <template>
   <CCallout color="info" class="bg-white">
-    {{content
+    {{
+      content
         ? content
         : `A Vue ${name} component ${
             plural ? 'have' : 'has'
           } been created as a native Vue.js version
-      of Bootstrap ${name}. ${name} ${plural ? 'are' : 'is'} delivered with some new features,
-      variants, and unique design that matches CoreUI Design System requirements.`}}
+      of Bootstrap ${name}. ${name} ${
+            plural ? 'are' : 'is'
+          } delivered with some new features,
+      variants, and unique design that matches CoreUI Design System requirements.`
+    }}
     <br />
     <br />
     For more information please visit our official
-    <CLink :href="href" target="_blank">
+    <CLink :href="url" target="_blank">
       documentation of CoreUI Components Library for Vue.js
     </CLink>
     .
@@ -40,10 +44,10 @@ export default {
     plural: Boolean,
   },
   setup(props) {
-    const href = `https://coreui.io/vue/docs/${packageJson.config.coreui_library_short_version}/${props.href}`
+    const url = `https://coreui.io/vue/docs/${packageJson.config.coreui_library_short_version}/${props.url}`
 
     return {
-      href,
+      url,
     }
   },
 }

diff --git a/src/components/DocsExample.vue b/src/components/DocsExample.vue
@@ -7,7 +7,7 @@
         </CNavLink>
       </CNavItem>
       <CNavItem>
-        <CNavLink :href="href" target="_blank">
+        <CNavLink :href="url" target="_blank">
           <CIcon icon="cil-code" class="me-2" />
           Code
         </CNavLink>
@@ -33,10 +33,10 @@ export default {
     },
   },
   setup(props) {
-    const href = `https://coreui.io/vue/docs/${pkg.config.coreui_library_short_version}/${props.href}`
+    const url = `https://coreui.io/vue/docs/${pkg.config.coreui_library_short_version}/${props.href}`
 
     return {
-      href,
+      url,
     }
   },
 }

diff --git a/src/layouts/DefaultLayout.vue b/src/layouts/DefaultLayout.vue
@@ -13,18 +13,18 @@
   </div>
 </template>
 <script>
-import { CContainer, CDropdown, CDropdownItem } from "@coreui/vue";
-import AppFooter from "@/components/AppFooter.vue";
-import AppHeader from "@/components/AppHeader.vue";
-import AppSidebar from "@/components/AppSidebar.vue";
+import { CContainer } from '@coreui/vue'
+import AppFooter from '@/components/AppFooter.vue'
+import AppHeader from '@/components/AppHeader.vue'
+import AppSidebar from '@/components/AppSidebar.vue'
 
 export default {
-  name: "DefaultLayout",
+  name: 'DefaultLayout',
   components: {
     AppFooter,
     AppHeader,
     AppSidebar,
     CContainer,
   },
-};
+}
 </script>
diff --git a/src/router/index.js b/src/router/index.js
@@ -274,17 +274,17 @@ const routes = [
       {
         path: '500',
         name: 'Page500',
-        component: () => import('@/views/pages/Page500')
+        component: () => import('@/views/pages/Page500'),
       },
       {
         path: 'login',
         name: 'Login',
-        component: () => import('@/views/pages/Login')
+        component: () => import('@/views/pages/Login'),
       },
       {
         path: 'register',
         name: 'Register',
-        component: () => import('@/views/pages/Register')
+        component: () => import('@/views/pages/Register'),
       },
     ],
   },

diff --git a/src/store/index.js b/src/store/index.js
@@ -14,7 +14,7 @@ export default createStore({
     },
     updateSidebarVisible(state, payload) {
       state.sidebarVisible = payload.value
-    }
+    },
   },
   actions: {},
   modules: {},