Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite WebUI in react #71

Merged
merged 30 commits into from
Nov 9, 2023
Merged

Rewrite WebUI in react #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1f18ddc
Initial work on new web ui
AntonUden Nov 2, 2023
0ff4d32
Add player list and server list
AntonUden Nov 2, 2023
b189fd3
add page selector
AntonUden Nov 3, 2023
a01509a
remove old admin ui
AntonUden Nov 3, 2023
716708a
nav fixes
AntonUden Nov 3, 2023
7f5c395
export button and overview
AntonUden Nov 5, 2023
d51a423
Overview page features
AntonUden Nov 5, 2023
0ac3f02
Score page and some score related stuff in tournament system
AntonUden Nov 5, 2023
ac93456
add way to add and clear score
AntonUden Nov 5, 2023
78389e6
add usernameToOfflineUserUUID
AntonUden Nov 6, 2023
b661b07
Initial work on whitelist and add way to allow unauthenticated access…
AntonUden Nov 6, 2023
91caef0
Prepare for live stats page
AntonUden Nov 6, 2023
cbcb8dd
whitelist page
AntonUden Nov 6, 2023
37ab04e
themes
AntonUden Nov 6, 2023
aa4f07d
changed webserver code to serve react page instead of html page
AntonUden Nov 6, 2023
fa8badf
improve login page
AntonUden Nov 6, 2023
4bc3fe9
Trigger page, 404 page and fix skin render issue
AntonUden Nov 7, 2023
4a64bcc
Add staff page and disconnect message
AntonUden Nov 7, 2023
3339147
Add staff list and preloader
AntonUden Nov 7, 2023
db83dac
Add staff modal
AntonUden Nov 7, 2023
37d5375
fix bug where once checked checkboxes would not change
AntonUden Nov 7, 2023
66476ba
make 404 page use html navigate to prevent issue where the login box …
AntonUden Nov 7, 2023
cf4c862
Update NotFound.tsx
AntonUden Nov 7, 2023
58b9b3e
add chat log page
AntonUden Nov 7, 2023
e40c31b
complete rewrite of auth system
AntonUden Nov 8, 2023
bcf1a1c
Add team editor and add way to load custom css files
AntonUden Nov 9, 2023
86b9223
Score snapshot and settings
AntonUden Nov 9, 2023
37d2ad4
Create build_webui.yml
AntonUden Nov 9, 2023
e7f443b
Trying to get the workflow running
AntonUden Nov 9, 2023
1782d9f
Maybe this will make the workflow run
AntonUden Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 22 additions & 0 deletions .github/workflows/build_webui.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
13 changes: 9 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file removed MCTournamentSystem-Bungeecord/favicon.ico
View file
Open in desktop
Binary file not shown.
23 changes: 21 additions & 2 deletions MCTournamentSystem-Bungeecord/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<includes>
<include>plugin.yml</include>
<include>config.yml</include>
<include>favicon.ico</include>
<include>sql/**/*.sql</include>
</includes>
</resource>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading