Merge branch 'master' of https://github.com/epicmaxco/vuestic-admin

# Conflicts: # src/components/statistics/progress-bars/ProgressBars.vue # src/components/vuestic-components/vuestic-tabs/VuesticTabs.vue
iampraba · Aug 2, 2017 · e7e9723 · e7e9723
2 parents 2202b78 + 9c1803b
commit e7e9723
Show file tree

Hide file tree

Showing 69 changed files with 420 additions and 370 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Dream Support LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,11 +1,18 @@
-# vuejs-admin
+# Vuestic Admin Dashboard
 
-> Vue.js admin template
+Responsive admin dasboard template built with [Vue.js](https://vuejs.org) and [Bootstrap 4](https://v4-alpha.getbootstrap.com). Developed by [Epicmax](http://epicmax.co). Designed by [Vasili Savitski](https://github.com/xx13/)
 
-## Build Setup
+## Demo
+Check it out [live](http://vuestic.epicmax.co)!
+
+## Installation
 
 ``` bash
-# install dependencies
+# clone the repo 
+git clone https://github.com/epicmaxco/vuestic-admin.git
+
+# go into app's directory and install dependencies:
+cd vuestic-admin
 npm install
 
 # serve with hot reload at localhost:8080
@@ -18,4 +25,28 @@ npm run build
 npm run build --report
 ```
 
-For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
+## Features
+* Vue.js
+* Bootstrap 4
+* Webpack
+* Responsive layout
+* Charts (Chart.js)
+* Maps (Google, Leaflet, amMap)
+* Progress bars
+* Material forms with beautiful validation
+* 4 Form wizard types
+* Static tables and datatables
+* Login/signup pages templates
+* and many more!
+
+## How can I support developers?
+- Star our GitHub repo :star:
+- Create pull requests, submit bugs, suggest new features or documentation updates :wrench:
+- Follow us on [Twitter](https://twitter.com/epicmaxco) :feet:
+- Like our page on [Facebook](https://www.facebook.com/epicmaxco) :thumbsup:
+
+## Can I hire you guys?
+Yes!  Visit [our homepage](http://epicmax.co/) or simply leave us a message to [[email protected]](mailto:[email protected]). We will be happy to work with you!
+
+## License
+[MIT](https://github.com/epicmaxco/vuestic-admin/blob/master/LICENSE) license.
diff --git a/src/App.vue b/src/App.vue
@@ -8,7 +8,7 @@
 <script>
   import Layout from 'components/layout/Layout'
   import AuthLayout from './components/layout/AuthLayout'
-  import VuesticPreLoader from './components/common/vuestic-preloader/VuesticPreLoader.vue'
+  import VuesticPreLoader from './components/vuestic-components/vuestic-preloader/VuesticPreLoader.vue'
 
   export default {
     name: 'app',

diff --git a/src/components/dashboard/Dashboard.vue b/src/components/dashboard/Dashboard.vue
@@ -12,7 +12,7 @@
 
     <dashboard-info-widgets></dashboard-info-widgets>
 
-    <widget class="no-padding no-v-padding">
+    <vuestic-widget class="no-padding no-v-padding">
       <vuestic-tabs :names="['Overview', 'Data Visualization', 'Users & Members', 'Setup Profile']" ref="tabs">
         <div slot="Overview">
           <overview-tab @explore="explore"></overview-tab>
@@ -27,18 +27,18 @@
           <setup-profile-tab></setup-profile-tab>
         </div>
       </vuestic-tabs>
-    </widget>
+    </vuestic-widget>
 
     <dashboard-bottom-widgets></dashboard-bottom-widgets>
 
   </div>
 </template>
 
 <script>
-  import Widget from 'components/common/widget/Widget'
-  import VuesticAlert from 'components/common/vuestic-alert/VuesticAlert'
+  import VuesticWidget from '../vuestic-components/vuestic-widget/VuesticWidget'
+  import VuesticAlert from '../vuestic-components/vuestic-alert/VuesticAlert'
   import DashboardInfoWidgets from './DashboardInfoWidgets'
-  import VuesticTabs from 'components/common/vuestic-tabs/VuesticTabs.vue'
+  import VuesticTabs from '../vuestic-components/vuestic-tabs/VuesticTabs.vue'
   import UsersMembersTab from './users-and-members-tab/UsersMembersTab.vue'
   import SetupProfileTab from './setup-profile-tab/SetupProfileTab.vue'
   import OverviewTab from './overview-tab/OverviewTab.vue'
@@ -49,7 +49,7 @@
     name: 'dashboard',
     components: {
       DataVisualisationTab,
-      Widget,
+      VuesticWidget,
       VuesticAlert,
       DashboardInfoWidgets,
       VuesticTabs,
@@ -68,9 +68,4 @@
 
 <style lang="scss" scoped>
   @import "../../sass/_variables.scss";
-
-  .vuestic-alert {
-    margin-bottom: 1.75rem;
-  }
-
 </style>
diff --git a/src/components/dashboard/DashboardBottomWidgets.vue b/src/components/dashboard/DashboardBottomWidgets.vue
@@ -1,29 +1,29 @@
 <template>
   <div class="row bottom-widgets">
     <div class="col-md-6 d-flex">
-      <widget class="no-h-padding no-v-padding">
+      <vuestic-widget class="no-h-padding no-v-padding">
         <vuestic-feed :initialPosts="posts"></vuestic-feed>
-      </widget>
+      </vuestic-widget>
     </div>
     <div class="col-md-6 d-flex">
-      <widget class="business-posts">
+      <vuestic-widget class="business-posts">
         <vuestic-social-news class="vuestic-social-news" :news="news" :url="'http://instagram.com/smartapant'"></vuestic-social-news>
-      </widget>
+      </vuestic-widget>
     </div>
   </div>
 </template>
 
 <script>
-  import Widget from 'components/common/widget/Widget'
-  import VuesticFeed from '../common/vuestic-feed/VuesticFeed.vue'
-  import VuesticSocialNews from '../common/vuestic-social-news/VuesticSocialNews.vue'
+  import VuesticWidget from '../vuestic-components/vuestic-widget/VuesticWidget'
+  import VuesticFeed from '../vuestic-components/vuestic-feed/VuesticFeed.vue'
+  import VuesticSocialNews from '../vuestic-components/vuestic-social-news/VuesticSocialNews.vue'
 
   export default {
     name: 'dashboard-bottom-widgets',
     components: {
       VuesticSocialNews,
       VuesticFeed,
-      Widget
+      VuesticWidget
     },
     data () {
       return {
@@ -35,7 +35,7 @@
           },
           {
             name: 'Andrei Hrabouski',
-            text: 'have just started a live video',
+            text: 'has just started a live video',
             photoURL: 'http://i.imgur.com/nryPD3a.png'
           },
           {

diff --git a/src/components/dashboard/DashboardInfoWidgets.vue b/src/components/dashboard/DashboardInfoWidgets.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="row dashboard-info-widgets">
     <div class="col-md-6 col-xl-3">
-      <widget class="info-widget">
+      <vuestic-widget class="info-widget">
         <div class="info-widget-inner">
           <div class="stats">
             <div class="stats-number">
@@ -11,10 +11,10 @@
             <div class="stats-title">Elements</div>
           </div>
         </div>
-      </widget>
+      </vuestic-widget>
     </div>
     <div class="col-md-6 col-xl-3">
-      <widget class="info-widget">
+      <vuestic-widget class="info-widget">
         <div class="info-widget-inner">
           <div class="stats">
             <div class="stats-number">
@@ -24,10 +24,10 @@
             <div class="stats-title">Versions</div>
           </div>
         </div>
-      </widget>
+      </vuestic-widget>
     </div>
     <div class="col-md-6 col-xl-3">
-      <widget class="info-widget brand-danger">
+      <vuestic-widget class="info-widget brand-danger">
         <div class="info-widget-inner">
           <div class="info-widget-inner has-chart">
             <div class="stats">
@@ -42,10 +42,10 @@
             </div>
           </div>
         </div>
-      </widget>
+      </vuestic-widget>
     </div>
     <div class="col-md-6 col-xl-3">
-      <widget class="info-widget brand-info">
+      <vuestic-widget class="info-widget brand-info">
         <div class="info-widget-inner">
           <div class="stats">
             <div class="stats-number">
@@ -55,19 +55,17 @@
             <div class="stats-title">Team Members</div>
           </div>
         </div>
-      </widget>
+      </vuestic-widget>
     </div>
   </div>
 </template>
 
 <script>
-  import Widget from 'components/common/widget/Widget'
-  import ProgressBar from 'components/common/vuestic-progress-bar/VuesticProgressBar'
+  import ProgressBar from '../../components/vuestic-components/vuestic-progress-bar/VuesticProgressBar'
 
   export default {
     name: 'dashboard-info-widgets',
     components: {
-      Widget,
       ProgressBar
     },
 

diff --git a/src/components/dashboard/data-visualisation-tab/DataVisualisation.vue b/src/components/dashboard/data-visualisation-tab/DataVisualisation.vue
@@ -18,9 +18,9 @@
 </template>
 
 <script>
-  import VuesticChart from '../../common/vuestic-chart/VuesticChart.vue'
+  import VuesticChart from '../../vuestic-components/vuestic-chart/VuesticChart.vue'
   import DonutChartData from './DonutChartData'
-  import DataTable from '../../common/vuestic-datatable/DataTable.vue'
+  import DataTable from '../../vuestic-components/vuestic-datatable/VuesticDataTable.vue'
   import Vue from 'vue'
   import BadgeColumn from '../../tables/BadgeColumn.vue'
 

diff --git a/src/components/dashboard/setup-profile-tab/SetupProfileTab.vue b/src/components/dashboard/setup-profile-tab/SetupProfileTab.vue
@@ -59,8 +59,8 @@
 </template>
 
 <script>
-  import VuesticWizard from 'components/common/vuestic-wizard/VuesticWizard'
-  import VuesticSimpleSelect from 'components/common/vuestic-simple-select/VuesticSimpleSelect'
+  import VuesticWizard from 'components/vuestic-components/vuestic-wizard/VuesticWizard'
+  import VuesticSimpleSelect from 'components/vuestic-components/vuestic-simple-select/VuesticSimpleSelect'
   import CountriesList from './CountriesList'
 
   export default {

diff --git a/src/components/dashboard/users-and-members-tab/UsersMembersTab.vue b/src/components/dashboard/users-and-members-tab/UsersMembersTab.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script>
-  import VuesticChat from 'components/common/vuestic-chat/VuesticChat'
-  import VuesticProfileCard from 'components/common/vuestic-profile-card/VuesticProfileCard.vue'
+  import VuesticChat from 'components/vuestic-components/vuestic-chat/VuesticChat'
+  import VuesticProfileCard from 'components/vuestic-components/vuestic-profile-card/VuesticProfileCard.vue'
 
   export default {
     name: 'users-members-tab',

diff --git a/src/components/extra/Extra.vue b/src/components/extra/Extra.vue
@@ -2,7 +2,7 @@
   <div class="extra">
     <div class="row">
       <div class="col-md-12">
-        <widget headerText="Alerts">
+        <vuestic-widget headerText="Alerts">
           <vuestic-alert type="success" :withCloseBtn="true">
             <span class="badge badge-pill badge-success">SUCCESS</span>
             You successfully read this important alert message.
@@ -20,11 +20,11 @@
             <span class="badge badge-pill badge-danger">DANGER</span>
             Change a few things up and try submitting again.
           </vuestic-alert>
-        </widget>
+        </vuestic-widget>
       </div>
     </div>
 
-    <widget class="no-padding no-v-padding no-h-padding">
+    <vuestic-widget class="no-padding no-v-padding no-h-padding">
       <vuestic-tabs :names="['Overview', 'Data Visualization', 'Users & Members', 'Setup Profile']">
         <div slot="Overview" class="d-flex justify-content-center">
           Overview
@@ -39,54 +39,52 @@
           Setup Profile
         </div>
       </vuestic-tabs>
-    </widget>
+    </vuestic-widget>
 
     <div class="row">
       <div class="col-md-4 d-flex">
-        <widget header-text="Profile Card" class="profile-card-widget">
+        <vuestic-widget headerText="Profile Card" class="profile-card-widget">
           <vuestic-profile-card :name="'Veronique Lee'" :location="'Malaga, Spain'" photoSource="http://i.imgur.com/UTc7Fne.png"
                                 :social="{twitter: 'twitter.com', facebook: 'facebook.com',
                                   instagram: 'instagram.com'}">
           </vuestic-profile-card>
-        </widget>
+        </vuestic-widget>
       </div>
       <div class="col-md-8 d-flex">
-        <widget header-text="Chat" class="chat-widget">
+        <vuestic-widget headerText="Chat" class="chat-widget">
           <vuestic-chat v-model="chatMessages"></vuestic-chat>
-        </widget>
+        </vuestic-widget>
       </div>
     </div>
 
     <div class="row bottom-widgets">
       <div class="col-md-6 d-flex">
-        <widget class="no-h-padding no-v-padding">
+        <vuestic-widget class="no-h-padding no-v-padding">
           <vuestic-feed :initialPosts="posts"></vuestic-feed>
-        </widget>
+        </vuestic-widget>
       </div>
       <div class="col-md-6 d-flex">
-        <widget class="business-posts">
+        <vuestic-widget class="business-posts">
           <vuestic-social-news :news="news" :url="'http://instagram.com/smartapant'"></vuestic-social-news>
-        </widget>
+        </vuestic-widget>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-  import VuesticTabs from 'components/common/vuestic-tabs/VuesticTabs.vue'
-  import Widget from 'components/common/widget/Widget'
-  import VuesticProfileCard from 'components/common/vuestic-profile-card/VuesticProfileCard.vue'
-  import VuesticAlert from 'components/common/vuestic-alert/VuesticAlert'
-  import VuesticChat from 'components/common/vuestic-chat/VuesticChat'
-  import VuesticFeed from '../common/vuestic-feed/VuesticFeed.vue'
-  import VuesticSocialNews from '../common/vuestic-social-news/VuesticSocialNews.vue'
+  import VuesticTabs from '../../components/vuestic-components/vuestic-tabs/VuesticTabs.vue'
+  import VuesticProfileCard from '../../components/vuestic-components/vuestic-profile-card/VuesticProfileCard.vue'
+  import VuesticAlert from '../../components/vuestic-components/vuestic-alert/VuesticAlert'
+  import VuesticChat from '../../components/vuestic-components/vuestic-chat/VuesticChat'
+  import VuesticFeed from '../vuestic-components/vuestic-feed/VuesticFeed.vue'
+  import VuesticSocialNews from '../vuestic-components/vuestic-social-news/VuesticSocialNews.vue'
 
   export default {
     name: 'extra',
     components: {
       VuesticSocialNews,
       VuesticFeed,
-      Widget,
       VuesticTabs,
       VuesticProfileCard,
       VuesticAlert,
@@ -128,7 +126,7 @@
           },
           {
             name: 'Andrei Hrabouski',
-            text: 'have just started a live video',
+            text: 'has just started a live video',
             photoURL: 'http://i.imgur.com/nryPD3a.png'
           },
           {