Merge branch 'winh-update-nuxt' into 'master'

Update to current Nuxt.js template

See merge request pages/nuxt!4

.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

.eslintrc.js

 module.exports = {
   root: true,
-  parser: 'babel-eslint',
   env: {
     browser: true,
     node: true
   },
-  extends: 'standard',
-  // required to lint *.vue files
-  plugins: [
-    'html'
+  parserOptions: {
+    parser: 'babel-eslint'
+  },
+  extends: [
+    '@nuxtjs',
+    'plugin:nuxt/recommended'
   ],
   // add your custom rules here
-  rules: {},
-  globals: {}
+  rules: {
+  }
 }

.gitignore

-# 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
+
+# Service worker
+sw.*
+
+# GitLab Pages
+public/

README.md

@@ -88,4 +88,4 @@ unless you want to contribute back to the upstream project.
 
 ----
 
-Forked from @haleksandre
+Created using https://github.com/nuxt/create-nuxt-app

assets/README.md

 # ASSETS
 
-This directory contains your un-compiled assets such as LESS, SASS, or JavaScript.
+**This directory is not required, you can delete it if you don't want to use it.**
 
-More informations about the usage of this directory in the documentation:
-https://nuxtjs.org/guide/assets#webpacked
+This directory contains your un-compiled assets such as LESS, SASS, or JavaScript.
 
-**This directory is not required, to 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).

components/Logo.vue

 <template>
   <div class="VueToNuxtLogo">
-    <div class="Triangle Triangle--two"></div>
-    <div class="Triangle Triangle--one"></div>
-    <div class="Triangle Triangle--three"></div>
-    <div class="Triangle Triangle--four"></div>
+    <div class="Triangle Triangle--two" />
+    <div class="Triangle Triangle--one" />
+    <div class="Triangle Triangle--three" />
+    <div class="Triangle Triangle--four" />
   </div>
 </template>
 
 <style>
