From 0e3d3b0adc6be70df3a9c0231ec7ab4e2d76cc75 Mon Sep 17 00:00:00 2001 From: "Felix W. Dekker" Date: Wed, 28 Apr 2021 13:11:29 +0200 Subject: [PATCH] Remove inline styles and scripts --- Gruntfile.js | 13 +++++++++++-- package-lock.json | Bin 310647 -> 212486 bytes package.json | 6 +++--- src/main/css/main.css | 7 +++++++ src/main/index.html | 10 ++++++---- src/main/js/index.js | 18 +++++++++--------- 6 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 src/main/css/main.css diff --git a/Gruntfile.js b/Gruntfile.js index b16e00f..12dbc30 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,6 +7,9 @@ module.exports = grunt => { default: ["dist/"], }, copy: { + css: { + files: [{expand: true, cwd: "src/main/", src: "**/*.css", dest: "dist/", flatten: true}] + }, db: { files: [{expand: true, cwd: "src/main/", src: "**/.*.db", dest: "dist/", flatten: true}] }, @@ -19,12 +22,12 @@ module.exports = grunt => { }, focus: { dev: { - include: ["html", "js", "php"], + include: ["css", "html", "js", "php"], }, }, replace: { dev: { - src: ["./dist/*.html", "./dist/*.js"], + src: ["./dist/**/*.html", "./dist/**/*.js"], replacements: [ { from: "%%VERSION_NUMBER%%", @@ -45,6 +48,10 @@ module.exports = grunt => { }, }, watch: { + css: { + files: ["src/main/**/*.css"], + tasks: ["copy:css"], + }, html: { files: ["src/main/**/*.html"], tasks: ["copy:html"], @@ -98,6 +105,7 @@ module.exports = grunt => { // Pre "clean", // Copy files + "copy:css", "copy:db", "copy:html", "copy:php", @@ -110,6 +118,7 @@ module.exports = grunt => { // Pre "clean", // Copy files + "copy:css", "copy:db", "copy:html", "copy:php", diff --git a/package-lock.json b/package-lock.json index 5869eafe3d4e26b452cb8c801457048b64674ca5..17441a391ed583f66bef4b1b4223345020efd74d 100644 GIT binary patch delta 3374 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 Y{5y8sgIiDBhb3_o#%SGhke3|&|1@tKPyhe` diff --git a/package.json b/package.json index 8ebe1f3..3c8c04f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "random-fo76", - "version": "1.0.15", + "version": "1.0.16", "description": "Random Fallout 76 record.", "author": "Felix W. Dekker", "browser": "dist/bundle.js", @@ -16,7 +16,7 @@ "deploy": "grunt deploy" }, "devDependencies": { - "grunt": "^1.3.0", + "grunt": "^1.4.0", "grunt-cli": "^1.4.2", "grunt-contrib-clean": "^2.0.0", "grunt-contrib-copy": "^1.0.0", @@ -24,7 +24,7 @@ "grunt-focus": "^1.0.0", "grunt-text-replace": "^0.4.0", "grunt-webpack": "^4.0.3", - "webpack": "^5.33.2", + "webpack": "^5.36.0", "webpack-cli": "^4.6.0" } } diff --git a/src/main/css/main.css b/src/main/css/main.css new file mode 100644 index 0000000..930bbb1 --- /dev/null +++ b/src/main/css/main.css @@ -0,0 +1,7 @@ +table#metadata { + max-width: 300px; +} + +.error { + color: red; +} diff --git a/src/main/index.html b/src/main/index.html index 97306cd..7e5c319 100644 --- a/src/main/index.html +++ b/src/main/index.html @@ -12,27 +12,29 @@ + +

- Counting pixel + Counting pixel +

This website does not function if JavaScript is disabled. Please check the instructions on how to enable JavaScript in your web browser.

-
+
- +
diff --git a/src/main/js/index.js b/src/main/js/index.js index e1c3329..d87fcaa 100644 --- a/src/main/js/index.js +++ b/src/main/js/index.js @@ -1,5 +1,5 @@ // noinspection JSUnresolvedVariable -const {$, doAfterLoad, footer, header, nav, showPage} = window.fwdekker; +const {$, doAfterLoad, footer, header, nav} = window.fwdekker; const storageKey = "/tools/random-fo76//selected-signatures"; @@ -98,10 +98,10 @@ const updateSignatureToggle = () => { if (getSelectedSignatures().length === document.querySelectorAll("#signatures input").length) { signatureToggle.innerHTML = "Deselect all signatures"; - signatureToggle.onclick = () => setAllSignatures(false); + signatureToggle.addEventListener("click", () => setAllSignatures(false)); } else { signatureToggle.innerHTML = "Select all signatures"; - signatureToggle.onclick = () => setAllSignatures(true); + signatureToggle.addEventListener("click", () => setAllSignatures(true)); } }; @@ -140,10 +140,10 @@ const createSignatureButtons = signatures => { checkbox.id = `signature-${signature}`; checkbox.name = `signature-${signature}`; checkbox.value = signature; - checkbox.onclick = () => { + checkbox.addEventListener("click", () => { updateSignatureToggle(); saveSelectedSignaturesToStorage(); - }; + }); col.appendChild(checkbox); row.appendChild(col); @@ -176,7 +176,7 @@ doAfterLoad(() => { vcsURL: "https://git.fwdekker.com/FWDekker/random-fo76/", version: "v%%VERSION_NUMBER%%" })); - showPage(); + $("main").classList.remove("hidden"); }); // Load page from API @@ -199,7 +199,7 @@ doAfterLoad(() => { }, () => { const form = $("#signatureForm"); - form.style.color = "red"; + form.classList.add("error"); form.innerHTML = "Error: Failed to download signatures. Try reloading the page."; } ); @@ -207,12 +207,12 @@ doAfterLoad(() => { // Install handlers doAfterLoad(() => { - $("#submit").onclick = () => { + $("#submit").addEventListener("click", () => { $("#output").innerHTML = "Fetching record... please wait"; const selectedSignatures = getSelectedSignatures(); fetchFromApi(`action=get-random&signatures=${selectedSignatures.join(",")}`, record => showRecord(record) ); - }; + }); });