diff --git a/_redirects b/_redirects deleted file mode 100644 index 7b45c9c..0000000 --- a/_redirects +++ /dev/null @@ -1,11 +0,0 @@ -http://gardev.com/* https://gar.dev/:splat 301! -https://gardev.com/* https://gar.dev/:splat 301! - -http://www.gardev.com/* https://gar.dev/:splat 301! -https://www.gardev.com/* https://gar.dev/:splat 301! - -http://georgi.dev/* https://gar.dev/:splat 301! -https://georgi.dev/* https://gar.dev/:splat 301! - -http://www.georgi.dev/* https://gar.dev/:splat 301! -https://www.georgi.dev/* https://gar.dev/:splat 301! diff --git a/nuxt.config.ts b/nuxt.config.ts index 6d6277a..3f776b4 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -28,26 +28,76 @@ export default { ] }, css: ['~/assets/styles/main.scss'], - modules: [ - '@nuxtjs/style-resources', - [ - 'nuxt-fontawesome', - { - component: 'fa', - imports: [ - { - set: '@fortawesome/free-solid-svg-icons', - icons: ['fas'] - }, - { - set: '@fortawesome/free-brands-svg-icons', - icons: ['fab'] - } - ] - } - ] - ], + modules: ['@bazzite/nuxt-netlify', '@nuxtjs/style-resources', 'nuxt-fontawesome'], + styleResources: { scss: ['assets/styles/variables.scss'] + }, + + fontawesome: { + component: 'fa', + imports: [ + { + set: '@fortawesome/free-solid-svg-icons', + icons: ['fas'] + }, + { + set: '@fortawesome/free-brands-svg-icons', + icons: ['fab'] + } + ] + }, + + netlify: { + redirects: [ + { + from: 'http://gardev.com/*', + to: 'https://gar.dev/:splat', + status: 301, + force: true + }, + { + from: 'https://gardev.com/*', + to: 'https://gar.dev/:splat', + status: 301, + force: true + }, + { + from: 'http://www.gardev.com/*', + to: 'https://gar.dev/:splat', + status: 301, + force: true + }, + { + from: 'https://www.gardev.com/*', + to: 'https://gar.dev/:splat', + status: 301, + force: true + }, + { + from: 'http://georgi.dev/*', + to: 'https://gar.dev/:splat', + status: 301, + force: true + }, + { + from: 'https://georgi.dev/*', + to: 'https://gar.dev/:splat', + status: 301, + force: true + }, + { + from: 'http://www.georgi.dev/*', + to: 'https://gar.dev/:splat', + status: 301, + force: true + }, + { + from: 'https://www.georgi.dev/*', + to: 'https://gar.dev/:splat', + status: 301, + force: true + } + ] } }; diff --git a/package-lock.json b/package-lock.json index 61db1ba..1fdb176 100644 --- a/package-lock.json +++ b/package-lock.json @@ -901,6 +901,16 @@ "to-fast-properties": "^2.0.0" } }, + "@bazzite/nuxt-netlify": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@bazzite/nuxt-netlify/-/nuxt-netlify-0.1.1.tgz", + "integrity": "sha512-zeiTu780WmloHlG0ZX5vLExUTIF5rC+8LpCkTdCzjS08D6GA4a+IpuX9hM9F9sCmg0MMlLzRrXBZYnobTxmOtQ==", + "requires": { + "consola": "^2.7.1", + "fs-extra": "^8.0.1", + "lodash.template": "^4.4.0" + } + }, "@csstools/convert-colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz", diff --git a/package.json b/package.json index 73d216b..53c1c2d 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-property-decorator": "^8.4.0" }, "devDependencies": { + "@bazzite/nuxt-netlify": "^0.1.1", "@nuxt/typescript-build": "^0.5.6", "@nuxtjs/eslint-config-typescript": "^1.0.2", "@nuxtjs/google-analytics": "^2.2.3",