Merge pull request #60 from AlecM33/add-tests

rename folders to make more sense
This commit is contained in:
Alec Maier
2020-05-03 06:09:00 -04:00
committed by GitHub
16 changed files with 13 additions and 12 deletions

View File

@@ -1,5 +1,5 @@
const debugMode = Array.from(process.argv.map( (arg)=>arg.trim().toLowerCase() )).includes("debug");
const LOGGER = require("./static/modules/logger")(debugMode);
const LOGGER = require("./javascript/modules/logger")(debugMode);
module.exports = class {

View File

@@ -14,12 +14,13 @@ const CronJob = require('cron').CronJob;
const serverHelper = new ServerHelper(CronJob);
const debugMode = Array.from(process.argv.map( (arg)=>arg.trim().toLowerCase() )).includes("debug");
const LOGGER = require("./static/modules/logger")(debugMode);
const LOGGER = require("./javascript/modules/logger")(debugMode);
app.set('port', 5000);
app.use('/static', express.static(__dirname + '/static')); // Routing
app.use('/javascript', express.static(__dirname + '/javascript')); // Routing
app.use('/assets', express.static(__dirname + '/assets')); // Routing
app.use('/stylesheets', express.static(__dirname + '/stylesheets')); // Routing
app.use('/node_modules/socket.io-client', express.static(__dirname + '/node_modules/socket.io-client')); // Routing
app.get('', function(request, response) {
response.sendFile(__dirname + '/views/index.html');

View File

@@ -4,7 +4,7 @@
<title>Werewolf</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel = "stylesheet" type = "text/css" href = "../static/styles.css" />
<link rel = "stylesheet" type = "text/css" href = "../stylesheets/styles.css" />
<link rel="shortcut icon" type="image/png" href="../assets/images/favicon.ico"/>
<script src="../node_modules/socket.io-client/dist/socket.io.js"></script>
</head>
@@ -117,6 +117,6 @@
<p id="some-error"></p>
</div>
</div>
<script type="module" src="/static/setup.js"></script>
<script type="module" src="/javascript/setup.js"></script>
</body>
</html>

View File

@@ -5,7 +5,7 @@
<title>Title</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel = "stylesheet" type = "text/css" href = "../static/styles.css" />
<link rel = "stylesheet" type = "text/css" href = "../stylesheets/styles.css" />
<link rel="shortcut icon" type="image/png" href="../assets/images/favicon.ico"/>
</head>
<body>

View File

@@ -4,7 +4,7 @@
<title>Werewolf</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel = "stylesheet" type = "text/css" href = "../static/styles.css" />
<link rel = "stylesheet" type = "text/css" href = "../stylesheets/styles.css" />
<link rel="shortcut icon" type="image/png" href="../assets/images/favicon.ico"/>
<script src="../node_modules/socket.io-client/dist/socket.io.js"></script>
</head>
@@ -22,6 +22,6 @@
<div id="end-container"></div>
<div id="launch"></div>
</div>
<script type="module" src="/static/game.js"></script>
<script type="module" src="/javascript/game.js"></script>
</body>
</html>

View File

@@ -3,7 +3,7 @@
<head>
<title>Werewolf</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel = "stylesheet" type = "text/css" href = "../static/styles.css" />
<link rel = "stylesheet" type = "text/css" href = "../stylesheets/styles.css" />
<link rel="shortcut icon" type="image/png" href="../assets/images/favicon.ico"/>
<script src="../node_modules/socket.io-client/dist/socket.io.js"></script>
</head>

View File

@@ -4,7 +4,7 @@
<title>Werewolf</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel = "stylesheet" type = "text/css" href = "static/styles.css" />
<link rel = "stylesheet" type = "text/css" href = "../stylesheets/styles.css" />
<link rel="shortcut icon" type="image/png" href="../assets/images/favicon.ico"/>
<script src="../node_modules/socket.io-client/dist/socket.io.js"></script>
</head>
@@ -36,6 +36,6 @@
</div>
</div>
</div>
<script type="module" src="/static/join.js"></script>
<script type="module" src="/javascript/join.js"></script>
</body>
</html>

View File

@@ -5,7 +5,7 @@
<title>Title</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel = "stylesheet" type = "text/css" href = "../static/styles.css" />
<link rel = "stylesheet" type = "text/css" href = "../stylesheets/styles.css" />
<link rel="shortcut icon" type="image/png" href="../assets/images/favicon.ico"/>
</head>
<body>