From c199f00c297909256e3d08def10643266c6d7cff Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Wed, 6 Apr 2022 22:50:32 -0600 Subject: [PATCH] Upgrade to FontAwesome6, start adding crypto (#9) --- scripts/remove_bloat.sh | 1 - www/assets/css/app.css | 6 ------ www/package-lock.json | 18 +++++++++--------- www/package.json | 2 +- www/pages/crypto.html | 32 ++++++++++++++++++++++++++++++++ www/routes.js | 37 +++++++++++++++++++++++++++---------- 6 files changed, 69 insertions(+), 27 deletions(-) create mode 100644 www/pages/crypto.html diff --git a/scripts/remove_bloat.sh b/scripts/remove_bloat.sh index d7d18e2..660dc55 100755 --- a/scripts/remove_bloat.sh +++ b/scripts/remove_bloat.sh @@ -23,7 +23,6 @@ cd @fortawesome/fontawesome-pro rm -rf {js,less,metadata,scss,sprites,svgs} find css -type f -not -name 'all.min.css' -delete find webfonts -type f -not -name '*.woff2' -delete -find webfonts -type f -name "fa-brands-400.*" -delete find . -type f -name '*.tgz' -delete # for some reason it's packaging an 18MB tarball sometimes cd $DIR diff --git a/www/assets/css/app.css b/www/assets/css/app.css index 6fc5370..c2abfb7 100644 --- a/www/assets/css/app.css +++ b/www/assets/css/app.css @@ -18,12 +18,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. --background-image: url(../images/background-transparent.svg); } -/* -Framework7 and FontAwesome both have a .fab class -*/ -.fafab { - font-family: "Font Awesome 5 Brands"; -} .fab { -webkit-text-size-adjust: 100%; diff --git a/www/package-lock.json b/www/package-lock.json index 359824c..7496f5b 100644 --- a/www/package-lock.json +++ b/www/package-lock.json @@ -1,15 +1,15 @@ { "name": "HelenaExpressApp", - "version": "1.7.2", + "version": "1.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "HelenaExpressApp", - "version": "1.7.2", + "version": "1.8.1", "license": "MPL-2.0", "dependencies": { - "@fortawesome/fontawesome-pro": "^5.15.4", + "@fortawesome/fontawesome-pro": "^6", "@zxing/library": "^0.15.2", "framework7": "^6.3.5", "jquery": "^3.6.0", @@ -18,9 +18,9 @@ } }, "node_modules/@fortawesome/fontawesome-pro": { - "version": "5.15.4", - "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/5.15.4/fontawesome-pro-5.15.4.tgz", - "integrity": "sha512-ApOqpDdKgA79xfLZH3B5PucZxj+TZyQUSrZ4bKkbJCR+zjmveQ4/gp/uXc5bNNhsdtJUy16BYJ/lAVydca2Y5Q==", + "version": "6.1.1", + "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/6.1.1/fontawesome-pro-6.1.1.tgz", + "integrity": "sha512-0w6GM8sCXNpcBLUz4bx61JvjjoCvfEIz5wBz2KjLNw9qk1F2XiUWuifXobvLbwaA7kqPGBRPo3U8Zw7zyaJ9sA==", "engines": { "node": ">=6" } @@ -432,9 +432,9 @@ }, "dependencies": { "@fortawesome/fontawesome-pro": { - "version": "5.15.4", - "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/5.15.4/fontawesome-pro-5.15.4.tgz", - "integrity": "sha512-ApOqpDdKgA79xfLZH3B5PucZxj+TZyQUSrZ4bKkbJCR+zjmveQ4/gp/uXc5bNNhsdtJUy16BYJ/lAVydca2Y5Q==" + "version": "6.1.1", + "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/6.1.1/fontawesome-pro-6.1.1.tgz", + "integrity": "sha512-0w6GM8sCXNpcBLUz4bx61JvjjoCvfEIz5wBz2KjLNw9qk1F2XiUWuifXobvLbwaA7kqPGBRPo3U8Zw7zyaJ9sA==" }, "@mapbox/geojson-rewind": { "version": "0.5.0", diff --git a/www/package.json b/www/package.json index a2d07ae..e0d2dfb 100644 --- a/www/package.json +++ b/www/package.json @@ -4,7 +4,7 @@ "main": "index.html", "license": "MPL-2.0", "dependencies": { - "@fortawesome/fontawesome-pro": "^5.15.4", + "@fortawesome/fontawesome-pro": "^6", "@zxing/library": "^0.15.2", "framework7": "^6.3.5", "jquery": "^3.6.0", diff --git a/www/pages/crypto.html b/www/pages/crypto.html new file mode 100644 index 0000000..ecac78d --- /dev/null +++ b/www/pages/crypto.html @@ -0,0 +1,32 @@ + + +
+ +
+
+
+
+ + + Back + +
+
Wallet
+
+
+ + +
+
+
+
+
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/www/routes.js b/www/routes.js index 60b5578..ea30c32 100644 --- a/www/routes.js +++ b/www/routes.js @@ -15,6 +15,7 @@ var pagesToCompile = [ "shop", "shoppingcart_fragment", "rateresult", + "crypto", "account", "trackresult", "settings", @@ -41,6 +42,16 @@ var routes = [ } } }, + { + path: '/crypto', + content: compiledPages.crypto(), + name: 'crypto', + on: { + pageAfterIn: function () { + + } + } + }, { path: '/home', name: 'home', @@ -70,31 +81,37 @@ var routes = [ { title: "Send a Package", href: "/send", - icon: "fad fa-boxes", + icon: "fa-duotone fa-box-alt", text: "Find a drop box or schedule a pickup." }, { title: "Notarize a Document", href: "/appointment/notary", - icon: "fad fa-file-signature", + icon: "fa-duotone fa-file-signature", text: "Book a mobile notary visit." }, { title: "Write a Telegram", href: "/telegram", - icon: "fad fa-typewriter", + icon: "fa-duotone fa-typewriter", text: "Send a hand-delivered telegram anywhere in the Helena area." }, { title: "Shop for Supplies", href: "/shop", - icon: "fad fa-shopping-cart", + icon: "fa-duotone fa-shopping-cart", text: "Get boxes, labels, and shipping supplies delivered to your door." }, + { + title: "Wallet", + href: "/crypto", + icon: "fa-duotone fa-wallet", + text: "Check your crypto wallet balance and pay people with cryptocurrency." + }, { title: "Manage My Account", href: "/account", - icon: "fad fa-user-circle", + icon: "fa-duotone fa-user-circle", text: "Get account number, check rewards points, update payment method, and more." }, ] @@ -112,19 +129,19 @@ var routes = [ { title: "Use a Drop Box", href: "/dropandsend", - icon: "fad fa-box-alt", + icon: "fa-duotone fa-box-alt", text: "Bring your package to a Drop and Send location and we'll ship it for you. No postage or appointment needed." }, { title: "Request a Pickup", href: "/pickup", - icon: "fad fa-home", + icon: "fa-duotone fa-home", text: "Leave your package on your porch and we'll pick it up and ship it for you. No postage or appointment needed." }, { title: "Book an Appointment", href: "/appointment/shipping", - icon: "fad fa-calendar-alt", + icon: "fa-duotone fa-calendar-alt", text: "A courier will come to you on your schedule. No account required." } ] @@ -142,13 +159,13 @@ var routes = [ { title: "Package Pickup", text: "A courier will come to you and ship your mail, packages, etc.", - icon: "fad fa-hand-holding-box", + icon: "fa-duotone fa-hand-holding-box", serviceid: "shipping" }, { title: "Mobile Notary", text: "A notary public will come to you and notarize your documents.", - icon: "fad fa-file-signature", + icon: "fa-duotone fa-file-signature", serviceid: "notary" } ]