Highlight & make links in terms pop up clickable

2025-05-24 02:14:21 -04:00 · 2021-03-02 13:42:25 +01:00 · 2021-03-02 13:42:25 +01:00 · 4992da6270
commit 4992da6270
parent b818e7204c
8 changed files with 86 additions and 2 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -2857,6 +2857,24 @@
                "sha.js": "^2.4.8"
            }
        },
+        "create-html-element": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/create-html-element/-/create-html-element-2.1.0.tgz",
+            "integrity": "sha512-ofbOpJh3GSDsyINuqppupKRUcQHnXSyvwvk0F5DlEtwKwb+thdFoJAtYczy7bIZWdsQjZfADUc38pF4gVd0o+Q==",
+            "requires": {
+                "escape-goat": "^1.3.0",
+                "html-tags": "^2.0.0",
+                "stringify-attributes": "^1.0.0",
+                "type-fest": "^0.3.0"
+            },
+            "dependencies": {
+                "html-tags": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
+                    "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos="
+                }
+            }
+        },
        "credit-card-type": {
            "version": "8.3.0",
            "resolved": "https://registry.npmjs.org/credit-card-type/-/credit-card-type-8.3.0.tgz",
@ -3730,6 +3748,11 @@
            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
        },
+        "escape-goat": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-1.3.0.tgz",
+            "integrity": "sha512-E2nU1Y39N5UgfLU8qwMlK0vZrZprIwWLeVmDYN8wd/e37hMtGzu2w1DBiREts0XHfgyZEQlj/hYr0H0izF0HDQ=="
+        },
        "escape-html": {
            "version": "1.0.3",
            "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@ -5721,6 +5744,14 @@
            "integrity": "sha1-eZllXoZGwX8In90YfRUNMyTVRRM=",
            "dev": true
        },
+        "linkify-urls": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/linkify-urls/-/linkify-urls-3.1.1.tgz",
+            "integrity": "sha512-sRxMSunCnLFtZ4iVkMqHhZKSJ3MC/nRAvej8Ou3pEEEPBL0iVN91mZvdFREKcGv3VNcakbT4qsfOnnWMEbA59w==",
+            "requires": {
+                "create-html-element": "^2.1.0"
+            }
+        },
        "listr": {
            "version": "0.14.3",
            "resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz",
@ -8882,6 +8913,14 @@
                "safe-buffer": "~5.1.0"
            }
        },
+        "stringify-attributes": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/stringify-attributes/-/stringify-attributes-1.0.0.tgz",
+            "integrity": "sha1-nosvmpRn57SAk8shJOvBwX5jgsU=",
+            "requires": {
+                "escape-goat": "^1.1.0"
+            }
+        },
        "strip-ansi": {
            "version": "3.0.1",
            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@ -9283,6 +9322,11 @@
            "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
            "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
        },
