Skip to content

Commit

Permalink
feat(structure): mv vuestic-components and vuestic-mixins into vuesti…
Browse files Browse the repository at this point in the history
…c-theme folder
  • Loading branch information
smartapant committed Feb 15, 2018
1 parent 91e3960 commit 663fd73
Show file tree
Hide file tree
Showing 52 changed files with 68 additions and 74 deletions.
5 changes: 3 additions & 2 deletions build/webpack.base.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ module.exports = {
'components': resolve('src/components'),
'services': resolve('src/services'),
'directives': resolve('src/directives'),
'vuestic-mixins': resolve('src/vuestic-mixins'),
'vuestic-components': resolve('src/components/vuestic-components'),
'vuestic-mixins': resolve('src/vuestic-theme/vuestic-mixins'),
'vuestic-components': resolve('src/vuestic-theme/vuestic-components'),
'vuestic-theme': resolve('src/vuestic-theme'),
'data': resolve('src/data'),
'vuex-store': resolve('src/store')
}
Expand Down
4 changes: 2 additions & 2 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

<script>
import Layout from 'components/layout/Layout'
import AuthLayout from './components/layout/AuthLayout'
import VuesticPreLoader from './components/vuestic-components/vuestic-preloader/VuesticPreLoader.vue'
import AuthLayout from 'components/layout/AuthLayout'
import VuesticPreLoader from 'vuestic-components/vuestic-preloader/VuesticPreLoader.vue'
export default {
name: 'app',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<script>
import Vue from 'vue'
import BadgeColumn from 'components/tables/BadgeColumn.vue'
import LocalData from 'components/vuestic-components/vuestic-datatable/data/local-data'
import LocalData from 'vuestic-components/vuestic-datatable/data/local-data'
import DonutChartData from './DonutChartData'
import FieldsDef from './fields-definition'
Expand Down
4 changes: 2 additions & 2 deletions src/components/tables/Table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@
<script>
import Vue from 'vue'
import BadgeColumn from './BadgeColumn.vue'
import FieldsDef from 'components/vuestic-components/vuestic-datatable/data/fields-definition'
import ItemsPerPageDef from 'components/vuestic-components/vuestic-datatable/data/items-per-page-definition'
import FieldsDef from 'vuestic-components/vuestic-datatable/data/fields-definition'
import ItemsPerPageDef from 'vuestic-components/vuestic-datatable/data/items-per-page-definition'
Vue.component('badge-column', BadgeColumn)
Expand Down
49 changes: 0 additions & 49 deletions src/components/vuestic-components/vuestic-components-plugin.js

This file was deleted.

4 changes: 1 addition & 3 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ import App from './App'
import store from './store'
import router from './router'
import { sync } from 'vuex-router-sync'
import VuesticPlugin from 'vuestic-components/vuestic-components-plugin'
import VuesticMixinsPlugin from 'vuestic-mixins/vuestic-mixins-plugin'
import VuesticPlugin from 'vuestic-theme/vuestic-plugin'
import './i18n'

Vue.use(VuesticPlugin)
Vue.use(VuesticMixinsPlugin)

// NOTE: workaround for VeeValidate + vuetable-2
Vue.use(VeeValidate, {fieldsBagName: 'formFields'})
Expand Down
9 changes: 0 additions & 9 deletions src/vuestic-mixins/vuestic-mixins-plugin.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</script>

<style lang='scss' scoped>
@import '../../../sass/_variables.scss';
@import '../../../sass/variables';
.vuestic-breadcrumbs {
height: $breadcrumbs-height;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import ItemsPerPage from './datatable-components/ItemsPerPage.vue'
import Vue from 'vue'
import LocalData from './data/local-data'
import DataTableStyles from '../../vuestic-components/vuestic-datatable/data/data-table-styles'
import DataTableStyles from '..//vuestic-datatable/data/data-table-styles'
const originalData = LocalData.data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</template>

<script>
import Dropdown from '../../../../directives/Dropdown'
import Dropdown from 'directives/Dropdown'
export default {
directives: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
</script>

<style lang="scss">
@import "../../../sass/_variables.scss";
@import "../../../sass/variables";
.multiselect-form-group {
.dropdown-menu {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</script>

<style lang="scss">
@import "../../../sass/_variables.scss";
@import "../../../sass/variables";
.select-form-group {
.dropdown-toggle {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</script>

<style lang="scss" scoped>
@import "../../../../sass/_variables.scss";
@import "../../../../sass/variables";
@import "../../../../../node_modules/bootstrap/scss/functions";
@import "../../../../../node_modules/bootstrap/scss/variables";
@import "../../../../../node_modules/bootstrap/scss/mixins/breakpoints";
Expand Down
File renamed without changes.
53 changes: 53 additions & 0 deletions src/vuestic-theme/vuestic-plugin.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import Alert from './vuestic-components/vuestic-alert/VuesticAlert.vue'
import Breadcrumbs from './vuestic-components/vuestic-breadcrumbs/VuesticBreadcrumbs.vue'
import Chart from './vuestic-components/vuestic-chart/VuesticChart.vue'
import Chat from './vuestic-components/vuestic-chat/VuesticChat.vue'
import DataTable from './vuestic-components/vuestic-datatable/VuesticDataTable.vue'
import Feed from './vuestic-components/vuestic-feed/VuesticFeed.vue'
import Modal from './vuestic-components/vuestic-modal/VuesticModal.vue'
import MultiSelect from './vuestic-components/vuestic-multi-select/VuesticMultiSelect.vue'
import PreLoader from './vuestic-components/vuestic-preloader/VuesticPreLoader.vue'
import ProfileCard from './vuestic-components/vuestic-profile-card/VuesticProfileCard.vue'
import ProgressBar from './vuestic-components/vuestic-progress-bar/VuesticProgressBar.vue'
import Scrollbar from './vuestic-components/vuestic-scrollbar/VuesticScrollbar.vue'
import SimpleSelect from './vuestic-components/vuestic-simple-select/VuesticSimpleSelect.vue'
import SocialNews from './vuestic-components/vuestic-social-news/VuesticSocialNews.vue'
import Switch from './vuestic-components/vuestic-switch/VuesticSwitch.vue'
import Tabs from './vuestic-components/vuestic-tabs/VuesticTabs.vue'
import Widget from './vuestic-components/vuestic-widget/VuesticWidget.vue'
import Wizard from './vuestic-components/vuestic-wizard/VuesticWizard.vue'
import MediumEditor from './vuestic-components/vuestic-medium-editor/VuesticMediumEditor.vue'
import Tooltip from './vuestic-components/vuestic-tooltip/VuesticTooltip.vue'
import Popover from './vuestic-components/vuestic-popover/VuesticPopover.vue'

import VuesticToasted from './vuestic-mixins/VuesticToasted'

const VuesticPlugin = {
install (Vue, options) {
Vue.component(Alert.name, Alert)
Vue.component(Breadcrumbs.name, Breadcrumbs)
Vue.component(Chart.name, Chart)
Vue.component(Chat.name, Chat)
Vue.component(DataTable.name, DataTable)
Vue.component(Feed.name, Feed)
Vue.component(Modal.name, Modal)
Vue.component(MultiSelect.name, MultiSelect)
Vue.component(PreLoader.name, PreLoader)
Vue.component(ProfileCard.name, ProfileCard)
Vue.component(ProgressBar.name, ProgressBar)
Vue.component(Scrollbar.name, Scrollbar)
Vue.component(SimpleSelect.name, SimpleSelect)
Vue.component(SocialNews.name, SocialNews)
Vue.component(Switch.name, Switch)
Vue.component(Tabs.name, Tabs)
Vue.component(Widget.name, Widget)
Vue.component(Wizard.name, Wizard)
Vue.component(MediumEditor.name, MediumEditor)
Vue.component(Tooltip.name, Tooltip)
Vue.component(Popover.name, Popover)

Vue.mixin(VuesticToasted)
}
}

export default VuesticPlugin

0 comments on commit 663fd73

Please sign in to comment.