From ed201936813d9a720b51e6cb40a05267b94e7314 Mon Sep 17 00:00:00 2001
From: Max Nanis
Date: Thu, 10 Sep 2026 17:46:41 -0700
Subject: Typescript prettier
Committing seperate so it's easier to see actual changes.
---
jb-ui/src/JBApp.tsx | 343 ++++++++++++++++++++++++++++------------------------
1 file changed, 186 insertions(+), 157 deletions(-)
(limited to 'jb-ui/src/JBApp.tsx')
diff --git a/jb-ui/src/JBApp.tsx b/jb-ui/src/JBApp.tsx
index ef23b3b..472b976 100644
--- a/jb-ui/src/JBApp.tsx
+++ b/jb-ui/src/JBApp.tsx
@@ -1,21 +1,26 @@
import {
- EventMessage,
- EventType,
- PingMessage,
- PongMessage,
- PongMessageKindEnum,
- StatsMessage,
- StatusApi,
- SubscribeMessage, SubscribeMessageKindEnum,
- TaskStatusResponse,
- UserWalletBalance,
- UserWalletBalanceResponse,
- WalletApi
+ EventMessage,
+ EventType,
+ PingMessage,
+ PongMessage,
+ PongMessageKindEnum,
+ StatsMessage,
+ StatusApi,
+ SubscribeMessage,
+ SubscribeMessageKindEnum,
+ TaskStatusResponse,
+ UserWalletBalance,
+ UserWalletBalanceResponse,
+ WalletApi,
} from "@/api_fsb";
import Footer from "@/components/Footer";
import { useAppDispatch } from "@/hooks";
import { bpid, routeBasename, tagManager } from "@/lib/utils";
-import { setAssignmentID, setProductUserID, setTurkSubmitTo } from "@/models/appSlice";
+import {
+ setAssignmentID,
+ setProductUserID,
+ setTurkSubmitTo,
+} from "@/models/appSlice";
import { addEvent } from "@/models/grlEventsSlice";
import { addStatsData } from "@/models/grlStatsSlice";
import Home from "@/pages/Home";
@@ -23,8 +28,15 @@ import MagicLink from "@/pages/MagicLink";
import Preview from "@/pages/Preview";
import Result from "@/pages/Result";
import Work from "@/pages/Work";
-import { BrowserRouter, Outlet, Route, Routes, useSearchParams } from "react-router-dom";
-import useWebSocket from 'react-use-websocket';
+import Transfer from "@/pages/Transfer";
+import {
+ BrowserRouter,
+ Outlet,
+ Route,
+ Routes,
+ useSearchParams,
+} from "react-router-dom";
+import useWebSocket from "react-use-websocket";
import NewsTicker from "./components/EventMarquee";
import { useEffect } from "react";
@@ -34,178 +46,195 @@ import "@/index.css";
import { setTaskStatus, setUserWalletBalance } from "@/models/appSlice";
import { Profiling } from "./components/Profiling";
-type Message = PingMessage | PongMessage | SubscribeMessage | EventMessage | StatsMessage;
+type Message =
+ | PingMessage
+ | PongMessage
+ | SubscribeMessage
+ | EventMessage
+ | StatsMessage;
function isStatsMessage(msg: Message): msg is StatsMessage {
- return msg.kind === 'stats';
+ return msg.kind === "stats";
}
function isEventMessage(msg: Message): msg is EventMessage {
- return msg.kind === 'event';
+ return msg.kind === "event";
}
function isPingMessage(msg: Message): msg is PingMessage {
- return msg.kind === 'ping';
+ return msg.kind === "ping";
}
function QueryParamProcessor() {
- const dispatch = useAppDispatch()
- const [searchParams] = useSearchParams();
+ const dispatch = useAppDispatch();
+ const [searchParams] = useSearchParams();
- useEffect(() => {
- const worker_id = searchParams.get('workerId');
- const assignment_id = searchParams.get('assignmentId');
- const tsid = searchParams.get('tsid');
- const turkSubmitTo = searchParams.get('turkSubmitTo');
-
- if (turkSubmitTo) {
- dispatch(setTurkSubmitTo(turkSubmitTo))
- }
+ useEffect(() => {
+ const worker_id = searchParams.get("workerId");
+ const assignment_id = searchParams.get("assignmentId");
+ const tsid = searchParams.get("tsid");
+ const turkSubmitTo = searchParams.get("turkSubmitTo");
- if (worker_id) {
- dispatch(setProductUserID(worker_id))
-
- new WalletApi().getUserWalletBalanceProductIdWalletGet(
- bpid, // productId
- worker_id, // bpuid
- ).then(res => {
- const response = res.data as UserWalletBalanceResponse;
- const balance = response.wallet as UserWalletBalance;
- dispatch(setUserWalletBalance(balance));
- });
- }
+ if (turkSubmitTo) {
+ dispatch(setTurkSubmitTo(turkSubmitTo));
+ }
- if (assignment_id) {
- dispatch(setAssignmentID(assignment_id))
- }
+ if (worker_id) {
+ dispatch(setProductUserID(worker_id));
+
+ new WalletApi()
+ .getUserWalletBalanceProductIdWalletGet(
+ bpid, // productId
+ worker_id, // bpuid
+ )
+ .then((res) => {
+ const response = res.data as UserWalletBalanceResponse;
+ const balance = response.wallet as UserWalletBalance;
+ dispatch(setUserWalletBalance(balance));
+ });
+ }
- if (tsid) {
- new StatusApi().getTaskStatusProductIdStatusTsidGet(
- bpid, // productId
- tsid).then(res => {
- const response: TaskStatusResponse = res.data;
- dispatch(setTaskStatus(response))
- }).catch((error) => {
- console.error("Error fetching task status:", error);
- });
- }
+ if (assignment_id) {
+ dispatch(setAssignmentID(assignment_id));
+ }
- }, [searchParams]);
+ if (tsid) {
+ new StatusApi()
+ .getTaskStatusProductIdStatusTsidGet(
+ bpid, // productId
+ tsid,
+ )
+ .then((res) => {
+ const response: TaskStatusResponse = res.data;
+ dispatch(setTaskStatus(response));
+ })
+ .catch((error) => {
+ console.error("Error fetching task status:", error);
+ });
+ }
+ }, [searchParams]);
- return ;
+ return ;
}
const Layout = () => {
- return (
-
+
+
+
+
+ );
};
function JBApp() {
- const dispatch = useAppDispatch()
-
- const { sendJsonMessage, lastMessage } = useWebSocket(
- "wss://fsb.generalresearch.com/ws/events/", {
- onOpen: () => {
- const subscribe: SubscribeMessage = {
- "kind": SubscribeMessageKindEnum.Subscribe,
- "product_id": bpid
- }
- sendJsonMessage(subscribe)
+ const dispatch = useAppDispatch();
+
+ const { sendJsonMessage, lastMessage } = useWebSocket(
+ "wss://fsb.generalresearch.com/ws/events/",
+ {
+ onOpen: () => {
+ const subscribe: SubscribeMessage = {
+ kind: SubscribeMessageKindEnum.Subscribe,
+ product_id: bpid,
+ };
+ sendJsonMessage(subscribe);
+ },
+ },
+ );
+
+ useEffect(() => {
+ if (lastMessage !== null) {
+ let msg: Message = JSON.parse(lastMessage.data);
+
+ if (isStatsMessage(msg)) {
+ dispatch(addStatsData(msg.data));
+ } else if (isEventMessage(msg)) {
+ // For simplicity, we just log the event messages here.
+ // You can extend this to update the UI or trigger notifications as needed.
+
+ switch (msg.data.event_type) {
+ case EventType.TaskEnter:
+ case EventType.TaskFinish:
+ case EventType.UserCreated:
+ dispatch(addEvent(msg.data));
+ break;
+
+ default:
+ // do nothing for now
+ break;
}
+ } else if (isPingMessage(msg)) {
+ const pong: PongMessage = {
+ kind: PongMessageKindEnum.Pong,
+ };
+ sendJsonMessage(pong);
+ }
}
- );
-
- useEffect(() => {
- if (lastMessage !== null) {
- let msg: Message = JSON.parse(lastMessage.data);
-
- if (isStatsMessage(msg)) {
- dispatch(addStatsData(msg.data))
-
- } else if (isEventMessage(msg)) {
- // For simplicity, we just log the event messages here.
- // You can extend this to update the UI or trigger notifications as needed.
-
- switch (msg.data.event_type) {
- case EventType.TaskEnter:
- case EventType.TaskFinish:
- case EventType.UserCreated:
- dispatch(addEvent(msg.data));
- break
-
- default:
- // do nothing for now
- break;
- }
-
- } else if (isPingMessage(msg)) {
- const pong: PongMessage = {
- "kind": PongMessageKindEnum.Pong,
- }
- sendJsonMessage(pong)
- }
- }
- }, [lastMessage]);
-
- useEffect(() => {
- if (!tagManager) return;
-
- var _mtm = window._mtm = window._mtm || [];
- _mtm.push({ 'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start' });
- var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
- g.async = true;
- g.src = tagManager;
- if (s.parentNode) {
- s.parentNode.insertBefore(g, s);
- }
- }, [tagManager])
-
- return (
-
-
- } />
- }>
- }>
- } />
- } />
- } />
- } />
-
-
-
-
- )
+ }, [lastMessage]);
+
+ useEffect(() => {
+ if (!tagManager) return;
+
+ var _mtm = (window._mtm = window._mtm || []);
+ _mtm.push({ "mtm.startTime": new Date().getTime(), event: "mtm.Start" });
+ var d = document,
+ g = d.createElement("script"),
+ s = d.getElementsByTagName("script")[0];
+ g.async = true;
+ g.src = tagManager;
+ if (s.parentNode) {
+ s.parentNode.insertBefore(g, s);
+ }
+ }, [tagManager]);
+
+ return (
+
+
+ } />
+ }>
+ }>
+ } />
+ {/* } /> */}
+
+ } />
+ } />
+ } />
+
+
+
+
+ );
}
export default JBApp;
--
cgit v1.2.3