+        "type-fest": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
+            "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="
+        },
        "type-is": {
            "version": "1.6.18",
            "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
--- a/package.json
+++ b/package.json
@ -26,6 +26,7 @@
        "cross-env": "^7.0.3",
        "jsignature": "^2.1.3",
        "laravel-mix": "^5.0.9",
+        "linkify-urls": "^3.1.1",
        "lodash": "^4.17.20",
        "resolve-url-loader": "^3.1.2",
        "sass": "^1.32.7",
--- a/public/js/clients/linkify-urls.js
+++ b/public/js/clients/linkify-urls.js
@ -0,0 +1,2 @@
+/*! For license information please see linkify-urls.js.LICENSE.txt */
+!function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="/",r(r.s=16)}({16:function(e,t,r){e.exports=r("cN42")},Ievl:function(e,t,r){"use strict";t.escape=e=>e.replace(/&/g,"&amp;").replace(/"/g,"&quot;").replace(/'/g,"&#39;").replace(/</g,"&lt;").replace(/>/g,"&gt;"),t.unescape=e=>e.replace(/&gt;/g,">").replace(/&lt;/g,"<").replace(/&#39;/g,"'").replace(/&quot;/g,'"').replace(/&amp;/g,"&"),t.escapeTag=function(e){let r=e[0];for(let n=1;n<arguments.length;n++)r=r+t.escape(arguments[n])+e[n];return r},t.unescapeTag=function(e){let r=e[0];for(let n=1;n<arguments.length;n++)r=r+t.unescape(arguments[n])+e[n];return r}},PoD1:function(e,t,r){"use strict";e.exports=r("sW1H")},YIIW:function(e,t,r){"use strict";const n=r("dBjz"),o=r("PoD1"),a=r("Ievl"),u=new Set(o);e.exports=e=>{if((e=Object.assign({name:"div",attributes:{},html:""},e)).html&&e.text)throw new Error("The `html` and `text` options are mutually exclusive");const t=e.text?a.escape(e.text):e.html;let r=`<${e.name}${n(e.attributes)}>`;return u.has(e.name)||(r+=`${t}</${e.name}>`),r}},cN42:function(e,t,r){var n=r("jG5F");document.querySelectorAll("[data-ref=entity-terms]").forEach((function(e){e.innerHTML=n(e.innerText,{attributes:{target:"_blank",class:"text-primary"}})}))},dBjz:function(e,t,r){"use strict";const n=r("Ievl");e.exports=e=>{const t=[];for(const r of Object.keys(e)){let o=e[r];if(!1===o)continue;Array.isArray(o)&&(o=o.join(" "));let a=n.escape(r);!0!==o&&(a+=`="${n.escape(String(o))}"`),t.push(a)}return t.length>0?" "+t.join(" "):""}},jG5F:function(e,t,r){"use strict";const n=r("YIIW"),o=(e,t)=>n({name:"a",attributes:{href:"",...t.attributes,href:e},text:void 0===t.value?e:void 0,html:void 0===t.value?void 0:"function"==typeof t.value?t.value(e):t.value});e.exports=(e,t)=>{if("string"===(t={attributes:{},type:"string",...t}).type)return((e,t)=>e.replace(/((?<!\+)(?:https?(?::\/\/))(?:www\.)?(?:[a-zA-Z\d-_.]+(?:(?:\.|@)[a-zA-Z\d]{2,})|localhost)(?:(?:[-a-zA-Z\d:%_+.~#*$!?&//=@]*)(?:[,](?![\s]))*)*)/g,e=>o(e,t)))(e,t);if("dom"===t.type)return((e,t)=>{const r=document.createDocumentFragment();for(const[a,u]of Object.entries(e.split(/((?<!\+)(?:https?(?::\/\/))(?:www\.)?(?:[a-zA-Z\d-_.]+(?:(?:\.|@)[a-zA-Z\d]{2,})|localhost)(?:(?:[-a-zA-Z\d:%_+.~#*$!?&//=@]*)(?:[,](?![\s]))*)*)/g)))a%2?r.append((n=o(u,t),document.createRange().createContextualFragment(n))):u.length>0&&r.append(u);var n;return r})(e,t);throw new Error("The type option must be either `dom` or `string`")}},sW1H:function(e){e.exports=JSON.parse('["area","base","br","col","embed","hr","img","input","link","menuitem","meta","param","source","track","wbr"]')}});
--- a/public/js/clients/linkify-urls.js.LICENSE.txt
+++ b/public/js/clients/linkify-urls.js.LICENSE.txt
@ -0,0 +1,9 @@
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@ -3,6 +3,7 @@
    "/css/app.css": "/css/app.css?id=58736e43b16ddde82ba9",
    "/js/clients/invoices/action-selectors.js": "/js/clients/invoices/action-selectors.js?id=a09bb529b8e1826f13b4",
    "/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=8ce8955ba775ea5f47d1",
+    "/js/clients/linkify-urls.js": "/js/clients/linkify-urls.js?id=0dc8c34010d09195d2f7",
    "/js/clients/payment_methods/authorize-authorize-card.js": "/js/clients/payment_methods/authorize-authorize-card.js?id=206d7de4ac97612980ff",
    "/js/clients/payments/authorize-credit-card-payment.js": "/js/clients/payments/authorize-credit-card-payment.js?id=a376eff2227da398b0ba",
    "/js/clients/payments/card-js.min.js": "/js/clients/payments/card-js.min.js?id=5469146cd629ea1b5c20",
--- a/resources/js/clients/linkify-urls.js
+++ b/resources/js/clients/linkify-urls.js
@ -0,0 +1,19 @@
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+const linkifyUrls = require('linkify-urls');
+
+document
+    .querySelectorAll('[data-ref=entity-terms]')
+    .forEach((text) => {
+        text.innerHTML = linkifyUrls(text.innerText, {
+            attributes: {target: '_blank', class: 'text-primary'}
+        });
+    });
--- a/resources/views/portal/ninja2020/invoices/includes/terms.blade.php
+++ b/resources/views/portal/ninja2020/invoices/includes/terms.blade.php
@ -12,9 +12,9 @@
                <div class="mt-4">
                    @foreach($entities as $entity)
                        <div class="mb-4">
-                            <h4 class="leading-6 font-medium text-gray-900">{{ $entity_type }} {{ $entity->number }}:</h4>
+                            <p class="text-sm leading-6 font-medium text-gray-500">{{ $entity_type }} {{ $entity->number }}:</p>
                            @if($entity->terms)
-                                <p class="text-sm leading-5 text-gray-500">{!! $entity->terms !!}</p>
+                                <h5 data-ref="entity-terms" class="text-sm leading-5 text-gray-900">{!! $entity->terms !!}</h5>
                            @else
                                <i class="text-sm leading-5 text-gray-500">{{ ctrans('texts.not_specified') }}</i>
                            @endif
@ -39,3 +39,7 @@
        </div>
    </div>
 </div>
+
+@push('footer')
+    <script src="{{ asset('js/clients/linkify-urls.js') }}" defer></script>
+@endpush
--- a/webpack.mix.js
+++ b/webpack.mix.js
@ -61,6 +61,10 @@ mix.js("resources/js/app.js", "public/js")
    .js(
        "resources/js/clients/shared/multiple-downloads.js",
        "public/js/clients/shared/multiple-downloads.js"
+    )
+    .js(
+        "resources/js/clients/linkify-urls.js",
+        "public/js/clients/linkify-urls.js"
    );

 mix.copyDirectory('node_modules/card-js/card-js.min.css', 'public/css/card-js.min.css');