From 63d2d808b0ffeaf3c0925c85da1ea111206a185f Mon Sep 17 00:00:00 2001 From: xaralis <filip.varecha@fragaria.cz> Date: Mon, 4 Jan 2021 11:27:24 +0100 Subject: [PATCH] feat: do not wait for WS to connect to show the page --- src/App.jsx | 13 +++++++++++-- src/containers/GlobalStats.jsx | 8 +++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index 98330bf..7414cf3 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,4 +1,4 @@ -import React, { Suspense } from "react"; +import React, { Suspense, useEffect } from "react"; import { Helmet, HelmetProvider } from "react-helmet-async"; import { BrowserRouter as Router, Route, Switch } from "react-router-dom"; import { KeycloakProvider } from "@react-keycloak/web"; @@ -6,7 +6,10 @@ import { ExtraErrorData } from "@sentry/integrations/dist/extraerrordata"; import * as Sentry from "@sentry/react"; import { Integrations } from "@sentry/tracing"; +import { loadAnnouncements } from "actions/announcements"; import { loadConfig } from "actions/global-info"; +import { loadPosts } from "actions/posts"; +import { loadProgram } from "actions/program"; import { loadMe } from "actions/users"; import { initializeWSChannel } from "actions/ws"; import Footer from "components/Footer"; @@ -86,7 +89,13 @@ const LoadingComponent = ( ); const BaseApp = () => { - initializeWSChannel.read(); + loadProgram.read(); + loadAnnouncements.read(); + loadPosts.read(); + + useEffect(() => { + initializeWSChannel.run(); + }, []); return ( <HelmetProvider> diff --git a/src/containers/GlobalStats.jsx b/src/containers/GlobalStats.jsx index 96ecbef..85cb17a 100644 --- a/src/containers/GlobalStats.jsx +++ b/src/containers/GlobalStats.jsx @@ -45,9 +45,11 @@ const GlobalStats = () => { <div> <strong>{onlineUsers}</strong> <span>online celkem</span> </div> - <div> - <span>Vel. skupiny členů je</span> <strong>{groupSizeHalf}</strong> - </div> + {groupSizeHalf !== null && ( + <div> + <span>Vel. skupiny členů je</span> <strong>{groupSizeHalf}</strong> + </div> + )} {nextProgramEntry && ( <div className="flex-grow text-right hidden sm:block lg:hidden xl:block truncate"> Následuje:{" "} -- GitLab