diff --git a/index.html b/index.html index 3c8c78f..1adf7e8 100644 --- a/index.html +++ b/index.html @@ -1,21 +1,26 @@ - - <%= productName %> - - - - - + + + <%= productName %> + - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index ccac3aa..f571595 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "multiglancer", "version": "0.0.1", "dependencies": { + "@fortawesome/fontawesome-free": "^6.5.1", "@quasar/extras": "^1.16.4", "quasar": "^2.6.0", "vue": "^3.0.0", @@ -36,6 +37,15 @@ "node": ">=6.0.0" } }, + "node_modules/@fortawesome/fontawesome-free": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz", + "integrity": "sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", diff --git a/package.json b/package.json index 2c522e4..9d0a3a7 100644 --- a/package.json +++ b/package.json @@ -11,14 +11,15 @@ "build": "quasar build" }, "dependencies": { + "@fortawesome/fontawesome-free": "^6.5.1", "@quasar/extras": "^1.16.4", "quasar": "^2.6.0", "vue": "^3.0.0", "vue-router": "^4.0.0" }, "devDependencies": { - "@types/node": "^12.20.21", "@quasar/app-vite": "^1.3.0", + "@types/node": "^12.20.21", "autoprefixer": "^10.4.2", "typescript": "^4.5.4" }, @@ -27,4 +28,4 @@ "npm": ">= 6.13.4", "yarn": ">= 1.21.1" } -} \ No newline at end of file +} diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index ae7bbdb..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/favicon.png b/public/favicon.png new file mode 100644 index 0000000..32c0285 Binary files /dev/null and b/public/favicon.png differ diff --git a/public/icons/favicon-128x128.png b/public/icons/favicon-128x128.png deleted file mode 100644 index 1401176..0000000 Binary files a/public/icons/favicon-128x128.png and /dev/null differ diff --git a/public/icons/favicon-16x16.png b/public/icons/favicon-16x16.png deleted file mode 100644 index 679063a..0000000 Binary files a/public/icons/favicon-16x16.png and /dev/null differ diff --git a/public/icons/favicon-32x32.png b/public/icons/favicon-32x32.png deleted file mode 100644 index fd1fbc6..0000000 Binary files a/public/icons/favicon-32x32.png and /dev/null differ diff --git a/public/icons/favicon-96x96.png b/public/icons/favicon-96x96.png deleted file mode 100644 index e93b80a..0000000 Binary files a/public/icons/favicon-96x96.png and /dev/null differ diff --git a/quasar.config.js b/quasar.config.js index 9daaaac..368c8c7 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -34,6 +34,7 @@ module.exports = configure(function (/* ctx */) { // https://github.com/quasarframework/quasar/tree/dev/extras extras: [ + 'fontawesome-v5', // 'ionicons-v4', // 'mdi-v5', // 'fontawesome-v6', @@ -89,6 +90,7 @@ module.exports = configure(function (/* ctx */) { config: { dark: true }, // iconSet: 'material-icons', // Quasar icon set + iconSet: 'fontawesome-v5', // lang: 'en-US', // Quasar language pack // For special cases outside of where the auto-import strategy can have an impact diff --git a/src/components/ViewsComponent.vue b/src/components/ViewsComponent.vue index 7ec42e3..5d83dc6 100644 --- a/src/components/ViewsComponent.vue +++ b/src/components/ViewsComponent.vue @@ -24,8 +24,9 @@ @@ -50,6 +51,5 @@ diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index e7a8ed1..69ef495 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -1,22 +1,27 @@