diff --git a/license-credits.md b/license-credits.md index c680600..dc6fee2 100644 --- a/license-credits.md +++ b/license-credits.md @@ -212,34 +212,6 @@ SOFTWARE. ----- -The following software may be included in this product: bwip-js. A copy of the source code may be downloaded from https://github.com/metafloor/bwip-js.git. This software contains the following license and notice below: - -bwip-js : Barcode Writer in Pure JavaScript - -Copyright (c) 2011-2019 Mark Warren - -The MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - ------ - The following software may be included in this product: dom7. A copy of the source code may be downloaded from git+https://github.com/nolimits4web/dom7.git. This software contains the following license and notice below: MIT License @@ -775,212 +747,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ----- -The following software may be included in this product: material-design-icons. A copy of the source code may be downloaded from https://github.com/google/material-design-icons. This software contains the following license and notice below: - -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ------ - The following software may be included in this product: minimist. A copy of the source code may be downloaded from git://github.com/substack/minimist.git. This software contains the following license and notice below: This software is released under the MIT license: @@ -1165,32 +931,6 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ----- -The following software may be included in this product: signature_pad. A copy of the source code may be downloaded from https://github.com/szimek/signature_pad.git. This software contains the following license and notice below: - -MIT License - -Copyright (c) 2018 Szymon Nowak - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - ------ - The following software may be included in this product: ssr-window. A copy of the source code may be downloaded from git+https://github.com/nolimits4web/ssr-window.git. This software contains the following license and notice below: MIT License diff --git a/scripts/remove_bloat.sh b/scripts/remove_bloat.sh index 05a4e38..d7d18e2 100755 --- a/scripts/remove_bloat.sh +++ b/scripts/remove_bloat.sh @@ -1,6 +1,6 @@ #!/bin/bash # This script removes some stuff in `www/node_modules` that the app doesn't need to run. -# It removes about 6MB from the build size. +# It makes the build under 6MB, and prevents zip64-related crashes. echo "Removing bloat in node_modules..." @@ -10,9 +10,9 @@ DIR="$(pwd)/www/node_modules" cd $DIR rm -rf {buffer-from,concat-stream,csscolorparser,dom7,earcut,geojson-vt,gl-matrix} -rm -rf {grid-index,ieee754,inherits,kdbush,@mapbox,minimist,murmurhash-js,path-to-regexp,pbf} +rm -rf {grid-index,htm,ieee754,inherits,kdbush,@mapbox,minimist,murmurhash-js,path-to-regexp,pbf} rm -rf {potpack,protocol-buffers-schema,quickselect,readable-stream,resolve-protobuf-schema,rw} -rm -rf {safe-buffer,ssr-window,string_decoder,supercluster,template7,text-encoding,tinyqueue} +rm -rf {safe-buffer,skeleton-elements,ssr-window,string_decoder,supercluster,swiper,text-encoding,tinyqueue} rm -rf {ts-custom-error,typedarray,util-deprecate,vt-pbf} # Make npm stop complaining that these don't exist by actually removing them @@ -22,7 +22,8 @@ cd $DIR 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 '*.woff*' -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 @@ -31,22 +32,14 @@ rm -rf {esm,esm5} rm -f umd/index.min.js.map cd $DIR -cd bwip-js -rm -rf {bin,examples,src,barcode.ps,demo.html,stb_truetype.h} -rm -rf dist/bwip-js.js -rm -rf dist/node-bwipjs.js +cd framework7 +rm -rf {bundle,cjs,components,core,esm,less,lite,lite-bundle,modules,types} +find . -type f -not -name 'framework7-bundle.min.js' -not -name 'framework7-bundle.min.css' -not -name 'LICENSE' -not -name 'package.json' -delete cd $DIR -cd framework7 -rm -rf components -rm -rf lazy-components -rm -rf less -rm -rf modules -rm -rf utils -rm -f framework7.* -rm -f framework7-lite.* -find css -type f -not -name 'framework7.bundle.min.css' -delete -find js -type f -not -name 'framework7.bundle.min.js' -delete +cd template7 +rm -rf src +find . -type f -not -name "LICENSE" -not -name "package.json" -not -name "template7.min.js" -delete cd $DIR cd jquery @@ -55,30 +48,11 @@ rm -rf external find dist -type f -not -name 'jquery.min.js' -delete cd $DIR -cd jsbarcode -rm -rf .dockerignore .eslintignore .eslintrcautomation bower.json CONTRIBUTING.md docker-compose.yml Dockerfile example gulpfile.js jsbarcode.d.ts src test .travis.yml -rm -rf {automation,bin} -rm -rf dist/barcodes -rm -rf dist/JsBarcode.all.js -cd $DIR - -cd material-design-icons -# Remove everything except the icon font and license, but also exclude the -# current and parent folder (. , ..) so rm won't complain about refusing -# to delete the whole filesystem -find . -maxdepth 1 -not -name '.' -not -name 'LICENSE' -not -name 'iconfont' -exec rm -rf {} \; -cd $DIR - cd maplibre-gl rm -rf {build,flow-typed,src} -find dist -type f -not -name 'mapbox-gl.css' -not -name 'mapbox-gl.js' -delete +find . -name "CHANGELOG.md" -delete +find dist -type f -not -name 'maplibre-gl.css' -not -name 'maplibre-gl.js' -delete rm -rf dist/style-spec cd $DIR -cd signature_pad -rm -rf {docs,src} -rm -rf dist/types -find dist -type f -not -name 'signature_pad.umd.min.js' -delete -cd $DIR - echo "Cleanup finished" diff --git a/scripts/www_npm_install.sh b/scripts/www_npm_install.sh index a6bd22a..202ff37 100755 --- a/scripts/www_npm_install.sh +++ b/scripts/www_npm_install.sh @@ -3,5 +3,6 @@ echo "Installing node modules in www/..." cd www +rm -rf node_modules npm install cd .. diff --git a/www/assets/css/app.css b/www/assets/css/app.css index fe4aea6..523862f 100644 --- a/www/assets/css/app.css +++ b/www/assets/css/app.css @@ -79,7 +79,7 @@ Framework7 and FontAwesome both have a .fab class -webkit-app-region: no-drag; } -.mapbox .package-marker { +.maplibregl-map .package-marker { width: 32px; height: 32px; background-image: url(../images/package-icon.png); @@ -191,21 +191,21 @@ Framework7 and FontAwesome both have a .fab class cursor: pointer; } -.mapboxgl-popup-content { +.maplibregl-popup-content { color: var(--f7-text-color); background-color: var(--f7-page-bg-color); } -.mapboxgl-popup-anchor-top .mapboxgl-popup-tip, .mapboxgl-popup-anchor-top-left .mapboxgl-popup-tip, .mapboxgl-popup-anchor-top-right .mapboxgl-popup-tip { +.maplibregl-popup-anchor-top .maplibregl-popup-tip, .maplibregl-popup-anchor-top-left .maplibregl-popup-tip, .maplibregl-popup-anchor-top-right .maplibregl-popup-tip { border-bottom-color: var(--f7-page-bg-color); } -.mapboxgl-popup-anchor-bottom .mapboxgl-popup-tip, .mapboxgl-popup-anchor-bottom-left .mapboxgl-popup-tip, .mapboxgl-popup-anchor-bottom-right .mapboxgl-popup-tip { +.maplibregl-popup-anchor-bottom .maplibregl-popup-tip, .maplibregl-popup-anchor-bottom-left .maplibregl-popup-tip, .maplibregl-popup-anchor-bottom-right .maplibregl-popup-tip { border-top-color: var(--f7-page-bg-color); } -.mapboxgl-popup-anchor-left .mapboxgl-popup-tip { +.maplibregl-popup-anchor-left .maplibregl-popup-tip { border-right-color: var(--f7-page-bg-color); } -.mapboxgl-popup-anchor-right .mapboxgl-popup-tip { +.maplibregl-popup-anchor-right .maplibregl-popup-tip { border-left-color: var(--f7-page-bg-color); } diff --git a/www/assets/js/MapControl.class.js b/www/assets/js/MapControl.class.js index f83fe47..eabbfce 100644 --- a/www/assets/js/MapControl.class.js +++ b/www/assets/js/MapControl.class.js @@ -5,14 +5,18 @@ */ class MapControl { - constructor(mapboxElement, interactive) { + constructor(maplibreElement, interactive) { this.mapObj = null; - this.mapEl = mapboxElement; + this.mapEl = maplibreElement; this.interactiveMap = interactive == true; } + static supported() { + return maplibregl.supported(); + } + createMap() { - if (mapboxgl.supported()) { + if (maplibregl.supported()) { $(this.mapEl).css("display", ""); this.mapObj = maplibreMap(this.mapEl, this.interactiveMap); } else { diff --git a/www/assets/js/account.js b/www/assets/js/account.js index c69d4b8..053ae2c 100644 --- a/www/assets/js/account.js +++ b/www/assets/js/account.js @@ -111,27 +111,13 @@ function displayAccountInfo() { $("#loadingaccountbox").css("display", "none"); if (success.status == "OK") { $("#loyaltyCreditBalanceHeading").text(success.credits + " points"); - $("#loyaltyBalanceBox").removeClass("display-none"); - - var canvas = document.createElement('canvas'); - - bwipjs.toCanvas(canvas, { - bcid: 'code128', // Barcode type - text: success.phone, // Text to encode - scaleX: 5, - scaleY: 1, - includetext: false, // Show human-readable text - textxalign: 'center', // Always good to set this - eclevel: 'M' - }); + $("#loyaltyBalanceBox").removeClass("display-none") $("#accountnumberspan").text(success.phone); - document.getElementById("loyaltyBarcodeImg").src = canvas.toDataURL('image/png'); if (success.payments_setup === false) { $("#addPaymentMethodBox").css("display", ""); } - $("#accountupdateform input#name").val(success.name); $("#accountupdateform input#email").val(success.email); $("#accountupdateform input#streetaddress").val(success.streetaddress); diff --git a/www/assets/js/addresscode.js b/www/assets/js/addresscode.js deleted file mode 100644 index 6289248..0000000 --- a/www/assets/js/addresscode.js +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - - -function getAddressQRCode() { - var qrstring = $("#addresscodeform #name").val() + "\t" - + $("#addresscodeform #company").val() + "\t" - + $("#addresscodeform #street1").val() + "\t" - + $("#addresscodeform #street2").val() + "\t" - + $("#addresscodeform #city").val() + "\t" - + $("#addresscodeform #state").val() + "\t" - + $("#addresscodeform #zip").val(); - - var canvas = document.createElement('canvas'); - - bwipjs.toCanvas(canvas, { - bcid: 'qrcode', // Barcode type - text: qrstring, // Text to encode - scale: 5, // 3x scaling factor - includetext: false, // Show human-readable text - textxalign: 'center', // Always good to set this - eclevel: 'M' - }); - document.getElementById("addresscode-barcode").src = canvas.toDataURL('image/png'); - - app.popup.create({el: document.getElementById("addresscode-popup")}).open(); -} \ No newline at end of file diff --git a/www/assets/js/dropandsend.js b/www/assets/js/dropandsend.js index b8ed089..61a7063 100644 --- a/www/assets/js/dropandsend.js +++ b/www/assets/js/dropandsend.js @@ -68,7 +68,7 @@ $("#app").on("click", "#pickupCodeManualEntryBtn", function () { }); $("body").on("popup:open", "#dasLocationMapPopup", function () { - if (mapboxgl.supported()) { + if (MapControl.supported()) { if (dropboxMap == null) { var mapboxel = document.getElementById("mapbox-dropboxes"); dropboxMap = new MapControl(mapboxel, true); @@ -109,7 +109,7 @@ $("body").on("popup:open", "#dasLocationMapPopup", function () { coordinates[0] += e.lngLat.lng > coordinates[0] ? 360 : -360; } - new mapboxgl.Popup() + new maplibregl.Popup() .setLngLat(coordinates) .setHTML("" + name + "
" + typedesc + "
Hours:
" + hours diff --git a/www/assets/js/map_maplibre.js b/www/assets/js/map_maplibre.js index fbe37ca..10d5133 100644 --- a/www/assets/js/map_maplibre.js +++ b/www/assets/js/map_maplibre.js @@ -13,7 +13,7 @@ function maplibreMap(containerEl, interactive) { $(containerEl).css("background-color", SETTINGS.maptileurls[theme].bgcolor); - var map = new mapboxgl.Map({ + var map = new maplibregl.Map({ container: containerEl.id, style: SETTINGS.maptileurls[theme].json, //attributionControl: false, @@ -25,12 +25,12 @@ function maplibreMap(containerEl, interactive) { }); if (interactive) { - map.addControl(new mapboxgl.NavigationControl({ + map.addControl(new maplibregl.NavigationControl({ visualizePitch: false, showCompass: false }), 'top-left'); - map.geolocatecontrol = new mapboxgl.GeolocateControl({ + map.geolocatecontrol = new maplibregl.GeolocateControl({ positionOptions: { enableHighAccuracy: true }, @@ -48,7 +48,7 @@ function maplibreMap(containerEl, interactive) { }); map.addControl( - new mapboxgl.ScaleControl({ + new maplibregl.ScaleControl({ unit: "imperial" }) ); @@ -99,7 +99,7 @@ function maplibreMap(containerEl, interactive) { var el = document.createElement("div"); el.className = classname; - new mapboxgl.Marker(el).setLngLat([longitude, latitude]).addTo(map); + new maplibregl.Marker(el).setLngLat([longitude, latitude]).addTo(map); }; map.removeMarkers = function () { diff --git a/www/assets/js/noticeslip.js b/www/assets/js/noticeslip.js deleted file mode 100644 index d370f8c..0000000 --- a/www/assets/js/noticeslip.js +++ /dev/null @@ -1,256 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -var signaturePad = null; -var frontSlipImg = null; -var backSlipImg = null; -var stripeLoaded = false; - -function initSignaturePad() { - var canvas = document.getElementById("signaturecanvas"); - resizeCanvas(canvas); - signaturePad = new SignaturePad(canvas, { - backgroundColor: 'rgba(255, 255, 255, 0.5)', - onBegin: function () { - // stop page from jumping around if user starts drawing signature while a text box is focused - $("input").blur(); - } - }); -} - -function resizeCanvas(canvas) { - var ratio = Math.max(window.devicePixelRatio || 1, 1); - canvas.width = canvas.offsetWidth * ratio; - canvas.height = canvas.offsetHeight * ratio; - canvas.getContext("2d").scale(ratio, ratio); - if (signaturePad != null) { - signaturePad.clear(); // otherwise isEmpty() might return incorrect value - } -} - - -function initNoticeSlipForm() { - initSignaturePad(); - $("#noticeform #name").attr("placeholder", ["John Doe", "Jane Doe", "Dave S. Nothereman", "Sara N. Ignatur"].random()); - $("#noticeform #zip").attr("placeholder", ["59601", "59602"].random()); - if (!stripeLoaded) { - $.getScript("https://js.stripe.com/v3", function () { - stripeLoaded = true; - }); - } -} - -function takeDocPhoto(side) { - try { - navigator.camera.getPicture(function (img) { - if (side == "front") { - frontSlipImg = "data:image/jpg;base64," + img; - $("#noticefrontimg").attr("src", frontSlipImg); - } else if (side == "back") { - backSlipImg = "data:image/jpg;base64," + img; - $("#noticebackimg").attr("src", backSlipImg); - } - }, function (err) { - app.dialog.alert(err, "Error"); - }, { - quality: 50, - targetWidth: 1000, - targetHeight: 2000, - pictureSourceType: Camera.PictureSourceType.CAMERA, - destinationType: Camera.DestinationType.DATA_URL, - encodingType: Camera.EncodingType.JPEG, - saveToPhotoAlbum: false, - correctOrientation: true, - cameraDirection: Camera.Direction.BACK - }); -// cordova-plugin-document-scanner was removed because the plugin is buggy. -// scan.scanDoc(function (img) { -// if (side == "front") { -// frontSlipImg = "data:image/jpg;base64," + img; -// $("#noticefrontimg").attr("src", frontSlipImg); -// } else if (side == "back") { -// backSlipImg = "data:image/jpg;base64," + img; -// $("#noticebackimg").attr("src", backSlipImg); -// } -// }, function (err) { -// -// }, { -// sourceType: 1, -// quality: 3, -// returnBase64: true -// }); - } catch (ex) { - app.dialog.alert("Looks like you can't do that with this device.", "Whoops!"); - } -} - -function checkNoticeSlipForm() { - // make sure everything's filled out - if ($("#noticeform #name").val().length < 5) { - return "Please type your name where provided."; - } - if ($("#noticeform #street").val().length < 5) { - return "Please type your street address (i.e. 1234 Example Rd, Apt 5)."; - } - if ($("#noticeform #zip").val().length < 5) { - return "Please type your ZIP Code."; - } - - if (signaturePad.isEmpty()) { - return "Please sign with a finger or stylus in the box provided."; - } - - if ($("#noticesignform #signature").val().length < 5) { - return "Please type your full name below your signature."; - } - - if (frontSlipImg == null) { - return "Take a picture of the front side of your notice slip."; - } - if (backSlipImg == null) { - return "Take a picture of the signed back side of your notice slip."; - } - - return true; -} - -function getPrice() { - var precheckResult = checkNoticeSlipForm(); - if (precheckResult === true) { - app.dialog.preloader("Loading..."); - apirequest(SETTINGS.apis.pickuprequest, { - action: "rate", - street: $("#noticeform #street").val(), - zip: $("#noticeform #zip").val() - }, function (resp) { - app.dialog.close(); - if (resp.status == "OK") { - // set display text so customer knows what they're paying - $("#noticeslip-pay-amount").text(resp.rate); - // initialize Stripe.js - initStripe(); - // open payment popup - app.popup.create({el: document.getElementById("noticeslip-pay-popup")}).open(); - } else if (resp.status == "ERROR") { - app.dialog.alert(resp.message, "Error"); - } else { - app.dialog.alert("There was a server problem. Try again later.", "Error"); - } - }, function (xhr) { - app.dialog.close(); - try { - var error = $.parseJSON(xhr.responseText); - if (error && typeof error.msg != 'undefined') { - app.dialog.alert(error.msg, "Error"); - } else { - app.dialog.alert("There's a server or network problem. Check your Internet connection or try again later.", "Error"); - } - } catch (ex) { - app.dialog.alert("There's a server or network problem. Check your Internet connection or try again later.", "Error"); - } - }, "GET"); - } else if (typeof precheckResult == "string") { - app.dialog.alert(precheckResult, "Whoops!"); - } else { - app.dialog.alert("Check that the form is filled out correctly.", "Whoops!"); - } -} - -function initStripe() { - // Wait for Stripe to be loaded - if (typeof Stripe == 'undefined') { - setTimeout(initStripe, 500); - return; - } - stripe = Stripe(SETTINGS["stripe_pubkey"]); - elements = stripe.elements(); - - card = elements.create('card', {}); - - // stop console warning "This Element will be mounted to a DOM element that contains child nodes." - $("#noticeslip-stripe-elements").html(""); - - card.mount('#noticeslip-stripe-elements'); - - card.addEventListener('change', function (event) { - var displayError = document.getElementById('noticeslip-card-errors'); - if (event.error) { - displayError.textContent = event.error.message; - } else { - displayError.textContent = ''; - } - }); -} - -function noticeSlipPayAndFinish() { - getPrice(); -} - -function submitNoticeSlip() { - app.dialog.preloader("Sending..."); - stripe.createPaymentMethod({type: 'card', card: card}).then(function (result) { - if (result.error) { - // Inform the customer that there was an error. - app.dialog.close(); - var errorElement = document.getElementById('noticeslip-card-errors'); - errorElement.textContent = result.error.message; - } else { - apirequest(SETTINGS.apis.pickuprequest, { - action: "submit", - name: $("#noticeform #name").val(), - street: $("#noticeform #street").val(), - zip: $("#noticeform #zip").val(), - phone: $("#noticeform #phone").val(), - email: $("#noticeform #email").val(), - front: frontSlipImg, - back: backSlipImg, - signature: signaturePad.toDataURL(), - signatureName: $("#noticesignform #signature").val(), - amount: $("#noticeslip-pay-amount").text(), - stripeid: result.paymentMethod.id, - phonenumber: getStorage("phonenumber") - }, function (resp) { - app.dialog.close(); - if (resp.status == "OK") { - app.popup.close(); - router.navigate("/noticeslip/success"); - } else if (resp.status == "ERROR") { - app.dialog.alert(resp.message, "Error"); - } else { - app.dialog.alert("There was a server problem. Try again later.", "Error"); - } - }, function (xhr) { - app.dialog.close(); - app.popup.close(); - try { - var error = $.parseJSON(xhr.responseText); - if (error && typeof error.msg != 'undefined') { - app.dialog.alert(error.msg, "Error"); - } else { - app.dialog.alert("There's a server or network problem. Check your Internet connection or try again later.", "Error"); - } - } catch (ex) { - app.dialog.alert("There's a server or network problem. Check your Internet connection or try again later.", "Error"); - } - }, "POST"); - } - }); -} - -$("#app").on("click", "#signatureClearBtn", function () { - //signaturePad.clear(); - // clear the signature pad and fix it if it's wrong - resizeCanvas(document.getElementById("signaturecanvas")); -}); - -$("#app").on("click", "#signatureUndoBtn", function () { - var data = signaturePad.toData(); - - if (data) { - data.pop(); // remove the last dot or line - signaturePad.fromData(data); - } -}); \ No newline at end of file diff --git a/www/assets/js/track.js b/www/assets/js/track.js index 56dfea9..401e0d8 100644 --- a/www/assets/js/track.js +++ b/www/assets/js/track.js @@ -71,7 +71,7 @@ function trackOpenAsync( {to, resolve, reject}) { ], events: [], map: { - enabled: (typeof resp.info.latitude == "number" && typeof resp.info.longitude == "number"), + enabled: (typeof resp.info.latitude == "number" && typeof resp.info.longitude == "number" && MapControl.supported()), latitude: resp.info.latitude, longitude: resp.info.longitude, accurate: resp.info.geoaccurate diff --git a/www/index.html b/www/index.html index 1e6a3ac..f30cf5e 100644 --- a/www/index.html +++ b/www/index.html @@ -10,8 +10,8 @@ - - + + @@ -42,10 +42,7 @@ - - - - + @@ -59,9 +56,7 @@ - - diff --git a/www/package-lock.json b/www/package-lock.json index 8c768f2..afabad6 100644 --- a/www/package-lock.json +++ b/www/package-lock.json @@ -9,22 +9,18 @@ "version": "1.4.0", "license": "MPL-2.0", "dependencies": { - "@fortawesome/fontawesome-pro": "^5.15.0", + "@fortawesome/fontawesome-pro": "^5.15.4", "@zxing/library": "^0.15.2", - "bwip-js": "^2.0.6", "framework7": "^6.3.5", - "jquery": "^3.5.1", - "jsbarcode": "^3.11.0", - "maplibre-gl": "^1.13.0-rc.4", - "material-design-icons": "^3.0.1", - "signature_pad": "^3.0.0-beta.4", + "jquery": "^3.6.0", + "maplibre-gl": "^1.15.2", "template7": "^1.4.2" } }, "node_modules/@fortawesome/fontawesome-pro": { - "version": "5.15.0", - "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/5.15.0/fontawesome-pro-5.15.0.tgz", - "integrity": "sha512-dUOjEquJemzw4Y4dsMfnBrkEGl1zMziXBH/UIT5D8NOJd1cKX/R/0X8qecaF0h82JsOY77rSNPA3nMmcrz/Cxw==", + "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==", "engines": { "node": ">=6" } @@ -112,14 +108,6 @@ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, - "node_modules/bwip-js": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/bwip-js/-/bwip-js-2.0.6.tgz", - "integrity": "sha512-25zupM+tgx6NGmrg0kFhdkddeQ5+QnUMvHbb7cPNVbBdFDd0SOG3xRZ1ocGDEamhmM+fStglCLEkH21OpD4Y/w==", - "bin": { - "bwip-js": "bin/bwip-js.js" - } - }, "node_modules/concat-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", @@ -215,69 +203,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/jquery": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", - "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==" - }, - "node_modules/jsbarcode": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.0.tgz", - "integrity": "sha1-IGI+AIsQHvRdDM6cgCLN9JvihUc=", - "bin": { - "auto.js": "bin/barcodes/CODE128/auto.js", - "Barcode.js": "bin/barcodes/Barcode.js", - "barcodes": "bin/barcodes", - "canvas.js": "bin/renderers/canvas.js", - "checksums.js": "bin/barcodes/MSI/checksums.js", - "codabar": "bin/barcodes/codabar", - "CODE128": "bin/barcodes/CODE128", - "CODE128_AUTO.js": "bin/barcodes/CODE128/CODE128_AUTO.js", - "CODE128.js": "bin/barcodes/CODE128/CODE128.js", - "CODE128A.js": "bin/barcodes/CODE128/CODE128A.js", - "CODE128B.js": "bin/barcodes/CODE128/CODE128B.js", - "CODE128C.js": "bin/barcodes/CODE128/CODE128C.js", - "CODE39": "bin/barcodes/CODE39", - "constants.js": "bin/barcodes/ITF/constants.js", - "defaults.js": "bin/options/defaults.js", - "EAN_UPC": "bin/barcodes/EAN_UPC", - "EAN.js": "bin/barcodes/EAN_UPC/EAN.js", - "EAN13.js": "bin/barcodes/EAN_UPC/EAN13.js", - "EAN2.js": "bin/barcodes/EAN_UPC/EAN2.js", - "EAN5.js": "bin/barcodes/EAN_UPC/EAN5.js", - "EAN8.js": "bin/barcodes/EAN_UPC/EAN8.js", - "encoder.js": "bin/barcodes/EAN_UPC/encoder.js", - "ErrorHandler.js": "bin/exceptions/ErrorHandler.js", - "exceptions": "bin/exceptions", - "exceptions.js": "bin/exceptions/exceptions.js", - "fixOptions.js": "bin/help/fixOptions.js", - "GenericBarcode": "bin/barcodes/GenericBarcode", - "getOptionsFromElement.js": "bin/help/getOptionsFromElement.js", - "getRenderProperties.js": "bin/help/getRenderProperties.js", - "help": "bin/help", - "index.js": "bin/renderers/index.js", - "index.tmp.js": "bin/barcodes/index.tmp.js", - "ITF": "bin/barcodes/ITF", - "ITF.js": "bin/barcodes/ITF/ITF.js", - "ITF14.js": "bin/barcodes/ITF/ITF14.js", - "JsBarcode.js": "bin/JsBarcode.js", - "linearizeEncodings.js": "bin/help/linearizeEncodings.js", - "merge.js": "bin/help/merge.js", - "MSI": "bin/barcodes/MSI", - "MSI.js": "bin/barcodes/MSI/MSI.js", - "MSI10.js": "bin/barcodes/MSI/MSI10.js", - "MSI1010.js": "bin/barcodes/MSI/MSI1010.js", - "MSI11.js": "bin/barcodes/MSI/MSI11.js", - "MSI1110.js": "bin/barcodes/MSI/MSI1110.js", - "object.js": "bin/renderers/object.js", - "options": "bin/options", - "optionsFromStrings.js": "bin/help/optionsFromStrings.js", - "pharmacode": "bin/barcodes/pharmacode", - "renderers": "bin/renderers", - "shared.js": "bin/renderers/shared.js", - "svg.js": "bin/renderers/svg.js", - "UPC.js": "bin/barcodes/EAN_UPC/UPC.js", - "UPCE.js": "bin/barcodes/EAN_UPC/UPCE.js" - } + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" }, "node_modules/kdbush": { "version": "3.0.0", @@ -285,9 +213,9 @@ "integrity": "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew==" }, "node_modules/maplibre-gl": { - "version": "1.13.0-rc.4", - "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-1.13.0-rc.4.tgz", - "integrity": "sha512-QQ4b0fjGxXTGdS/sTKaXp8kyL/DsC93zAm2zGkhyExywvvsduFup9GTzCDas7g4VljYGgTsNhaWkxWewu0gG9A==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-1.15.2.tgz", + "integrity": "sha512-uPeV530apb4JfX3cRFfE+awFnbcJTOnCv2QvY4mw4huiInbybElWYkNzTs324YLSADq0f4bidRoYcR81ho3aLA==", "dependencies": { "@mapbox/geojson-rewind": "^0.5.0", "@mapbox/geojson-types": "^1.0.2", @@ -317,11 +245,6 @@ "node": ">=6.4.0" } }, - "node_modules/material-design-icons": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz", - "integrity": "sha1-mnHEh0chjrylHlGmbaaCA4zct78=" - }, "node_modules/minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", @@ -409,11 +332,6 @@ } ] }, - "node_modules/signature_pad": { - "version": "3.0.0-beta.4", - "resolved": "https://registry.npmjs.org/signature_pad/-/signature_pad-3.0.0-beta.4.tgz", - "integrity": "sha512-cOf2NhVuTiuNqe2X/ycEmizvCDXk0DoemhsEpnkcGnA4kS5iJYTCqZ9As7tFBbsch45Q1EdX61833+6sjJ8rrw==" - }, "node_modules/skeleton-elements": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/skeleton-elements/-/skeleton-elements-3.5.0.tgz", @@ -514,9 +432,9 @@ }, "dependencies": { "@fortawesome/fontawesome-pro": { - "version": "5.15.0", - "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/5.15.0/fontawesome-pro-5.15.0.tgz", - "integrity": "sha512-dUOjEquJemzw4Y4dsMfnBrkEGl1zMziXBH/UIT5D8NOJd1cKX/R/0X8qecaF0h82JsOY77rSNPA3nMmcrz/Cxw==" + "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==" }, "@mapbox/geojson-rewind": { "version": "0.5.0", @@ -585,11 +503,6 @@ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, - "bwip-js": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/bwip-js/-/bwip-js-2.0.6.tgz", - "integrity": "sha512-25zupM+tgx6NGmrg0kFhdkddeQ5+QnUMvHbb7cPNVbBdFDd0SOG3xRZ1ocGDEamhmM+fStglCLEkH21OpD4Y/w==" - }, "concat-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", @@ -663,14 +576,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "jquery": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", - "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==" - }, - "jsbarcode": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.0.tgz", - "integrity": "sha1-IGI+AIsQHvRdDM6cgCLN9JvihUc=" + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" }, "kdbush": { "version": "3.0.0", @@ -678,9 +586,9 @@ "integrity": "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew==" }, "maplibre-gl": { - "version": "1.13.0-rc.4", - "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-1.13.0-rc.4.tgz", - "integrity": "sha512-QQ4b0fjGxXTGdS/sTKaXp8kyL/DsC93zAm2zGkhyExywvvsduFup9GTzCDas7g4VljYGgTsNhaWkxWewu0gG9A==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-1.15.2.tgz", + "integrity": "sha512-uPeV530apb4JfX3cRFfE+awFnbcJTOnCv2QvY4mw4huiInbybElWYkNzTs324YLSADq0f4bidRoYcR81ho3aLA==", "requires": { "@mapbox/geojson-rewind": "^0.5.0", "@mapbox/geojson-types": "^1.0.2", @@ -707,11 +615,6 @@ "vt-pbf": "^3.1.1" } }, - "material-design-icons": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz", - "integrity": "sha1-mnHEh0chjrylHlGmbaaCA4zct78=" - }, "minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", @@ -779,11 +682,6 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" }, - "signature_pad": { - "version": "3.0.0-beta.4", - "resolved": "https://registry.npmjs.org/signature_pad/-/signature_pad-3.0.0-beta.4.tgz", - "integrity": "sha512-cOf2NhVuTiuNqe2X/ycEmizvCDXk0DoemhsEpnkcGnA4kS5iJYTCqZ9As7tFBbsch45Q1EdX61833+6sjJ8rrw==" - }, "skeleton-elements": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/skeleton-elements/-/skeleton-elements-3.5.0.tgz", diff --git a/www/package.json b/www/package.json index f6c06ec..43bd381 100644 --- a/www/package.json +++ b/www/package.json @@ -4,15 +4,11 @@ "main": "index.html", "license": "MPL-2.0", "dependencies": { - "@fortawesome/fontawesome-pro": "^5.15.0", + "@fortawesome/fontawesome-pro": "^5.15.4", "@zxing/library": "^0.15.2", - "bwip-js": "^2.0.6", "framework7": "^6.3.5", - "jquery": "^3.5.1", - "jsbarcode": "^3.11.0", - "maplibre-gl": "^1.13.0-rc.4", - "material-design-icons": "^3.0.1", - "signature_pad": "^3.0.0-beta.4", + "jquery": "^3.6.0", + "maplibre-gl": "^1.15.2", "template7": "^1.4.2" } } diff --git a/www/pages/credits.html b/www/pages/credits.html index a63ae2c..fc25c0e 100644 --- a/www/pages/credits.html +++ b/www/pages/credits.html @@ -242,34 +242,6 @@ SOFTWARE. ----- -The following software may be included in this product: bwip-js. A copy of the source code may be downloaded from https://github.com/metafloor/bwip-js.git. This software contains the following license and notice below: - -bwip-js : Barcode Writer in Pure JavaScript - -Copyright (c) 2011-2019 Mark Warren - -The MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - ------ - The following software may be included in this product: dom7. A copy of the source code may be downloaded from git+https://github.com/nolimits4web/dom7.git. This software contains the following license and notice below: MIT License @@ -805,212 +777,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ----- -The following software may be included in this product: material-design-icons. A copy of the source code may be downloaded from https://github.com/google/material-design-icons. This software contains the following license and notice below: - -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ------ - The following software may be included in this product: minimist. A copy of the source code may be downloaded from git://github.com/substack/minimist.git. This software contains the following license and notice below: This software is released under the MIT license: @@ -1195,32 +961,6 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ----- -The following software may be included in this product: signature_pad. A copy of the source code may be downloaded from https://github.com/szimek/signature_pad.git. This software contains the following license and notice below: - -MIT License - -Copyright (c) 2018 Szymon Nowak - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - ------ - The following software may be included in this product: ssr-window. A copy of the source code may be downloaded from git+https://github.com/nolimits4web/ssr-window.git. This software contains the following license and notice below: MIT License