Skip to content

Commit

Permalink
Merge pull request #3 from AskToni/restaurant-table
Browse files Browse the repository at this point in the history
Restaurant table
  • Loading branch information
RedTn committed Sep 10, 2017
2 parents e023c08 + d6081ff commit 7acb489
Show file tree
Hide file tree
Showing 30 changed files with 7,419 additions and 11,709 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ root = true
[*]
charset = utf-8
indent_style = space
indent_size = 2
indent_size = 4
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
8 changes: 4 additions & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build/*.js
config/*.js
test/unit/coverage
dist/
build/*.js
test/unit/coverage
dist/
node_modules/
8 changes: 6 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ module.exports = {
env: {
browser: true,
},
extends: 'airbnb-base',
extends: [
'airbnb-base'
],
// required to lint *.vue files
plugins: [
'html'
'html',
],
// check if imports actually resolve
'settings': {
Expand All @@ -37,5 +39,7 @@ module.exports = {
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
'linebreak-style': ["error", "unix"],
'no-console': 0,
"comma-dangle": ["error", "never"],
"indent": ["error", 4]
}
}
4 changes: 3 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
* text eol=lf
*.css text eol=lf
*.html text eol=lf
*.js text eol=lf
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ selenium-debug.log
*.sln

# Code
package-lock.json
.vscode
.vscode/launch.json
16 changes: 10 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
sudo: false
language: node_js
node_js:
- '6'
cache:
directories:
- node_modules
- '8'
notifications:
email: false
email: true
script:
- npm rebuild node-sass
- npm rebuild phantom-prebuilt
- npm run build
- npm run ci-test
- npm run lint
- npm run lint
deploy:
provider: surge
project: ./dist/
domain: asktoni.surge.sh
skip_cleanup: true
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"eslint.validate": [
{ "language": "vue", "autoFix": true },
{ "language": "html", "autoFix": true }
]
}
9 changes: 8 additions & 1 deletion build/dev-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,14 @@ var compiler = webpack(webpackConfig)

var devMiddleware = require('webpack-dev-middleware')(compiler, {
publicPath: webpackConfig.output.publicPath,
quiet: true
stats: {
colors: true,
chunks: false
},
watchOptions: {
aggregateTimeout: 300,
poll: 1000
}
})

var hotMiddleware = require('webpack-hot-middleware')(compiler, {
Expand Down
8 changes: 4 additions & 4 deletions config/dev.env.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var merge = require('webpack-merge')
var prodEnv = require('./prod.env')
const merge = require('webpack-merge');
const prodEnv = require('./prod.env');

module.exports = merge(prodEnv, {
NODE_ENV: '"development"'
})
NODE_ENV: '"development"'
});
72 changes: 37 additions & 35 deletions config/index.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
// see http://vuejs-templates.github.io/webpack for documentation.
var path = require('path')
const path = require('path');
const prodEnv = require('./prod.env');
const devEnv = require('./dev.env');

module.exports = {
build: {
env: require('./prod.env'),
index: path.resolve(__dirname, '../dist/index.html'),
assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'static',
assetsPublicPath: '/',
productionSourceMap: true,
// 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
}
}
build: {
env: prodEnv,
index: path.resolve(__dirname, '../dist/index.html'),
assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'static',
assetsPublicPath: '/',
productionSourceMap: true,
// 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: devEnv,
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
}
};
4 changes: 2 additions & 2 deletions config/prod.env.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
NODE_ENV: '"production"'
}
NODE_ENV: '"production"'
};
8 changes: 4 additions & 4 deletions config/test.env.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var merge = require('webpack-merge')
var devEnv = require('./dev.env')
const merge = require('webpack-merge');
const devEnv = require('./dev.env');

module.exports = merge(devEnv, {
NODE_ENV: '"testing"'
})
NODE_ENV: '"testing"'
});
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>asktoni-client</title>
<title>AskToni</title>
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic">
<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">
</head>
Expand Down

0 comments on commit 7acb489

Please sign in to comment.