diff --git a/index.html b/client/index.html
similarity index 96%
rename from index.html
rename to client/index.html
index dec210e..fc874af 100644
--- a/index.html
+++ b/client/index.html
@@ -3,7 +3,7 @@
Zahlen raten
-
+
diff --git a/src/client.ts b/client/src/client.ts
similarity index 89%
rename from src/client.ts
rename to client/src/client.ts
index 6c8f885..7472718 100644
--- a/src/client.ts
+++ b/client/src/client.ts
@@ -6,17 +6,18 @@ document.addEventListener('DOMContentLoaded', function() {
const guessInput = document.getElementById('guessInput') as HTMLInputElement;
const guessValue = guessInput.value;
+ if (guessValue === '') {
+ displayResult('Please enter a valid number!');
+ return;
+ }
+
// Hier sendest du die Anfrage an den Server
- fetch('http://localhost:8080/guess', { // Beachte die richtige Serveradresse
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- },
- body: JSON.stringify({ guess: guessValue }),
+ fetch(`http://localhost:8080/guess/${guessValue}`, { // Beachte die richtige Serveradresse
+ method: 'GET'
})
.then(response => response.json())
.then(data => {
- // Hier wird die Antwort des Servers in einem sichtbaren Bereich angezeigt
+ console.log(data)
displayResult(data.answer);
})
.catch(error => {
diff --git a/style/styles.css b/client/style/styles.css
similarity index 100%
rename from style/styles.css
rename to client/style/styles.css
diff --git a/server/server.ts b/server/server.ts
index 12e527a..51bd735 100644
--- a/server/server.ts
+++ b/server/server.ts
@@ -10,15 +10,11 @@ app.use(express.json());
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
-let basedir: string = __dirname + "../../client";
+let basedir: string = __dirname + "/../client";
app.use("/", express.static(basedir + "/"));
-app.use("/bootstrap", express.static(basedir + "/node_modules/bootstrap/dist/"));
-
+app.use("/bootstrap", express.static(basedir + "/../node_modules/bootstrap/dist/"));
let ranNum: number;
-app.get('/', (req, res) => {
- res.sendFile(__dirname + 'Aufgabenblatt 3/index.html');
-});
app.listen(port, () => {
console.log(`Server gestartet auf http://localhost:${port}/`);
ranNum = random(1, 10);
@@ -55,7 +51,7 @@ app.post('/reset', (req, res) => {
const min: number = Number(req.body.min);
const max: number = Number(req.body.max);
if (Number.isNaN(min || Number.isNaN(max) || min > max || min <= 0 || max <= 0)) {
- return res.status(400).send({
+ return res.status(200).send({
message: 'Invalid input'
})
}
diff --git a/tsconfig.json b/tsconfig.json
index 5d52e08..174c57b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,7 +3,8 @@
"module": "ESNext",
"target": "es6",
"sourceMap": true,
- "allowSyntheticDefaultImports": true
+ "allowSyntheticDefaultImports": true,
+ "esModuleInterop": true
},
"exclude": [
"node_modules"