sean/manja_ui_dev
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

update: vuejs-templates/webpack to v1.3.1

Browse Source
This commit is contained in:
xidedix
2018-04-05 18:59:29 +02:00
parent 6de23dce60
commit 123737e20c
78 changed files with 3075 additions and 2025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.babelrc
+8 -4
View File
@@ -1,14 +1,18 @@
{
"presets": [
["env", { "modules": false }],
["env", {
"modules": false,
"targets": {
"browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
}
}],
"stage-2"
],
"plugins": ["transform-runtime"],
"comments": false,
"plugins": ["transform-vue-jsx", "transform-runtime"],
"env": {
"test": {
"presets": ["env", "stage-2"],
"plugins": [ "istanbul" ]
"plugins": ["transform-vue-jsx", "istanbul"]
}
}
}
.eslintignore
+6 -2
View File
@@ -1,2 +1,6 @@
build/*.js
config/*.js
/build/
/config/
/dist/
/*.js
/test/unit/coverage/
/test/e2e/specs/
.eslintrc.js
+12 -10
View File
@@ -2,26 +2,28 @@
module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
sourceType: 'module'
parser: 'babel-eslint'
},
env: {
browser: true,
},
// https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
extends: 'standard',
extends: [
// https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
'plugin:vue/essential',
// https://github.com/standard/standard/blob/master/docs/RULES-en.md
'standard'
],
// required to lint *.vue files
plugins: [
'html'
'vue'
],
// add your custom rules here
'rules': {
// allow paren-less arrow functions
'arrow-parens': 0,
rules: {
// allow async-await
'generator-star-spacing': 0,
'generator-star-spacing': 'off',
// allow debugger during development
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
}
}
.gitignore
+11 -4
View File
@@ -1,10 +1,17 @@
.idea
.DS_Store
node_modules/
dist/
/dist/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
test/unit/coverage
test/e2e/reports
/test/unit/coverage/
/test/e2e/reports/
selenium-debug.log
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
.postcssrc.js
+3 -1
View File
@@ -2,7 +2,9 @@
module.exports = {
"plugins": {
// to edit target browsers: use "browserlist" field in package.json
"postcss-import": {},
"postcss-url": {},
// to edit target browsers: use "browserslist" field in package.json
"autoprefixer": {}
}
}
README.md
+62 -9
View File
@@ -32,21 +32,74 @@ Within the download you'll find the following directories and files:
```
CoreUI-Vue/
├── Vue_Full_Project/
├── Vue_Starter/
├── build/ # webpack config files
├── config/ # main project config
├── scss/ # styles
├── src/ # project root
│ ├── assets/ # module assets (processed by webpack)
│ ├── components/ # ui components
│ ├── containers/ # ui containers
│ ├── router/ # routing
│ ├── shared/ # utils
│ ├── views/ # ui views
│ ├── App.vue # main app component
│ └── main.js # app entry file
├── _nav.js # sidebar nav config
├── static/ # pure static assets (directly copied)
├── test/
│ └── unit/ # unit tests
│ └── e2e/ # e2e tests
├── .babelrc.js # babel config
├── .editorconfig # settings for your editor
├── .eslintignore # eslint ignore rules
├── .eslintrc.js # eslint config
├── .gitignore # defaults for gitignore
├── .postcssrc.js # postcss config
├── CHANGELOG.md
├── index.html # index.html template
├── LICENSE
├── README.md
└── package.json # build scripts and dependencies
```
## Other Versions
CoreUI includes 6 Version for Angular 4, AngularJS, React.js, Vue.js, Static HTML5 and AJAX HTML5.
* [Angular Version (Angular 2+)](https://github.com/mrholek/CoreUI-Angular).
* [AngularJS Version](https://github.com/mrholek/CoreUI-AngularJS).
* [HTML5 AJAX Version](https://github.com/mrholek/CoreUI-Free-Bootstrap-Admin-Template).
* [HTML5 Static Version](https://github.com/mrholek/CoreUI-Free-Bootstrap-Admin-Template).
* [React.js Version](https://github.com/mrholek/CoreUI-React).
* [Vue.js Version](https://github.com/mrholek/CoreUI-Vue).
* [Angular Version (Angular 2+)](https://github.com/mrholek/CoreUI-Angular)
* [AngularJS Version](https://github.com/mrholek/CoreUI-AngularJS)
* [HTML5 AJAX Version](https://github.com/mrholek/CoreUI-Free-Bootstrap-Admin-Template)
* [HTML5 Static Version](https://github.com/mrholek/CoreUI-Free-Bootstrap-Admin-Template)
* [React.js Version](https://github.com/mrholek/CoreUI-React)
* [Vue.js Version](https://github.com/mrholek/CoreUI-Vue)
* [ASP.NET Core 2 MVC Version](https://github.com/mrholek/CoreUI-NET)
## Build Setup
``` bash
# install dependencies
npm install
# serve with hot reload at localhost:8080
npm run dev
# build for production with minification
npm run build
# build for production and view the bundle analyzer report
npm run build --report
# run unit tests
npm run unit
# run e2e tests
npm run e2e
# run all tests
npm test
```
For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
## Bugs and feature requests
build/build.js
+16 -10
View File
@@ -1,31 +1,37 @@
'use strict'
require('./check-versions')()
process.env.NODE_ENV = 'production'
var ora = require('ora')
var rm = require('rimraf')
var path = require('path')
var chalk = require('chalk')
var webpack = require('webpack')
var config = require('../config')
var webpackConfig = require('./webpack.prod.conf')
const ora = require('ora')
const rm = require('rimraf')
const path = require('path')
const chalk = require('chalk')
const webpack = require('webpack')
const config = require('../config')
const webpackConfig = require('./webpack.prod.conf')
var spinner = ora('building for production...')
const spinner = ora('building for production...')
spinner.start()
rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
if (err) throw err
webpack(webpackConfig, function (err, stats) {
webpack(webpackConfig, (err, stats) => {
spinner.stop()
if (err) throw err
process.stdout.write(stats.toString({
colors: true,
modules: false,
children: false,
children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build.
chunks: false,
chunkModules: false
}) + '\n\n')
if (stats.hasErrors()) {
console.log(chalk.red(' Build failed with errors.\n'))
process.exit(1)
}
console.log(chalk.cyan(' Build complete.\n'))
console.log(chalk.yellow(
' Tip: built files are meant to be served over an HTTP server.\n' +
build/check-versions.js
+17 -11
View File
@@ -1,17 +1,19 @@
var chalk = require('chalk')
var semver = require('semver')
var packageConfig = require('../package.json')
var shell = require('shelljs')
'use strict'
const chalk = require('chalk')
const semver = require('semver')
const packageConfig = require('../package.json')
const shell = require('shelljs')
function exec (cmd) {
return require('child_process').execSync(cmd).toString().trim()
}
var versionRequirements = [
const versionRequirements = [
{
name: 'node',
currentVersion: semver.clean(process.version),
versionRequirement: packageConfig.engines.node
},
}
]
if (shell.which('npm')) {
@@ -23,9 +25,11 @@ if (shell.which('npm')) {
}
module.exports = function () {
var warnings = []
for (var i = 0; i < versionRequirements.length; i++) {
var mod = versionRequirements[i]
const warnings = []
for (let i = 0; i < versionRequirements.length; i++) {
const mod = versionRequirements[i]
if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
warnings.push(mod.name + ': ' +
chalk.red(mod.currentVersion) + ' should be ' +
@@ -38,10 +42,12 @@ module.exports = function () {
console.log('')
console.log(chalk.yellow('To use this template, you must update following to modules:'))
console.log()
for (var i = 0; i < warnings.length; i++) {
var warning = warnings[i]
for (let i = 0; i < warnings.length; i++) {
const warning = warnings[i]
console.log(' ' + warning)
}
console.log()
process.exit(1)
}
build/dev-client.js
-9
View File
@@ -1,9 +0,0 @@
/* eslint-disable */
require('eventsource-polyfill')
var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
hotClient.subscribe(function (event) {
if (event.action === 'reload') {
window.location.reload()
}
})
build/dev-server.js
-91
View File
@@ -1,91 +0,0 @@
require('./check-versions')()
var config = require('../config')
if (!process.env.NODE_ENV) {
process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV)
}
var opn = require('opn')
var path = require('path')
var express = require('express')
var webpack = require('webpack')
var proxyMiddleware = require('http-proxy-middleware')
var webpackConfig = process.env.NODE_ENV === 'testing'
? require('./webpack.prod.conf')
: require('./webpack.dev.conf')
// default port where dev server listens for incoming traffic
var port = process.env.PORT || config.dev.port
// automatically open browser, if not set will be false
var autoOpenBrowser = !!config.dev.autoOpenBrowser
// Define HTTP proxies to your custom API backend
// https://github.com/chimurai/http-proxy-middleware
var proxyTable = config.dev.proxyTable
var app = express()
var compiler = webpack(webpackConfig)
var devMiddleware = require('webpack-dev-middleware')(compiler, {
publicPath: webpackConfig.output.publicPath,
quiet: true
})
var hotMiddleware = require('webpack-hot-middleware')(compiler, {
log: () => {}
})
// force page reload when html-webpack-plugin template changes
compiler.plugin('compilation', function (compilation) {
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
hotMiddleware.publish({ action: 'reload' })
cb()
})
})
// proxy api requests
Object.keys(proxyTable).forEach(function (context) {
var options = proxyTable[context]
if (typeof options === 'string') {
options = { target: options }
}
app.use(proxyMiddleware(options.filter || context, options))
})
// handle fallback for HTML5 history API
app.use(require('connect-history-api-fallback')())
// serve webpack bundle output
app.use(devMiddleware)
// enable hot-reload and state-preserving
// compilation error display
app.use(hotMiddleware)
// serve pure static assets
var staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory)
app.use(staticPath, express.static('./static'))
var uri = 'http://localhost:' + port
var _resolve
var readyPromise = new Promise(resolve => {
_resolve = resolve
})
console.log('> Starting dev server...')
devMiddleware.waitUntilValid(() => {
console.log('> Listening at ' + uri + '\n')
// when env is testing, don't need open it
if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
opn(uri)
}
_resolve()
})
var server = app.listen(port)
module.exports = {
ready: readyPromise,
close: () => {
server.close()
}
}
build/logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

