From 926530ff356f081434a812b72ac4fd7afef4a742 Mon Sep 17 00:00:00 2001 From: cirakg Date: Sun, 15 Jan 2023 20:20:29 +0100 Subject: Azuriran readme. --- README.md | 17 ++++++++++++++++- images/adminIndex.png | Bin 0 -> 51902 bytes images/inGame.png | Bin 0 -> 60002 bytes images/userIndex.png | Bin 0 -> 81806 bytes src/main/java/database/Database.java | 3 ++- src/main/java/models/CONSTS.java | 1 + 6 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 images/adminIndex.png create mode 100644 images/inGame.png create mode 100644 images/userIndex.png diff --git a/README.md b/README.md index 31ca2f6..83899d4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,18 @@ # ImiPokemon -## Instalacija i pokretanje +## Pokretanje + +1. Importovati pokemon.sql. +2. Pokrenuti Server.java. +3. Pokrenuti web server. +4. Pokretanje klijenata. + +## Slike + +

+ + +
+ + +

\ No newline at end of file diff --git a/images/adminIndex.png b/images/adminIndex.png new file mode 100644 index 0000000..71cbf25 Binary files /dev/null and b/images/adminIndex.png differ diff --git a/images/inGame.png b/images/inGame.png new file mode 100644 index 0000000..efc13ed Binary files /dev/null and b/images/inGame.png differ diff --git a/images/userIndex.png b/images/userIndex.png new file mode 100644 index 0000000..bf488f4 Binary files /dev/null and b/images/userIndex.png differ diff --git a/src/main/java/database/Database.java b/src/main/java/database/Database.java index a25e113..1840cef 100644 --- a/src/main/java/database/Database.java +++ b/src/main/java/database/Database.java @@ -13,6 +13,7 @@ import java.util.List; import models.Ability; import models.AbilityType; +import models.CONSTS; import models.GameStatus; import models.History; import models.Monster; @@ -25,7 +26,7 @@ public class Database { static Database instance=null; private Database() { - String connString="jdbc:mysql://localhost:3306/pokemon?user=root&password="; + String connString=CONSTS.connStringDb; try { Class.forName("com.mysql.cj.jdbc.Driver"); conn=DriverManager.getConnection(connString); diff --git a/src/main/java/models/CONSTS.java b/src/main/java/models/CONSTS.java index ebee3a6..948652b 100644 --- a/src/main/java/models/CONSTS.java +++ b/src/main/java/models/CONSTS.java @@ -4,5 +4,6 @@ public class CONSTS { public static final int port=5555; public static final String rmiUrl="rmi://localhost:"+port+"/rmi"; public static final int socketPort=5556; + public static final String connStringDb="jdbc:mysql://localhost:3306/pokemon?user=root&password="; } -- cgit v1.2.3