diff options
| -rw-r--r-- | README.md | 17 | ||||
| -rw-r--r-- | images/adminIndex.png | bin | 0 -> 51902 bytes | |||
| -rw-r--r-- | images/inGame.png | bin | 0 -> 60002 bytes | |||
| -rw-r--r-- | images/userIndex.png | bin | 0 -> 81806 bytes | |||
| -rw-r--r-- | src/main/java/database/Database.java | 3 | ||||
| -rw-r--r-- | src/main/java/models/CONSTS.java | 1 |
6 files changed, 19 insertions, 2 deletions
@@ -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 + +<p align="center"> + +<img src="./images/inGame.png" style="border:1px solid black" /> +<br> +<img src="./images/adminIndex.png" width="400px" style="border:1px solid black"/> +<img src="./images/userIndex.png" width="400px" style="border:1px solid black"/> +</p>
\ No newline at end of file diff --git a/images/adminIndex.png b/images/adminIndex.png Binary files differnew file mode 100644 index 0000000..71cbf25 --- /dev/null +++ b/images/adminIndex.png diff --git a/images/inGame.png b/images/inGame.png Binary files differnew file mode 100644 index 0000000..efc13ed --- /dev/null +++ b/images/inGame.png diff --git a/images/userIndex.png b/images/userIndex.png Binary files differnew file mode 100644 index 0000000..bf488f4 --- /dev/null +++ b/images/userIndex.png 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="; } |
