Skip to content

Commit

Permalink
wip: general config done
Browse files Browse the repository at this point in the history
Still many errors though.
  • Loading branch information
asvae committed Aug 22, 2018
1 parent fc01ff3 commit 5976eb4
Show file tree
Hide file tree
Showing 14 changed files with 259 additions and 737 deletions.
18 changes: 0 additions & 18 deletions .babelrc

This file was deleted.

3 changes: 3 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
> 1%
last 2 versions
not ie <= 8
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ module.exports = {
},
parserOptions: {
parser: 'babel-eslint'
}
},
}
27 changes: 21 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
.DS_Store
node_modules/
dist/
npm-debug.log
package-lock.json
/yarn-error.log
.idea/
node_modules
/dist

# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
inspect.js

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw*
7 changes: 2 additions & 5 deletions .postcssrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
// https://github.com/michael-ciniawsky/postcss-load-config

module.exports = {
"plugins": {
// to edit target browsers: use "browserslist" field in package.json
"autoprefixer": {}
plugins: {
autoprefixer: {}
}
}
5 changes: 5 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
presets: [
'@vue/app'
]
}
58 changes: 27 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,32 @@
},
"license": "MIT",
"dependencies": {
"amcharts3": "github:amcharts/amcharts3",
"ammap3": "github:amcharts/ammap3",
"amcharts3": "^3.21.13",
"ammap3": "^3.21.13",
"awesome-bootstrap-checkbox": "1.0.0-alpha.5",
"bootstrap": "^4.0.0",
"chart.js": "^2.6.0",
"detect-browser": "^1.7.1",
"detect-browser": "^3.0.0",
"element-resize-detector": "^1.1.12",
"epic-spinners": "^1.0.1",
"flag-icon-css": "^2.9.0",
"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",
"ionicons": "^4.3.0",
"kewler": "^1.0.8",
"leaflet-map": "^0.2.1",
"medium-editor": "^5.23.3",
"normalize.css": "7.0.0",
"normalize.css": "8.0.0",
"v-tooltip": "^2.0.0-rc.30",
"vee-validate": "2.0.9",
"vee-validate": "2.1.0-beta.7",
"vue": "^2.5.17",
"vue-book": "0.0.3",
"vue-book": "0.0.14",
"vue-bulma-expanding": "0.0.1",
"vue-chartjs": "^2.8.1",
"vue-chartjs": "^3.4.0",
"vue-color": "^2.4.6",
"vue-router": "^3.0.1",
"vue-slider-component": "2.3.3",
"vue-slider-component": "2.7.6",
"vue-toasted": "^1.1.24",
"vue-yandex-maps": "^0.7.9",
"vue2-circle-progress": "^1.0.3",
Expand All @@ -52,42 +52,38 @@
"vuex-router-sync": "5.0.0"
},
"devDependencies": {
"autoprefixer": "7.1.2",
"chalk": "2.3.0",
"connect-history-api-fallback": "1.3.0",
"copy-webpack-plugin": "4.0.1",
"eslint-friendly-formatter": "3.0.0",
"@vue/cli-plugin-babel": "^3.0.0",
"@vue/cli-plugin-eslint": "^3.0.0",
"@vue/cli-service": "^3.0.0",
"@vue/eslint-config-standard": "^3.0.0",
"autoprefixer": "9.1.1",
"chalk": "2.4.1",
"connect-history-api-fallback": "1.5.0",
"copy-webpack-plugin": "4.5.2",
"eslint-friendly-formatter": "4.0.1",
"eventsource-polyfill": "0.9.6",
"express": "^4.16.3",
"extract-text-webpack-plugin": "3.0.0",
"file-loader": "1.1.4",
"friendly-errors-webpack-plugin": "1.6.1",
"extract-text-webpack-plugin": "3.0.2",
"file-loader": "1.1.11",
"friendly-errors-webpack-plugin": "1.7.0",
"lint-staged": "^7.2.0",
"node-sass": "^4.9.0",
"opn": "5.1.0",
"optimize-css-assets-webpack-plugin": "3.2.0",
"ora": "1.2.0",
"portfinder": "1.0.13",
"rimraf": "2.6.0",
"opn": "5.3.0",
"optimize-css-assets-webpack-plugin": "5.0.0",
"ora": "3.0.0",
"portfinder": "1.0.16",
"rimraf": "2.6.2",
"sass-loader": "^7.0.1",
"lint-staged": "^7.2.0",
"semver": "5.3.0",
"shelljs": "0.7.6",
"sass-resources-loader": "^1.3.3",
"semver": "5.5.0",
"shelljs": "0.8.2",
"vue-flatpickr-component": "^7.0.1",
"vue-template-compiler": "^2.5.17"
},
"engines": {
"node": ">= 4.0.0",
"npm": ">= 3.0.0"
},
"browserslist": [
"> 1%",
"last 2 versions",
"not ie <= 8"
],
"gitHooks": {
"pre-commit": "lint-staged"
},
Expand Down
File renamed without changes.
File renamed without changes.
38 changes: 19 additions & 19 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Polyfills
import 'es6-promise/auto'
import 'babel-polyfill'
// import 'es6-promise/auto'
// 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 store from './store'
import router from './router'
import VuesticPlugin from 'vuestic-theme/vuestic-plugin'
// import App from './App'
// import store from './store'
// import router from './router'
import VuesticPlugin from '@/vuestic-theme/vuestic-plugin'
import './i18n'
import YmapPlugin from 'vue-yandex-maps'

