From c154465376a2719eb1e6cfe3439dfceb2a97d5e0 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Fri, 31 Mar 2023 22:42:10 -0500 Subject: [PATCH 01/29] chore: Add Masonry package dependency --- package-lock.json | 85 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + 2 files changed, 86 insertions(+) diff --git a/package-lock.json b/package-lock.json index 54739dc..f5f1c78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "fittext.js": "^1.2.0", "jquery": "^3.6.0", "jquery-mask-plugin": "^1.14.16", + "masonry-layout": "^4.2.2", "postcss": "^8.4.12", "postcss-purgecss": "^2.0.3" }, @@ -379,6 +380,11 @@ } } }, + "node_modules/desandro-matches-selector": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/desandro-matches-selector/-/desandro-matches-selector-2.0.2.tgz", + "integrity": "sha512-+1q0nXhdzg1IpIJdMKalUwvvskeKnYyEe3shPRwedNcWtnhEKT3ZxvFjzywHDeGcKViIxTCAoOYQWP1qD7VNyg==" + }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -399,6 +405,11 @@ "node": ">=0.8.0" } }, + "node_modules/ev-emitter": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-1.1.1.tgz", + "integrity": "sha512-ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q==" + }, "node_modules/execa": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz", @@ -439,11 +450,24 @@ "resolved": "https://registry.npmjs.org/fittext.js/-/fittext.js-1.2.0.tgz", "integrity": "sha512-t74oh607jFTvZ1zelX5nVlxrLbk0iREVSgvn5HZhltUj34ANAaFNtORHwmXEHUiPNcZVk252G52hFnFLjLHBqg==" }, + "node_modules/fizzy-ui-utils": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/fizzy-ui-utils/-/fizzy-ui-utils-2.0.7.tgz", + "integrity": "sha512-CZXDVXQ1If3/r8s0T+v+qVeMshhfcuq0rqIFgJnrtd+Bu8GmDmqMjntjUePypVtjHXKJ6V4sw9zeyox34n9aCg==", + "dependencies": { + "desandro-matches-selector": "^2.0.0" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, + "node_modules/get-size": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/get-size/-/get-size-2.0.3.tgz", + "integrity": "sha512-lXNzT/h/dTjTxRbm9BXb+SGxxzkm97h/PCIKtlN/CBCxxmkkIVV21udumMS93MuVTDX583gqc94v3RjuHmI+2Q==" + }, "node_modules/get-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", @@ -854,6 +878,15 @@ "node": ">=8" } }, + "node_modules/masonry-layout": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/masonry-layout/-/masonry-layout-4.2.2.tgz", + "integrity": "sha512-iGtAlrpHNyxaR19CvKC3npnEcAwszXoyJiI8ARV2ePi7fmYhIud25MHK8Zx4P0LCC4d3TNO9+rFa1KoK1OEOaA==", + "dependencies": { + "get-size": "^2.0.2", + "outlayer": "^2.1.0" + } + }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -981,6 +1014,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/outlayer": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/outlayer/-/outlayer-2.1.1.tgz", + "integrity": "sha512-+GplXsCQ3VrbGujAeHEzP9SXsBmJxzn/YdDSQZL0xqBmAWBmortu2Y9Gwdp9J0bgDQ8/YNIPMoBM13nTwZfAhw==", + "dependencies": { + "ev-emitter": "^1.0.0", + "fizzy-ui-utils": "^2.0.0", + "get-size": "^2.0.2" + } + }, "node_modules/p-map": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", @@ -1791,6 +1834,11 @@ "ms": "2.1.2" } }, + "desandro-matches-selector": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/desandro-matches-selector/-/desandro-matches-selector-2.0.2.tgz", + "integrity": "sha512-+1q0nXhdzg1IpIJdMKalUwvvskeKnYyEe3shPRwedNcWtnhEKT3ZxvFjzywHDeGcKViIxTCAoOYQWP1qD7VNyg==" + }, "eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -1808,6 +1856,11 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==" }, + "ev-emitter": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-1.1.1.tgz", + "integrity": "sha512-ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q==" + }, "execa": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz", @@ -1839,11 +1892,24 @@ "resolved": "https://registry.npmjs.org/fittext.js/-/fittext.js-1.2.0.tgz", "integrity": "sha512-t74oh607jFTvZ1zelX5nVlxrLbk0iREVSgvn5HZhltUj34ANAaFNtORHwmXEHUiPNcZVk252G52hFnFLjLHBqg==" }, + "fizzy-ui-utils": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/fizzy-ui-utils/-/fizzy-ui-utils-2.0.7.tgz", + "integrity": "sha512-CZXDVXQ1If3/r8s0T+v+qVeMshhfcuq0rqIFgJnrtd+Bu8GmDmqMjntjUePypVtjHXKJ6V4sw9zeyox34n9aCg==", + "requires": { + "desandro-matches-selector": "^2.0.0" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, + "get-size": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/get-size/-/get-size-2.0.3.tgz", + "integrity": "sha512-lXNzT/h/dTjTxRbm9BXb+SGxxzkm97h/PCIKtlN/CBCxxmkkIVV21udumMS93MuVTDX583gqc94v3RjuHmI+2Q==" + }, "get-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", @@ -2130,6 +2196,15 @@ } } }, + "masonry-layout": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/masonry-layout/-/masonry-layout-4.2.2.tgz", + "integrity": "sha512-iGtAlrpHNyxaR19CvKC3npnEcAwszXoyJiI8ARV2ePi7fmYhIud25MHK8Zx4P0LCC4d3TNO9+rFa1KoK1OEOaA==", + "requires": { + "get-size": "^2.0.2", + "outlayer": "^2.1.0" + } + }, "merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -2217,6 +2292,16 @@ "mimic-fn": "^4.0.0" } }, + "outlayer": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/outlayer/-/outlayer-2.1.1.tgz", + "integrity": "sha512-+GplXsCQ3VrbGujAeHEzP9SXsBmJxzn/YdDSQZL0xqBmAWBmortu2Y9Gwdp9J0bgDQ8/YNIPMoBM13nTwZfAhw==", + "requires": { + "ev-emitter": "^1.0.0", + "fizzy-ui-utils": "^2.0.0", + "get-size": "^2.0.2" + } + }, "p-map": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", diff --git a/package.json b/package.json index 31df98b..67e1f54 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "fittext.js": "^1.2.0", "jquery": "^3.6.0", "jquery-mask-plugin": "^1.14.16", + "masonry-layout": "^4.2.2", "postcss": "^8.4.12", "postcss-purgecss": "^2.0.3" }, From e7b28d2a1a9d72993c195b34da7ee6444eb5b47a Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Fri, 31 Mar 2023 22:43:00 -0500 Subject: [PATCH 02/29] refactor: Remove custom academia layout --- layouts/academia/list.html | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 layouts/academia/list.html diff --git a/layouts/academia/list.html b/layouts/academia/list.html deleted file mode 100644 index fa1e46f..0000000 --- a/layouts/academia/list.html +++ /dev/null @@ -1,20 +0,0 @@ -{{ define "main" }} - {{ partial "scrolling-image-header" . }} -
-
-

