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 5869eaf..17441a3 100644 Binary files a/package-lock.json and b/package-lock.json differ 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 @@ + + -
+
- +
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) ); - }; + }); });
Game version loading...