diff --git a/gulpfile.js b/gulpfile.js index 5eea7f13..72745ccc 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -41,7 +41,7 @@ function styles(done) { function scripts() { const dest = 'pipeline/built_assets/js'; - const base_scripts = ["src.js", "util.js", "alert.js", "collapse.js", "dropdown.js", "modal.js", "konami.js"]; + const base_scripts = ["src.js", "util.js", "alert.js", "collapse.js", "dropdown.js", "modal.js", "konami.js", "marked.min.js"]; const bs_select = ["bootstrap-select.js", "ajax-bootstrap-select.js"] const interaction = ["html5sortable.min.js", "interaction.js"] const jpop = ["jquery.min.js", "popper.min.js"] @@ -57,6 +57,7 @@ function scripts() { 'node_modules/bootstrap/js/dist/modal.js', 'node_modules/bootstrap/js/dist/alert.js', + 'node_modules/marked/marked.min.js', 'node_modules/html5sortable/dist/html5sortable.min.js', 'node_modules/clipboard/dist/clipboard.min.js', 'node_modules/flatpickr/dist/flatpickr.min.js', diff --git a/package-lock.json b/package-lock.json index ed6d932d..7120d4e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,6 +30,7 @@ "html5sortable": "^0.13.3", "jquery": "^3.6.0", "konami": "^1.6.3", + "marked": "^4.0.10", "moment": "^2.27.0", "node-sass": "^7.0.0", "popper.js": "^1.16.1", @@ -1579,12 +1580,20 @@ } }, "node_modules/copy-props": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz", - "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz", + "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==", "dependencies": { - "each-props": "^1.3.0", - "is-plain-object": "^2.0.1" + "each-props": "^1.3.2", + "is-plain-object": "^5.0.0" + } + }, + "node_modules/copy-props/node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "engines": { + "node": ">=0.10.0" } }, "node_modules/core-util-is": { @@ -2750,12 +2759,23 @@ } }, "node_modules/follow-redirects": { - "version": "1.14.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz", - "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==", + "version": "1.14.7", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", + "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], "engines": { "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } } }, "node_modules/for-in": { @@ -4868,9 +4888,9 @@ } }, "node_modules/marked": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.8.tgz", - "integrity": "sha512-dkpJMIlJpc833hbjjg8jraw1t51e/eKDoG8TFOgc5O0Z77zaYKigYekTDop5AplRoKFGIaoazhYEhGkMtU3IeA==", + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz", + "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==", "bin": { "marked": "bin/marked.js" }, diff --git a/package.json b/package.json index 0ed004a7..da021602 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "html5sortable": "^0.13.3", "jquery": "^3.6.0", "konami": "^1.6.3", + "marked": "^4.0.10", "moment": "^2.27.0", "node-sass": "^7.0.0", "popper.js": "^1.16.1", diff --git a/templates/base.html b/templates/base.html index 9c7cb706..95075c83 100644 --- a/templates/base.html +++ b/templates/base.html @@ -78,7 +78,6 @@ - {% include 'partials/dark_theme.html' %} {% block js %} diff --git a/templates/partials/dark_theme.html b/templates/partials/dark_theme.html index 57d50dbf..1f5a0335 100644 --- a/templates/partials/dark_theme.html +++ b/templates/partials/dark_theme.html @@ -1,7 +1,7 @@ {% load static %}