build/utils.js
+42 -13
View File
@@ -1,29 +1,38 @@
var path = require('path')
var config = require('../config')
var ExtractTextPlugin = require('extract-text-webpack-plugin')
'use strict'
const path = require('path')
const config = require('../config')
const ExtractTextPlugin = require('extract-text-webpack-plugin')
const packageConfig = require('../package.json')
exports.assetsPath = function (_path) {
var assetsSubDirectory = process.env.NODE_ENV === 'production'
const assetsSubDirectory = process.env.NODE_ENV === 'production'
? config.build.assetsSubDirectory
: config.dev.assetsSubDirectory
return path.posix.join(assetsSubDirectory, _path)
}
exports.cssLoaders = function (options) {
options = options || {}
var cssLoader = {
const cssLoader = {
loader: 'css-loader',
options: {
minimize: process.env.NODE_ENV === 'production',
sourceMap: options.sourceMap,
alias: { '../img': '../static/img' }
sourceMap: options.sourceMap
}
}
const postcssLoader = {
loader: 'postcss-loader',
options: {
sourceMap: options.sourceMap
}
}
// generate loader string to be used with extract text plugin
function generateLoaders (loader, loaderOptions) {
var loaders = [cssLoader]
const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
if (loader) {
loaders.push({
loader: loader + '-loader',
@@ -59,14 +68,34 @@ exports.cssLoaders = function (options) {
// Generate loaders for standalone style files (outside of .vue)
exports.styleLoaders = function (options) {
var output = []
var loaders = exports.cssLoaders(options)
for (var extension in loaders) {
var loader = loaders[extension]
const output = []
const loaders = exports.cssLoaders(options)
for (const extension in loaders) {
const loader = loaders[extension]
output.push({
test: new RegExp('\\.' + extension + '$'),
use: loader
})
}
return output
}
exports.createNotifierCallback = () => {
const notifier = require('node-notifier')
return (severity, errors) => {
if (severity !== 'error') return
const error = errors[0]
const filename = error.file && error.file.split('!').pop()
notifier.notify({
title: packageConfig.name,
message: severity + ': ' + error.name,
subtitle: filename || '',
icon: path.join(__dirname, 'logo.png')
})
}
}
build/vue-loader.conf.js
+17 -7
View File
@@ -1,12 +1,22 @@
var utils = require('./utils')
var config = require('../config')
var isProduction = process.env.NODE_ENV === 'production'
'use strict'
const utils = require('./utils')
const config = require('../config')
const isProduction = process.env.NODE_ENV === 'production'
const sourceMapEnabled = isProduction
? config.build.productionSourceMap
: config.dev.cssSourceMap
module.exports = {
loaders: utils.cssLoaders({
sourceMap: isProduction
? config.build.productionSourceMap
: config.dev.cssSourceMap,
sourceMap: sourceMapEnabled,
extract: isProduction
})
}),
cssSourceMap: sourceMapEnabled,
cacheBusting: config.dev.cacheBusting,
transformToRequire: {
video: ['src', 'poster'],
source: 'src',
img: 'src',
image: 'xlink:href'
}
}
build/webpack.base.conf.js
+46 -30
View File
@@ -1,13 +1,26 @@
var path = require('path')
var utils = require('./utils')
var config = require('../config')
var vueLoaderConfig = require('./vue-loader.conf')
'use strict'
const path = require('path')
const utils = require('./utils')
const config = require('../config')
const vueLoaderConfig = require('./vue-loader.conf')
function resolve (dir) {
return path.join(__dirname, '..', dir)
}
const createLintingRule = () => ({
test: /\.(js|vue)$/,
loader: 'eslint-loader',
enforce: 'pre',
include: [resolve('src'), resolve('test')],
options: {
formatter: require('eslint-friendly-formatter'),
emitWarning: !config.dev.showEslintErrorsInOverlay
}
})
module.exports = {
context: path.resolve(__dirname, '../'),
entry: {
app: './src/main.js'
},
@@ -22,20 +35,12 @@ module.exports = {
extensions: ['.js', '.vue', '.json'],
alias: {
'vue$': 'vue/dist/vue.esm.js',
'@': resolve('src')
'@': resolve('src'),
}
},
module: {
rules: [
{
test: /\.(js|vue)$/,
loader: 'eslint-loader',
enforce: 'pre',
include: [resolve('src'), resolve('test')],
options: {
formatter: require('eslint-friendly-formatter')
}
},
...(config.dev.useEslint ? [createLintingRule()] : []),
{
test: /\.vue$/,
loader: 'vue-loader',
@@ -44,33 +49,44 @@ module.exports = {
{
test: /\.js$/,
loader: 'babel-loader',
include: [resolve('src'), resolve('test')]
include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
},
{
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
exclude: [/fonts/],
use: {
loader: 'file-loader',
loader: 'url-loader',
options: {
name: '[name].[hash:7].[ext]',
publicPath: '../../',
outputPath: utils.assetsPath('img/'),
emitFile: true
}
limit: 10000,
name: utils.assetsPath('img/[name].[hash:7].[ext]')
}
},
{
test: /\.(woff2?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
exclude: [/flags/],
use: {
loader: 'file-loader',
test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
loader: 'url-loader',
options: {
name: '[name].[hash:7].[ext]',
publicPath: '../../',
outputPath: utils.assetsPath('fonts/')
limit: 10000,
name: utils.assetsPath('media/[name].[hash:7].[ext]')
}
},
{
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
loader: 'url-loader',
options: {
limit: 10000,
name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
}
}
]
},
node: {
// prevent webpack from injecting useless setImmediate polyfill because Vue
// source contains it (although only uses it if it's native).
setImmediate: false,
// prevent webpack from injecting mocks to Node native modules
// that does not make sense for the client
dgram: 'empty',
fs: 'empty',
net: 'empty',
tls: 'empty',
child_process: 'empty'
}
}
build/webpack.dev.conf.js
+70 -20
View File
@@ -1,30 +1,55 @@
var path = require('path')
var utils = require('./utils')
var webpack = require('webpack')
var config = require('../config')
var merge = require('webpack-merge')
var baseWebpackConfig = require('./webpack.base.conf')
var CopyWebpackPlugin = require('copy-webpack-plugin')
var HtmlWebpackPlugin = require('html-webpack-plugin')
var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
'use strict'
const utils = require('./utils')
const webpack = require('webpack')
const config = require('../config')
const merge = require('webpack-merge')
const path = require('path')
const baseWebpackConfig = require('./webpack.base.conf')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
const portfinder = require('portfinder')
// add hot-reload related code to entry chunks
Object.keys(baseWebpackConfig.entry).forEach(function (name) {
baseWebpackConfig.entry[name] = ['./build/dev-client'].concat(baseWebpackConfig.entry[name])
})
const HOST = process.env.HOST
const PORT = process.env.PORT && Number(process.env.PORT)
module.exports = merge(baseWebpackConfig, {
const devWebpackConfig = merge(baseWebpackConfig, {
module: {
rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap })
rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
},
// cheap-module-eval-source-map is faster for development
devtool: '#cheap-module-eval-source-map',
devtool: config.dev.devtool,
// these devServer options should be customized in /config/index.js
devServer: {
clientLogLevel: 'warning',
historyApiFallback: {
rewrites: [
{ from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
],
},
hot: true,
contentBase: false, // since we use CopyWebpackPlugin.
compress: true,
host: HOST || config.dev.host,
port: PORT || config.dev.port,
open: config.dev.autoOpenBrowser,
overlay: config.dev.errorOverlay
? { warnings: false, errors: true }
: false,
publicPath: config.dev.assetsPublicPath,
proxy: config.dev.proxyTable,
quiet: true, // necessary for FriendlyErrorsPlugin
watchOptions: {
poll: config.dev.poll,
}
},
plugins: [
new webpack.DefinePlugin({
'process.env': config.dev.env
'process.env': require('../config/dev.env')
}),
// https://github.com/glenjamin/webpack-hot-middleware#installation--usage
new webpack.HotModuleReplacementPlugin(),
new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update.
new webpack.NoEmitOnErrorsPlugin(),
// https://github.com/ampedandwired/html-webpack-plugin
new HtmlWebpackPlugin({
@@ -32,14 +57,39 @@ module.exports = merge(baseWebpackConfig, {
template: 'index.html',
inject: true
}),
new FriendlyErrorsPlugin(),
// copy custom static assets
new CopyWebpackPlugin([
{
from: path.resolve(__dirname, '../static'),
to: config.build.assetsSubDirectory,
to: config.dev.assetsSubDirectory,
ignore: ['.*']
}
])
]
})
module.exports = new Promise((resolve, reject) => {
portfinder.basePort = process.env.PORT || config.dev.port
portfinder.getPort((err, port) => {
if (err) {
reject(err)
} else {
// publish the new Port, necessary for e2e tests
process.env.PORT = port
// add port to devServer config
devWebpackConfig.devServer.port = port
// Add FriendlyErrorsPlugin
devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
compilationSuccessInfo: {
messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
},
onErrors: config.dev.notifyOnErrors
? utils.createNotifierCallback()
: undefined
}))
resolve(devWebpackConfig)
}
})
})
build/webpack.prod.conf.js
+50 -25
View File
@@ -1,26 +1,29 @@
var path = require('path')
var utils = require('./utils')
var webpack = require('webpack')
var config = require('../config')
var merge = require('webpack-merge')
var baseWebpackConfig = require('./webpack.base.conf')
var CopyWebpackPlugin = require('copy-webpack-plugin')
var HtmlWebpackPlugin = require('html-webpack-plugin')
var ExtractTextPlugin = require('extract-text-webpack-plugin')
var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
'use strict'
const path = require('path')
const utils = require('./utils')
const webpack = require('webpack')
const config = require('../config')
const merge = require('webpack-merge')
const baseWebpackConfig = require('./webpack.base.conf')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const ExtractTextPlugin = require('extract-text-webpack-plugin')
const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
var env = process.env.NODE_ENV === 'testing'
const env = process.env.NODE_ENV === 'testing'
? require('../config/test.env')
: config.build.env
: require('../config/prod.env')
var webpackConfig = merge(baseWebpackConfig, {
const webpackConfig = merge(baseWebpackConfig, {
module: {
rules: utils.styleLoaders({
sourceMap: config.build.productionSourceMap,
extract: true
extract: true,
usePostCSS: true
})
},
devtool: config.build.productionSourceMap ? '#source-map' : false,
devtool: config.build.productionSourceMap ? config.build.devtool : false,
output: {
path: config.build.assetsRoot,
filename: utils.assetsPath('js/[name].[chunkhash].js'),
@@ -31,22 +34,30 @@ var webpackConfig = merge(baseWebpackConfig, {
new webpack.DefinePlugin({
'process.env': env
}),
new webpack.optimize.UglifyJsPlugin({
new UglifyJsPlugin({
uglifyOptions: {
compress: {
warnings: false
}
},
sourceMap: true
sourceMap: config.build.productionSourceMap,
parallel: true
}),
// extract css into its own file
new ExtractTextPlugin({
filename: utils.assetsPath('css/[name].[contenthash].css')
filename: utils.assetsPath('css/[name].[contenthash].css'),
// Setting the following option to `false` will not extract CSS from codesplit chunks.
// Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
// It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`,
// increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
allChunks: true,
}),
// Compress extracted CSS. We are using this plugin so that possible
// duplicated CSS from different components can be deduped.
new OptimizeCSSPlugin({
cssProcessorOptions: {
safe: true
}
cssProcessorOptions: config.build.productionSourceMap
? { safe: true, map: { inline: false } }
: { safe: true }
}),
// generate dist index.html with correct asset hash for caching.
// you can customize output by editing /index.html
@@ -67,10 +78,14 @@ var webpackConfig = merge(baseWebpackConfig, {
// necessary to consistently work with multiple chunks via CommonsChunkPlugin
chunksSortMode: 'dependency'
}),
// keep module.id stable when vendor modules does not change
new webpack.HashedModuleIdsPlugin(),
// enable scope hoisting
new webpack.optimize.ModuleConcatenationPlugin(),
// split vendor js into its own file
new webpack.optimize.CommonsChunkPlugin({
name: 'vendor',
minChunks: function (module, count) {
minChunks (module) {
// any required modules inside node_modules are extracted to vendor
return (
module.resource &&
@@ -85,8 +100,18 @@ var webpackConfig = merge(baseWebpackConfig, {
// prevent vendor hash from being updated whenever app bundle is updated
new webpack.optimize.CommonsChunkPlugin({
name: 'manifest',
chunks: ['vendor']
minChunks: Infinity
}),
// This instance extracts shared chunks from code splitted chunks and bundles them
// in a separate chunk, similar to the vendor chunk
// see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk
new webpack.optimize.CommonsChunkPlugin({
name: 'app',
async: 'vendor-async',
children: true,
minChunks: 3
}),
// copy custom static assets
new CopyWebpackPlugin([
{
@@ -99,7 +124,7 @@ var webpackConfig = merge(baseWebpackConfig, {
})
if (config.build.productionGzip) {
var CompressionWebpackPlugin = require('compression-webpack-plugin')
const CompressionWebpackPlugin = require('compression-webpack-plugin')
webpackConfig.plugins.push(
new CompressionWebpackPlugin({
@@ -117,7 +142,7 @@ if (config.build.productionGzip) {
}
if (config.build.bundleAnalyzerReport) {
var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
webpackConfig.plugins.push(new BundleAnalyzerPlugin())
}
build/webpack.test.conf.js
+6 -5
View File
@@ -1,11 +1,12 @@
'use strict'
// This is the webpack config used for unit tests.
var utils = require('./utils')
var webpack = require('webpack')
var merge = require('webpack-merge')
var baseConfig = require('./webpack.base.conf')
const utils = require('./utils')
const webpack = require('webpack')
const merge = require('webpack-merge')
const baseWebpackConfig = require('./webpack.base.conf')
var webpackConfig = merge(baseConfig, {
const webpackConfig = merge(baseWebpackConfig, {
// use inline sourcemap for karma-sourcemap-loader
module: {
rules: utils.styleLoaders()
config/dev.env.js
+3 -2
View File
@@ -1,5 +1,6 @@
var merge = require('webpack-merge')
var prodEnv = require('./prod.env')
'use strict'
const merge = require('webpack-merge')
const prodEnv = require('./prod.env')
module.exports = merge(prodEnv, {
NODE_ENV: '"development"'
config/index.js
+55 -17
View File
@@ -1,38 +1,76 @@
'use strict'
// Template version: 1.3.1
// see http://vuejs-templates.github.io/webpack for documentation.
var path = require('path')
const path = require('path')
module.exports = {
dev: {
// Paths
assetsSubDirectory: 'static',
assetsPublicPath: '/',
proxyTable: {},
// Various Dev Server settings
host: 'localhost', // can be overwritten by process.env.HOST
port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,
notifyOnErrors: true,
poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
// Use Eslint Loader?
// If true, your code will be linted during bundling and
// linting errors and warnings will be shown in the console.
useEslint: true,
// If true, eslint errors and warnings will also be shown in the error overlay
// in the browser.
showEslintErrorsInOverlay: false,
/**
* Source Maps
*/
// https://webpack.js.org/configuration/devtool/#development
devtool: 'cheap-module-eval-source-map',
// If you have problems debugging vue-files in devtools,
// set this to false - it *may* help
// https://vue-loader.vuejs.org/en/options.html#cachebusting
cacheBusting: true,
cssSourceMap: true
},
build: {
env: require('./prod.env'),
// Template for index.html
index: path.resolve(__dirname, '../dist/index.html'),
// Paths
assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'static',
assetsPublicPath: './',
assetsPublicPath: '/',
/**
* Source Maps
*/
productionSourceMap: true,
// https://webpack.js.org/configuration/devtool/#production
devtool: '#source-map',
// Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you.
// Before setting to `true`, make sure to:
// npm install --save-dev compression-webpack-plugin
productionGzip: false,
productionGzipExtensions: ['js', 'css'],
// Run the build command with an extra argument to
// View the bundle analyzer report after build finishes:
// `npm run build --report`
// Set to `true` or `false` to always turn it on or off
bundleAnalyzerReport: process.env.npm_config_report
},
dev: {
env: require('./dev.env'),
port: 8080,
autoOpenBrowser: true,
assetsSubDirectory: 'static',
assetsPublicPath: '',
proxyTable: {},
// CSS Sourcemaps off by default because relative paths are "buggy"
// with this option, according to the CSS-Loader README
// (https://github.com/webpack/css-loader#sourcemaps)
// In our experience, they generally work as expected,
// just be aware of this issue when enabling this option.
cssSourceMap: false
}
}
config/prod.env.js
+1
View File
@@ -1,3 +1,4 @@
'use strict'
module.exports = {
NODE_ENV: '"production"'
}
config/test.env.js
+3 -2
View File
@@ -1,5 +1,6 @@
var merge = require('webpack-merge')
var devEnv = require('./dev.env')
'use strict'
const merge = require('webpack-merge')
const devEnv = require('./dev.env')
module.exports = merge(devEnv, {
NODE_ENV: '"testing"'
package-lock.json
Generated
+1686 -388
View File
File diff suppressed because it is too large Load Diff
package.json
+74 -67
View File
@@ -8,13 +8,13 @@
"license": "MIT",
"private": true,
"scripts": {
"dev": "node build/dev-server.js",
"start": "node build/dev-server.js",
"build": "node build/build.js",
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
"start": "npm run dev",
"unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
"e2e": "node test/e2e/runner.js",
"test": "npm run unit && npm run e2e",
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
"lint": "eslint --ext .js,.vue src test/unit test/e2e/specs",
"build": "node build/build.js"
},
"dependencies": {
"@coreui/coreui": "next",
@@ -30,75 +30,82 @@
},
"devDependencies": {
"autoprefixer": "7.2.5",
"babel-core": "6.26.0",
"babel-eslint": "8.2.1",
"babel-loader": "7.1.2",
"babel-plugin-transform-runtime": "6.23.0",
"babel-preset-env": "1.6.1",
"babel-preset-stage-2": "6.24.1",
"babel-register": "6.26.0",
"chalk": "2.3.0",
"connect-history-api-fallback": "1.5.0",
"copy-webpack-plugin": "4.3.1",
"css-loader": "0.28.9",
"eslint": "4.16.0",
"eslint-friendly-formatter": "3.0.0",
"eslint-loader": "1.9.0",
"eslint-plugin-html": "4.0.2",
"eslint-plugin-import": "2.8.0",
"eslint-plugin-node": "5.2.1",
"eslint-config-standard": "11.0.0-beta.0",
"eslint-plugin-promise": "3.6.0",
"eslint-plugin-standard": "3.0.1",
"eventsource-polyfill": "0.9.6",
"express": "4.16.2",
"extract-text-webpack-plugin": "3.0.2",
"file-loader": "1.1.6",
"friendly-errors-webpack-plugin": "1.6.1",
"html-webpack-plugin": "2.30.1",
"http-proxy-middleware": "0.17.4",
"cross-env": "5.1.3",
"karma": "2.0.0",
"karma-coverage": "1.1.1",
"karma-mocha": "1.3.0",
"karma-phantomjs-launcher": "1.0.4",
"karma-phantomjs-shim": "1.5.0",
"karma-sinon-chai": "1.3.3",
"karma-sourcemap-loader": "0.3.7",
"karma-spec-reporter": "0.0.32",
"karma-webpack": "2.0.9",
"lolex": "2.3.2",
"mocha": "5.0.0",
"chai": "4.1.2",
"sinon": "4.2.2",
"sinon-chai": "2.14.0",
"inject-loader": "3.0.1",
"babel-plugin-istanbul": "4.1.5",
"babel-core": "^6.26.0",
"babel-eslint": "^8.2.2",
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"babel-loader": "^7.1.4",
"babel-plugin-istanbul": "^4.1.5",
"babel-plugin-syntax-jsx": "^6.18.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-plugin-transform-vue-jsx": "^3.7.0",
"babel-preset-env": "^1.6.1",
"babel-preset-stage-2": "^6.24.1",
"babel-register": "^6.26.0",
"chai": "^4.1.2",
"chalk": "^2.3.2",
"chromedriver": "^2.37.0",
"copy-webpack-plugin": "^4.3.1",
"cross-env": "^5.0.1",
"cross-spawn": "^5.0.1",
"css-loader": "^0.28.11",
"eslint": "^4.19.1",
"eslint-config-standard": "^11.0.0",
"eslint-friendly-formatter": "^3.0.0",
"eslint-loader": "^2.0.0",
"eslint-plugin-import": "^2.10.0",
"eslint-plugin-node": "^6.0.1",
"eslint-plugin-promise": "^3.6.0",
"eslint-plugin-standard": "^3.0.1",
"eslint-plugin-vue": "^4.4.0",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^1.1.11",
"friendly-errors-webpack-plugin": "^1.7.0",
"html-webpack-plugin": "^2.30.1",
"inject-loader": "^3.0.1",
"karma": "^2.0.0",
"karma-coverage": "^1.1.1",
"karma-mocha": "^1.3.0",
"karma-phantomjs-launcher": "^1.0.4",
"karma-phantomjs-shim": "^1.5.0",
"karma-sinon-chai": "^1.3.3",
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "^0.0.32",
"karma-webpack": "^2.0.9",
"mocha": "^5.0.5",
"nightwatch": "^0.9.12",
"node-notifier": "^5.1.2",
"node-sass": "^4.8.3",
"optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0",
"phantomjs-prebuilt": "^2.1.16",
"chromedriver": "2.35.0",
"cross-spawn": "6.0.4",
"nightwatch": "0.9.19",
"node-sass": "4.7.2",
"sass-loader": "6.0.6",
"selenium-server": "3.8.1",
"semver": "5.5.0",
"shelljs": "0.8.1",
"opn": "5.2.0",
"optimize-css-assets-webpack-plugin": "3.2.0",
"ora": "1.4.0",
"rimraf": "2.6.2",
"url-loader": "0.6.2",
"vue-loader": "14.2.2",
"vue-style-loader": "^3.1.2",
"portfinder": "^1.0.13",
"postcss-import": "^11.1.0",
"postcss-loader": "^2.1.3",
"postcss-url": "^7.3.2",
"rimraf": "^2.6.2",
"sass-loader": "^6.0.7",
"selenium-server": "^3.11.0",
"semver": "^5.5.0",
"shelljs": "^0.8.1",
"sinon": "^4.5.0",
"sinon-chai": "^2.14.0",
"uglifyjs-webpack-plugin": "^1.1.1",
"url-loader": "^0.6.2",
"vue-loader": "^14.2.2",
"vue-style-loader": "^4.1.0",
"vue-template-compiler": "^2.5.16",
"webpack": "3.11.0",
"webpack": "^3.6.0",
"webpack-bundle-analyzer": "^2.11.1",
"webpack-dev-middleware": "^2.0.4",
"webpack-hot-middleware": "^2.21.2",
"webpack-dev-server": "^2.11.2",
"webpack-merge": "^4.1.2"
},
"engines": {
"node": ">= 8.9.4",
"npm": ">= 5.6.0"
}
},
"browserslist": [
"> 1%",
"last 2 versions",
"not ie <= 8"
]
}
src/App.vue
+22 -5
View File
@@ -8,17 +8,34 @@ export default {
}
</script>
<!--<style lang="scss">-->
<!--/* Import Font Awesome Icons Set */-->
<!--$fa-font-path: '~font-awesome/fonts/';-->
<!--@import '~font-awesome/scss/font-awesome.scss';-->
<!--/* Import Simple Line Icons Set */-->
<!--$simple-line-font-path: '~simple-line-icons/fonts/';-->
<!--@import '~simple-line-icons/scss/simple-line-icons.scss';-->
<!--/* Import Flag Icons Set */-->
<!--@import '~flag-icon-css/sass/flag-icon.scss';-->
<!--/* Import Bootstrap Vue Styles */-->
<!--@import 'bootstrap-vue/dist/bootstrap-vue.css';-->
<!--/* Import Main styles for this application */-->
<!--@import '../scss/style';-->
<!--/*@import './assets/scss/style';*/-->
<!--</style>-->
<style lang="scss">
/* Import Font Awesome Icons Set */
@import '~flag-icon-css/css/flag-icon.min.css';
/* Import Font Awesome Icons Set */
$fa-font-path: '~font-awesome/fonts/';
@import '~font-awesome/css/font-awesome.min.css';
@import '~font-awesome/scss/font-awesome.scss';
/* Import Simple Line Icons Set */
$simple-line-font-path: '~simple-line-icons/fonts/';
@import '~simple-line-icons/css/simple-line-icons.css';
@import '~simple-line-icons/scss/simple-line-icons.scss';
/* Import Flag Icons Set */
@import '../node_modules/flag-icon-css/css/flag-icon.min.css';
/* Import Bootstrap Vue Styles */
@import '~bootstrap-vue/dist/bootstrap-vue.css';
@import '../node_modules/bootstrap-vue/dist/bootstrap-vue.css';
// Import Main styles for this application
@import '../scss/style';
/*@import './assets/scss/style';*/
</style>
src/assets/.gitkeep
View File
src/components/Aside/Aside.vue
+3 -3
View File
@@ -5,9 +5,9 @@
</template>
<script>
// import { asideMenuCssClasses, validBreakpoints, checkBreakpoint } from '../../shared/classes'
// import { asideMenuCssClasses, validBreakpoints, checkBreakpoint } from '../../shared/classes'
export default {
export default {
name: 'AppAside',
props: {
fixed: {
@@ -44,5 +44,5 @@
// document.body.classList.add(cssClass)
// }
}
}
}
</script>
src/components/Aside/AsideToggler.vue
+4 -4
View File
@@ -10,10 +10,10 @@
</template>
<script>
import { asideMenuCssClasses, validBreakpoints, checkBreakpoint } from '../../shared/classes'
import toggleClasses from '../../shared/toggle-classes'
import { asideMenuCssClasses, validBreakpoints, checkBreakpoint } from '../../shared/classes'
import toggleClasses from '../../shared/toggle-classes'
export default {
export default {
name: 'AsideToggler',
props: {
mobile: {
@@ -51,5 +51,5 @@
this.toggle()
}
}
}
}
</script>
src/components/Breadcrumb/Breadcrumb.vue
+2 -2
View File
@@ -8,7 +8,7 @@
</template>
<script>
export default {
export default {
props: {
list: {
type: Array,
@@ -30,5 +30,5 @@
return item
}
}
}
}
</script>
src/components/Footer/Footer.vue
+2 -2
View File
@@ -14,7 +14,7 @@
</template>
<script>
export default {
export default {
name: 'AppFooter',
props: {
fixed: {
@@ -37,5 +37,5 @@
this.fixed ? document.body.classList.add('footer-fixed') : document.body.classList.remove('footer-fixed')
}
}
}
}
</script>
src/components/Header v1/HeaderDropdown_v1.vue
-29
View File
@@ -1,29 +0,0 @@
<template>
<b-nav-item-dropdown right no-caret>
<template slot="button-content">
<img src="static/img/avatars/6.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
</template>
<b-dropdown-header tag="div" class="text-center"><strong>Account</strong></b-dropdown-header>
<b-dropdown-item><i class="fa fa-bell-o"></i> Updates<b-badge variant="info">{{itemsCount}}</b-badge></b-dropdown-item>
<b-dropdown-item><i class="fa fa-envelope-o"></i> Messages<b-badge variant="success">{{itemsCount}}</b-badge></b-dropdown-item>
<b-dropdown-item><i class="fa fa-tasks"></i> Tasks<b-badge variant="danger">{{itemsCount}}</b-badge></b-dropdown-item>
<b-dropdown-item><i class="fa fa-comments"></i> Comments<b-badge variant="warning">{{itemsCount}}</b-badge></b-dropdown-item>
<b-dropdown-header tag="div" class="text-center"><strong>Settings</strong></b-dropdown-header>
<b-dropdown-item><i class="fa fa-user"></i> Profile</b-dropdown-item>
<b-dropdown-item><i class="fa fa-wrench"></i> Settings</b-dropdown-item>
<b-dropdown-item><i class="fa fa-usd"></i> Payments<b-badge variant="secondary">{{itemsCount}}</b-badge></b-dropdown-item>
<b-dropdown-item><i class="fa fa-file"></i> Projects<b-badge variant="primary">{{itemsCount}}</b-badge></b-dropdown-item>
<b-dropdown-divider></b-dropdown-divider>
<b-dropdown-item><i class="fa fa-shield"></i> Lock Account</b-dropdown-item>
<b-dropdown-item><i class="fa fa-lock"></i> Logout</b-dropdown-item>
</b-nav-item-dropdown>
</template>
<script>
export default {
name: 'header-dropdown',
data: () => {
return { itemsCount: 42 }
}
}
</script>
src/components/Header v1/Header_v1.vue
-60
View File
@@ -1,60 +0,0 @@
<template>
<header class="app-header navbar">
<button class="navbar-toggler mobile-sidebar-toggler d-lg-none" type="button" @click="mobileSidebarToggle">
<span class="navbar-toggler-icon"></span>
</button>
<b-link class="navbar-brand" to="#"></b-link>
<button class="navbar-toggler sidebar-toggler d-md-down-none" type="button" @click="sidebarToggle">
<span class="navbar-toggler-icon"></span>
</button>
<b-navbar-nav class="d-md-down-none">
<b-nav-item class="px-3">Dashboard</b-nav-item>
<b-nav-item class="px-3">Users</b-nav-item>
<b-nav-item class="px-3">Settings</b-nav-item>
</b-navbar-nav>
<b-navbar-nav class="ml-auto">
<b-nav-item class="d-md-down-none">
<i class="icon-bell"></i>
<b-badge pill variant="danger">5</b-badge>
</b-nav-item>
<b-nav-item class="d-md-down-none">
<i class="icon-list"></i>
</b-nav-item>
<b-nav-item class="d-md-down-none">
<i class="icon-location-pin"></i>
</b-nav-item>
<HeaderDropdown/>
</b-navbar-nav>
<button class="navbar-toggler aside-menu-toggler d-md-down-none" type="button" @click="asideToggle">
<span class="navbar-toggler-icon"></span>
</button>
</header>
</template>
<script>
import HeaderDropdown from '../Header/HeaderDropdown.vue'
export default {
name: 'c-header',
components: {
HeaderDropdown
},
methods: {
sidebarToggle (e) {
e.preventDefault()
document.body.classList.toggle('sidebar-hidden')
},
sidebarMinimize (e) {
e.preventDefault()
document.body.classList.toggle('sidebar-minimized')
},
mobileSidebarToggle (e) {
e.preventDefault()
document.body.classList.toggle('sidebar-mobile-show')
},
asideToggle (e) {
e.preventDefault()
document.body.classList.toggle('aside-menu-hidden')
}
}
}
</script>
src/components/Header/Header.vue
+2 -2
View File
@@ -6,7 +6,7 @@
</template>
<script>
export default {
export default {
name: 'AppHeader',
props: {
fixed: {
@@ -31,5 +31,5 @@
return fixed
}
}
}
}
</script>
src/components/Header/HeaderDropdown.vue
+2 -3
View File
@@ -14,7 +14,7 @@
</b-nav-item-dropdown>
</template>
<script>
export default {
export default {
name: 'HeaderDropdown',
props: {
right: {
@@ -29,6 +29,5 @@
data: () => {
return { itemsCount: 42 }
}
}
}
</script>
src/components/Sidebar v1/Sidebar.vue
-98
View File
@@ -1,98 +0,0 @@
<template>
<div class="sidebar">
<SidebarHeader/>
<SidebarForm/>
<nav class="sidebar-nav">
<div slot="header"></div>
<ul class="nav">
<template v-for="(item, index) in navItems">
<template v-if="item.title">
<SidebarNavTitle :name="item.name" :classes="item.class" :wrapper="item.wrapper"/>
</template>
<template v-else-if="item.divider">
<SidebarNavDivider :classes="item.class"/>
</template>
<template v-else-if="item.label">
<SidebarNavLabel :name="item.name" :url="item.url" :icon="item.icon" :label="item.label" :classes="item.class"/>
</template>
<template v-else>
<template v-if="item.children">
<!-- First level dropdown -->
<SidebarNavDropdown :name="item.name" :url="item.url" :icon="item.icon">
<template v-for="(childL1, index) in item.children">
<template v-if="childL1.children">
<!-- Second level dropdown -->
<SidebarNavDropdown :name="childL1.name" :url="childL1.url" :icon="childL1.icon">
<li class="nav-item" v-for="(childL2, index) in childL1.children">
<SidebarNavLink :name="childL2.name" :url="childL2.url" :icon="childL2.icon" :badge="childL2.badge" :variant="item.variant"/>
</li>
</SidebarNavDropdown>
</template>
<template v-else>
<SidebarNavItem :classes="item.class">
<SidebarNavLink :name="childL1.name" :url="childL1.url" :icon="childL1.icon" :badge="childL1.badge" :variant="item.variant"/>
</SidebarNavItem>
</template>
</template>
</SidebarNavDropdown>
</template>
<template v-else>
<SidebarNavItem :classes="item.class">
<SidebarNavLink :name="item.name" :url="item.url" :icon="item.icon" :badge="item.badge" :variant="item.variant"/>
</SidebarNavItem>
</template>
</template>
</template>
</ul>
<slot></slot>
</nav>
<SidebarFooter/>
<SidebarMinimizer/>
</div>
</template>
<script>
import SidebarFooter from './SidebarFooter'
import SidebarForm from './SidebarForm'
import SidebarHeader from './SidebarHeader'
import SidebarMinimizer from './SidebarMinimizer'
import SidebarNavDivider from './SidebarNavDivider'
import SidebarNavDropdown from './SidebarNavDropdown'
import SidebarNavLink from './SidebarNavLink'
import SidebarNavTitle from './SidebarNavTitle'
import SidebarNavItem from './SidebarNavItem'
import SidebarNavLabel from './SidebarNavLabel'
export default {
name: 'sidebar',
props: {
navItems: {
type: Array,
required: true,
default: () => []
}
},
components: {
SidebarFooter,
SidebarForm,
SidebarHeader,
SidebarMinimizer,
SidebarNavDivider,
SidebarNavDropdown,
SidebarNavLink,
SidebarNavTitle,
SidebarNavItem,
SidebarNavLabel
},
methods: {
handleClick (e) {
e.preventDefault()
e.target.parentElement.classList.toggle('open')
}
}
}
</script>
<style lang="css">
.nav-link {
cursor:pointer;
}
</style>
src/components/Sidebar v1/SidebarFooter.vue
-9
View File
@@ -1,9 +0,0 @@
<template>
<!-- <div class="sidebar-footer"></div> -->
</template>
<script>
export default {
name: 'sidebar-footer'
}
</script>
src/components/Sidebar v1/SidebarForm.vue
-9
View File
@@ -1,9 +0,0 @@
<template>
<!-- <div class="sidebar-form"></div> -->
</template>
<script>
export default {
name: 'sidebar-form'
}
</script>
src/components/Sidebar v1/SidebarHeader.vue
-9
View File
@@ -1,9 +0,0 @@
<template>
<!-- <div class="sidebar-header"></div> -->
</template>
<script>
export default {
name: 'sidebar-header'
}
</script>
src/components/Sidebar v1/SidebarMinimizer.vue
-17
View File
@@ -1,17 +0,0 @@
<template>
<button class="sidebar-minimizer" type="button" @click="sidebarMinimize();brandMinimize()"></button>
</template>
<script>
export default {
name: 'sidebar-minimizer',
methods: {
sidebarMinimize () {
document.body.classList.toggle('sidebar-minimized')
},
brandMinimize () {
document.body.classList.toggle('brand-minimized')
}
}
}
</script>
src/components/Sidebar v1/SidebarNavDivider.vue
-26
View File
@@ -1,26 +0,0 @@
<template>
<li :class="classList"></li>
</template>
<script>
export default {
name: 'sidebar-nav-divider',
props: {
classes: {
type: String,
default: ''
}
},
computed: {
classList () {
return [
'divider',
...this.itemClasses
]
},
itemClasses () {
return this.classes ? this.classes.split(' ') : ''
}
}
}
</script>
src/components/Sidebar v1/SidebarNavDropdown.vue
-33
View File
@@ -1,33 +0,0 @@
<template>
<router-link tag="li" class="nav-item nav-dropdown" :to="url" disabled>
<div class="nav-link nav-dropdown-toggle" @click="handleClick"><i :class="icon"></i> {{name}}</div>
<ul class="nav-dropdown-items">
<slot></slot>
</ul>
</router-link>
</template>
<script>
export default {
props: {
name: {
type: String,
default: ''
},
url: {
type: String,
default: ''
},
icon: {
type: String,
default: ''
}
},
methods: {
handleClick (e) {
e.preventDefault()
e.target.parentElement.classList.toggle('open')
}
}
}
</script>
src/components/Sidebar v1/SidebarNavItem.vue
-35
View File
@@ -1,35 +0,0 @@
<template>
<li :class="classList" @click="hideMobile">
<slot></slot>
</li>
</template>
<script>
export default {
name: 'sidebar-nav-item',
props: {
classes: {
type: String,
default: ''
}
},
computed: {
classList () {
return [
'nav-item',
...this.itemClasses
]
},
itemClasses () {
return this.classes ? this.classes.split(' ') : ''
}
},
methods: {
hideMobile () {
if (document.body.classList.contains('sidebar-mobile-show')) {
document.body.classList.toggle('sidebar-mobile-show')
}
}
}
}
</script>
src/components/Sidebar v1/SidebarNavLabel.vue
-59
View File
@@ -1,59 +0,0 @@
<template>
<SidebarNavItem :classes="classList.navItem">
<a :class="classList.navLink" :href="url"><i :class="classList.icon"></i> {{name}}</a>
</SidebarNavItem>
</template>
<script>
import SidebarNavItem from './SidebarNavItem'
import SidebarNavLink from './SidebarNavLink'
export default {
name: 'sidebar-nav-label',
components: {
SidebarNavItem,
SidebarNavLink
},
props: {
name: {
type: String,
default: ''
},
url: {
type: String,
default: '#'
},
icon: {
type: String,
default: 'fa fa-circle'
},
classes: {
type: String,
default: ''
},
label: {
type: Object,
required: true,
default: () => {}
}
},
computed: {
classList () {
const classes = {
navItem: ['hidden-cn', ...this.getClasses(this.classes)].join(' '),
navLink: 'nav-label',
icon: [
this.icon ? this.icon : 'fa fa-circle',
this.label.variant ? `text-${this.label.variant}` : '',
this.label.class ? this.label.class : ''
].join(' ')
}
return classes
}
},
methods: {
getClasses (classes) {
return classes ? classes.split(' ') : []
}
}
}
</script>
src/components/Sidebar v1/SidebarNavLink.vue
-68
View File
@@ -1,68 +0,0 @@
<template>
<div v-if="isExternalLink">
<a :href="url" :class="classList">
<i :class="icon"></i> {{name}}
<b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
</a>
</div>
<div v-else>
<router-link :to="url" :class="classList">
<i :class="icon"></i> {{name}}
<b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
</router-link>
</div>
</template>
<script>
export default {
name: 'sidebar-nav-link',
props: {
name: {
type: String,
default: ''
},
url: {
type: String,
default: ''
},
icon: {
type: String,
default: ''
},
badge: {
type: Object,
default: () => {}
},
variant: {
type: String,
default: ''
},
classes: {
type: String,
default: ''
}
},
computed: {
classList () {
return [
'nav-link',
this.linkVariant,
...this.itemClasses
]
},
linkVariant () {
return this.variant ? `nav-link-${this.variant}` : ''
},
itemClasses () {
return this.classes ? this.classes.split(' ') : []
},
isExternalLink () {
if (this.url.substring(0, 4) === 'http') {
return true
} else {
return false
}
}
}
}
</script>
src/components/Sidebar v1/SidebarNavTitle.vue
-42
View File
@@ -1,42 +0,0 @@
<template>
<li :class="classList">
<template v-if="wrapper && wrapper.element">
<component v-bind:is="wrapper.element" v-bind="wrapper.attributes">
{{name}}
</component>
</template>
<template v-else>
{{name}}
</template>
</li>
</template>
<script>
export default {
props: {
name: {
type: String,
default: ''
},
classes: {
type: String,
default: ''
},
wrapper: {
type: Object,
default: () => {}
}
},
computed: {
classList () {
return [
'nav-title',
...this.itemClasses
]
},
itemClasses () {
return this.classes ? this.classes.split(' ') : ''
}
}
}
</script>
src/components/Sidebar/SidebarFooter.vue
+1
View File
@@ -1,3 +1,4 @@
/* eslint-disable */
<template>
<!--<div class="sidebar-footer"></div>-->
</template>
src/components/Sidebar/SidebarForm.vue
+1
View File
@@ -1,3 +1,4 @@
/* eslint-disable */
<template>
<!-- <div class="sidebar-form"></div> -->
</template>
src/components/Sidebar/SidebarHeader.vue
+1
View File
@@ -1,3 +1,4 @@
/* eslint-disable */
<template>
<!-- <div class="sidebar-header"></div> -->
</template>
src/components/Sidebar/SidebarNav.vue
+17 -17
View File
@@ -4,29 +4,29 @@
<ul class="nav">
<template v-for="(item, index) in navItems">
<template v-if="item.title">
<SidebarNavTitle :name="item.name" :classes="item.class" :wrapper="item.wrapper"/>
<SidebarNavTitle :key="index" :name="item.name" :classes="item.class" :wrapper="item.wrapper"/>
</template>
<template v-else-if="item.divider">
<SidebarNavDivider :classes="item.class"/>
<SidebarNavDivider :key="index" :classes="item.class"/>
</template>
<template v-else-if="item.label">
<SidebarNavLabel :name="item.name" :url="item.url" :icon="item.icon" :label="item.label" :classes="item.class"/>
<SidebarNavLabel :key="index" :name="item.name" :url="item.url" :icon="item.icon" :label="item.label" :classes="item.class"/>
</template>
<template v-else>
<template v-if="item.children">
<!-- First level dropdown -->
<SidebarNavDropdown :name="item.name" :url="item.url" :icon="item.icon">
<template v-for="(childL1, index) in item.children">
<SidebarNavDropdown :key="index" :name="item.name" :url="item.url" :icon="item.icon">
<template v-for="(childL1, index1) in item.children">
<template v-if="childL1.children">
<!-- Second level dropdown -->
<SidebarNavDropdown :name="childL1.name" :url="childL1.url" :icon="childL1.icon">
<li class="nav-item" v-for="(childL2, index) in childL1.children">
<SidebarNavDropdown :key="index1" :name="childL1.name" :url="childL1.url" :icon="childL1.icon">
<li :key="index2" class="nav-item" v-for="(childL2, index2) in childL1.children">
<SidebarNavLink :name="childL2.name" :url="childL2.url" :icon="childL2.icon" :badge="childL2.badge" :variant="item.variant"/>
</li>
</SidebarNavDropdown>
</template>
<template v-else>
<SidebarNavItem :classes="item.class">
<SidebarNavItem :key="index1" :classes="item.class">
<SidebarNavLink :name="childL1.name" :url="childL1.url" :icon="childL1.icon" :badge="childL1.badge" :variant="item.variant"/>
</SidebarNavItem>
</template>
@@ -34,7 +34,7 @@
</SidebarNavDropdown>
</template>
<template v-else>
<SidebarNavItem :classes="item.class">
<SidebarNavItem :key="index" :classes="item.class">
<SidebarNavLink :name="item.name" :url="item.url" :icon="item.icon" :badge="item.badge" :variant="item.variant"/>
</SidebarNavItem>
</template>
@@ -46,13 +46,13 @@
</template>
<script>
import SidebarNavDivider from './SidebarNavDivider'
import SidebarNavDropdown from './SidebarNavDropdown'
import SidebarNavLink from './SidebarNavLink'
import SidebarNavTitle from './SidebarNavTitle'
import SidebarNavItem from './SidebarNavItem'
import SidebarNavLabel from './SidebarNavLabel'
export default {
import SidebarNavDivider from './SidebarNavDivider'
import SidebarNavDropdown from './SidebarNavDropdown'
import SidebarNavLink from './SidebarNavLink'
import SidebarNavTitle from './SidebarNavTitle'
import SidebarNavItem from './SidebarNavItem'
import SidebarNavLabel from './SidebarNavLabel'
export default {
name: 'SidebarNav',
props: {
navItems: {
@@ -69,7 +69,7 @@
SidebarNavItem,
SidebarNavLabel
}
}
}
</script>
<style scoped lang="css">
src/components/Sidebar/SidebarNavDivider.vue
+2 -2
View File
@@ -3,7 +3,7 @@
</template>
<script>
export default {
export default {
name: 'sidebar-nav-divider',
props: {
classes: {
@@ -22,5 +22,5 @@
return this.classes ? this.classes.split(' ') : ''
}
}
}
}
</script>
src/components/Sidebar/SidebarNavItem.vue
+2 -2
View File
@@ -5,7 +5,7 @@
</template>
<script>
export default {
export default {
name: 'sidebar-nav-item',
props: {
classes: {
@@ -31,5 +31,5 @@
}
}
}
}
}
</script>
src/components/Sidebar/SidebarNavLabel.vue
+4 -4
View File
@@ -5,9 +5,9 @@
</template>
<script>
import SidebarNavItem from './SidebarNavItem'
import SidebarNavLink from './SidebarNavLink'
export default {
import SidebarNavItem from './SidebarNavItem'
import SidebarNavLink from './SidebarNavLink'
export default {
name: 'sidebar-nav-label',
components: {
SidebarNavItem,
@@ -55,5 +55,5 @@
return classes ? classes.split(' ') : []
}
}
}
}
</script>
src/components/Sidebar/SidebarNavLink.vue
+2 -2
View File
@@ -14,7 +14,7 @@
</template>
<script>
export default {
export default {
name: 'sidebar-nav-link',
props: {
name: {
@@ -70,5 +70,5 @@
}
}
}
}
}
</script>
src/components/Sidebar/SidebarNavTitle.vue
+2 -2
View File
@@ -12,7 +12,7 @@
</template>
<script>
export default {
export default {
props: {
name: {
type: String,
@@ -38,5 +38,5 @@
return this.classes ? this.classes.split(' ') : ''
}
}
}
}
</script>
src/components/Sidebar/SidebarToggler.vue
+4 -4
View File
@@ -10,10 +10,10 @@
</template>
<script>
import { sidebarCssClasses, validBreakpoints, checkBreakpoint } from '../../shared/classes'
import toggleClasses from '../../shared/toggle-classes'
import { sidebarCssClasses, validBreakpoints, checkBreakpoint } from '../../shared/classes'
import toggleClasses from '../../shared/toggle-classes'
export default {
export default {
name: 'SidebarToggler',
props: {
mobile: {
@@ -51,5 +51,5 @@
this.toggle()
}
}
}
}
</script>
src/containers/FullAside.vue
+9 -10
View File
@@ -16,10 +16,10 @@
<strong>Lucas</strong>
</div>
<small class="text-muted mr-3">
<i class="icon-calendar"></i>  1 - 3pm
<i class="icon-calendar"></i>&nbsp;&nbsp;1 - 3pm
</small>
<small class="text-muted">
<i class="icon-location-pin"></i>  Palo Alto, CA
<i class="icon-location-pin"></i>&nbsp;&nbsp;Palo Alto, CA
</small>
</b-list-group-item>
<b-list-group-item class="list-group-item-accent-info">
@@ -28,8 +28,8 @@
</div>
<div>Skype with <strong>Megan</strong>
</div>
<small class="text-muted mr-3"><i class="icon-calendar"></i>  4 - 5pm</small>
<small class="text-muted"><i class="icon-social-skype"></i>  On-line</small>
<small class="text-muted mr-3"><i class="icon-calendar"></i>&nbsp;&nbsp;4 - 5pm</small>
<small class="text-muted"><i class="icon-social-skype"></i>&nbsp;&nbsp;On-line</small>
</b-list-group-item>
<hr class="transparent mx-3 my-0">
<b-list-group-item class="list-group-item-accent-secondary bg-light text-center font-weight-bold text-muted text-uppercase small">
@@ -38,8 +38,8 @@
<b-list-group-item class="list-group-item-accent-danger list-group-item-divider">
<div>New UI Project - <strong>deadline</strong>
</div>
<small class="text-muted mr-3"><i class="icon-calendar"></i>  10 - 11pm</small>
<small class="text-muted"><i class="icon-home"></i>  creativeLabs HQ</small>
<small class="text-muted mr-3"><i class="icon-calendar"></i>&nbsp;&nbsp;10 - 11pm</small>
<small class="text-muted"><i class="icon-home"></i>&nbsp;&nbsp;creativeLabs HQ</small>
<div class="avatars-stack mt-2">
<div class="avatar avatar-xs">
<img class="img-avatar" src="static/img/avatars/2.jpg" alt="admin@bootstrapmaster.com">
@@ -241,12 +241,11 @@
</template>
<script>
import {Switch as cSwitch} from '../components'
export default {
import {Switch as cSwitch} from '../components'
export default {
name: 'FullAside',
components: {
cSwitch
}
}
}
</script>
src/views/Dashboard.vue
-1
View File
@@ -203,7 +203,6 @@
</div>
</div>
</div>
</b-col>
</b-row>
<b-row>
src/views/Widgets.vue
+77 -53
View File
@@ -113,7 +113,7 @@
<div class="text-muted text-uppercase font-weight-bold font-xs">Income</div>
</b-card-body>
<div slot="footer">
<a class="font-weight-bold font-xs btn-block text-muted" href="#">View More <i class="fa fa-angle-right float-right font-lg"></i></a>
<b-link class="font-weight-bold font-xs btn-block text-muted" href="#">View More <i class="fa fa-angle-right float-right font-lg"></i></b-link>
</div>
</b-card>
</b-col>
@@ -125,7 +125,7 @@
<div class="text-muted text-uppercase font-weight-bold font-xs">Income</div>
</b-card-body>
<div slot="footer">
<a class="font-weight-bold font-xs btn-block text-muted" href="#">View More <i class="fa fa-angle-right float-right font-lg"></i></a>
<b-link class="font-weight-bold font-xs btn-block text-muted" href="#">View More <i class="fa fa-angle-right float-right font-lg"></i></b-link>
</div>
</b-card>
</b-col>
@@ -137,7 +137,7 @@
<div class="text-muted text-uppercase font-weight-bold font-xs">Income</div>
</b-card-body>
<div slot="footer">
<a class="font-weight-bold font-xs btn-block text-muted" href="#">View More <i class="fa fa-angle-right float-right font-lg"></i></a>
<b-link class="font-weight-bold font-xs btn-block text-muted" href="#">View More <i class="fa fa-angle-right float-right font-lg"></i></b-link>
</div>
</b-card>
</b-col>
@@ -149,7 +149,7 @@
<div class="text-muted text-uppercase font-weight-bold font-xs">Income</div>
</b-card-body>
<div slot="footer">
<a class="font-weight-bold font-xs btn-block text-muted" href="#">View More <i class="fa fa-angle-right float-right font-lg"></i></a>
<b-link class="font-weight-bold font-xs btn-block text-muted" href="#">View More <i class="fa fa-angle-right float-right font-lg"></i></b-link>
</div>
</b-card>
</b-col>
@@ -230,64 +230,84 @@
</b-row><!--/.row-->
<b-row>
<b-col md="3" sm="6">
<div class="social-box facebook">
<div class="brand-card">
<div class="brand-card-header bg-facebook">
<i class="fa fa-facebook"></i>
<ul>
<li>
<strong>89k</strong>
<span>friends</span>
</li>
<li>
<strong>459</strong>
<span>feeds</span>
</li>
</ul>
</div><!--/social-box-->
<div class="chart-wrapper">
<social-box-chart-example :data="[65, 59, 84, 84, 51, 55, 40]" height="100"/>
</div>
</div>
<div class="brand-card-body">
<div>
<div class="text-value">89k</div>
<div class="text-uppercase text-muted small">friends</div>
</div>
<div>
<div class="text-value">459</div>
<div class="text-uppercase text-muted small">feeds</div>
</div>
</div>
</div>
</b-col>
<b-col md="3" sm="6">
<div class="social-box twitter">
<div class="brand-card">
<div class="brand-card-header bg-twitter">
<i class="fa fa-twitter"></i>
<ul>
<li>
<strong>973k</strong>
<span>followers</span>
</li>
<li>
<strong>1.792</strong>
<span>tweets</span>
</li>
</ul>
</div><!--/social-box-->
<div class="chart-wrapper">
<social-box-chart-example :data="[1, 13, 9, 17, 34, 41, 38]" height="100"/>
</div>
</div>
<div class="brand-card-body">
<div>
<div class="text-value">973k</div>
<div class="text-uppercase text-muted small">followers</div>
</div>
<div>
<div class="text-value">1.792</div>
<div class="text-uppercase text-muted small">tweets</div>
</div>
</div>
</div>
</b-col>
<b-col md="3" sm="6">
<div class="social-box linkedin">
<div class="brand-card">
<div class="brand-card-header bg-linkedin">
<i class="fa fa-linkedin"></i>
<ul>
<li>
<strong>500+</strong>
<span>contacts</span>
</li>
<li>
<strong>292</strong>
<span>feeds</span>
</li>
</ul>
</div><!--/social-box-->
<div class="chart-wrapper">
<social-box-chart-example :data="[78, 81, 80, 45, 34, 12, 40]" height="100"/>
</div>
</div>
<div class="brand-card-body">
<div>
<div class="text-value">500+</div>
<div class="text-uppercase text-muted small">contacts</div>
</div>
<div>
<div class="text-value">292</div>
<div class="text-uppercase text-muted small">feeds</div>
</div>
</div>
</div>
</b-col>
<b-col md="3" sm="6">
<div class="social-box google-plus">
<div class="brand-card">
<div class="brand-card-header bg-google-plus">
<i class="fa fa-google-plus"></i>
<ul>
<li>
<strong>894</strong>
<span>followers</span>
</li>
<li>
<strong>92</strong>
<span>circles</span>
</li>
</ul>
</div><!--/social-box-->
<div class="chart-wrapper">
<social-box-chart-example :data="[35, 23, 56, 22, 97, 23, 64]" height="100"/>
</div>
</div>
<div class="brand-card-body">
<div>
<div class="text-value">894</div>
<div class="text-uppercase text-muted small">followers</div>
</div>
<div>
<div class="text-value">92</div>
<div class="text-uppercase text-muted small">circles</div>
</div>
</div>
</div>
</b-col>
</b-row><!--/.row-->
<b-card-group class="mb-4">
@@ -390,7 +410,7 @@
</div>
<div class="h4 mb-0">972</div>
<small class="text-muted text-uppercase font-weight-bold">Comments</small>
<b-progress height={} class="progress-xs mt-3 mb-0"variant="info" :value="25"/>
<b-progress height={} class="progress-xs mt-3 mb-0" variant="info" :value="25"/>
</b-card>
</b-col>
</b-row><!--/.row-->
@@ -460,8 +480,12 @@
</template>
<script>
import SocialBoxChartExample from './dashboard/SocialBoxChartExample'
export default {
name: 'widgets',
components: {
SocialBoxChartExample
},
data () {
return {
msg: 'Widgets'
src/views/base/Breadcrumbs.vue
+2 -3
View File
@@ -23,7 +23,7 @@
</template>
<script>
export default {
export default {
name: 'breadcrumbs',
data () {
return {
@@ -39,6 +39,5 @@
}]
}
}
}
}
</script>
src/views/base/Carousels.vue
+2 -3
View File
@@ -75,7 +75,7 @@
</template>
<script>
export default {
export default {
name: 'carousels',
data () {
return {
@@ -91,6 +91,5 @@
this.sliding = false
}
}
}
}
</script>
src/views/base/Collapses.vue
+2 -2
View File
@@ -176,7 +176,7 @@
</template>
<script>
export default {
export default {
name: 'collapses',
data () {
return {
@@ -193,5 +193,5 @@
`
}
}
}
}
</script>
src/views/base/Jumbotrons.vue
+2 -2
View File
@@ -74,9 +74,9 @@
</template>
<script>
export default {
export default {
name: 'jumbotrons'
}
}
</script>
<style scoped>
src/views/base/ListGroups.vue
+2 -2
View File
@@ -245,9 +245,9 @@
</template>
<script>
export default {
export default {
name: 'list-groups'
}
}
</script>
<style scoped>
src/views/base/Navbars.vue
+2 -2
View File
@@ -157,9 +157,9 @@
</template>
<script>
export default {
export default {
name: 'navbars'
}
}
</script>
<style scoped>
src/views/base/Navs.vue
+2 -2
View File
@@ -120,9 +120,9 @@
</template>
<script>
export default {
export default {
name: 'navs'
}
}
</script>
<style scoped>
src/views/base/Paginations.vue
+2 -2
View File
@@ -82,7 +82,7 @@
</template>
<script>
export default {
export default {
name: 'paginations',
data () {
return {
@@ -94,7 +94,7 @@
return '#page/' + pageNum + '/foobar'
}
}
}
}
</script>
<style scoped>
src/views/base/Popovers.vue
+2 -3
View File
@@ -178,7 +178,7 @@
</template>
<script>
export default {
export default {
name: 'popovers',
data () {
return {
@@ -205,6 +205,5 @@
this.$refs.popover2.$emit('disable')
}
}
}
}
</script>
src/views/base/ProgressBars.vue
+5 -5
View File
@@ -78,7 +78,7 @@
<i class="fa fa-align-justify"></i> <strong>Progress</strong> <small>variants</small>
</div>
<div>
<div v-for="bar in bars" class="row mb-1">
<div :key="index" v-for="(bar, index) in bars" class="row mb-1">
<div class="col-sm-2">{{ bar.variant }}:</div>
<div class="col-sm-10 pt-1">
<b-progress :value="bar.value"
@@ -133,12 +133,12 @@
<b-progress-bar variant="success" :value="values[1]"></b-progress-bar>
<b-progress-bar variant="info" :value="values[2]"></b-progress-bar>
</b-progress>
<b-progress show-progress :max="max3" class="mb-3"></b-progress-bar>
<b-progress show-progress :max="max3" class="mb-3">
<b-progress-bar variant="primary" :value="values[0]"></b-progress-bar>
<b-progress-bar variant="success" :value="values[1]"></b-progress-bar>
<b-progress-bar variant="info" :value="values[2]"></b-progress-bar>
</b-progress>
<b-progress show-value striped :max="max3" class="mb-3"></b-progress-bar>
<b-progress show-value striped :max="max3" class="mb-3">
<b-progress-bar variant="primary" :value="values[0]"></b-progress-bar>
<b-progress-bar variant="success" :value="values[1]"></b-progress-bar>
<b-progress-bar variant="info" :value="values[2]"></b-progress-bar>
@@ -155,7 +155,7 @@
</template>
<script>
export default {
export default {
name: 'progress-bars',
data () {
return {
@@ -198,7 +198,7 @@
clearInterval(this.timer)
this.timer = null
}
}
}
</script>
<style scoped>
src/views/base/Switches.vue
+3 -3
View File
@@ -308,9 +308,9 @@
</template>
<script>
import { Switch as cSwitch } from '../../components'
import { Switch as cSwitch } from '../../components'
export default {
export default {
name: 'switches',
components: {
cSwitch
@@ -335,5 +335,5 @@
]
}
}
}
}
</script>
src/views/base/Table.vue
+5 -5
View File
@@ -12,11 +12,11 @@
</template>
<script>
/**
/**
* Randomize array element order in-place.
* Using Durstenfeld shuffle algorithm.
*/
const shuffleArray = (array) => {
const shuffleArray = (array) => {
for (let i = array.length - 1; i > 0; i--) {
let j = Math.floor(Math.random() * (i + 1))
let temp = array[i]
@@ -24,9 +24,9 @@
array[j] = temp
}
return array
}
}
export default {
export default {
name: 'c-table',
props: {
caption: {
@@ -105,5 +105,5 @@
return items.length
}
}
}
}
</script>
src/views/base/Tables.vue
+3 -3
View File
@@ -31,10 +31,10 @@
</template>
<script>
import cTable from './Table.vue'
import cTable from './Table.vue'
export default {
export default {
name: 'tables',
components: {cTable}
}
}
</script>
src/views/base/Tooltips.vue
+2 -2
View File
@@ -117,7 +117,7 @@
</template>
<script>
export default {
export default {
name: 'tooltips',
data () {
return {
@@ -140,7 +140,7 @@
}
}
}
}
}
</script>
<style scoped>
src/views/buttons/ButtonGroups.vue
+2 -3
View File
@@ -190,8 +190,7 @@
</template>
<script>
export default {
export default {
name: 'button-groups'
}
}
</script>
src/views/buttons/Dropdowns.vue
+2 -2
View File
@@ -232,7 +232,7 @@
</template>
<script>
export default {
export default {
name: 'dropdowns'
}
}
</script>
src/views/notifications/Alerts.vue
+5 -5
View File
@@ -69,7 +69,7 @@
header-tag="header"
footer-tag="footer">
<div slot="header">
<i class="fa fa-align-justify"></i>Alerts</strong>
<i class="fa fa-align-justify"></i>Alerts
<small>with additional content</small>
</div>
<b-alert show variant="success">
@@ -91,7 +91,7 @@
header-tag="header"
footer-tag="footer">
<div slot="header">
<i class="fa fa-align-justify"></i>Alerts</strong>
<i class="fa fa-align-justify"></i>Alerts
<small>dismissible</small>
</div>
<div>
@@ -113,7 +113,7 @@
header-tag="header"
footer-tag="footer">
<div slot="header">
<i class="fa fa-align-justify"></i>Alerts</strong>
<i class="fa fa-align-justify"></i>Alerts
<small>auto dismissible</small>
</div>
<div>
@@ -148,7 +148,7 @@
</template>
<script>
export default {
export default {
name: 'alerts',
data () {
return {
@@ -165,5 +165,5 @@
this.dismissCountDown = this.dismissSecs
}
}
}
}
</script>
src/views/widgets/Widget03.vue
+34
View File
@@ -0,0 +1,34 @@
<template>
<div class={classes}>
<div class={classCardHeader}>
<i class={icon}></i>
{children}
</div>
<div class={classCardBody}>
<div>
<div class="text-value">{vals[1]}</div>
<div class="text-uppercase text-muted small">{keys[1]}</div>
</div>
<div>
<div class="text-value">{vals[2]}</div>
<div class="text-uppercase text-muted small">{keys[2]}</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'Widget03',
props: {
value: {
type: Boolean,
default: true
}
}
}
</script>
<style scoped>
</style>
test/e2e/runner.js
+21 -6
View File
@@ -1,16 +1,31 @@
// 1. start the dev server using production config
process.env.NODE_ENV = 'testing'
var server = require('../../build/dev-server.js')
server.ready.then(() => {
const webpack = require('webpack')
const DevServer = require('webpack-dev-server')
const webpackConfig = require('../../build/webpack.prod.conf')
const devConfigPromise = require('../../build/webpack.dev.conf')
let server
devConfigPromise.then(devConfig => {
const devServerOptions = devConfig.devServer
const compiler = webpack(webpackConfig)
server = new DevServer(compiler, devServerOptions)
const port = devServerOptions.port
const host = devServerOptions.host
return server.listen(port, host)
})
.then(() => {
// 2. run the nightwatch test suite against it
// to run in additional browsers:
// 1. add an entry in test/e2e/nightwatch.conf.json under "test_settings"
// 1. add an entry in test/e2e/nightwatch.conf.js under "test_settings"
// 2. add it to the --env flag below
// or override the environment flag, for example: `npm run e2e -- --env chrome,firefox`
// For more information on Nightwatch's config file, see
// http://nightwatchjs.org/guide#settings-file
var opts = process.argv.slice(2)
let opts = process.argv.slice(2)
if (opts.indexOf('--config') === -1) {
opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js'])
}
@@ -18,8 +33,8 @@ server.ready.then(() => {
opts = opts.concat(['--env', 'chrome'])
}
var spawn = require('cross-spawn')
var runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' })
const spawn = require('cross-spawn')
const runner = spawn('./node_modules/.bin/nightwatch', opts, { stdio: 'inherit' })
runner.on('exit', function (code) {
server.close()
test/e2e/specs/test.js
+31 -34
View File
@@ -3,12 +3,12 @@
module.exports = {
before : function(browser) {
console.log('Setting up...');
before: function (browser) {
console.log('Setting up...')
},
after : function(browser) {
console.log('Closing down...');
after: function (browser) {
console.log('Closing down...')
},
'CoreUI Vue e2e tests': function (browser) {
@@ -16,12 +16,9 @@ module.exports = {
// default: http://localhost:8080
// see nightwatch.conf.js
const devServer = browser.globals.devServerURL;
const devServer = browser.globals.devServerURL
browser
.url(devServer)
.pause(500)
.expect.element('body').to.be.present;
browser.url(devServer).pause(500).expect.element('body').to.be.present
browser.waitForElementVisible('.app > .app', 3000)
.assert.elementPresent('.app-header')
@@ -36,47 +33,47 @@ module.exports = {
.assert.containsText('.app-footer > span.ml-auto', 'Powered by')
.assert.elementCount('button', 18)
.resizeWindow(1024, 800)
.pause(500);
.pause(500)
browser.click('body > div > header > button.navbar-toggler.aside-menu-toggler.d-md-down-none', function(response) {
this.assert.ok(browser === this, 'Check if the context is right.');
this.assert.cssClassNotPresent('body', 'aside-menu-hidden');
});
browser.click('body > div > header > button.navbar-toggler.aside-menu-toggler.d-md-down-none', function (response) {
this.assert.ok(browser === this, 'Check if the context is right.')
this.assert.cssClassNotPresent('body', 'aside-menu-hidden')
})
browser.pause(500);
browser.pause(500)
browser.click('body > div > header > button.navbar-toggler.aside-menu-toggler.d-md-down-none', function(response) {
this.assert.cssClassPresent('body', 'aside-menu-hidden');
});
browser.click('body > div > header > button.navbar-toggler.aside-menu-toggler.d-md-down-none', function (response) {
this.assert.cssClassPresent('body', 'aside-menu-hidden')
})
browser.pause(500);
browser.pause(500)
browser
.useXpath()
.click('/html/body/div/header/button[2]', function(response) {
this.assert.cssClassPresent('/html/body', 'sidebar-hidden');
});
.click('/html/body/div/header/button[2]', function (response) {
this.assert.cssClassPresent('/html/body', 'sidebar-hidden')
})
browser
.pause(500)
.click('/html/body/div/header/button[2]', function(response) {
this.assert.cssClassNotPresent('/html/body', 'sidebar-hidden');
});
.click('/html/body/div/header/button[2]', function (response) {
this.assert.cssClassNotPresent('/html/body', 'sidebar-hidden')
})
browser
.pause(500)
.click('/html/body/div/div/div/button', function(response) {
this.assert.cssClassPresent('/html/body', 'sidebar-minimized');
this.assert.cssClassPresent('/html/body', 'brand-minimized');
.click('/html/body/div/div/div/button', function (response) {
this.assert.cssClassPresent('/html/body', 'sidebar-minimized')
this.assert.cssClassPresent('/html/body', 'brand-minimized')
})
.pause(500)
.click('/html/body/div/div/div/button', function(response) {
this.assert.cssClassNotPresent('/html/body', 'sidebar-minimized');
this.assert.cssClassNotPresent('/html/body', 'brand-minimized');
});
.click('/html/body/div/div/div/button', function (response) {
this.assert.cssClassNotPresent('/html/body', 'sidebar-minimized')
this.assert.cssClassNotPresent('/html/body', 'brand-minimized')
})
browser
.pause(3000)
.end();
.end()
}
};
}
test/unit/karma.conf.js
+1 -1
View File
@@ -5,7 +5,7 @@
var webpackConfig = require('../../build/webpack.test.conf')
module.exports = function (config) {
module.exports = function karmaConfig (config) {
config.set({
// to run in additional browsers:
// 1. install corresponding karma launcher