From 80f7624d3eb7f7a58686859f1c81d79eca47db9e Mon Sep 17 00:00:00 2001
From: xaralis <filip.varecha@fragaria.cz>
Date: Fri, 19 Mar 2021 13:06:18 +0100
Subject: [PATCH] wip
---
src/App.jsx | 26 ++++++++++-----
src/actions/global-info.js | 27 +++++++++++++++
src/components/routing/EventBoundRoute.jsx | 39 ++++++++++++++++++++++
src/pages/Index.jsx | 7 ++++
src/stores.js | 4 ++-
typings/cf2021.d.ts | 12 +++++++
6 files changed, 105 insertions(+), 10 deletions(-)
create mode 100644 src/components/routing/EventBoundRoute.jsx
create mode 100644 src/pages/Index.jsx
diff --git a/src/App.jsx b/src/App.jsx
index 4b983f2..a16bcee 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -8,15 +8,17 @@ import * as Sentry from "@sentry/react";
import { Integrations } from "@sentry/tracing";
import { loadAnnouncements } from "actions/announcements";
-import { loadConfig } from "actions/global-info";
+import { loadConfig, loadEventList } from "actions/global-info";
import { loadPosts } from "actions/posts";
import { loadProgram } from "actions/program";
import { loadMe, refreshAccessToken } from "actions/users";
import { initializeWSChannel } from "actions/ws";
import Footer from "components/Footer";
import Navbar from "components/Navbar";
+import EventBoundRoute from "components/routing/EventBoundRoute";
import About from "pages/About";
import Home from "pages/Home";
+import Index from "pages/Index";
import NotFound from "pages/NotFound";
import Program from "pages/Program";
import Protocol from "pages/Protocol";
@@ -118,10 +120,15 @@ const BaseApp = () => {
</Helmet>
<Navbar />
<Switch>
- <Route exact path="/" children={<Home />} />
- <Route exact path="/program" children={<Program />} />
- <Route exact path="/protocol" children={<Protocol />} />
- <Route exact path="/about" children={<About />} />
+ <Route exact path="/" children={<Index />} />
+ <EventBoundRoute exact path="/event/live" children={<Home />} />
+ <EventBoundRoute exact path="/event/program" children={<Program />} />
+ <EventBoundRoute
+ exact
+ path="/event/protocol"
+ children={<Protocol />}
+ />
+ <EventBoundRoute exact path="/event/about" children={<About />} />
<Route component={NotFound} />
</Switch>
<Footer />
@@ -132,10 +139,11 @@ const BaseApp = () => {
};
const ConfiguredApp = () => {
- loadConfig.read();
- loadProgram.read();
- loadAnnouncements.read();
- loadPosts.read();
+ // loadConfig.read();
+ // loadProgram.read();
+ // loadAnnouncements.read();
+ // loadPosts.read();
+ loadEventList.read();
return (
<Suspense fallback={LoadingComponent}>
diff --git a/src/actions/global-info.js b/src/actions/global-info.js
index 11b518f..bb9a51a 100644
--- a/src/actions/global-info.js
+++ b/src/actions/global-info.js
@@ -6,6 +6,33 @@ import { fetch } from "api";
import { markdownConverter } from "markdown";
import { GlobalInfoStore } from "stores";
+
+export const loadEventList = createAsyncAction(
+ async () => {
+ try {
+ const resp = await fetch("/events");
+ const payload = await resp.json();
+
+ if (!isArray(payload)) {
+ return errorResult([], "Unexpected response format");
+ }
+
+ return successResult(payload);
+ } catch (err) {
+ return errorResult([], err.toString());
+ }
+ },
+ {
+ postActionHook: ({ result }) => {
+ if (!result.error) {
+ GlobalInfoStore.update((state) => {
+ console.log(result.payload);
+ });
+ }
+ },
+ }
+);
+
export const loadConfig = createAsyncAction(
async () => {
try {
diff --git a/src/components/routing/EventBoundRoute.jsx b/src/components/routing/EventBoundRoute.jsx
new file mode 100644
index 0000000..7e56269
--- /dev/null
+++ b/src/components/routing/EventBoundRoute.jsx
@@ -0,0 +1,39 @@
+import React from "react";
+import { Redirect, Route } from "react-router-dom";
+import PropTypes from "prop-types";
+
+import { GlobalInfoStore } from "stores";
+
+const EventBoundRoute = ({
+ component: Component,
+ children,
+ fallbackTo = "/",
+ ...rest
+}) => {
+ const { eventId } = GlobalInfoStore.useState();
+
+ return (
+ <Route
+ {...rest}
+ render={(props) =>
+ !!eventId ? (
+ children ? (
+ children
+ ) : (
+ <Component {...props} />
+ )
+ ) : (
+ <Redirect to={fallbackTo} />
+ )
+ }
+ />
+ );
+};
+
+EventBoundRoute.propTypes = {
+ component: PropTypes.elementType,
+ children: PropTypes.node,
+ fallbackTo: PropTypes.string,
+};
+
+export default EventBoundRoute;
diff --git a/src/pages/Index.jsx b/src/pages/Index.jsx
new file mode 100644
index 0000000..30e21b8
--- /dev/null
+++ b/src/pages/Index.jsx
@@ -0,0 +1,7 @@
+import React from "react";
+
+const Index = () => {
+ return <div></div>;
+};
+
+export default Index;
diff --git a/src/stores.js b/src/stores.js
index 6be388b..c856d17 100644
--- a/src/stores.js
+++ b/src/stores.js
@@ -3,7 +3,9 @@ import { Store } from "pullstate";
/** @type {CF2021.GlobalInfoStorePayload} */
const globalInfoStoreInitial = {
- connectionState: "connecting",
+ currentEventId: null,
+ events: [],
+ connectionState: "offline",
onlineMembers: 0,
onlineUsers: 0,
groupSizeHalf: null,
diff --git a/typings/cf2021.d.ts b/typings/cf2021.d.ts
index b699e18..05d2755 100644
--- a/typings/cf2021.d.ts
+++ b/typings/cf2021.d.ts
@@ -1,5 +1,17 @@
declare namespace CF2021 {
+ interface EventDetails {
+ name: string;
+ type: 1 | 2 | 3;
+ description?: string;
+ start: Date;
+ stream: string;
+ banner: string;
+ }
+
export interface GlobalInfoStorePayload {
+ // Current event selection
+ currentEventId: string;
+ events: EventDetails[];
connectionState: "connected" | "offline" | "connecting";
onlineMembers: number;
onlineUsers: number;
--
GitLab