diff --git a/.eslintrc.js b/.eslintrc.js index 08335fa5..5c067fcc 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -2,16 +2,14 @@ module.exports = { root: true, env: { browser: true, - node: true, + node: true }, extends: [ '@nuxtjs/eslint-config-typescript', - 'prettier', - 'prettier/vue', - 'plugin:prettier/recommended', - 'plugin:nuxt/recommended', + 'plugin:nuxt/recommended' ], - plugins: ['prettier'], // add your custom rules here - rules: {}, + rules: { + 'space-before-function-paren': 'off' + } } diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index b2095be8..00000000 --- a/.prettierrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "semi": false, - "singleQuote": true -} diff --git a/assets/README.md b/assets/README.md deleted file mode 100644 index 34766f93..00000000 --- a/assets/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# 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). diff --git a/assets/variables.scss b/assets/variables.scss deleted file mode 100644 index f60e6090..00000000 --- a/assets/variables.scss +++ /dev/null @@ -1,4 +0,0 @@ -// Ref: https://github.com/nuxt-community/vuetify-module#customvariables -// -// The variables you want to modify -// $font-size-root: 20px; diff --git a/components/Logo.vue b/components/Logo.vue deleted file mode 100644 index 6c728541..00000000 --- a/components/Logo.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - diff --git a/components/VuetifyLogo.vue b/components/VuetifyLogo.vue deleted file mode 100644 index 9a609379..00000000 --- a/components/VuetifyLogo.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/jest.config.js b/jest.config.js index 152978fd..2a95967d 100644 --- a/jest.config.js +++ b/jest.config.js @@ -2,17 +2,17 @@ module.exports = { moduleNameMapper: { '^@/(.*)$': '/$1', '^~/(.*)$': '/$1', - '^vue$': 'vue/dist/vue.common.js', + '^vue$': 'vue/dist/vue.common.js' }, moduleFileExtensions: ['ts', 'js', 'vue', 'json'], transform: { '^.+\\.ts$': 'ts-jest', '^.+\\.js$': 'babel-jest', - '.*\\.(vue)$': 'vue-jest', + '.*\\.(vue)$': 'vue-jest' }, collectCoverage: true, collectCoverageFrom: [ '/components/**/*.vue', - '/pages/**/*.vue', - ], + '/pages/**/*.vue' + ] } diff --git a/layouts/default.vue b/layouts/default.vue index 48daba20..02d3826e 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -50,7 +50,9 @@ - mdi-repeat + + mdi-repeat + Switch drawer (click me) @@ -73,19 +75,19 @@ export default { { icon: 'mdi-apps', title: 'Welcome', - to: '/', + to: '/' }, { icon: 'mdi-chart-bubble', title: 'Inspire', - to: '/inspire', - }, + to: '/inspire' + } ], miniVariant: false, right: true, rightDrawer: false, - title: 'Vuetify.js', + title: 'Vuetify.js' } - }, + } } diff --git a/layouts/error.vue b/layouts/error.vue index 80f4a26f..3b535fee 100644 --- a/layouts/error.vue +++ b/layouts/error.vue @@ -6,7 +6,9 @@

{{ otherError }}

- Home page + + Home page + @@ -16,22 +18,22 @@ export default { props: { error: { type: Object, - default: null, - }, + default: null + } }, data() { return { pageNotFound: '404 Not Found', - otherError: 'An error occurred', + otherError: 'An error occurred' } }, head() { const title = this.error.statusCode === 404 ? this.pageNotFound : this.otherError return { - title, + title } - }, + } } diff --git a/middleware/README.md b/middleware/README.md deleted file mode 100644 index 01595ded..00000000 --- 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. -Middleware let you define custom functions that can be run before rendering either a page or a group of pages. - -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 aa93b17d..fd43999b 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -14,9 +14,9 @@ export default { meta: [ { charset: 'utf-8' }, { name: 'viewport', content: 'width=device-width, initial-scale=1' }, - { hid: 'description', name: 'description', content: '' }, + { hid: 'description', name: 'description', content: '' } ], - link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }], + link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }] }, // Global CSS (https://go.nuxtjs.dev/config-css) @@ -33,7 +33,7 @@ export default { // https://go.nuxtjs.dev/typescript '@nuxt/typescript-build', // https://go.nuxtjs.dev/vuetify - '@nuxtjs/vuetify', + '@nuxtjs/vuetify' ], // Modules (https://go.nuxtjs.dev/config-modules) @@ -41,7 +41,7 @@ export default { // https://go.nuxtjs.dev/axios '@nuxtjs/axios', // https://go.nuxtjs.dev/pwa - '@nuxtjs/pwa', + '@nuxtjs/pwa' ], // Axios module configuration (https://go.nuxtjs.dev/config-axios) @@ -60,12 +60,12 @@ export default { info: colors.teal.lighten1, warning: colors.amber.base, error: colors.deepOrange.accent4, - success: colors.green.accent3, - }, - }, - }, + success: colors.green.accent3 + } + } + } }, // Build Configuration (https://go.nuxtjs.dev/config-build) - build: {}, + build: {} } diff --git a/package-lock.json b/package-lock.json index 0c90f685..d8fcad44 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5366,6 +5366,15 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, + "copy-anything": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz", + "integrity": "sha512-lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g==", + "dev": true, + "requires": { + "is-what": "^3.7.1" + } + }, "copy-concurrently": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", @@ -8621,6 +8630,13 @@ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==" }, + "image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", + "dev": true, + "optional": true + }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", @@ -9075,6 +9091,12 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, + "is-what": { + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.12.0.tgz", + "integrity": "sha512-2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw==", + "dev": true + }, "is-whitespace": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz", @@ -10669,6 +10691,12 @@ "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", "dev": true }, + "klona": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz", + "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==", + "dev": true + }, "last-call-webpack-plugin": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz", @@ -10707,6 +10735,85 @@ "launch-editor": "^2.2.1" } }, + "less": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/less/-/less-4.0.0.tgz", + "integrity": "sha512-av1eEa2D0xZfF7fjLJS/Dld7zAYSLU7EOEJvuOELeaNI3i6L/81AdjbK5/pytaRkBwi7ZEa0433IDvMLskKCOw==", + "dev": true, + "requires": { + "copy-anything": "^2.0.1", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "native-request": "^1.0.5", + "parse-node-version": "^1.0.1", + "source-map": "~0.6.0", + "tslib": "^1.10.0" + }, + "dependencies": { + "make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, + "optional": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "optional": true + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } + } + }, + "less-loader": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-7.1.0.tgz", + "integrity": "sha512-EHbnRaTzHgsxnd3RK6OXSiygcCJs72+2ezXVLg+Hgl/ijUTtthKZXZh4MvQkWJr3h/SSKvxGZr7IIHzuS2KbVQ==", + "dev": true, + "requires": { + "klona": "^2.0.4", + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0" + }, + "dependencies": { + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "schema-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", + "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.6", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + } + } + } + }, "leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", @@ -11223,6 +11330,13 @@ "to-regex": "^3.0.1" } }, + "native-request": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz", + "integrity": "sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==", + "dev": true, + "optional": true + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -11814,6 +11928,12 @@ "json-parse-better-errors": "^1.0.1" } }, + "parse-node-version": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", + "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", + "dev": true + }, "parse-path": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-4.0.2.tgz", @@ -12912,12 +13032,6 @@ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, - "prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", - "dev": true - }, "prettier-linter-helpers": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", @@ -15830,6 +15944,12 @@ "resolved": "https://registry.npmjs.org/vue-no-ssr/-/vue-no-ssr-1.1.1.tgz", "integrity": "sha512-ZMjqRpWabMPqPc7gIrG0Nw6vRf1+itwf0Itft7LbMXs2g3Zs/NFmevjZGN1x7K3Q95GmIjWbQZTVerxiBxI+0g==" }, + "vue-property-decorator": { + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz", + "integrity": "sha512-xYA8MkZynPBGd/w5QFJ2d/NM0z/YeegMqYTphy7NJQXbZcuU6FC6AOdUAcy4SXP+YnkerC6AfH+ldg7PDk9ESQ==", + "dev": true + }, "vue-router": { "version": "3.4.9", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.9.tgz", diff --git a/package.json b/package.json index aa28e8cf..42d55d7f 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "scripts": { "dev": "nuxt-ts", - "build": "nuxt-ts build", + "build": "npm run generate", "start": "nuxt-ts start", "generate": "nuxt-ts generate", "lint:js": "eslint --ext .js,.vue --ignore-path .gitignore .", @@ -34,8 +34,10 @@ "eslint-plugin-nuxt": "^1.0.0", "eslint-plugin-prettier": "^3.1.4", "jest": "^26.5.0", - "prettier": "^2.1.2", + "less": "^4.0.0", + "less-loader": "^7.1.0", "ts-jest": "^26.4.1", - "vue-jest": "^3.0.4" + "vue-jest": "^3.0.4", + "vue-property-decorator": "^9.1.2" } } diff --git a/pages/index.vue b/pages/index.vue index 4bb8197c..0b734e1e 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,15 +1,13 @@ + + diff --git a/pages/inspire.vue b/pages/inspire.vue index 172f12f2..86232831 100644 --- a/pages/inspire.vue +++ b/pages/inspire.vue @@ -1,7 +1,7 @@