Changed static.yml to main.yml and changed paths to html refs

utastudents · Apr 13, 2024 · fb01091 · fb01091
1 parent eb355ea
commit fb01091
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/static.yml → .github/workflows/main.yml b/.github/workflows/static.yml → .github/workflows/main.yml
diff --git a/html/index.html b/html/index.html
@@ -10,21 +10,19 @@
     <!-- 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>
 
 <body>
 <div>
     <div class="container-fluid custom-footer" data-aos="fade-down">
         <nav class="navbar navbar-expand-sm navbar-dark container">
-            <a href="index.html" class="navbar-brand" ><img src="asset/navBarIcon.png" width="200" height="70"></a>
+            <a href="index.html" class="navbar-brand" ><img src="../asset/navBarIcon.png" width="200" height="70"></a>
 
 
             <!-- Create ticket to fix this, doesn't respone on click  -->

diff --git a/html/match.html b/html/match.html
@@ -33,7 +33,7 @@
 <body>
     <div class="container-fluid custom-footer" data-aos="fade-down">
         <nav class="navbar navbar-expand-sm navbar-dark container">
-            <a href="index.html" class="navbar-brand" ><img src="asset/navBarIcon.png" width="200" height="70"></a>
+            <a href="index.html" class="navbar-brand" ><img src="../asset/navBarIcon.png" width="200" height="70"></a>
 
 
             <!-- Create ticket to fix this, doesn't respone on click  -->

diff --git a/src/main/java/com/cse3310/App.java b/src/main/java/com/cse3310/App.java
@@ -101,6 +101,7 @@ public static void main(String[] args) {
             else{
                 httpPort = 9026;
             }
+
             HttpServer H = new HttpServer(httpPort, "./html");
             H.start();
             System.out.println("http Server started on port:" + httpPort);
@@ -114,12 +115,15 @@ public static void main(String[] args) {
             else{
                 socketPort = 9126;
             }
+
             App A = new App(socketPort);
             A.start();
             System.out.println("websocket Server started on port: " + socketPort);
         }
         catch (NullPointerException e){ // Checks for environment variable
             e.printStackTrace();
         }
+
+
     }
 }
diff --git a/target/classes/com/cse3310/App.class b/target/classes/com/cse3310/App.class
diff --git a/target/cse3310-wordsearch.jar b/target/cse3310-wordsearch.jar
diff --git a/target/surefire-reports/TEST-com.cse3310.AppTest.xml b/target/surefire-reports/TEST-com.cse3310.AppTest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.cse3310.AppTest" time="0.051" tests="1" errors="0" skipped="0" failures="0">
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.cse3310.AppTest" time="0.098" tests="1" errors="0" skipped="0" failures="0">
   <properties>
+    <property name="exec.mainClass" value="com.cse3310.App"/>
     <property name="java.specification.version" value="21"/>
     <property name="sun.jnu.encoding" value="UTF-8"/>
     <property name="java.class.path" value="/workspaces/cse3310_sp24_group_26/target/test-classes:/workspaces/cse3310_sp24_group_26/target/classes:/home/codespace/.m2/repository/junit/junit/4.11/junit-4.11.jar:/home/codespace/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/home/codespace/.m2/repository/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar:/home/codespace/.m2/repository/net/freeutils/jlhttp/2.6/jlhttp-2.6.jar:/home/codespace/.m2/repository/org/java-websocket/Java-WebSocket/1.5.4/Java-WebSocket-1.5.4.jar:/home/codespace/.m2/repository/org/slf4j/slf4j-api/2.0.6/slf4j-api-2.0.6.jar:"/>
@@ -11,7 +12,7 @@
     <property name="java.vm.specification.version" value="21"/>
     <property name="sun.java.launcher" value="SUN_STANDARD"/>
     <property name="sun.boot.library.path" value="/usr/local/sdkman/candidates/java/21.0.2-ms/lib"/>
-    <property name="sun.java.command" value="/workspaces/cse3310_sp24_group_26/target/surefire/surefirebooter14039090773852145503.jar /workspaces/cse3310_sp24_group_26/target/surefire 2024-04-13T19-37-40_596-jvmRun1 surefire17408383254445461201tmp surefire_01577500218245761020tmp"/>
+    <property name="sun.java.command" value="/workspaces/cse3310_sp24_group_26/target/surefire/surefirebooter4397079868997897534.jar /workspaces/cse3310_sp24_group_26/target/surefire 2024-04-13T20-40-46_333-jvmRun1 surefire7999166267010999568tmp surefire_017836790898688924630tmp"/>
     <property name="jdk.debug" value="release"/>
     <property name="surefire.test.class.path" value="/workspaces/cse3310_sp24_group_26/target/test-classes:/workspaces/cse3310_sp24_group_26/target/classes:/home/codespace/.m2/repository/junit/junit/4.11/junit-4.11.jar:/home/codespace/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/home/codespace/.m2/repository/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar:/home/codespace/.m2/repository/net/freeutils/jlhttp/2.6/jlhttp-2.6.jar:/home/codespace/.m2/repository/org/java-websocket/Java-WebSocket/1.5.4/Java-WebSocket-1.5.4.jar:/home/codespace/.m2/repository/org/slf4j/slf4j-api/2.0.6/slf4j-api-2.0.6.jar:"/>
     <property name="sun.cpu.endian" value="little"/>
@@ -26,7 +27,7 @@
     <property name="line.separator" value="&#10;"/>
     <property name="java.specification.name" value="Java Platform API Specification"/>
     <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
-    <property name="surefire.real.class.path" value="/workspaces/cse3310_sp24_group_26/target/surefire/surefirebooter14039090773852145503.jar"/>
+    <property name="surefire.real.class.path" value="/workspaces/cse3310_sp24_group_26/target/surefire/surefirebooter4397079868997897534.jar"/>
     <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
     <property name="java.runtime.version" value="21.0.2+13-LTS"/>
     <property name="user.name" value="codespace"/>

diff --git a/target/surefire-reports/com.cse3310.AppTest.txt b/target/surefire-reports/com.cse3310.AppTest.txt
@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.cse3310.AppTest
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.051 s - in com.cse3310.AppTest
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.098 s - in com.cse3310.AppTest