tools
/
dice
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Use new template system, bump to chart.js 3

This commit is contained in:
Florine W. Dekker 2021-04-18 18:13:23 +02:00
parent 15e0eb26d3
commit 9af57b171c
Signed by: FWDekker
GPG Key ID: B1B567AF58D6EE0F
5 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@ -8,10 +8,10 @@ module.exports = grunt => {
},
copy: {
html: {
files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/"}]
files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/", flatten: true}]
},
css: {
files: [{expand: true, cwd: "src/main/", src: "**/*.css", dest: "dist/"}]
files: [{expand: true, cwd: "src/main/", src: "**/*.css", dest: "dist/", flatten: true}]
},
},
focus: {
@ -43,7 +43,7 @@ module.exports = grunt => {
},
webpack: {
options: {
entry: "./src/main/js/index.js",
entry: "./src/main/js/main.js",
module: {
rules: [
{

BIN
package-lock.json generated
View File

Binary file not shown.

13
package.json
View File

@ -1,6 +1,6 @@
{
"name": "dice",
"version": "1.0.12",
"version": "1.0.13",
"description": "Calculates the probability of rolling a value given a combination of dice.",
"author": "Felix W. Dekker",
"browser": "dist/bundle.js",
@ -16,19 +16,18 @@
"deploy": "grunt deploy"
},
"dependencies": {
"@fwdekker/template": "^0.0.24",
"chart.js": "^2.9.4"
"chart.js": "^3.1.1"
},
"devDependencies": {
"grunt": "^1.3.0",
"grunt-cli": "^1.4.1",
"grunt-cli": "^1.4.2",
"grunt-contrib-clean": "^2.0.0",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-watch": "^1.1.0",
"grunt-focus": "^1.0.0",
"grunt-text-replace": "^0.4.0",
"grunt-webpack": "^4.0.2",
"webpack": "^5.28.0",
"webpack-cli": "^4.5.0"
"grunt-webpack": "^4.0.3",
"webpack": "^5.33.2",
"webpack-cli": "^4.6.0"
}
}

9
src/main/index.html
View File

@ -11,14 +11,15 @@
<title>Dice probabilities | FWDekker</title>
<link rel="stylesheet" href="https://static.fwdekker.com/fonts/roboto.css" crossorigin="anonymous" />
<link rel="stylesheet" href="https://static.fwdekker.com/lib/template/1.x.x/bundle.css" crossorigin="anonymous" />
</head>
<body>
<noscript>
<span style="color: red; font-weight: bold;">
<p style="color: red; font-weight: bold;">
This website does not function if JavaScript is disabled.
Please check the <a href="https://www.enable-javascript.com/">
instructions on how to enable JavaScript in your web browser</a>.
</span>
</p>
</noscript>
<main style="display: none;">
<div id="nav"></div>
@ -70,8 +71,8 @@
<div id="footer"></div>
</main>
<!-- Scripts -->
<script src="https://static.fwdekker.com/lib/template/1.x.x/bundle.js" crossorigin="anonymous"></script>
<!--suppress HtmlUnknownTarget -->
<script src="bundle.js?v=%%VERSION_NUMBER%%"></script>
</body>
</html>

16
src/main/js/index.js → src/main/js/main.js
View File

@ -1,5 +1,8 @@
import {$, doAfterLoad, footer, header, nav, showPage} from "@fwdekker/template";
import Chart from "chart.js"
// noinspection JSUnresolvedVariable
const {$, doAfterLoad, footer, header, nav, showPage} = window.fwdekker;
import {Chart, CategoryScale, Filler, LineController, LineElement, LinearScale, PointElement, Tooltip} from "chart.js"
Chart.register(CategoryScale, Filler, LineController, LineElement, LinearScale, PointElement, Tooltip);
//////
@ -49,11 +52,6 @@ doAfterLoad(() => {
description: "Calculate the probability of rolling a value given a combination of dice"
}));
$("#footer").appendChild(footer({
author: "Felix W. Dekker",
authorURL: "https://fwdekker.com/",
license: "MIT License",
licenseURL: "https://git.fwdekker.com/FWDekker/dice/src/branch/master/LICENSE",
vcs: "git",
vcsURL: "https://git.fwdekker.com/FWDekker/dice/",
version: "v%%VERSION_NUMBER%%"
}));
@ -218,9 +216,7 @@ doAfterLoad(() => {
type: "line",
data: {},
options: {
legend: {
display: false
},
fill: true,
scales: {
yAxes: [{
display: true,