Expand All @@ -19,20 +19,20 @@ Vue.use(YmapPlugin)
// NOTE: workaround for VeeValidate + vuetable-2
Vue.use(VeeValidate, {fieldsBagName: 'formFields'})

router.beforeEach((to, from, next) => {
store.commit('setLoading', true)
next()
})
// router.beforeEach((to, from, next) => {
// store.commit('setLoading', true)
// next()
// })

router.afterEach((to, from) => {
store.commit('setLoading', false)
})
// router.afterEach((to, from) => {
// store.commit('setLoading', false)
// })

/* eslint-disable no-new */

new Vue({
el: '#app',
router,
store,
render: h => h(App)
})
// new Vue({
// el: '#app',
// router,
// store,
// render: h => h(App)
// })
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Pie, mixins} from 'vue-chartjs'
import { Pie, mixins } from 'vue-chartjs'
import DefaultOptions from '../DefaultOptions'

export default Pie.extend({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,19 @@ export default {
</script>

<style lang="scss">
//Modals
$modal-header-padding-x: $widget-padding;
$modal-header-padding-y: 0;
$modal-header-height: $widget-header-height;
$modal-header-border: $widget-header-border;
$modal-content-border-width: 0;
$modal-content-border-radius: 0;
$modal-inner-padding: 25px;
$modal-footer-btns-padding-bottom: 20px;
$modal-footer-btns-margin-x: 10px;
$modal-md: 650px;
$modal-lg: 850px;
.vuestic-modal {
height: 0;
width: 0;
Expand Down
49 changes: 49 additions & 0 deletions vue.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
const path = require('path')

module.exports = {
lintOnSave: false,
pages: {
index: {
// entry for the page
entry: 'src/main.js',
// the source template
template: 'public/index.html',
// output as dist/index.html
filename: 'index.html',
// when using title option,
// template title tag needs to be <title><%= htmlWebpackPlugin.options.title %></title>
title: 'Vuestic Admin',
// chunks to include on this page, by default includes
// extracted common chunks and vendor chunks.
chunks: ['chunk-vendors', 'chunk-common', 'index'],
},
},
configureWebpack: {
resolve: {
alias: {
'vue$': 'vue/dist/vue.esm.js',
'@': path.resolve('src'),
'src': path.resolve('src'),
'assets': path.resolve('src/assets'),
'components': path.resolve('src/components'),
'services': path.resolve('src/services'),
'directives': path.resolve('src/directives'),
'vuestic-mixins': path.resolve('src/vuestic-theme/vuestic-mixins'),
'vuestic-components': path.resolve('src/vuestic-theme/vuestic-components'),
'vuestic-directives': path.resolve('src/vuestic-theme/vuestic-directives'),
'vuestic-theme': path.resolve('src/vuestic-theme'),
'data': path.resolve('src/data'),
'vuex-store': path.resolve('src/store')
}
}
},
css: {
loaderOptions: {
// pass options to sass-loader
sass: {
// @/ is an alias to src/
data: `@import "@/sass/shared.scss";`
}
}
}
}
Loading

0 comments on commit 5976eb4

Please sign in to comment.