diff --git a/.gitignore b/.gitignore index 185e663..3d2af3f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules /dist +.netlify # local env files .env.local diff --git a/package-lock.json b/package-lock.json index ca75744..1dfb256 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8231,6 +8231,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/husky/-/husky-1.3.1.tgz", "integrity": "sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==", + "dev": true, "requires": { "cosmiconfig": "^5.0.7", "execa": "^1.0.0", @@ -8247,12 +8248,14 @@ "ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "dev": true }, "is-ci": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", + "dev": true, "requires": { "ci-info": "^2.0.0" } @@ -8261,6 +8264,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dev": true, "requires": { "error-ex": "^1.3.1", "json-parse-better-errors": "^1.0.1" @@ -8269,12 +8273,14 @@ "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true }, "read-pkg": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz", "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=", + "dev": true, "requires": { "normalize-package-data": "^2.3.2", "parse-json": "^4.0.0", @@ -12569,6 +12575,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", + "dev": true, "requires": { "find-up": "^3.0.0" } @@ -14099,7 +14106,8 @@ "run-node": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/run-node/-/run-node-1.0.0.tgz", - "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==" + "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==", + "dev": true }, "run-queue": { "version": "1.0.3", diff --git a/package.json b/package.json index 611b854..2efd8a9 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,6 @@ "admin": "node bin/admin" }, "dependencies": { - "husky": "^1.3.1", "lint-staged": "^8.1.5", "register-service-worker": "^1.6.2", "stylelint": "^9.10.1", @@ -40,6 +39,7 @@ "babel-jest": "^24.7.1", "eslint": "^5.16.0", "eslint-plugin-vue": "^5.0.0", + "husky": "^1.3.1", "js-yaml": "^3.13.1", "node-sass": "^4.11.0", "normalize.css": "^8.0.1", diff --git a/public/_redirects b/public/_redirects new file mode 100644 index 0000000..ad37e2c --- /dev/null +++ b/public/_redirects @@ -0,0 +1 @@ +/* /index.html 200 diff --git a/public/admin/config.yml b/public/admin/config.yml index da31d8d..048094d 100644 --- a/public/admin/config.yml +++ b/public/admin/config.yml @@ -92,7 +92,7 @@ collections: widget: string hint: >- An optional, localised URL which will be used for this page (e.g. - https://euromat.info/#/ + https://euromat.info/#/) optional: true - label: '[Meta] Site Name' name: title @@ -142,7 +142,7 @@ collections: widget: string hint: >- An optional, localised URL which will be used for this page (e.g. - https://euromat.info/#/ + https://euromat.info/#/) optional: true - label: '[Meta] Site Name' name: title @@ -183,7 +183,7 @@ collections: widget: string hint: >- An optional, localised URL which will be used for this page (e.g. - https://euromat.info/#/ + https://euromat.info/#/) optional: true - label: '[Meta] Site Name' name: title @@ -228,7 +228,7 @@ collections: widget: string hint: >- An optional, localised URL which will be used for this page (e.g. - https://euromat.info/#/ + https://euromat.info/#/) optional: true - label: '[Meta] Site Name' name: title @@ -266,7 +266,7 @@ collections: widget: string hint: >- An optional, localised URL which will be used for this page (e.g. - https://euromat.info/#/ + https://euromat.info/#/) optional: true - label: '[Meta] Site Name' name: title @@ -311,7 +311,7 @@ collections: widget: string hint: >- An optional, localised URL which will be used for this page (e.g. - https://euromat.info/#/ + https://euromat.info/#/) optional: true - label: '[Meta] Site Name' name: title diff --git a/src/router/index.js b/src/router/index.js index 7cdeee9..fcb98f7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -15,7 +15,8 @@ import { routes as fourzerofour } from '@/app/404' Vue.use(Router) const router = new Router({ - mode: 'hash', + // mode: process.env.NODE_ENV === 'production' ? 'history' : 'hash', + mode: 'history', routes: [ ...intro, ...euromat,