From 8d6647df999ede552e97d981e181dd5aeac73f02 Mon Sep 17 00:00:00 2001 From: pubkey Date: Thu, 27 Sep 2018 19:03:16 +0200 Subject: [PATCH] UPGRADE deps --- .babelrc | 7 +- .eslintrc.js | 39 ---- .eslintrc.json | 320 +++++++++++++++++++++++++++++++++ build/webpack.base.conf.js | 13 +- build/webpack.dev.conf.js | 9 +- build/webpack.prod.conf.js | 16 +- package.json | 66 +++---- src/App.vue | 3 +- src/lang/ca.js | 14 +- src/lang/cn.js | 14 +- src/lang/de.js | 18 +- src/lang/el.js | 10 +- src/lang/en.js | 18 +- src/lang/es.js | 14 +- src/lang/fr.js | 18 +- src/lang/he.js | 14 +- src/lang/hu.js | 14 +- src/lang/id.js | 14 +- src/lang/it.js | 14 +- src/lang/ja.js | 14 +- src/lang/ka.js | 10 +- src/lang/ko.js | 14 +- src/lang/lt.js | 10 +- src/lang/nl.js | 14 +- src/lang/pl.js | 14 +- src/lang/pt-br.js | 16 +- src/lang/pt.js | 14 +- src/lang/ru.js | 14 +- src/lang/sv.js | 10 +- src/lang/th.js | 10 +- src/lang/tr.js | 10 +- src/lang/zh-tw.js | 10 +- src/main.js | 12 +- src/pages/home.vue | 2 +- src/pages/resume.vue | 2 +- src/resumes/creative.vue | 2 +- src/resumes/left-right-rtl.vue | 2 +- src/resumes/left-right.vue | 2 +- src/resumes/material-dark.vue | 2 +- src/resumes/oblique.vue | 2 +- src/resumes/options.js | 48 ++--- src/resumes/side-bar-rtl.vue | 2 +- src/resumes/side-bar.vue | 2 +- src/resumes/template.vue | 2 +- src/router/index.js | 24 +-- src/terms.js | 24 ++- 46 files changed, 611 insertions(+), 312 deletions(-) delete mode 100755 .eslintrc.js create mode 100755 .eslintrc.json diff --git a/.babelrc b/.babelrc index 13f0e47..deeda53 100755 --- a/.babelrc +++ b/.babelrc @@ -1,13 +1,12 @@ { "presets": [ - ["env", { "modules": false }], - "stage-2" + ["@babel/env", { "modules": false }] ], - "plugins": ["transform-runtime"], + "plugins": ["@babel/plugin-transform-runtime"], "comments": false, "env": { "test": { - "presets": ["env", "stage-2"], + "presets": ["@babel/env"], "plugins": [ "istanbul" ] } } diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100755 index 91b24a9..0000000 --- a/.eslintrc.js +++ /dev/null @@ -1,39 +0,0 @@ -// http://eslint.org/docs/user-guide/configuring - -module.exports = { - root: true, - parser: 'babel-eslint', - parserOptions: { - sourceType: 'module' - }, - env: { - browser: true, - }, - // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style - extends: 'standard', - // required to lint *.vue files - plugins: [ - 'html' - ], - // add your custom rules here - 'rules': { - // allow paren-less arrow functions - 'arrow-parens': 0, - // allow async-await - 'generator-star-spacing': 0, - // allow debugger during development - 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0, - 'quotes': [ - 'error', - 'single' - ], - 'semi': [ - 'error', - 'always' - ], - 'no-console': 'off', - 'curly': ['error', 'multi-or-nest'], - 'space-before-function-paren': ['error', 'always'], - 'no-var': 'error' - } -} diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100755 index 0000000..6eac5e0 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,320 @@ +{ + "env": { + "browser": true, + "es6": true, + "node": true + }, + "extends": "eslint:recommended", + "parserOptions": { + "ecmaVersion": 2018, + "sourceType": "module" + }, + "plugins": [ + "html" + ], + "rules": { + "accessor-pairs": "error", + "array-bracket-newline": "off", + "array-bracket-spacing": [ + "error", + "never" + ], + "array-callback-return": "off", + "array-element-newline": "off", + "arrow-body-style": "off", + "arrow-parens": "off", + "arrow-spacing": [ + "error", + { + "after": true, + "before": true + } + ], + "block-scoped-var": "error", + "block-spacing": "error", + "brace-style": [ + "error", + "1tbs" + ], + "callback-return": "error", + "capitalized-comments": "off", + "class-methods-use-this": "off", + "comma-dangle": "off", + "comma-spacing": [ + "error", + { + "after": true, + "before": false + } + ], + "comma-style": [ + "error", + "last" + ], + "complexity": "off", + "computed-property-spacing": [ + "error", + "never" + ], + "consistent-return": "off", + "consistent-this": "off", + "curly": "off", + "default-case": "off", + "dot-location": [ + "error", + "property" + ], + "dot-notation": "off", + "eol-last": "off", + "eqeqeq": "off", + "func-call-spacing": "error", + "func-name-matching": "off", + "func-names": "off", + "func-style": "off", + "function-paren-newline": "off", + "generator-star-spacing": "error", + "global-require": "off", + "guard-for-in": "off", + "handle-callback-err": "error", + "id-blacklist": "error", + "id-length": "off", + "id-match": "error", + "implicit-arrow-linebreak": "off", + "indent": [ + "error", + 4, + { + "MemberExpression": "off", + "SwitchCase": 1 + } + ], + "indent-legacy": "off", + "init-declarations": "off", + "jsx-quotes": "error", + "key-spacing": "error", + "keyword-spacing": "off", + "line-comment-position": "off", + "linebreak-style": [ + "error", + "unix" + ], + "lines-around-comment": "off", + "lines-around-directive": "error", + "lines-between-class-members": "off", + "max-classes-per-file": "off", + "max-depth": "error", + "max-len": "off", + "max-lines": "off", + "max-lines-per-function": "off", + "max-nested-callbacks": "error", + "max-params": "off", + "max-statements": "off", + "max-statements-per-line": "error", + "multiline-comment-style": "off", + "multiline-ternary": [ + "error", + "always-multiline" + ], + "new-parens": "off", + "newline-after-var": "off", + "newline-before-return": "off", + "newline-per-chained-call": "off", + "no-alert": "error", + "no-array-constructor": "error", + "no-await-in-loop": "off", + "no-bitwise": "off", + "no-buffer-constructor": "off", + "no-caller": "error", + "no-catch-shadow": "error", + "no-case-declarations": "off", + "no-confusing-arrow": "off", + "no-constant-condition": [ + "error", + { + "checkLoops": false + } + ], + "no-console": "off", + "no-continue": "off", + "no-div-regex": "error", + "no-duplicate-imports": "off", + "no-else-return": "off", + "no-empty": [ + "error", + { + "allowEmptyCatch": true + } + ], + "no-empty-function": "off", + "no-eq-null": "error", + "no-eval": "error", + "no-extend-native": "error", + "no-extra-bind": "error", + "no-extra-label": "error", + "no-extra-parens": "off", + "no-floating-decimal": "error", + "no-implicit-globals": "error", + "no-implied-eval": "error", + "no-inline-comments": "off", + "no-invalid-this": "off", + "no-iterator": "error", + "no-label-var": "error", + "no-labels": "error", + "no-lone-blocks": "error", + "no-lonely-if": "off", + "no-loop-func": "off", + "no-magic-numbers": "off", + "no-mixed-operators": "off", + "no-mixed-requires": "error", + "no-multi-assign": "error", + "no-multi-spaces": "error", + "no-multi-str": "error", + "no-multiple-empty-lines": "off", + "no-native-reassign": "error", + "no-negated-condition": "off", + "no-negated-in-lhs": "error", + "no-nested-ternary": "error", + "no-new": "error", + "no-new-func": "error", + "no-new-object": "error", + "no-new-require": "error", + "no-new-wrappers": "error", + "no-octal-escape": "error", + "no-param-reassign": "off", + "no-path-concat": "error", + "no-plusplus": "off", + "no-process-env": "off", + "no-process-exit": "off", + "no-proto": "off", + "no-prototype-builtins": "off", + "no-restricted-globals": "error", + "no-restricted-imports": "error", + "no-restricted-modules": "error", + "no-restricted-properties": "error", + "no-restricted-syntax": "error", + "no-return-assign": "off", + "no-return-await": "off", + "no-script-url": "error", + "no-self-compare": "error", + "no-sequences": "error", + "no-shadow": "off", + "no-shadow-restricted-names": "error", + "no-spaced-func": "error", + "no-sync": "off", + "no-tabs": "error", + "no-template-curly-in-string": "error", + "no-ternary": "off", + "no-throw-literal": "error", + "no-trailing-spaces": [ + "error", + { + "ignoreComments": true, + "skipBlankLines": true + } + ], + "no-undef-init": "error", + "no-undefined": "off", + "no-underscore-dangle": "off", + "no-unmodified-loop-condition": "error", + "no-unneeded-ternary": "off", + "no-unused-expressions": "off", + "no-use-before-define": "off", + "no-useless-call": "error", + "no-useless-computed-key": "error", + "no-useless-concat": "off", + "no-useless-constructor": "error", + "no-useless-return": "off", + "no-var": "error", + "no-void": "error", + "no-warning-comments": "off", + "no-whitespace-before-property": "error", + "no-with": "error", + "nonblock-statement-body-position": [ + "error", + "any" + ], + "object-curly-newline": "off", + "object-curly-spacing": [ + "error", + "always" + ], + "object-property-newline": "error", + "object-shorthand": "off", + "one-var": "off", + "one-var-declaration-per-line": [ + "error", + "initializations" + ], + "operator-assignment": "off", + "operator-linebreak": [ + "error", + "after" + ], + "padded-blocks": "off", + "padding-line-between-statements": "error", + "prefer-arrow-callback": "off", + "prefer-const": "error", + "prefer-destructuring": "off", + "prefer-numeric-literals": "error", + "prefer-object-spread": "off", + "prefer-promise-reject-errors": "error", + "prefer-reflect": "off", + "prefer-rest-params": "off", + "prefer-spread": "off", + "prefer-template": "off", + "quote-props": "off", + "quotes": [ + "error", + "single" + ], + "radix": "off", + "require-await": "off", + "require-jsdoc": "off", + "rest-spread-spacing": [ + "error", + "never" + ], + "semi": "error", + "semi-spacing": [ + "error", + { + "after": true, + "before": false + } + ], + "semi-style": [ + "error", + "last" + ], + "sort-imports": "off", + "sort-keys": "off", + "sort-vars": "off", + "space-before-blocks": "error", + "space-before-function-paren": "off", + "space-in-parens": [ + "error", + "never" + ], + "space-infix-ops": "error", + "space-unary-ops": "error", + "spaced-comment": "off", + "strict": "error", + "switch-colon-spacing": "error", + "symbol-description": "error", + "template-curly-spacing": [ + "error", + "never" + ], + "template-tag-spacing": "error", + "unicode-bom": [ + "error", + "never" + ], + "valid-jsdoc": "off", + "vars-on-top": "error", + "wrap-iife": "error", + "wrap-regex": "off", + "yield-star-spacing": "error", + "yoda": "off" + } +} diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 3e99e48..ad19359 100755 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -15,8 +15,7 @@ module.exports = { path: config.build.assetsRoot, filename: '[name].js', publicPath: process.env.NODE_ENV === 'production' ? - config.build.assetsPublicPath : - config.dev.assetsPublicPath + config.build.assetsPublicPath : config.dev.assetsPublicPath }, resolve: { extensions: ['.js', '.vue', '.json'], @@ -60,16 +59,6 @@ module.exports = { limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - }, - { - test: /\.less$/, - use: [{ - loader: "style-loader" // creates style nodes from JS strings - }, { - loader: "css-loader" // translates CSS into CommonJS - }, { - loader: "less-loader" // compiles Less to CSS - }] } ] } diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 5470402..33b37a6 100755 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -5,19 +5,24 @@ var merge = require('webpack-merge') var baseWebpackConfig = require('./webpack.base.conf') var HtmlWebpackPlugin = require('html-webpack-plugin') var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') +var VueLoaderPlugin = require('vue-loader/lib/plugin') + // add hot-reload related code to entry chunks -Object.keys(baseWebpackConfig.entry).forEach(function (name) { +Object.keys(baseWebpackConfig.entry).forEach(function(name) { baseWebpackConfig.entry[name] = ['./build/dev-client'].concat(baseWebpackConfig.entry[name]) }) module.exports = merge(baseWebpackConfig, { module: { - rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap }) + rules: utils.styleLoaders({ + sourceMap: config.dev.cssSourceMap + }) }, // cheap-module-eval-source-map is faster for development devtool: '#cheap-module-eval-source-map', plugins: [ + new VueLoaderPlugin(), new webpack.DefinePlugin({ 'process.env': config.dev.env }), diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index b464bcc..d0f40c9 100755 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -8,10 +8,11 @@ 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') +var VueLoaderPlugin = require('vue-loader/lib/plugin') -var env = process.env.NODE_ENV === 'testing' - ? require('../config/test.env') - : config.build.env +var env = process.env.NODE_ENV === 'testing' ? + require('../config/test.env') : + config.build.env var webpackConfig = merge(baseWebpackConfig, { module: { @@ -27,6 +28,7 @@ var webpackConfig = merge(baseWebpackConfig, { chunkFilename: utils.assetsPath('js/[id].[chunkhash].js') }, plugins: [ + new VueLoaderPlugin(), // http://vuejs.github.io/vue-loader/en/workflow/production.html new webpack.DefinePlugin({ 'process.env': env @@ -46,9 +48,9 @@ var webpackConfig = merge(baseWebpackConfig, { // you can customize output by editing /index.html // see https://github.com/ampedandwired/html-webpack-plugin new HtmlWebpackPlugin({ - filename: process.env.NODE_ENV === 'testing' - ? 'index.html' - : config.build.index, + filename: process.env.NODE_ENV === 'testing' ? + 'index.html' : + config.build.index, template: 'index.html', inject: true, minify: { @@ -64,7 +66,7 @@ var webpackConfig = merge(baseWebpackConfig, { // split vendor js into its own file new webpack.optimize.CommonsChunkPlugin({ name: 'vendor', - minChunks: function (module, count) { + minChunks: function(module, count) { // any required modules inside node_modules are extracted to vendor return ( module.resource && diff --git a/package.json b/package.json index b73cc19..89e0ec9 100755 --- a/package.json +++ b/package.json @@ -23,7 +23,8 @@ "test:docs": "npm run docs && concurrently \"npm run docs:serve\" \"npm run test:cafe\" --success first --kill-others --raw", "test": "npm run test:export && npm run test:preview && npm run test:docs && npm run test:e2e", "export": "concurrently \"npm run dev\" \"npm run pdf\" --success first --kill-others --raw", - "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs" + "lint": "eslint --ext .js,.vue src", + "lint:fix": "eslint --ext .js,.vue src --fix" }, "dependencies": { "font-awesome": "4.7.0", @@ -39,52 +40,50 @@ "vue-router": "3.0.1" }, "devDependencies": { - "autoprefixer": "8.0.0", - "babel-cli": "6.26.0", - "babel-core": "6.26.3", - "babel-eslint": "8.2.1", - "babel-loader": "7.1.2", - "babel-plugin-transform-runtime": "6.23.0", - "babel-preset-env": "1.7.0", - "babel-preset-stage-2": "6.24.1", - "babel-register": "6.26.0", + "@babel/cli": "7.1.0", + "@babel/core": "7.1.0", + "@babel/plugin-transform-runtime": "7.1.0", + "@babel/preset-env": "7.1.0", + "@babel/register": "7.0.0", + "autoprefixer": "9.1.5", + "babel-loader": "8.0.2", "chalk": "2.4.1", "check-node-version": "3.2.0", - "concurrently": "^3.5.1", + "concurrently": "4.0.1", "connect-history-api-fallback": "1.5.0", "copy-webpack-plugin": "4.5.2", "cpx": "1.5.0", - "css-loader": "0.28.9", + "css-loader": "1.0.0", "escope": "3.6.0", - "eslint": "4.17.0", - "eslint-config-standard": "10.2.1", - "eslint-friendly-formatter": "3.0.0", - "eslint-loader": "1.9.0", + "eslint": "5.6.0", + "eslint-config-standard": "12.0.0", + "eslint-friendly-formatter": "4.0.1", + "eslint-loader": "2.1.1", "eslint-plugin-html": "4.0.6", "eslint-plugin-import": "2.14.0", - "eslint-plugin-node": "6.0.0", - "eslint-plugin-promise": "3.6.0", - "eslint-plugin-standard": "3.0.1", + "eslint-plugin-node": "7.0.1", + "eslint-plugin-promise": "4.0.1", + "eslint-plugin-standard": "4.0.0", "eventsource-polyfill": "0.9.6", "express": "4.16.3", "extract-text-webpack-plugin": "3.0.2", - "file-loader": "1.1.6", + "file-loader": "2.0.0", "friendly-errors-webpack-plugin": "1.7.0", - "html-webpack-plugin": "2.30.1", + "html-webpack-plugin": "3.2.0", "http": "0.0.0", "http-proxy-middleware": "0.19.0", "less": "3.8.1", "less-loader": "4.1.0", "local-web-server": "2.6.0", "lolex": "2.7.5", - "mocha": "^5.2.0", + "mocha": "5.2.0", "mv": "2.1.1", - "node": "9.5.0", + "node": "10.11.0", "opn": "5.4.0", - "optimize-css-assets-webpack-plugin": "3.2.0", - "ora": "1.4.0", - "pdf-image": "1.1.0", - "postcss": "6.0.17", + "optimize-css-assets-webpack-plugin": "5.0.1", + "ora": "3.0.0", + "pdf-image": "2.0.0", + "postcss": "7.0.4", "postcss-cssnext": "3.1.0", "puppeteer": "1.8.0", "rename": "1.0.4", @@ -92,19 +91,20 @@ "request-promise": "4.2.2", "rimraf": "2.6.2", "rx": "4.1.0", - "rxjs": "5.5.6", + "rxjs": "6.3.3", + "rxjs-compat": "6.3.3", "semver": "5.5.1", "shelljs": "0.8.2", "testcafe": "0.22.0", "testcafe-hammerhead": "14.2.7", "url-exists": "1.0.3", - "url-loader": "0.6.2", - "vue-loader": "14.0.3", + "url-loader": "1.1.1", + "vue-loader": "15.4.2", "vue-style-loader": "4.1.2", "vue-template-compiler": "2.5.17", - "webpack": "3.11.0", - "webpack-bundle-analyzer": "2.10.0", - "webpack-dev-middleware": "2.0.5", + "webpack": "4.20.2", + "webpack-bundle-analyzer": "3.0.2", + "webpack-dev-middleware": "3.4.0", "webpack-hot-middleware": "2.24.2", "webpack-merge": "4.1.4" }, diff --git a/src/App.vue b/src/App.vue index b4e0ca6..ecacb3f 100755 --- a/src/App.vue +++ b/src/App.vue @@ -6,7 +6,7 @@ @@ -19,6 +19,7 @@ export default { @import '../node_modules/npm-font-open-sans/open-sans.css'; @import '../node_modules/npm-font-open-sans-condensed/open-sans-condensed.css'; @import '../node_modules/raleway-webfont/raleway.css'; + body { padding: 0; margin: 0; diff --git a/src/lang/ca.js b/src/lang/ca.js index 231bf91..2eee7e8 100644 --- a/src/lang/ca.js +++ b/src/lang/ca.js @@ -1,11 +1,11 @@ // Catalan const lang = { - contact: 'Contacte', - experience: 'Experiència', - education: 'Educació', - skills: 'Habilitats', - projects: 'Projectes', - contributions: 'Contribucions', - about: 'Sobre mi' + contact: 'Contacte', + experience: 'Experiència', + education: 'Educació', + skills: 'Habilitats', + projects: 'Projectes', + contributions: 'Contribucions', + about: 'Sobre mi' }; export default lang; diff --git a/src/lang/cn.js b/src/lang/cn.js index 7f57f8e..13576db 100755 --- a/src/lang/cn.js +++ b/src/lang/cn.js @@ -1,12 +1,12 @@ /* eslint unicode-bom: "off" */ // Chinese (Simplified) const lang = { - contact: '联系方式', - experience: '工作经历', - education: '教育经历', - skills: '技能专长', - projects: '项目', - contributions: '贡献', - about: '自我介绍' + contact: '联系方式', + experience: '工作经历', + education: '教育经历', + skills: '技能专长', + projects: '项目', + contributions: '贡献', + about: '自我介绍' }; export default lang; diff --git a/src/lang/de.js b/src/lang/de.js index 83a5aa9..bc6f411 100755 --- a/src/lang/de.js +++ b/src/lang/de.js @@ -1,13 +1,13 @@ // Dutch const lang = { - contact: 'Kontakt', - born: 'Geboren', - bornIn: 'in', - experience: 'Berufserfahrung', - education: 'Schulbildung', - skills: 'Qualifikationen', - projects: 'Projecten', - contributions: 'Bijdragen', - about: 'Über mich' + contact: 'Kontakt', + born: 'Geboren', + bornIn: 'in', + experience: 'Berufserfahrung', + education: 'Schulbildung', + skills: 'Qualifikationen', + projects: 'Projecten', + contributions: 'Bijdragen', + about: 'Über mich' }; export default lang; diff --git a/src/lang/el.js b/src/lang/el.js index afb16b0..9142e38 100755 --- a/src/lang/el.js +++ b/src/lang/el.js @@ -1,8 +1,8 @@ const lang = { - contact: 'Επικοινωνία', - experience: 'Επαγγελματική εμπειρία', - education: 'Εκπαίδευση', - skills: 'Δεξιότητες', - about: 'Σχετικά με εμένα' + contact: 'Επικοινωνία', + experience: 'Επαγγελματική εμπειρία', + education: 'Εκπαίδευση', + skills: 'Δεξιότητες', + about: 'Σχετικά με εμένα' }; export default lang; diff --git a/src/lang/en.js b/src/lang/en.js index 3bf30ca..6fa9fc0 100755 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -1,13 +1,13 @@ // English const lang = { - contact: 'Contact', - born: 'Born', - bornIn: 'in', - experience: 'Experience', - education: 'Education', - skills: 'Skills', - projects: 'Projects', - contributions: 'Contributions', - about: 'About me' + contact: 'Contact', + born: 'Born', + bornIn: 'in', + experience: 'Experience', + education: 'Education', + skills: 'Skills', + projects: 'Projects', + contributions: 'Contributions', + about: 'About me' }; export default lang; diff --git a/src/lang/es.js b/src/lang/es.js index 312bbd9..3d20e12 100755 --- a/src/lang/es.js +++ b/src/lang/es.js @@ -1,11 +1,11 @@ // Spanish const lang = { - contact: 'Contacto', - experience: 'Experiencia', - education: 'Educación', - skills: 'Habilidades', - projects: 'Proyectos', - contributions: 'Contribuciones', - about: 'Sobre mi' + contact: 'Contacto', + experience: 'Experiencia', + education: 'Educación', + skills: 'Habilidades', + projects: 'Proyectos', + contributions: 'Contribuciones', + about: 'Sobre mi' }; export default lang; diff --git a/src/lang/fr.js b/src/lang/fr.js index 27c1c51..e52b82e 100755 --- a/src/lang/fr.js +++ b/src/lang/fr.js @@ -1,13 +1,13 @@ // French const lang = { - contact: 'Contact', - born: 'Né en', - bornIn: 'à', - experience: 'Expérience professionelle', - education: 'Formation', - skills: 'Compétences', - projects: 'Projets', - contributions: 'Contributions', - about: 'À propos de moi' + contact: 'Contact', + born: 'Né en', + bornIn: 'à', + experience: 'Expérience professionelle', + education: 'Formation', + skills: 'Compétences', + projects: 'Projets', + contributions: 'Contributions', + about: 'À propos de moi' }; export default lang; diff --git a/src/lang/he.js b/src/lang/he.js index 431709d..b47e59b 100755 --- a/src/lang/he.js +++ b/src/lang/he.js @@ -1,11 +1,11 @@ // Hebrew const lang = { - contact: 'יצירת קשר', - experience: 'ניסיון', - education: 'השכלה', - skills: 'כישורים', - projects: 'פרויקטים', - contributions: 'תרומות', - about: 'תמצית' + contact: 'יצירת קשר', + experience: 'ניסיון', + education: 'השכלה', + skills: 'כישורים', + projects: 'פרויקטים', + contributions: 'תרומות', + about: 'תמצית' }; export default lang; diff --git a/src/lang/hu.js b/src/lang/hu.js index 908fcc1..5847948 100755 --- a/src/lang/hu.js +++ b/src/lang/hu.js @@ -1,11 +1,11 @@ // Hungarian const lang = { - contact: 'Kapcsolat', - experience: 'Munkatapasztalat', - education: 'Tanulmány', - skills: 'Készségek', - projects: 'Projektek', - contributions: 'Hozzájárulások', - about: 'Rólam' + contact: 'Kapcsolat', + experience: 'Munkatapasztalat', + education: 'Tanulmány', + skills: 'Készségek', + projects: 'Projektek', + contributions: 'Hozzájárulások', + about: 'Rólam' }; export default lang; diff --git a/src/lang/id.js b/src/lang/id.js index 8ebddc4..d8d50fb 100755 --- a/src/lang/id.js +++ b/src/lang/id.js @@ -1,11 +1,11 @@ // Indonesian const lang = { - contact: 'Kontak', - experience: 'Pengalaman', - education: 'Pendidikan', - skills: 'Keterampilan', - projects: 'Proyek', - contributions: 'Kontribusi', - about: 'Tentang Saya' + contact: 'Kontak', + experience: 'Pengalaman', + education: 'Pendidikan', + skills: 'Keterampilan', + projects: 'Proyek', + contributions: 'Kontribusi', + about: 'Tentang Saya' }; export default lang; diff --git a/src/lang/it.js b/src/lang/it.js index 06d2325..0603ce2 100755 --- a/src/lang/it.js +++ b/src/lang/it.js @@ -1,11 +1,11 @@ // Italian const lang = { - contact: 'Contatti', - experience: 'Esperienza professionale', - education: 'Formazione', - skills: 'Competenze', - contributions: 'Contributi', - projects: 'Progetti', - about: 'Su di me' + contact: 'Contatti', + experience: 'Esperienza professionale', + education: 'Formazione', + skills: 'Competenze', + contributions: 'Contributi', + projects: 'Progetti', + about: 'Su di me' }; export default lang; diff --git a/src/lang/ja.js b/src/lang/ja.js index cd97de1..8b1b4fa 100755 --- a/src/lang/ja.js +++ b/src/lang/ja.js @@ -1,11 +1,11 @@ // Japanese const lang = { - contact: '連絡先', - experience: '職務経歴', - education: '学歴', - skills: 'スキル', - projects: 'プロジェクト', - contributions: '貢献', - about: '自己紹介' + contact: '連絡先', + experience: '職務経歴', + education: '学歴', + skills: 'スキル', + projects: 'プロジェクト', + contributions: '貢献', + about: '自己紹介' }; export default lang; diff --git a/src/lang/ka.js b/src/lang/ka.js index 9ef6be0..e7b53b6 100755 --- a/src/lang/ka.js +++ b/src/lang/ka.js @@ -1,8 +1,8 @@ const lang = { - contact: 'კონტაქტი', - experience: 'გამოცდილება', - education: 'განათლება', - skills: 'უნარები', - about: 'ჩემ შესახებ' + contact: 'კონტაქტი', + experience: 'გამოცდილება', + education: 'განათლება', + skills: 'უნარები', + about: 'ჩემ შესახებ' }; export default lang; diff --git a/src/lang/ko.js b/src/lang/ko.js index 82dd21f..cefe2c4 100644 --- a/src/lang/ko.js +++ b/src/lang/ko.js @@ -1,11 +1,11 @@ // Korean const lang = { - contact: '연락처', - experience: '경력', - education: '학력', - skills: '보유스킬', - projects: '프로젝트', - contributions: '기고', - about: '자기소개' + contact: '연락처', + experience: '경력', + education: '학력', + skills: '보유스킬', + projects: '프로젝트', + contributions: '기고', + about: '자기소개' }; export default lang; diff --git a/src/lang/lt.js b/src/lang/lt.js index 2f40eac..142b631 100755 --- a/src/lang/lt.js +++ b/src/lang/lt.js @@ -1,8 +1,8 @@ const lang = { - contact: 'Kontaktai', - experience: 'Patirtis', - education: 'Išsilavinimas', - skills: 'Įgūdžiai', - about: 'Apie mane' + contact: 'Kontaktai', + experience: 'Patirtis', + education: 'Išsilavinimas', + skills: 'Įgūdžiai', + about: 'Apie mane' }; export default lang; diff --git a/src/lang/nl.js b/src/lang/nl.js index b1ab92d..0ce0a87 100755 --- a/src/lang/nl.js +++ b/src/lang/nl.js @@ -1,11 +1,11 @@ // Nederlands const lang = { - contact: 'Contact', - experience: 'Ervaringen', - education: 'Opleidingen', - skills: 'Skills', - projects: 'Projecten', - contributions: 'Bijdragen', - about: 'Over mij' + contact: 'Contact', + experience: 'Ervaringen', + education: 'Opleidingen', + skills: 'Skills', + projects: 'Projecten', + contributions: 'Bijdragen', + about: 'Over mij' }; export default lang; diff --git a/src/lang/pl.js b/src/lang/pl.js index 4c0ed55..d1fa785 100755 --- a/src/lang/pl.js +++ b/src/lang/pl.js @@ -1,11 +1,11 @@ // Polish const lang = { - contact: 'Kontakt', - experience: 'Doświadczenie', - education: 'Wykształcenie', - skills: 'Umiejętności', - projects: 'Projektowanie', - contributions: 'Składki', - about: 'O mnie' + contact: 'Kontakt', + experience: 'Doświadczenie', + education: 'Wykształcenie', + skills: 'Umiejętności', + projects: 'Projektowanie', + contributions: 'Składki', + about: 'O mnie' }; export default lang; diff --git a/src/lang/pt-br.js b/src/lang/pt-br.js index 843125e..d08a829 100755 --- a/src/lang/pt-br.js +++ b/src/lang/pt-br.js @@ -1,12 +1,12 @@ // Portuguese const lang = { - contact: 'Contato', - experience: 'Experiência Profissional', - /* You can choose, "Educação" or "Formação Acadêmica"! But the second one is more professional and is more used. */ - education: 'Formação Acadêmica', - skills: 'Competências', - projects: 'Projetos', - contributions: 'Contribuições', - about: 'Sobre' + contact: 'Contato', + experience: 'Experiência Profissional', + /* You can choose, "Educação" or "Formação Acadêmica"! But the second one is more professional and is more used. */ + education: 'Formação Acadêmica', + skills: 'Competências', + projects: 'Projetos', + contributions: 'Contribuições', + about: 'Sobre' }; export default lang; diff --git a/src/lang/pt.js b/src/lang/pt.js index cff8272..67ec605 100755 --- a/src/lang/pt.js +++ b/src/lang/pt.js @@ -1,11 +1,11 @@ // Portuguese const lang = { - contact: 'Contactos', - experience: 'Experiência Profissional', - education: 'Educação', - skills: 'Competências', - projects: 'Projetos', - contributions: 'Contribuições', - about: 'Sobre mim' + contact: 'Contactos', + experience: 'Experiência Profissional', + education: 'Educação', + skills: 'Competências', + projects: 'Projetos', + contributions: 'Contribuições', + about: 'Sobre mim' }; export default lang; diff --git a/src/lang/ru.js b/src/lang/ru.js index f1ef2c8..96b7d6e 100755 --- a/src/lang/ru.js +++ b/src/lang/ru.js @@ -1,12 +1,12 @@ // Russian const lang = { - contact: 'Контакты', - experience: 'Опыт', - education: 'Образование', - skills: 'Навыки', - projects: 'проектов', - contributions: 'взносы', - about: 'Обо мне' + contact: 'Контакты', + experience: 'Опыт', + education: 'Образование', + skills: 'Навыки', + projects: 'проектов', + contributions: 'взносы', + about: 'Обо мне' }; export default lang; diff --git a/src/lang/sv.js b/src/lang/sv.js index 1debecc..78cde44 100755 --- a/src/lang/sv.js +++ b/src/lang/sv.js @@ -1,8 +1,8 @@ const lang = { - contact: 'Kontakt', - experience: 'Arbetslivserfarenhet', - education: 'Utbildning', - skills: 'Kunskaper', - about: 'Om mig' + contact: 'Kontakt', + experience: 'Arbetslivserfarenhet', + education: 'Utbildning', + skills: 'Kunskaper', + about: 'Om mig' }; export default lang; diff --git a/src/lang/th.js b/src/lang/th.js index 1898719..d9b7c70 100755 --- a/src/lang/th.js +++ b/src/lang/th.js @@ -1,8 +1,8 @@ const lang = { - contact: 'ข้อมูลติดต่อ', - experience: 'ประสบการณ์ทำงาน', - education: 'ประวัติการศึกษา', - skills: 'ทักษะและความสามารถ', - about: 'ข้อมูลส่วนตัว' + contact: 'ข้อมูลติดต่อ', + experience: 'ประสบการณ์ทำงาน', + education: 'ประวัติการศึกษา', + skills: 'ทักษะและความสามารถ', + about: 'ข้อมูลส่วนตัว' }; export default lang; diff --git a/src/lang/tr.js b/src/lang/tr.js index 8d4624a..4452191 100755 --- a/src/lang/tr.js +++ b/src/lang/tr.js @@ -1,8 +1,8 @@ const lang = { - contact: 'İletişim', - experience: 'Deneyim', - education: 'Eğitim', - skills: 'Yetenekler', - about: 'Hakkımda' + contact: 'İletişim', + experience: 'Deneyim', + education: 'Eğitim', + skills: 'Yetenekler', + about: 'Hakkımda' }; export default lang; diff --git a/src/lang/zh-tw.js b/src/lang/zh-tw.js index 4404121..ab01a40 100755 --- a/src/lang/zh-tw.js +++ b/src/lang/zh-tw.js @@ -1,8 +1,8 @@ const lang = { - contact: '聯絡方式', - experience: '經歷', - education: '學歷', - skills: '技能專長', - about: '自我介紹' + contact: '聯絡方式', + experience: '經歷', + education: '學歷', + skills: '技能專長', + about: '自我介紹' }; export default lang; diff --git a/src/main.js b/src/main.js index 9184c9f..ef8799e 100755 --- a/src/main.js +++ b/src/main.js @@ -8,10 +8,10 @@ Vue.config.productionTip = false; /* eslint-disable no-new */ new Vue({ - el: '#app', - router, - template: '', - components: { - App - } + el: '#app', + router, + template: '', + components: { + App + } }); diff --git a/src/pages/home.vue b/src/pages/home.vue index 4f55640..828dda8 100755 --- a/src/pages/home.vue +++ b/src/pages/home.vue @@ -77,7 +77,7 @@ diff --git a/src/pages/resume.vue b/src/pages/resume.vue index c96e489..22c1ec5 100755 --- a/src/pages/resume.vue +++ b/src/pages/resume.vue @@ -12,7 +12,7 @@ import Vue from 'vue'; import '../resumes/resumes'; export default Vue.component('resume', { - name: 'app' + name: 'app' }); diff --git a/src/resumes/creative.vue b/src/resumes/creative.vue index bdaf168..975a54a 100644 --- a/src/resumes/creative.vue +++ b/src/resumes/creative.vue @@ -202,7 +202,7 @@ import Vue from 'vue'; import { getVueOptions } from './options'; -let name = 'creative'; +const name = 'creative'; export default Vue.component(name, getVueOptions(name)); diff --git a/src/resumes/left-right-rtl.vue b/src/resumes/left-right-rtl.vue index 324293a..3d110ba 100755 --- a/src/resumes/left-right-rtl.vue +++ b/src/resumes/left-right-rtl.vue @@ -72,7 +72,7 @@ diff --git a/src/resumes/left-right.vue b/src/resumes/left-right.vue index 4e700bb..3b5b7fa 100755 --- a/src/resumes/left-right.vue +++ b/src/resumes/left-right.vue @@ -73,7 +73,7 @@ import Vue from 'vue'; import { getVueOptions } from './options'; -let name = 'left-right'; +const name = 'left-right'; export default Vue.component(name, getVueOptions(name)); diff --git a/src/resumes/material-dark.vue b/src/resumes/material-dark.vue index 3a25552..e81be27 100755 --- a/src/resumes/material-dark.vue +++ b/src/resumes/material-dark.vue @@ -124,7 +124,7 @@ diff --git a/src/resumes/oblique.vue b/src/resumes/oblique.vue index 9bfebb4..bc6a6fe 100755 --- a/src/resumes/oblique.vue +++ b/src/resumes/oblique.vue @@ -76,7 +76,7 @@ import Vue from 'vue'; import { getVueOptions } from './options'; -let name = 'oblique'; +const name = 'oblique'; export default Vue.component(name, getVueOptions(name)); diff --git a/src/resumes/options.js b/src/resumes/options.js index cc3de95..5092127 100755 --- a/src/resumes/options.js +++ b/src/resumes/options.js @@ -1,41 +1,41 @@ import yaml from 'js-yaml'; import { - PERSON + PERSON } from '../../resume/data.yml'; import { - terms + terms } from '../terms'; // Called by templates to decrease redundancy function getVueOptions (name) { - let opt = { - name: name, - data () { - return { - person: yaml.load(PERSON), - terms: terms - }; - }, - computed: { - lang () { - const defaultLang = this.terms.en; - const useLang = this.terms[this.person.lang]; + const opt = { + name: name, + data () { + return { + person: yaml.load(PERSON), + terms: terms + }; + }, + computed: { + lang () { + const defaultLang = this.terms.en; + const useLang = this.terms[this.person.lang]; - // overwrite non-set fields with default lang - Object.keys(defaultLang) + // overwrite non-set fields with default lang + Object.keys(defaultLang) .filter(k => !useLang[k]) .forEach(k => { - console.log(k); - useLang[k] = defaultLang[k]; + console.log(k); + useLang[k] = defaultLang[k]; }); - return useLang; - } - } - }; - return opt; + return useLang; + } + } + }; + return opt; } export { - getVueOptions + getVueOptions }; diff --git a/src/resumes/side-bar-rtl.vue b/src/resumes/side-bar-rtl.vue index b364374..6f3be68 100755 --- a/src/resumes/side-bar-rtl.vue +++ b/src/resumes/side-bar-rtl.vue @@ -91,7 +91,7 @@ import Vue from 'vue'; import { getVueOptions } from './options'; -let name = 'side-bar-rtl'; +const name = 'side-bar-rtl'; export default Vue.component(name, getVueOptions(name)); diff --git a/src/resumes/side-bar.vue b/src/resumes/side-bar.vue index f1ae426..a88143c 100755 --- a/src/resumes/side-bar.vue +++ b/src/resumes/side-bar.vue @@ -91,7 +91,7 @@ import Vue from 'vue'; import { getVueOptions } from './options'; -let name = 'side-bar'; +const name = 'side-bar'; export default Vue.component(name, getVueOptions(name)); diff --git a/src/resumes/template.vue b/src/resumes/template.vue index f936a74..4831da8 100755 --- a/src/resumes/template.vue +++ b/src/resumes/template.vue @@ -8,7 +8,7 @@ import Vue from 'vue'; import { getVueOptions } from './options'; -let name = 'TEMPLATE-NAME'; // TODO change name +const name = 'TEMPLATE-NAME'; // TODO change name export default Vue.component(name, getVueOptions(name)); diff --git a/src/router/index.js b/src/router/index.js index a553c64..9a10118 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,16 +6,16 @@ import Home from '@/pages/home'; Vue.use(Router); export default new Router({ - routes: [ - { - path: '/', - name: 'home', - component: Home - }, - { - path: '/resume/:resumeid', - name: 'resume', - component: Resume - } - ] + routes: [ + { + path: '/', + name: 'home', + component: Home + }, + { + path: '/resume/:resumeid', + name: 'resume', + component: Resume + } + ] }); diff --git a/src/terms.js b/src/terms.js index 978dff1..29da166 100755 --- a/src/terms.js +++ b/src/terms.js @@ -23,5 +23,27 @@ import ko from './lang/ko'; import el from './lang/el'; export const terms = { - en, de, fr, pt, ca, cn, it, es, th, 'pt-br': ptbr, ru, sv, id, hu, pl, ja, nl, he, 'zh-tw': zhtw, lt, tr, ko, el + en, + de, + fr, + pt, + ca, + cn, + it, + es, + th, + 'pt-br': ptbr, + ru, + sv, + id, + hu, + pl, + ja, + nl, + he, + 'zh-tw': zhtw, + lt, + tr, + ko, + el };