From 5382049dcd4ed8e1b36d77c379f6488db1cf03ea Mon Sep 17 00:00:00 2001 From: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com> Date: Sun, 5 Jun 2022 22:20:30 +0300 Subject: [PATCH] Show React version of /players page if opted to Frontend BETA --- .../delivery/rendering/pages/PageFactory.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PageFactory.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PageFactory.java index 6bc611b4b..c92f99a41 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PageFactory.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/pages/PageFactory.java @@ -86,7 +86,12 @@ public class PageFactory { this.locale = locale; } - public PlayersPage playersPage() throws IOException { + public Page playersPage() throws IOException { + if (config.get().isTrue(PluginSettings.FRONTEND_BETA)) { + String reactHtml = getResource("index.html"); + return () -> reactHtml; + } + return new PlayersPage(getResource("players.html"), versionChecker.get(), config.get(), theme.get(), serverInfo.get()); } @@ -116,11 +121,17 @@ public class PageFactory { ); } - public PlayerPage playerPage(UUID playerUUID) throws IOException { + public Page playerPage(UUID playerUUID) throws IOException { Database db = dbSystem.get().getDatabase(); PlayerContainer player = db.query(ContainerFetchQueries.fetchPlayerContainer(playerUUID)); + + if (config.get().isTrue(PluginSettings.FRONTEND_BETA)) { + String reactHtml = getResource("index.html"); + return () -> reactHtml; + } + return new PlayerPage( - getResource(config.get().isTrue(PluginSettings.FRONTEND_BETA) ? "index.html" : "player.html"), player, + getResource("player.html"), player, versionChecker.get(), config.get(), this,