-.VueToNuxtLogo
-{
+.VueToNuxtLogo {
   display: inline-block;
   animation: turn 2s linear forwards 1s;
   transform: rotateX(180deg);
@@ -18,40 +17,40 @@
   height: 180px;
   width: 245px;
 }
-.Triangle
-{
+
+.Triangle {
   position: absolute;
   top: 0;
   left: 0;
   width: 0;
   height: 0;
 }
-.Triangle--one
-{
+
+.Triangle--one {
   border-left: 105px solid transparent;
   border-right: 105px solid transparent;
-  border-bottom: 180px solid #41B883;
+  border-bottom: 180px solid #41b883;
 }
-.Triangle--two
-{
+
+.Triangle--two {
   top: 30px;
   left: 35px;
   animation: goright 0.5s linear forwards 3.5s;
   border-left: 87.5px solid transparent;
   border-right: 87.5px solid transparent;
-  border-bottom: 150px solid #3B8070;
+  border-bottom: 150px solid #3b8070;
 }
-.Triangle--three
-{
+
+.Triangle--three {
   top: 60px;
   left: 35px;
   animation: goright 0.5s linear forwards 3.5s;
   border-left: 70px solid transparent;
   border-right: 70px solid transparent;
-  border-bottom: 120px solid #35495E;
+  border-bottom: 120px solid #35495e;
 }
-.Triangle--four
-{
+
+.Triangle--four {
   top: 120px;
   left: 70px;
   animation: godown 0.5s linear forwards 3s;
@@ -65,11 +64,13 @@
     transform: rotateX(0deg);
   }
 }
+
 @keyframes godown {
   100% {
     top: 180px;
   }
 }
+
 @keyframes goright {
   100% {
     left: 70px;

components/README.md

 # COMPONENTS
 
+**This directory is not required, you can delete it if you don't want to use it.**
+
 The components directory contains your Vue.js Components.
-Nuxt.js doesn't supercharge these components.
 
-**This directory is not required, to can delete it if you don't want to use it.**
+_Nuxt.js doesn't supercharge these components._

layouts/README.md

 # LAYOUTS
 
-This directory contains your Application Layouts.
+**This directory is not required, you can delete it if you don't want to use it.**
 
-More informations about the usage of this directory in the documentation:
-https://nuxtjs.org/guide/views#layouts
+This directory contains your Application Layouts.
 
-**This directory is not required, to 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/views#layouts).

layouts/default.vue

 <template>
   <div>
-    <nuxt/>
+    <nuxt />
   </div>
 </template>
 
 <style>
-html
-{
-  font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+html {
+  font-family: 'Source Sans Pro', -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    Roboto, 'Helvetica Neue', Arial, sans-serif;
   font-size: 16px;
   word-spacing: 1px;
   -ms-text-size-adjust: 100%;
@@ -16,13 +16,15 @@ html
   -webkit-font-smoothing: antialiased;
   box-sizing: border-box;
 }
-*, *:before, *:after
-{
+
+*,
+*:before,
+*:after {
   box-sizing: border-box;
   margin: 0;
 }
-.button--green
-{
+
+.button--green {
   display: inline-block;
   border-radius: 4px;
   border: 1px solid #3b8070;
@@ -30,13 +32,13 @@ html
   text-decoration: none;
   padding: 10px 30px;
 }
-.button--green:hover
-{
+
+.button--green:hover {
   color: #fff;
   background-color: #3b8070;
 }
-.button--grey
-{
+
+.button--grey {
   display: inline-block;
   border-radius: 4px;
   border: 1px solid #35495e;
@@ -45,8 +47,8 @@ html
   padding: 10px 30px;
   margin-left: 15px;
 }
-.button--grey:hover
-{
+
+.button--grey:hover {
   color: #fff;
   background-color: #35495e;
 }

middleware/README.md

 # MIDDLEWARE
 
-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).
+**This directory is not required, you can delete it if you don't want to use it.**
 
-More informations about the usage of this directory in the documentation:
-https://nuxtjs.org/guide/routing#middleware
+This directory contains your application middleware.
+Middleware let you define custom functions that can be run before rendering either a page or a group of pages.
 
-**This directory is not required, to 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/routing#middleware).

nuxt.config.js

-module.exports = {
+import pkg from './package'
+
+export default {
+  mode: 'universal',
+
   /*
   ** Headers of the page
   */
   head: {
-    title: 'starter',
+    title: pkg.name,
     meta: [
       { charset: 'utf-8' },
       { name: 'viewport', content: 'width=device-width, initial-scale=1' },
-      { hid: 'description', name: 'description', content: 'Nuxt.js project' }
+      { hid: 'description', name: 'description', content: pkg.description }
     ],
     link: [
       { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }
@@ -17,7 +21,7 @@ module.exports = {
   /*
   ** Customize the progress-bar color
   */
-  loading: { color: '#3B8070' },
+  loading: { color: '#fff' },
 
   /*
   ** Customize the generated output folder
@@ -33,15 +37,34 @@ module.exports = {
     base: '/nuxt/'
   },
 
+  /*
+  ** Global CSS
+  */
+  css: [
+  ],
+
+  /*
+  ** Plugins to load before mounting the App
+  */
+  plugins: [
+  ],
+
+  /*
+  ** Nuxt.js modules
+  */
+  modules: [
+  ],
+
   /*
   ** Build configuration
   */
   build: {
     /*
-    ** Run ESLINT on save
+    ** You can extend webpack config here
     */
-    extend (config, ctx) {
-      if (ctx.isClient) {
+    extend(config, ctx) {
+      // Run ESLint on save
+      if (ctx.isDev && ctx.isClient) {
         config.module.rules.push({
           enforce: 'pre',
           test: /\.(js|vue)$/,

package.json

 {
   "name": "nuxt-gitlab-pages",
   "version": "1.0.0",
-  "description": "Nuxt example for Gitlab Pages",
-  "author": {
-    "name": "Alexandre Villeneuve",
-    "email": "haleksviller@gmail.com"
-  },
+  "description": "Nuxt.js example for GitLab Pages",
   "private": true,
-  "dependencies": {
-    "nuxt": "latest"
-  },
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
@@ -18,13 +11,23 @@
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
     "precommit": "npm run lint"
   },
+  "dependencies": {
+    "cross-env": "^5.2.0",
+    "nuxt": "^2.4.0"
+  },
   "devDependencies": {
-    "babel-eslint": "^7.1.1",
-    "eslint": "^3.15.0",
-    "eslint-config-standard": "^6.2.1",
-    "eslint-loader": "^1.6.1",
-    "eslint-plugin-html": "^2.0.0",
-    "eslint-plugin-promise": "^3.4.1",
-    "eslint-plugin-standard": "^2.0.1"
+    "nodemon": "^1.18.9",
+    "@nuxtjs/eslint-config": "^0.0.1",
+    "babel-eslint": "^10.0.1",
+    "eslint": "^5.15.1",
+    "eslint-config-standard": ">=12.0.0",
+    "eslint-plugin-import": ">=2.16.0",
+    "eslint-plugin-jest": ">=22.3.0",
+    "eslint-plugin-node": ">=8.0.1",
+    "eslint-plugin-nuxt": ">=0.4.2",
+    "eslint-plugin-promise": ">=4.0.1",
+    "eslint-plugin-standard": ">=4.0.0",
+    "eslint-loader": "^2.1.2",
+    "eslint-plugin-vue": "^5.2.2"
   }
 }

pages/README.md

 # 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.
+The framework reads all the `*.vue` files inside this directory and creates the router of your application.
 
-More informations about the usage of this directory in the documentation:
-https://nuxtjs.org/guide/routing
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/routing).

pages/index.vue

 <template>
   <section class="container">
     <div>
-      <logo/>
+      <logo />
       <h1 class="title">
-        NUXT
+        nuxt-gitlab-pages
       </h1>
       <h2 class="subtitle">
-        Universal Vue.js Application
+        Nuxt.js example for GitLab Pages
       </h2>
       <div class="links">
-        <a href="https://nuxtjs.org/" target="_blank" class="button--green">Documentation</a>
-        <a href="https://github.com/nuxt/nuxt.js" target="_blank" class="button--grey">Github</a>
+        <a
+          href="https://nuxtjs.org/"
+          target="_blank"
+          class="button--green"
+        >Documentation</a>
+        <a
+          href="https://github.com/nuxt/nuxt.js"
+          target="_blank"
+          class="button--grey"
+        >GitHub</a>
       </div>
     </div>
   </section>
 </template>
 
 <script>
-import Logo from '~components/Logo.vue'
+import Logo from '~/components/Logo.vue'
 
 export default {
   components: {
@@ -27,33 +35,34 @@ export default {
 </script>
 
 <style>
-.container
-{
+.container {
+  margin: 0 auto;
   min-height: 100vh;
   display: flex;
   justify-content: center;
   align-items: center;
   text-align: center;
 }
-.title
-{
-  font-family: "Quicksand", "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; /* 1 */
+
+.title {
+  font-family: 'Quicksand', 'Source Sans Pro', -apple-system, BlinkMacSystemFont,
+    'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
   display: block;
   font-weight: 300;
   font-size: 100px;
   color: #35495e;
   letter-spacing: 1px;
 }
-.subtitle
-{
+
+.subtitle {
   font-weight: 300;
   font-size: 42px;
   color: #526488;
   word-spacing: 5px;
   padding-bottom: 15px;
 }
-.links
-{
+
+.links {
   padding-top: 15px;
 }
 </style>

plugins/README.md

 # PLUGINS
 
-This directory contains your Javascript plugins that you want to run before instantiating the root vue.js application.
+**This directory is not required, you can delete it if you don't want to use it.**
 
-More informations about the usage of this directory in the documentation:
-https://nuxtjs.org/guide/plugins
+This directory contains Javascript plugins that you want to run before mounting the root Vue.js application.
 
-**This directory is not required, to 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/plugins).

static/README.md

 # STATIC
 
-This directory contains your static files.
-Each file inside this directory is mapped to /.
+**This directory is not required, you can delete it if you don't want to use it.**
 
-Example: /static/robots.txt is mapped as /robots.txt.
+This directory contains your static files.
+Each file inside this directory is mapped to `/`.
+Thus you'd want to delete this README.md before deploying to production.
 
-More informations about the usage of this directory in the documentation:
-https://nuxtjs.org/guide/assets#static
+Example: `/static/robots.txt` is mapped as `/robots.txt`.
 
-**This directory is not required, to 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#static).

store/README.md

 # STORE
 
+**This directory is not required, you can delete it if you don't want to use it.**
+
 This directory contains your Vuex Store files.
 Vuex Store option is implemented in the Nuxt.js framework.
-Creating a index.js file in this directory activate the option in the framework automatically.
 
-More informations about the usage of this directory in the documentation:
-https://nuxtjs.org/guide/vuex-store
+Creating a file in this directory automatically activates the option in the framework.
 
-**This directory is not required, to 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/vuex-store).