From 767e340f6bfee034e02e1bb740f54b172ea39a47 Mon Sep 17 00:00:00 2001 From: Totmak <totmak@utu.fi> Date: Thu, 20 May 2021 19:05:32 +0300 Subject: [PATCH] Docker test --- index.html | 63 ++++++++++++++++++++++++++++++++++++---- index.js | 1 - monopoly/code/index.html | 0 monopoly/code/test.js | 2 +- server.js | 2 -- 5 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 monopoly/code/index.html diff --git a/index.html b/index.html index 345c634..a6cf3e1 100644 --- a/index.html +++ b/index.html @@ -1,8 +1,61 @@ <!DOCTYPE html> <html> -<head> + <head> + <meta charset="utf-8"/> + <link rel="stylesheet" href="monopoly/style.css"> + </head> + <body> + <main> + <div id="container"> + <div id="board"></div> + <span id="info"> + <span id="infoCoa"></span> + <span id="infoNameText"><p id="infoName"></p></span> + <span id="infoOtherS"><p><b>Value:</b><p id="infoValue"></p></p></span> + <span id="infoOther"> <p><b>Dignity:</b><p id="infoDignity"></p></p> </span> + <span id="infoShareS"> + <p><b>Shares:</b><p id="infoShares"></p></p> + </span> + <span id="infoOwnerText"><p><b>Owner:</b><p id="infoOwner"></p></p></span> + <button id="buyShare" onclick="Player.buyShare()">BUY SHARE</button> + </span> + <span id="console"> + </span> + </main><selection> + <table id="entrepreneurs"> + <caption><h3>ENTREPRENEURS</h3></caption> + <tr><th width='50%'>Name</th><th>Company</th><th title="Prudence">PRU</th><th title="Ambition">AMB</th><th title="Pride">PRI</th><th>Reputation</th><th>Tenure</th></tr> + </table> + </selection> + <selection> + <table id="companies"> + <caption><h3>COMPANIES</h3></caption> + <tr><th width="31.95%">Name</th><th>Icon</th><th>Properties</th><th>Treasury</th><th>Total value</th></tr> + </table> + </selection> + <aside> + <table id="shares"> + <caption><h3>SHARES</h3></caption> + <tr><th>Location</th><th>Company</th><th title="Current Value">C. value</th><th title="Original value">O. value</th><th>Options</th></tr> + </table> + </aside> + <aside> + <fieldset> + <legend><h3>PLAYER</h3></legend> + <table id="player"> + <tr><th>Treasury:</th><td id="playerTreasury">a</td></tr> + <tr><th>Shares:</th><td id="playerShares"></td></tr> + <tr><th>Shares value:</th><td id="playerSharesValue"></td></tr> + <tr><th>Turn:</th><td id="playerTurn"></td></tr> + <tr><td colspan="2"><button id="turnButton" onclick="turn()">TURN</button></td></tr> + <tr><td colspan="2"> <button id="cashOutButton" onclick="Player.cashOut()">CASH OUT</button></td></tr> + <tr><td colspan="2"> <button id="reloadButton" onclick="reloadGame()">RELOAD</button></td></tr> + </table> + </fieldset + </aside> -</head> -<body> -</body> -</html> + + </body> + <script type="module" src="index.js"></script> + +<html> diff --git a/index.js b/index.js index 4110aec..5de6b22 100644 --- a/index.js +++ b/index.js @@ -43,4 +43,3 @@ document.getElementById("cashOutButton").onclick = function(){Player.cashOut();} document.getElementById("reloadButton").onclick = function(){Basic.reloadGame();} //UnitTest.runUnitTest(); - diff --git a/monopoly/code/index.html b/monopoly/code/index.html new file mode 100644 index 0000000..e69de29 diff --git a/monopoly/code/test.js b/monopoly/code/test.js index 6223225..37c70f3 100644 --- a/monopoly/code/test.js +++ b/monopoly/code/test.js @@ -1,2 +1,2 @@ -var test = false; +var test = true; module.exports = test; diff --git a/server.js b/server.js index ce2cee4..187c891 100644 --- a/server.js +++ b/server.js @@ -3,5 +3,3 @@ var app = express(); app.use(express.static(__dirname)); //__dir and not _dir var port = 3000; // you can use any port app.listen(port); - - -- GitLab