Selected Presentations

- {{ $featuredpubs := where .Pages ".Params.featured" "==" true }} - {{ range $featuredpubs }} - {{ .Scratch.Set "showAbstract" true }} - {{ partial "academia/list-single.html" . }} - {{ end }} -
-

Other Presentations

- {{ $nonfeaturedpubs := where .Pages ".Params.featured" "==" false }} - {{ range $nonfeaturedpubs }} - {{ partial "academia/list-single.html" . }} - {{ end }} - -
-
-{{ end }} From d3fbc737fd05da64d758ee73e594c55ff858f677 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Fri, 31 Mar 2023 22:43:21 -0500 Subject: [PATCH 03/29] refactor: Remove custom website layout --- layouts/websites/list.html | 53 -------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 layouts/websites/list.html diff --git a/layouts/websites/list.html b/layouts/websites/list.html deleted file mode 100644 index 9e5f5e7..0000000 --- a/layouts/websites/list.html +++ /dev/null @@ -1,53 +0,0 @@ -{{ define "main" }} - {{ partial "scrolling-image-header" . }} - - -
-
- {{ range .Pages }} -
-
- {{ $thumbnail := .Resources.GetMatch "thumbnail.png" }} - {{ $thumbimg := $thumbnail.Resize "250x" }} -
- {{ $image := . }} - Thumbnail of {{ .Title }} -
-
-

{{ .Title }}

-

- {{ .Params.deployURL }} -

- {{ .Content }} -
-
-
- - - - - - -
-
-
-
- {{ end }} - -
-
-{{ end }} From 2ad5baec495408b29c07ab3e040491ce5790996a Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Fri, 31 Mar 2023 22:43:47 -0500 Subject: [PATCH 04/29] chore: Add module mount point for Masonry --- config.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config.toml b/config.toml index b6b5145..b9057b2 100644 --- a/config.toml +++ b/config.toml @@ -71,3 +71,7 @@ target = "assets/scripts/jquery" [[module.mounts]] source = "./node_modules/jquery-mask-plugin/dist" target = "assets/scripts/jquery-mask-plugin" + +[[module.mounts]] +source = "./node_modules/masonry-layout/dist" +target = "assets/scripts/masonry" From 92b49ab4aa3e4dd02b81285d7b6a37c63afaff4e Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Fri, 31 Mar 2023 22:44:24 -0500 Subject: [PATCH 05/29] chore: Add Masonry JS to template --- layouts/_default/baseof.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 7360ca8..41833a3 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -116,6 +116,10 @@ {{ $bootstrapbundle := slice $popperjs $twbsjs $ttjs | resources.Concat "js/bootstrap-bundle.js" }} + + {{ $masonryjs := resources.Get "scripts/masonry/masonry.pkgd.min.js" }} + +