Move to lucide-icons (#36) and fix @gorymoon/minecraft-text (#37)

* remove fontawesome deps to allow for installing

* fix building, except for gradle

* finish moving to lucide over fontawesome

* remove package-lock.json (doesn't seem to be in the repo)

Author: AnotherPillow

gradlew

@@ -5,10 +5,6 @@
   "dependencies": {
     "@babel/core": "7.16.10",
     "@babel/preset-env": "7.16.10",
-    "@fortawesome/fontawesome-svg-core": "^1.2.36",
-    "@fortawesome/free-brands-svg-icons": "^5.15.4",
-    "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@fortawesome/vue-fontawesome": "^2.0.6",
     "@gorymoon/minecraft-text": "^1.0.1",
     "@types/leaflet": "1.7.8",
     "babel-loader": "8.2.3",
@@ -30,6 +26,7 @@
     "intersection-observer": "0.12.0",
     "leaflet": "^1.7.1",
     "leaflet-rotatedmarker": "0.2.0",
+    "lucide-vue": "^0.517.0",
     "mini-css-extract-plugin": "2.5.2",
     "regenerator-runtime": "^0.13.9",
     "terser-webpack-plugin": "5.3.0",

package.json

@@ -13,18 +13,16 @@ import "leaflet/dist/leaflet.css"
 import "../css/index.css"
 
 import { LCircleMarker, LControl, LMap, LMarker, LPolygon, LTileLayer, LTooltip } from "vue2-leaflet"
-import { faCogs, faCube, faExpandArrowsAlt, faFileAlt, faGlobeEurope, faLocationArrow, faTimesCircle } from "@fortawesome/free-solid-svg-icons"
+import { Settings, Box, Expand, Navigation, Earth, File, CircleX } from 'lucide-vue'
 
 import Buefy, { SnackbarProgrammatic as Snackbar } from "buefy"
-import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"
 import { Icon } from "leaflet"
 import MarkerIcon from "leaflet/dist/images/marker-icon.png"
 import MarkerIcon2x from "leaflet/dist/images/marker-icon-2x.png"
 import MarkerShadow from "leaflet/dist/images/marker-shadow.png"
 import Vue from "vue"
 
 import datastore from "./datastore"
-import { library } from "@fortawesome/fontawesome-svg-core"
 import { methods } from "./methods"
 import { patch } from "./utils"
 
@@ -36,9 +34,13 @@ window.datastore = datastore
 
 patch()
 
-library.add(faCube, faLocationArrow, faGlobeEurope, faCogs, faExpandArrowsAlt, faFileAlt, faTimesCircle)
-
-Vue.component("font-awesome-icon", FontAwesomeIcon)
+Vue.component('lucide-icon-settings', Settings)
+Vue.component('lucide-icon-box', Box)
+Vue.component('lucide-icon-expand', Expand)
+Vue.component('lucide-icon-navigation', Navigation)
+Vue.component('lucide-icon-earth', Earth)
+Vue.component('lucide-icon-file', File)
+Vue.component('lucide-icon-circle-x', CircleX)
 
 Vue.component("l-circle-marker", LCircleMarker)
 Vue.component("l-control", LControl)

src/main/js/index.js

@@ -78,15 +78,14 @@
                    class="info-pane">
             <b-tooltip :animated="true" label="Player biome" position="is-left">
                 <div>
-                    <font-awesome-icon icon="cube"></font-awesome-icon>
+                    <lucide-icon-box></lucide-icon-box>
                     <span v-text="playerBiome"></span>
                 </div>
             </b-tooltip>
 
             <b-tooltip :animated="true" label="Player coordinates" position="is-left">
                 <div class="truncate">
-                    <font-awesome-icon icon="location-arrow"></font-awesome-icon>
-
+                    <lucide-icon-navigation></lucide-icon-navigation>
                     <span class="light-text">x:</span>
                     <span v-text="playerX"></span>
                     <span class="light-text">z:</span>
@@ -101,7 +100,7 @@
                    class="info-pane">
             <b-tooltip :animated="true" label="World" position="is-left">
                 <div>
-                    <font-awesome-icon icon="globe-europe"></font-awesome-icon>
+                    <lucide-icon-earth></lucide-icon-earth>
                     <span v-text="playerWorld"></span>
                 </div>
             </b-tooltip>
@@ -116,7 +115,7 @@
                        position="is-left">
                 <div>
                     <a @click="settingsVisible = !settingsVisible">
-                        <font-awesome-icon icon="cogs"></font-awesome-icon>
+                        <lucide-icon-settings></lucide-icon-settings>
                     </a>
                 </div>
             </b-tooltip>
@@ -151,13 +150,13 @@
                    class="leaflet-bar leaflet-control">
             <b-tooltip :animated="true" class="is-flex" label="Toggle full-screen" position="is-right">
                 <a @click="toggleFullScreen">
-                    <font-awesome-icon icon="expand-arrows-alt"></font-awesome-icon>
+                    <lucide-icon-expand></lucide-icon-expand>
                 </a>
             </b-tooltip>
 
             <b-tooltip :animated="true" class="is-flex" label="View journeymap.log" position="is-right">
                 <a @click="logModalActive = true" id="logButton">
-                    <font-awesome-icon icon="file-alt"></font-awesome-icon>
+                    <lucide-icon-file></lucide-icon-file>
                 </a>
             </b-tooltip>
         </l-control>
@@ -243,7 +242,7 @@
 
                @click="settingsVisible = !settingsVisible">
 
-                <font-awesome-icon icon="times-circle"></font-awesome-icon>
+                <lucide-icon-circle-x></lucide-icon-circle-x>
             </a>
         </div>
         <div class="content">

src/main/resources/assets/journeymap/web/index.html

@@ -79,6 +79,18 @@ module.exports = {
                 test: /\.vue$/,
                 loader: "vue-loader",
             },
+            {
+                test: /\.m?js$/,
+                resolve: {
+                    fullySpecified: false,
+                },
+                include: [
+                    path.resolve(
+                        __dirname,
+                        'node_modules/@gorymoon/minecraft-text'
+                    ),
+                ],
+            },
         ],
     },
 }