diff --git a/pom.xml b/pom.xml index 182986c..887a62c 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.5.7 5.10.2 - it.cavallium.connect4x4.MainVerticle + it.cavallium.connect2x.MainVerticle io.vertx.core.Launcher diff --git a/src/main/java/it/cavallium/connect4x4/App.java b/src/main/java/it/cavallium/connect2x/App.java similarity index 93% rename from src/main/java/it/cavallium/connect4x4/App.java rename to src/main/java/it/cavallium/connect2x/App.java index b0929f3..24705d9 100644 --- a/src/main/java/it/cavallium/connect4x4/App.java +++ b/src/main/java/it/cavallium/connect2x/App.java @@ -1,4 +1,4 @@ -package it.cavallium.connect4x4; +package it.cavallium.connect2x; import io.vertx.core.DeploymentOptions; import io.vertx.core.ThreadingModel; diff --git a/src/main/java/it/cavallium/connect4x4/MainVerticle.java b/src/main/java/it/cavallium/connect2x/MainVerticle.java similarity index 84% rename from src/main/java/it/cavallium/connect4x4/MainVerticle.java rename to src/main/java/it/cavallium/connect2x/MainVerticle.java index 6f5f882..8afa7d7 100644 --- a/src/main/java/it/cavallium/connect4x4/MainVerticle.java +++ b/src/main/java/it/cavallium/connect2x/MainVerticle.java @@ -1,4 +1,4 @@ -package it.cavallium.connect4x4; +package it.cavallium.connect2x; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Single; @@ -19,25 +19,19 @@ public class MainVerticle extends AbstractVerticle { @Override public Completable rxStart() { - vertx.eventBus().consumer("connect4x4.move") + vertx.eventBus().consumer("connect2x.move") .handler(event -> System.out.println("Received: " + event.body())); var server = vertx.createHttpServer(); SockJSHandler sockJSHandler = SockJSHandler.create(vertx); SockJSBridgeOptions sockJSBridgeOptions = new SockJSBridgeOptions() - .addInboundPermitted(new PermittedOptions().setAddress("connect4x4.move")) - .addOutboundPermitted(new PermittedOptions().setAddress("connect4x4.moved")); + .addInboundPermitted(new PermittedOptions().setAddress("connect2x.move")) + .addOutboundPermitted(new PermittedOptions().setAddress("connect2x.moved")); Router router = Router.router(vertx); router .get("/*") - .handler(ctx -> { - System.out.println(ctx.request().uri()); - System.out.println(ctx.request().absoluteURI()); - System.out.println(ctx.normalizedPath()); - ctx.next(); - }) .handler(StaticHandler .create(FileSystemAccess.RELATIVE,"webroot") //.setDirectoryListing(true) diff --git a/src/main/resources/webroot/static/connect4x4.js b/src/main/resources/webroot/static/connect2x.js similarity index 91% rename from src/main/resources/webroot/static/connect4x4.js rename to src/main/resources/webroot/static/connect2x.js index b84bb44..4cbb668 100644 --- a/src/main/resources/webroot/static/connect4x4.js +++ b/src/main/resources/webroot/static/connect2x.js @@ -26,7 +26,7 @@ document.addEventListener("DOMContentLoaded", e => { }; - const connect4x4 = document.connect4x4 = { + const connect2x = document.connect2x = { clientId: randomID(), gameId: null } @@ -44,7 +44,7 @@ document.addEventListener("DOMContentLoaded", e => { hash = ""; } if (hash.length === 0) { - if (connect4x4.gameId == null) { + if (connect2x.gameId == null) { onGameIdChange(randomID()); } else { console.warn("Game hash unchanged."); @@ -58,8 +58,8 @@ document.addEventListener("DOMContentLoaded", e => { setTimeout(() => { document.location.href = redirectLink; }, 5000); - } else if (connect4x4.gameId !== hash) { - if (connect4x4.gameId != null) { + } else if (connect2x.gameId !== hash) { + if (connect2x.gameId != null) { console.log("Game id changed, reloading..."); document.location.reload(); } else { @@ -71,7 +71,7 @@ document.addEventListener("DOMContentLoaded", e => { } function onGameIdChange(gameId) { - connect4x4.gameId = gameId; + connect2x.gameId = gameId; console.info("Game ID", gameId); gameCode.innerText = gameId; const gameLink = `${document.location.origin}#${gameId}`; @@ -81,8 +81,8 @@ document.addEventListener("DOMContentLoaded", e => { if (navigator.share !== undefined) { e.preventDefault(); await navigator.share({ - title: "Connect 4x4", - text: "Play Connect 4x4 game with me", + title: "Connect 2x", + text: "Play Connect 2x game with me", url: gameLink }).then(() => console.log("Shared!")).catch(err => { console.error("Share failed", err); @@ -106,12 +106,12 @@ document.addEventListener("DOMContentLoaded", e => { eb.onopen = () => { // set a handler to receive a message - eb.registerHandler('connect4x4.moved', (error, message) => { + eb.registerHandler('connect2x.moved', (error, message) => { console.log('received a message: ' + JSON.stringify(message)); }); // send a message - eb.send('connect4x4.move', {name: 'tim', age: 587}); + eb.send('connect2x.move', {name: 'tim', age: 587}); } }) diff --git a/src/main/resources/webroot/static/index.html b/src/main/resources/webroot/static/index.html index cb4516b..81bdaaf 100644 --- a/src/main/resources/webroot/static/index.html +++ b/src/main/resources/webroot/static/index.html @@ -1,17 +1,20 @@ - Connect 4x4 + Connect 2x - +
-

Connect 4x4

+

Connect 2x

Game code: [share] [new game]

+
+ +
diff --git a/src/test/java/it/cavallium/connect4x4/TestMainVerticle.java b/src/test/java/it/cavallium/connect2x/TestMainVerticle.java similarity index 94% rename from src/test/java/it/cavallium/connect4x4/TestMainVerticle.java rename to src/test/java/it/cavallium/connect2x/TestMainVerticle.java index 2f8617c..f4c9dfb 100644 --- a/src/test/java/it/cavallium/connect4x4/TestMainVerticle.java +++ b/src/test/java/it/cavallium/connect2x/TestMainVerticle.java @@ -1,4 +1,4 @@ -package it.cavallium.connect4x4; +package it.cavallium.connect2x; import io.vertx.core.Vertx; import io.vertx.junit5.VertxExtension;