From d84f3005bd92760037a4d631b90930e3e8516e7d Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Fri, 22 Jan 2021 11:50:57 -0800 Subject: [PATCH] remove font-awesome --- frontend/nuxt.config.js | 7 ++---- frontend/package.json | 3 --- frontend/pages/_author/index.vue | 2 +- frontend/plugins/font-awesome.ts | 23 ------------------ frontend/yarn.lock | 24 ------------------- .../io/papermc/hangar/model/Category.java | 20 ++++++++-------- 6 files changed, 13 insertions(+), 66 deletions(-) delete mode 100644 frontend/plugins/font-awesome.ts diff --git a/frontend/nuxt.config.js b/frontend/nuxt.config.js index a7d611b87..d9d2f4faf 100644 --- a/frontend/nuxt.config.js +++ b/frontend/nuxt.config.js @@ -19,10 +19,10 @@ export default { }, // Global CSS: https://go.nuxtjs.dev/config-css - css: ['@fortawesome/fontawesome-svg-core/styles.css'], + css: [], // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins - plugins: ['~/plugins/api.ts', '~/plugins/auth.ts', '~/plugins/font-awesome.ts', '~/plugins/utils.ts'], + plugins: ['~/plugins/api.ts', '~/plugins/auth.ts', '~/plugins/utils.ts'], // Auto import components: https://go.nuxtjs.dev/config-components components: true, @@ -62,9 +62,6 @@ export default { // Vuetify module configuration: https://go.nuxtjs.dev/config-vuetify vuetify: { customVariables: ['~/assets/variables.scss'], - icons: { - iconfont: 'faSvg', - }, theme: { dark: true, themes: { diff --git a/frontend/package.json b/frontend/package.json index c91d68100..dc52903e9 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -31,9 +31,6 @@ "vuex": "^3.6.0" }, "devDependencies": { - "@fortawesome/fontawesome-svg-core": "^1.2.34", - "@fortawesome/free-solid-svg-icons": "^5.15.2", - "@fortawesome/vue-fontawesome": "^2.0.2", "@nuxt/types": "^2.14.12", "@nuxt/typescript-build": "^2.0.4", "@nuxtjs/dotenv": "^1.4.1", diff --git a/frontend/pages/_author/index.vue b/frontend/pages/_author/index.vue index 8db4b6d1c..fa811d4f9 100644 --- a/frontend/pages/_author/index.vue +++ b/frontend/pages/_author/index.vue @@ -68,7 +68,7 @@ interface Author { interface Button { icon: String; - action: Function; + action?: Function; url: String; name: String; } diff --git a/frontend/plugins/font-awesome.ts b/frontend/plugins/font-awesome.ts deleted file mode 100644 index d88521fc6..000000000 --- a/frontend/plugins/font-awesome.ts +++ /dev/null @@ -1,23 +0,0 @@ -import Vue from 'vue'; -import { config, dom, library } from '@fortawesome/fontawesome-svg-core'; -import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'; -import { - faAsterisk, - faComment, - faGamepad, - faGlobe, - faLock, - faMagic, - faMoneyBillAlt, - faPuzzlePiece, - faServer, - faWrench, -} from '@fortawesome/free-solid-svg-icons'; - -Vue.component('FontAwesomeIcon', FontAwesomeIcon); - -config.autoAddCss = false; - -library.add(faServer, faComment, faWrench, faMoneyBillAlt, faPuzzlePiece, faGamepad, faLock, faMagic, faGlobe, faAsterisk); - -dom.watch(); diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 5bc81af56..c6a8e6e8e 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -867,30 +867,6 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@fortawesome/fontawesome-common-types@^0.2.34": - version "0.2.34" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.34.tgz#0a8c348bb23b7b760030f5b1d912e582be4ec915" - integrity sha512-XcIn3iYbTEzGIxD0/dY5+4f019jIcEIWBiHc3KrmK/ROahwxmZ/s+tdj97p/5K0klz4zZUiMfUlYP0ajhSJjmA== - -"@fortawesome/fontawesome-svg-core@^1.2.34": - version "1.2.34" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.34.tgz#1d1a7c92537cbc2b8a83eef6b6d824b4b5b46b26" - integrity sha512-0KNN0nc5eIzaJxlv43QcDmTkDY1CqeN6J7OCGSs+fwGPdtv0yOQqRjieopBCmw+yd7uD3N2HeNL3Zm5isDleLg== - dependencies: - "@fortawesome/fontawesome-common-types" "^0.2.34" - -"@fortawesome/free-solid-svg-icons@^5.15.2": - version "5.15.2" - resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.2.tgz#25bb035de57cf85aee8072965732368ccc8e8943" - integrity sha512-ZfCU+QjaFsdNZmOGmfqEWhzI3JOe37x5dF4kz9GeXvKn/sTxhqMtZ7mh3lBf76SvcYY5/GKFuyG7p1r4iWMQqw== - dependencies: - "@fortawesome/fontawesome-common-types" "^0.2.34" - -"@fortawesome/vue-fontawesome@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.2.tgz#5b86cd2fb7b4c17e5dede722c1c2855c97eceaea" - integrity sha512-ecpKSBUWXsxRJVi/dbOds4tkKwEcBQ1JSDZFzE2jTFpF8xIh3OgTX8POIor6bOltjibr3cdEyvnDjecMwUmxhQ== - "@nodelib/fs.scandir@2.1.4": version "2.1.4" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" diff --git a/src/main/java/io/papermc/hangar/model/Category.java b/src/main/java/io/papermc/hangar/model/Category.java index a6fb23843..e7370adaf 100644 --- a/src/main/java/io/papermc/hangar/model/Category.java +++ b/src/main/java/io/papermc/hangar/model/Category.java @@ -13,16 +13,16 @@ import java.util.stream.Collectors; @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum Category { - ADMIN_TOOLS(0, "Admin Tools", "fa-server", "admin_tools"), - CHAT(1, "Chat", "fa-comment", "chat"), - DEV_TOOLS(2, "Developer Tools", "fa-wrench", "dev_tools"), - ECONOMY(3, "Economy", "fa-money-bill-alt", "economy"), - GAMEPLAY(4, "Gameplay", "fa-puzzle-piece", "gameplay"), - GAMES(5, "Games", "fa-gamepad", "games"), - PROTECTION(6, "Protection", "fa-lock", "protection"), - ROLE_PLAYING(7, "Role Playing", "fa-magic", "role_playing"), - WORLD_MANAGEMENT(8, "World Management", "fa-globe", "world_management"), - MISC(9, "Miscellaneous", "fa-asterisk", "misc"), + ADMIN_TOOLS(0, "Admin Tools", "mdi-server", "admin_tools"), + CHAT(1, "Chat", "mdi-chat", "chat"), + DEV_TOOLS(2, "Developer Tools", "mdi-wrench", "dev_tools"), + ECONOMY(3, "Economy", "mdi-cash-multiple", "economy"), + GAMEPLAY(4, "Gameplay", "mdi-puzzle", "gameplay"), + GAMES(5, "Games", "mdi-controller-classic", "games"), + PROTECTION(6, "Protection", "mdi-lock", "protection"), + ROLE_PLAYING(7, "Role Playing", "mdi-auto-fix", "role_playing"), + WORLD_MANAGEMENT(8, "World Management", "mdi-earth", "world_management"), + MISC(9, "Miscellaneous", "mdi-asterisk", "misc"), UNDEFINED(10, "Undefined", "", "undefined"); private final int value;