From 4fdb9c2a547ba2721c4924a5bfa525abdf4da4df Mon Sep 17 00:00:00 2001 From: Matthew Ess Date: Sun, 14 Oct 2018 02:45:44 -0400 Subject: [PATCH] Nuxt 2 --- .editorconfig | 2 +- .eslintrc.js | 12 +- .gitignore | 80 +- .prettierrc | 4 + .vscode/settings.json | 8 +- README.md | 18 +- assets/README.md | 7 +- assets/sass/_variables.sass | 23 + assets/sass/mat.sass | 34 +- components/Hero.vue | 31 +- components/README.md | 7 +- components/navTabs.vue | 9 + layouts/README.md | 7 +- layouts/compact.vue | 19 + layouts/default.vue | 8 +- middleware/README.md | 9 +- nuxt.config.js | 60 +- package.json | 36 +- pages/README.md | 5 +- pages/blog/index.vue | 14 + pages/projects.vue | 27 +- pages/resume.vue | 14 +- plugins/README.md | 9 +- static/README.md | 15 +- store/README.md | 8 +- yarn.lock | 6389 ++++++++++++++++++++++------------- 26 files changed, 4315 insertions(+), 2540 deletions(-) create mode 100644 .prettierrc create mode 100644 assets/sass/_variables.sass create mode 100644 components/navTabs.vue create mode 100644 layouts/compact.vue create mode 100644 pages/blog/index.vue diff --git a/.editorconfig b/.editorconfig index 9142239..5d12634 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,8 +2,8 @@ root = true [*] -indent_size = 2 indent_style = space +indent_size = 2 end_of_line = lf charset = utf-8 trim_trailing_whitespace = true diff --git a/.eslintrc.js b/.eslintrc.js index 8879413..25a4edf 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -8,15 +8,17 @@ module.exports = { parser: 'babel-eslint' }, 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/recommended', - 'airbnb-base' + 'plugin:prettier/recommended' ], // required to lint *.vue files plugins: [ - 'vue' + 'vue', + 'prettier' ], // add your custom rules here - rules: {} + rules: { + 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' + } } diff --git a/.gitignore b/.gitignore index 7ee6115..29669c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,81 @@ -# dependencies -node_modules +# Created by .ignore support plugin (hsz.mobi) +### Node template +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* -# logs -npm-debug.log +# Runtime data +pids +*.pid +*.seed +*.pid.lock -# Nuxt build +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# next.js build output +.next + +# nuxt.js build output .nuxt # Nuxt generate dist + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless + +# IDE +.idea diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..b2095be --- /dev/null +++ b/.prettierrc @@ -0,0 +1,4 @@ +{ + "semi": false, + "singleQuote": true +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 4718ffd..d83c9db 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,9 @@ { - "eslint.enable": true + "eslint.enable": true, + "eslint.packageManager": "yarn", + "eslint.validate": [ + "javascript", + "javascriptreact", + "vue" + ] } \ No newline at end of file diff --git a/README.md b/README.md index 6d8135a..77d4eaa 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,22 @@ -# mat.services +# mat.services [![pipeline status](https://gitlab.com/matthewess/mat.services/badges/master/pipeline.svg)](https://gitlab.com/matthewess/mat.services/commits/master) -> my personal website +> my personal site ## Build Setup -``` bash +```bash # install dependencies -$ npm install # Or yarn install +$ yarn install # serve with hot reload at localhost:3000 -$ npm run dev +$ yarn dev # build for production and launch server -$ npm run build -$ npm start +$ yarn build +$ yarn start # generate static project -$ npm run generate +$ yarn generate ``` -For detailed explanation on how things work, checkout the [Nuxt.js docs](https://github.com/nuxt/nuxt.js). +For detailed explanation on how things work, checkout [Nuxt.js docs](https://nuxtjs.org). diff --git a/assets/README.md b/assets/README.md index c67cf2e..34766f9 100644 --- a/assets/README.md +++ b/assets/README.md @@ -1,8 +1,7 @@ # ASSETS +**This directory is not required, you can delete it if you don't want to use it.** + This directory contains your un-compiled assets such as LESS, SASS, or JavaScript. -More information about the usage of this directory in the documentation: -https://nuxtjs.org/guide/assets#webpacked - -**This directory is not required, you can delete it if you don't want to use it.** +More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#webpacked). diff --git a/assets/sass/_variables.sass b/assets/sass/_variables.sass new file mode 100644 index 0000000..b517129 --- /dev/null +++ b/assets/sass/_variables.sass @@ -0,0 +1,23 @@ +@import '~bulma/sass/utilities/functions' + +$pink: #F4ACB7 +$pink-invert: findColorInvert($pink) +$blue: #7D82B8 +$blue-invert: findColorInvert($blue) +$red: #471323 +$red-invert: findColorInvert($red) +$bright: #EF798A +$bright-invert: findColorInvert($bright) +$purple: #613F75 +$purple-invert: findColorInvert($purple) + +$primary: $pink +$primary-invert: $pink-invert +$info: $blue +$info-invert: $blue-invert +$danger: $red +$danger-invert: $red-invert +$warning: $bright +$warning-invert: $bright-invert +$link: $purple +$link-invert: $purple-invert diff --git a/assets/sass/mat.sass b/assets/sass/mat.sass index 6ace206..10b0416 100644 --- a/assets/sass/mat.sass +++ b/assets/sass/mat.sass @@ -1,38 +1,6 @@ @import '~bulma/sass/utilities/initial-variables' -@import '~bulma/sass/utilities/functions' -// v1 -$pink: #f8a5c2 -$pink-invert: findColorInvert($pink) -$purple: #786fa6 -$purple-invert: findColorInvert($purple) -$blue: #546de5 -$blue-invert: findColorInvert($blue) -$charcoal: #3a435e -$charcoal-invert: findColorInvert($charcoal) - -// v(odka)2 -$soviet: #BD271A -$soviet-invert: findColorInvert($soviet) -$yellow: #FAD749 -$yellow-invert: findColorInvert($yellow) -$gray: #C0BCB5 -$gray-invert: findColorInvert($gray) -$green: #4A6C6F -$green-invert: findColorInvert($green) -$violet: #846075 -$violet-invert: findColorInvert($violet) - -$primary: $soviet -$primary-invert: $soviet-invert -$info: $green -$info-invert: $green-invert -$danger: $violet -$danger-invert: $violet-invert -$warning: $yellow -$warning-invert: $yellow-invert -$link: $danger -$link-invert: $danger-invert +@import 'variables' @import '~bulma/bulma' diff --git a/components/Hero.vue b/components/Hero.vue index f1c4ac7..10951f2 100644 --- a/components/Hero.vue +++ b/components/Hero.vue @@ -1,20 +1,27 @@ + + diff --git a/layouts/default.vue b/layouts/default.vue index 22bf904..306f431 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -1,17 +1,17 @@ + + diff --git a/pages/resume.vue b/pages/resume.vue index d34d62d..813666d 100644 --- a/pages/resume.vue +++ b/pages/resume.vue @@ -41,10 +41,22 @@ p source control, git + +