Merge pull request #6 from utastudents/main

Updating branch to current version of main

.github/workflows/main.yml

@@ -60,7 +60,7 @@ jobs:
            ssh production 'echo "Environment=VERSION=\"${{ github.sha }}\"" >>.config/systemd/user/${{ vars.SERVICE_NAME }}.service'
            ssh production 'echo "Environment=WEBSOCKET_PORT=${{ vars.WEBSOCKET_PORT }}" >>.config/systemd/user/${{ vars.SERVICE_NAME }}.service'
            ssh production 'echo "Environment=HTTP_PORT=${{ vars.HTTP_PORT }}" >>.config/systemd/user/${{ vars.SERVICE_NAME }}.service'
-           ssh production 'echo "ExecStart=mvn exec:java -Dexec.mainClass=uta.cse3310.App" >> .config/systemd/user/${{ vars.SERVICE_NAME }}.service'
+           ssh production 'echo "ExecStart=mvn exec:java -Dexec.mainClass=com.cse3310.App" >> .config/systemd/user/${{ vars.SERVICE_NAME }}.service'
            ssh production 'echo "WorkingDirectory=$PWD/${{ github.event.repository.name }}" >> .config/systemd/user/${{ vars.SERVICE_NAME }}.service'
            ssh production 'echo "[Install]" >>.config/systemd/user/${{ vars.SERVICE_NAME }}.service'
            ssh production 'echo "WantedBy=default.target" >>.config/systemd/user/${{ vars.SERVICE_NAME }}.service'

html/index.html

@@ -10,10 +10,10 @@
     <!-- Fonts -->
     <!-- <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Chivo Mono"> -->
     <!-- Bootstrap CSS -->
-    <link rel="stylesheet" href="../bootstrap-5.3.3-dist/css/bootstrap.css">
-    <link rel="stylesheet" href="../bootstrap-5.3.3-dist/css/styling.css">
+    <link rel="stylesheet" href="bootstrap-5.3.3-dist/css/bootstrap.css">
+    <link rel="stylesheet" href="bootstrap-5.3.3-dist/css/styling.css">
     <!--suppress JSUnresolvedLibraryURL -->
-    <link rel="stylesheet" href="../bootstrap-5.3.3-dist/aos/aos-next/src/sass/aos.scss" />
+    <link rel="stylesheet" href="bootstrap-5.3.3-dist/aos/aos-next/src/sass/aos.scss" />
     <link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css" />
 
 </head>
@@ -160,10 +160,10 @@ <h1>LEADERBOARD</h1>
 
 
 
-    <script src="../bootstrap-5.3.3-dist/js/bootstrap.js"></script>
-    <script src="../bootstrap-5.3.3-dist/js/js.js"></script>
+    <script src="bootstrap-5.3.3-dist/js/bootstrap.js"></script>
+    <script src="bootstrap-5.3.3-dist/js/js.js"></script>
     <script src="https://unpkg.com/aos@next/dist/aos.js"></script>
-    <script src="../bootstrap-5.3.3-dist/js/usernameValidation.js"></script>
+    <script src="bootstrap-5.3.3-dist/js/usernameValidation.js"></script>
 
     <script>AOS.init();</script>
     <script src="usernameValidation.js"></script>

pom.xml

@@ -22,7 +22,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.1</version>
       <scope>test</scope>
     </dependency>
 

src/main/java/com/cse3310/App.java

@@ -1,6 +1,7 @@
 package com.cse3310;
 
 import java.io.BufferedReader;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.InetSocketAddress;
@@ -16,6 +17,7 @@
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.Vector;
+import java.util.ArrayList;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -24,6 +26,7 @@ public class App extends WebSocketServer
 {
     Vector<Game> ActiveGames = new Vector<Game>();
     int GameID;
+
 
     public App(int port){
         super(new InetSocketAddress(port));
@@ -91,6 +94,21 @@ public void onStart() {
     }
 
     public static void main(String[] args) {
+        String filename = "words.txt";
+        //Read in file of words
+        ArrayList<String> wordList = new ArrayList<>();
+        try(BufferedReader br = new BufferedReader(new FileReader(filename)))
+        {
+            String line;
+            while((line = br.readLine()) != null)
+            {
+                wordList.add(line.trim());
+            }
+        }
+        catch (IOException e)
+        {
+            System.err.println("Error reading file:"+ e.getMessage());
+        }
         // Set up the http server
         try{
             String envPort = System.getenv("HTTP_PORT");

src/main/java/com/cse3310/Game.java

@@ -5,10 +5,11 @@
 public class Game{
     private ArrayList<User> users;
     public int GameId;
-    public int[][] grid;
+    public char[][] grid;
 
-    public Game()
+    public Game(ArrayList words)
     {
+        grid = new char[50][50];
 
     }
 

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,6 +1,6 @@
+com/cse3310/Locations.class
 com/cse3310/Coordinate.class
 com/cse3310/ServerEvent.class
-com/cse3310/Locations.class
 com/cse3310/HttpServer.class
 com/cse3310/HttpServer$1.class
 com/cse3310/UserEvent.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -2,7 +2,7 @@
 /workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/HttpServer.java
 /workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/Coordinate.java
 /workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/ServerEvent.java
-/workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/UserEvent.java
 /workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/User.java
+/workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/UserEvent.java
 /workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/Locations.java
 /workspaces/cse3310_sp24_group_26/src/main/java/com/cse3310/App.java