Merge branch 'master' into 404-page

renato04 · Jul 26, 2018 · 596b928 · 596b928
2 parents e822616 + 9c282c5
commit 596b928
Show file tree

Hide file tree

Showing 53 changed files with 2,039 additions and 581 deletions.
diff --git a/README.md b/README.md
@@ -5,13 +5,13 @@ Responsive admin dashboard template built with [Vue.js](https://vuejs.org) and [
 Subscribe to our [newsletter](https://epicmax.co/newsletter) to get Vuestic updates, our team's stories and Vue.js materials hand-picked by Epicmax.
 
 <p align="center">
-  <a href="http://vuestic.epicmax.co" target="_blank">
-    <img src="http://i.imgur.com/pMuJVVc.png" align="center" width="888px"/>
+  <a href="https://vuestic.epicmax.co" target="_blank">
+    <img src="https://i.imgur.com/pMuJVVc.png" align="center" width="888px"/>
   </a>
 </p>
 
 ## Demo
-Check it out [live](http://vuestic.epicmax.co)!
+Check it out [live](https://vuestic.epicmax.co)!
 
 ## Prerequisites:
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vuestic-admin",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Vue.js admin template",
   "author": "smartapant <[email protected]>",
   "private": false,
@@ -81,7 +81,7 @@
     "friendly-errors-webpack-plugin": "1.6.1",
     "html-webpack-plugin": "2.30.1",
     "http-proxy-middleware": "0.17.3",
-    "node-sass": "4.7.1",
+    "node-sass": "^4.9.2",
     "opn": "5.1.0",
     "optimize-css-assets-webpack-plugin": "3.2.0",
     "ora": "1.2.0",

diff --git a/src/assets/icons/icon-faster.svg b/src/assets/icons/icon-faster.svg
diff --git a/src/assets/icons/icon-slower.svg b/src/assets/icons/icon-slower.svg
diff --git a/src/components/admin/AppLayout.vue b/src/components/admin/AppLayout.vue
@@ -4,10 +4,10 @@
     <app-sidebar :isOpen="opened" @toggle-menu="toggleSidebar"/>
     <main slot="content" id="content" class="content" role="main">
       <app-breadcrumbs/>
-      <vuestic-pre-loader v-show="isLoading" ref="preLoader" class="pre-loader"></vuestic-pre-loader>
+      <vuestic-pre-loader v-show="isLoading" class="pre-loader"></vuestic-pre-loader>
       <router-view></router-view>
     </main>
-    <span slot="footer">©2018. Made by&nbsp;<a href="http://epicmax.co" target="_blank">Epicmax </a></span>
+    <span slot="footer">©2018. Made by&nbsp;<a href="https://epicmax.co" target="_blank">Epicmax </a></span>
   </vuestic-layout>
 </template>
 

diff --git a/src/components/admin/app-breadcrumbs/Breadcrumbs.js b/src/components/admin/app-breadcrumbs/Breadcrumbs.js
@@ -59,6 +59,10 @@ export default {
           path: 'buttons',
           displayName: 'menu.buttons'
         },
+        {
+          path: 'color-pickers',
+          displayName: 'menu.colorPickers'
+        },
         {
           path: 'notifications',
           displayName: 'menu.notifications'
@@ -83,6 +87,14 @@ export default {
           path: 'file-upload',
           displayName: 'menu.fileUpload'
         },
+        {
+          path: 'tags',
+          displayName: 'menu.tags'
+        },
+        {
+          path: 'cards',
+          displayName: 'menu.cards'
+        },
         {
           path: 'tree-view',
           displayName: 'menu.treeView'

diff --git a/src/components/admin/app-navbar/AppNavbar.vue b/src/components/admin/app-navbar/AppNavbar.vue
@@ -10,7 +10,7 @@
     <notification-dropdown/>
     <language-dropdown/>
     <profile-dropdown>
-      <img src="http://i.imgur.com/nfa5itq.png"/>
+      <img src="https://i.imgur.com/nfa5itq.png"/>
     </profile-dropdown>
   </vuestic-navbar>
 

diff --git a/src/components/admin/app-sidebar/AppSidebar.vue b/src/components/admin/app-sidebar/AppSidebar.vue
@@ -121,12 +121,24 @@
             <span>{{ $t('menu.fileUpload') }}</span>
           </span>
         </sidebar-link>
+        <sidebar-link
+          :to="{ name: 'tags' }">
+          <span slot="title">
+            <span>{{ $t('menu.tags') }}</span>
+          </span>
+        </sidebar-link>
         <sidebar-link
           :to="{ name: 'tree-view' }">
           <span slot="title">
             <span>{{ $t('menu.treeView') }}</span>
           </span>
         </sidebar-link>
+        <sidebar-link
+          :to="{ name: 'cards' }">
+          <span slot="title">
+            <span>{{ $t('menu.cards') }}</span>
+          </span>
+        </sidebar-link>
       </sidebar-link-group>
       <sidebar-link
         :to="{ name: 'extra' }">

diff --git a/src/components/dashboard/DashboardBottomWidgets.vue b/src/components/dashboard/DashboardBottomWidgets.vue
@@ -23,52 +23,52 @@
           {
             name: 'Irina Myatelskaya',
             text: 'joined the network',
-            photoURL: 'http://i.imgur.com/VuTDC8u.png'
+            photoURL: 'https://i.imgur.com/VuTDC8u.png'
           },
           {
             name: 'Andrei Hrabouski',
             text: 'has just started a live video',
-            photoURL: 'http://i.imgur.com/W3mGrmW.png'
+            photoURL: 'https://i.imgur.com/W3mGrmW.png'
           },
           {
             name: 'Evan You',
             text: 'joined the network',
-            photoURL: 'http://i.imgur.com/D7DOGBH.jpg'
+            photoURL: 'https://i.imgur.com/D7DOGBH.jpg'
           }
         ],
         news: [
           {
-            photoURL: 'http://i.imgur.com/PiTDDcA.png'
+            photoURL: 'https://i.imgur.com/PiTDDcA.png'
           },
           {
-            photoURL: 'http://i.imgur.com/M6GugaM.png'
+            photoURL: 'https://i.imgur.com/M6GugaM.png'
           },
           {
-            photoURL: 'http://i.imgur.com/vEy3fRU.png'
+            photoURL: 'https://i.imgur.com/vEy3fRU.png'
           },
           {
-            photoURL: 'http://i.imgur.com/Xrywphx.png'
+            photoURL: 'https://i.imgur.com/Xrywphx.png'
           },
           {
-            photoURL: 'http://i.imgur.com/dqVtQGY.png'
+            photoURL: 'https://i.imgur.com/dqVtQGY.png'
           },
           {
-            photoURL: 'http://i.imgur.com/qP7rTCy.png'
+            photoURL: 'https://i.imgur.com/qP7rTCy.png'
           },
           {
-            photoURL: 'http://i.imgur.com/6YLsM43.png'
+            photoURL: 'https://i.imgur.com/6YLsM43.png'
           },
           {
-            photoURL: 'http://i.imgur.com/9PAOx55.png'
+            photoURL: 'https://i.imgur.com/9PAOx55.png'
           },
           {
-            photoURL: 'http://i.imgur.com/mVpc04D.png'
+            photoURL: 'https://i.imgur.com/mVpc04D.png'
           },
           {
-            photoURL: 'http://i.imgur.com/WdbTSLn.png'
+            photoURL: 'https://i.imgur.com/WdbTSLn.png'
           },
           {
-            photoURL: 'http://i.imgur.com/ZXRIHfk.png'
+            photoURL: 'https://i.imgur.com/ZXRIHfk.png'
           }
         ]
       }

diff --git a/src/components/dashboard/DashboardInfoWidgets.vue b/src/components/dashboard/DashboardInfoWidgets.vue
@@ -37,8 +37,7 @@
               <div class="stats-title">Commits</div>
             </div>
             <div class="chart-container">
-              <vuestic-progress-bar type="circle" ref="circleProgress" :colorName="'white'" :backgroundColorName="'danger'"
-                            :startColorName="'danger'"></vuestic-progress-bar>
+              <vuestic-progress-bar type="circle" :value="70" theme="White" backgroundTheme="Danger"/>
             </div>
           </div>
         </div>
@@ -62,11 +61,7 @@
 
 <script>
   export default {
-    name: 'dashboard-info-widgets',
-
-    mounted () {
-      this.$refs.circleProgress.$data.value = 70
-    }
+    name: 'dashboard-info-widgets'
   }
 </script>
 

diff --git a/src/components/dashboard/users-and-members-tab/UsersMembersTab.vue b/src/components/dashboard/users-and-members-tab/UsersMembersTab.vue
@@ -2,7 +2,7 @@
   <div class="users-members-tab dashboard-tab">
     <div class="row">
       <div class="col-md-3 d-flex justify-content-center align-items-center">
-        <vuestic-profile-card :name="'Veronique Lee'" :location="'Malaga, Spain'" photoSource="http://i.imgur.com/NLrdqsk.png"
+        <vuestic-profile-card :name="'Veronique Lee'" :location="'Malaga, Spain'" photoSource="https://i.imgur.com/NLrdqsk.png"
                               :social="{twitter: 'twitter.com', facebook: 'facebook.com',
                                   instagram: 'instagram.com'}">
         </vuestic-profile-card>

diff --git a/src/components/extra/Extra.vue b/src/components/extra/Extra.vue
@@ -17,7 +17,7 @@
     <div class="row">
       <div class="col-md-4 d-flex">
         <vuestic-widget :headerText="$t('extra.profileCard')" class="profile-card-widget">
-          <vuestic-profile-card :name="'Veronique Lee'" :location="'Malaga, Spain'" photoSource="http://i.imgur.com/NLrdqsk.png"
+          <vuestic-profile-card :name="'Veronique Lee'" :location="'Malaga, Spain'" photoSource="https://i.imgur.com/NLrdqsk.png"
                                 :social="{twitter: 'twitter.com', facebook: 'facebook.com',
                                   instagram: 'instagram.com'}">
           </vuestic-profile-card>
@@ -38,7 +38,7 @@
       </div>
       <div class="col-md-6 d-flex">
         <vuestic-widget class="business-posts">
-          <vuestic-social-news :news="news" :url="'http://instagram.com/smartapant'"></vuestic-social-news>
+          <vuestic-social-news :news="news" :url="'https://instagram.com/smartapant'"></vuestic-social-news>
         </vuestic-widget>
       </div>
     </div>
@@ -89,52 +89,52 @@
           {
             name: 'Irina Myatelskaya',
             text: 'joined the network',
-            photoURL: 'http://i.imgur.com/VuTDC8u.png'
+            photoURL: 'https://i.imgur.com/VuTDC8u.png'
           },
           {
             name: 'Andrei Hrabouski',
             text: 'has just started a live video',
-            photoURL: 'http://i.imgur.com/W3mGrmW.png'
+            photoURL: 'https://i.imgur.com/W3mGrmW.png'
           },
           {
             name: 'Evan You',
             text: 'joined the network',
-            photoURL: 'http://i.imgur.com/D7DOGBH.jpg'
+            photoURL: 'https://i.imgur.com/D7DOGBH.jpg'
           }
         ],
         news: [
           {
-            photoURL: 'http://i.imgur.com/PiTDDcA.png'
+            photoURL: 'https://i.imgur.com/PiTDDcA.png'
           },
           {
-            photoURL: 'http://i.imgur.com/M6GugaM.png'
+            photoURL: 'https://i.imgur.com/M6GugaM.png'
           },
           {
-            photoURL: 'http://i.imgur.com/vEy3fRU.png'
+            photoURL: 'https://i.imgur.com/vEy3fRU.png'
           },
           {
-            photoURL: 'http://i.imgur.com/Xrywphx.png'
+            photoURL: 'https://i.imgur.com/Xrywphx.png'
           },
           {
-            photoURL: 'http://i.imgur.com/dqVtQGY.png'
+            photoURL: 'https://i.imgur.com/dqVtQGY.png'
           },
           {
-            photoURL: 'http://i.imgur.com/qP7rTCy.png'
+            photoURL: 'https://i.imgur.com/qP7rTCy.png'
           },
           {
-            photoURL: 'http://i.imgur.com/6YLsM43.png'
+            photoURL: 'https://i.imgur.com/6YLsM43.png'
           },
           {
-            photoURL: 'http://i.imgur.com/9PAOx55.png'
+            photoURL: 'https://i.imgur.com/9PAOx55.png'
           },
           {
-            photoURL: 'http://i.imgur.com/mVpc04D.png'
+            photoURL: 'https://i.imgur.com/mVpc04D.png'
           },
           {
-            photoURL: 'http://i.imgur.com/WdbTSLn.png'
+            photoURL: 'https://i.imgur.com/WdbTSLn.png'
           },
           {
-            photoURL: 'http://i.imgur.com/ZXRIHfk.png'
+            photoURL: 'https://i.imgur.com/ZXRIHfk.png'
           }
         ]
       }

diff --git a/src/components/maps/leaflet-maps/LeafletMap.vue b/src/components/maps/leaflet-maps/LeafletMap.vue
@@ -16,8 +16,8 @@
 
       var map = L.map(this.$el).setView([51.505, -0.09], 13)
 
-      L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
-        attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+      L.tileLayer('https://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="https://osm.org/copyright">OpenStreetMap</a> contributors'
       }).addTo(map)
 
       L.marker([51.5, -0.09]).addTo(map)

diff --git a/src/components/statistics/progress-bars/ProgressBars.vue b/src/components/statistics/progress-bars/ProgressBars.vue
@@ -22,21 +22,3 @@
     components: { StandardBars, ColorfulBars },
   }
 </script>
-
-<style lang="scss">
-  .progress-bars {
-    .vuestic-progress-bar {
-      .progress.thick {
-        margin-top: calc(#{$progress-bar-width-thick} / 2 - .125rem);
-      }
-      .progress.thin {
-        margin-top: .125rem;
-      }
-    }
-
-    .vertical, .circle {
-      margin-top: 1.25rem;
-      margin-left: .125rem;
-    }
-  }
-</style>