Merge pull request #71 from NovaUniverse/webui-rewrite

Rewrite WebUI in react

.github/workflows/build_webui.yml

@@ -0,0 +1,22 @@
+name: Build WebUI
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  install:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - name: Install dependencies
+        working-directory: ./ReactUI
+        run: pnpm install
+      - name: Build
+        working-directory: ./ReactUI
+        run: pnpm run build

.gitignore

@@ -1,9 +1,14 @@
-# NodeJS stuff
-node_modules
-npm-debug.log
+# WebSocketAPI
+/WebSocketAPI/node_modules
+/WebSocketAPI/npm-debug.log
 /WebSocketAPI/data
 /WebSocketAPI/dist
-yarn.lock
+/WebSocketAPI/yarn.lock
+
+# WebUI
+/ReactUI/node_modules
+/ReactUI/npm-debug.log
+/ReactUI/dist
 
 # Compiled class file
 *.class

MCTournamentSystem-Bungeecord/pom.xml

@@ -20,7 +20,6 @@
 				<includes>
 					<include>plugin.yml</include>
 					<include>config.yml</include>
-					<include>favicon.ico</include>
 					<include>sql/**/*.sql</include>
 				</includes>
 			</resource>
@@ -44,6 +43,14 @@
 							<pattern>org.apache.http</pattern>
 							<shadedPattern>net.novauniverse.mctournamentsystem.shaded.org.apache.http</shadedPattern>
 						</relocation>
+						<relocation>
+							<pattern>org.mindrot</pattern>
+							<shadedPattern>net.novauniverse.mctournamentsystem.shaded.org.mindrot</shadedPattern>
+						</relocation>
+						<relocation>
+							<pattern>com.auth0</pattern>
+							<shadedPattern>net.novauniverse.mctournamentsystem.shaded.com.auth0</shadedPattern>
+						</relocation>
 					</relocations>
 				</configuration>
 				<executions>
@@ -140,7 +147,7 @@
 		<dependency>
 			<groupId>net.novauniverse</groupId>
 			<artifactId>NovaAPILib</artifactId>
-			<version>1.2.3-SNAPSHOT</version>
+			<version>1.2.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -173,6 +180,18 @@
 			<version>2.0.0-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.auth0</groupId>
+			<artifactId>java-jwt</artifactId>
+			<version>4.4.0</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mindrot</groupId>
+			<artifactId>jbcrypt</artifactId>
+			<version>0.4</version>
+			<scope>compile</scope>
+		</dependency>
 		<!-- https://mvnrepository.com/artifact/com.sun.net.httpserver/http -->
 		<dependency>
 			<groupId>com.sun.net.httpserver</groupId>