From 2f9f7bc2593366c46e3b97895ec373314f1c6b7a Mon Sep 17 00:00:00 2001 From: Matthew Ess Date: Thu, 18 Oct 2018 01:13:18 -0400 Subject: [PATCH] Big change, hope it works!!! --- .eslintrc.js | 25 ++++++------ .gitlab-ci.yml | 2 - .prettierrc | 3 +- .../sass/{_variables.sass => _utilities.sass} | 3 ++ assets/sass/mat.sass | 4 +- content/2018-10-16-BlogWithVueNuxtNuxtent.md | 15 +++++++ content/2018-10-17-FirstPost.md | 22 ++++++++++ middleware/README.md | 8 ---- nuxt.config.js | 21 +++++++--- pages/README.md | 6 --- pages/blog.vue | 26 ++++++++++++ pages/blog/_slug.vue | 34 +++++++++++++++- pages/blog/index.vue | 38 +++++++++++++++--- pages/projects.vue | 22 +++++----- pages/resume.vue | 12 +----- plugins/README.md | 7 ---- plugins/filters.js | 38 ++++++++++++++++++ static/README.md | 10 ----- static/favicon.ico | Bin 0 -> 1406 bytes 19 files changed, 212 insertions(+), 84 deletions(-) rename assets/sass/{_variables.sass => _utilities.sass} (86%) create mode 100644 content/2018-10-16-BlogWithVueNuxtNuxtent.md create mode 100644 content/2018-10-17-FirstPost.md delete mode 100644 middleware/README.md delete mode 100644 pages/README.md create mode 100644 pages/blog.vue delete mode 100644 plugins/README.md create mode 100644 plugins/filters.js delete mode 100644 static/README.md create mode 100644 static/favicon.ico diff --git a/.eslintrc.js b/.eslintrc.js index 25a4edf..335ca16 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -2,23 +2,24 @@ module.exports = { root: true, env: { browser: true, - node: true + node: true, }, parserOptions: { - parser: 'babel-eslint' + parser: 'babel-eslint', }, - extends: [ - 'plugin:vue/recommended', - 'plugin:prettier/recommended' - ], + extends: ['plugin:vue/recommended', 'plugin:prettier/recommended'], // required to lint *.vue files - plugins: [ - 'vue', - 'prettier' - ], + plugins: ['vue', 'prettier'], // add your custom rules here rules: { 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', - 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' - } + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'comma-dangle': [ + 'error', + { + arrays: 'only-multiline', + objects: 'only-multiline', + }, + ], + }, } diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d74a78..bf26956 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,8 +10,6 @@ cache: pages: script: - yarn generate - - mkdir public - - mv dist/* public/ artifacts: paths: - public diff --git a/.prettierrc b/.prettierrc index b2095be..36301bc 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,5 @@ { "semi": false, - "singleQuote": true + "singleQuote": true, + "trailingComma": "es5" } diff --git a/assets/sass/_variables.sass b/assets/sass/_utilities.sass similarity index 86% rename from assets/sass/_variables.sass rename to assets/sass/_utilities.sass index b517129..8af3c32 100644 --- a/assets/sass/_variables.sass +++ b/assets/sass/_utilities.sass @@ -1,3 +1,4 @@ +@import '~bulma/sass/utilities/initial-variables' @import '~bulma/sass/utilities/functions' $pink: #F4ACB7 @@ -21,3 +22,5 @@ $warning: $bright $warning-invert: $bright-invert $link: $purple $link-invert: $purple-invert + +@import '~bulma/sass/utilities/all' diff --git a/assets/sass/mat.sass b/assets/sass/mat.sass index 10b0416..2c6d6c9 100644 --- a/assets/sass/mat.sass +++ b/assets/sass/mat.sass @@ -1,6 +1,4 @@ -@import '~bulma/sass/utilities/initial-variables' - -@import 'variables' +@import 'utilities' @import '~bulma/bulma' diff --git a/content/2018-10-16-BlogWithVueNuxtNuxtent.md b/content/2018-10-16-BlogWithVueNuxtNuxtent.md new file mode 100644 index 0000000..b89c2a9 --- /dev/null +++ b/content/2018-10-16-BlogWithVueNuxtNuxtent.md @@ -0,0 +1,15 @@ +--- +title: writing your own blog in Vue, powered by Nuxt, and Nuxtent +tagline: break free from boring jekyll themes +tags: + - blog + - vue + - vuejs + - nuxt + - nuxtent + - markdown + - static site + - github pages + - gitlab pages +draft: true +--- diff --git a/content/2018-10-17-FirstPost.md b/content/2018-10-17-FirstPost.md new file mode 100644 index 0000000..46babfb --- /dev/null +++ b/content/2018-10-17-FirstPost.md @@ -0,0 +1,22 @@ +--- +title: hi, world +tagline: my personal introduction to the world of words on the web +tags: + - first post + - introduction + - tech blog + - creative writing +--- + +hi, world! this is my first blog post. i'm hoping to use this as part creative outlet, part +self-encouragement to see technical projects through, and part place to document my learning so i +can go back and look at all the things i forgot, one day. + +to those of you who don't know me, here's a brief introduction: my name is mat! i'm a communist, +a [partner][1], and generally (at the very least) something of a curmudgeon. i have a number of +strong opinions, especially about technology and politics. i have a love for art, and, in another +life, i really wish that i'd studied philosophy or music. + +if you have ideas for me to blog about, feel free to reach out to me at mess [at] yelp [dot] com. + +[1]: https://macklovesmatt.com/ 'me and my partner' diff --git a/middleware/README.md b/middleware/README.md deleted file mode 100644 index 009e48c..0000000 --- a/middleware/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# MIDDLEWARE - -**This directory is not required, you can delete it if you don't want to use it.** - -This directory contains your application middleware. -The middleware lets you define custom function to be ran before rendering a page or a group of pages (layouts). - -More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/routing#middleware). diff --git a/nuxt.config.js b/nuxt.config.js index a75b02d..1dc76d7 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -1,6 +1,6 @@ -const pkg = require('./package') // javascript.validate.enable false +import pkg from './package' -module.exports = { +export default { mode: 'universal', /* @@ -31,20 +31,29 @@ module.exports = { /* ** Plugins to load before mounting the App */ - plugins: [], + plugins: ['~/plugins/filters.js'], /* ** Nuxt.js modules */ modules: ['@nuxtjs/bulma', 'nuxtent'], + /* + ** Static Site Generation configuration + */ + generate: { + dir: 'public' + }, + /* ** Nuxtent configuration */ nuxtent: { - page: '/posts/_slug', - permalink: ':slug', - generate: ['get', 'getAll'] + content: { + page: '/blog/_slug', + permalink: ':slug', + generate: ['get', 'getAll'] + } }, /* diff --git a/pages/README.md b/pages/README.md deleted file mode 100644 index 7a6cffa..0000000 --- a/pages/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# PAGES - -This directory contains your Application Views and Routes. -The framework reads all the `*.vue` files inside this directory and create the router of your application. - -More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/routing). diff --git a/pages/blog.vue b/pages/blog.vue new file mode 100644 index 0000000..4f68539 --- /dev/null +++ b/pages/blog.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/pages/blog/_slug.vue b/pages/blog/_slug.vue index 1c13d96..f6f817b 100644 --- a/pages/blog/_slug.vue +++ b/pages/blog/_slug.vue @@ -1,9 +1,41 @@ + + diff --git a/pages/blog/index.vue b/pages/blog/index.vue index 2026be6..bec6abe 100644 --- a/pages/blog/index.vue +++ b/pages/blog/index.vue @@ -1,17 +1,43 @@ + + diff --git a/pages/projects.vue b/pages/projects.vue index 8fecb97..5111016 100644 --- a/pages/projects.vue +++ b/pages/projects.vue @@ -33,21 +33,19 @@ or my older #[a.has-text-info(href='https://github.com/matthewess') github account]. + + - - diff --git a/pages/resume.vue b/pages/resume.vue index 343bcfb..a180f70 100644 --- a/pages/resume.vue +++ b/pages/resume.vue @@ -47,23 +47,15 @@