Skip to content

Commit 05b5c8c

Browse files
ben221199ben221199
committed
Fix errors
1 parent 18201e3 commit 05b5c8c

9 files changed

Lines changed: 32 additions & 26 deletions

File tree

‎server.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import express from "express";
55
import fs from "fs";
66
import http, { Server } from "http";
77
import path from "path";
8-
import process from "process";
98
import React, { ReactNode } from "react";
109
import { renderToString } from "react-dom/server";
1110
import App from "~/App";

‎src/AppRouter.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function AppRouter({
1010
return <MemoryRouter>{children}</MemoryRouter>;
1111
}
1212
if (import.meta.env.SSR) {
13-
return <StaticRouter location={url}>{children}</StaticRouter>;
13+
return <StaticRouter location={url ?? ''}>{children}</StaticRouter>;
1414
}
1515
return <BrowserRouter>{children}</BrowserRouter>;
1616
}

‎src/LBRY.tsx‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,21 @@ function setDaemonRPC(url: string | null): void {
3939
} else {
4040
sessionStorage.setItem(storageDaemonRPCKey, url);
4141
}
42-
window.dispatchEvent(
43-
new StorageEvent("storage", {
44-
key: storageDaemonRPCKey,
45-
newValue: url,
46-
oldValue: oldURL,
47-
storageArea: sessionStorage,
48-
}),
49-
);
42+
43+
const eventDict: StorageEventInit = {
44+
key: storageDaemonRPCKey,
45+
storageArea: sessionStorage,
46+
};
47+
if(url){
48+
eventDict.newValue = url;
49+
}
50+
if(oldURL){
51+
eventDict.oldValue = oldURL;
52+
}
53+
54+
const event: StorageEvent = new StorageEvent("storage",eventDict);
55+
56+
window.dispatchEvent(event);
5057
}
5158

5259
async function rpcDirect(

‎src/pages/DiscoverPage.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function DiscoverPage(): JSX.Element {
7575
}}
7676
style={{
7777
backgroundColor:
78-
toggle == "new" ? "rgb(17, 17, 17)" : "rgba(17, 17, 17, 0.4)",
78+
toggle === "new" ? "rgb(17, 17, 17)" : "rgba(17, 17, 17, 0.4)",
7979
// backgroundColorHover: 'rgba(17, 17, 17, 0.7)',
8080
border: "none",
8181
borderRadius: "6px 0 0 6px",
@@ -97,7 +97,7 @@ function DiscoverPage(): JSX.Element {
9797
}}
9898
style={{
9999
backgroundColor:
100-
toggle == "trending"
100+
toggle === "trending"
101101
? "rgb(17, 17, 17)"
102102
: "rgba(17, 17, 17, 0.4)",
103103
// backgroundColorHover: 'rgba(17, 17, 17, 0.7)',
@@ -120,7 +120,7 @@ function DiscoverPage(): JSX.Element {
120120
}}
121121
style={{
122122
backgroundColor:
123-
toggle == "top" ? "rgb(17, 17, 17)" : "rgba(17, 17, 17, 0.4)",
123+
toggle === "top" ? "rgb(17, 17, 17)" : "rgba(17, 17, 17, 0.4)",
124124
// backgroundColorHover: 'rgba(17, 17, 17, 0.7)',
125125
border: "none",
126126
borderRadius: "0 6px 6px 0",

‎src/pages/FollowingPage.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Loader from "~/components/Loader";
88

99
function FollowingPage(): JSX.Element {
1010
const [localPreferenceResponse, setLocalPreferenceResponse] =
11-
useState<object>(undefined);
11+
useState<object|undefined>(undefined);
1212
const [channelIDs, setChannelIDs] = useState<string[]>([]);
1313
const [items, setItems] = useState<object[] | string | null>(null);
1414
const [toggle, setToggle] = useState<string>("new");
@@ -106,7 +106,7 @@ function FollowingPage(): JSX.Element {
106106
}}
107107
style={{
108108
backgroundColor:
109-
toggle == "new"
109+
toggle === "new"
110110
? "rgb(17, 17, 17)"
111111
: "rgba(17, 17, 17, 0.4)",
112112
// backgroundColorHover: 'rgba(17, 17, 17, 0.7)',
@@ -130,7 +130,7 @@ function FollowingPage(): JSX.Element {
130130
}}
131131
style={{
132132
backgroundColor:
133-
toggle == "trending"
133+
toggle === "trending"
134134
? "rgb(17, 17, 17)"
135135
: "rgba(17, 17, 17, 0.4)",
136136
// backgroundColorHover: 'rgba(17, 17, 17, 0.7)',
@@ -153,7 +153,7 @@ function FollowingPage(): JSX.Element {
153153
}}
154154
style={{
155155
backgroundColor:
156-
toggle == "top"
156+
toggle === "top"
157157
? "rgb(17, 17, 17)"
158158
: "rgba(17, 17, 17, 0.4)",
159159
// backgroundColorHover: 'rgba(17, 17, 17, 0.7)',

‎src/pages/HelpPage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import Error from "~/components/Error";
77
import Loader from "~/components/Loader";
88

99
function HelpPage(): JSX.Element {
10-
const [statusResponse, setStatusResponse] = useState<object>(undefined);
11-
const [versionResponse, setVersionResponse] = useState<object>(undefined);
10+
const [statusResponse, setStatusResponse] = useState<object|undefined>(undefined);
11+
const [versionResponse, setVersionResponse] = useState<object|undefined>(undefined);
1212

1313
useEffect((): void => {
1414
LBRY.rpc(

‎src/pages/SettingsPage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Error from "~/components/Error";
44
import Loader from "~/components/Loader";
55

66
function SettingsPage(): JSX.Element {
7-
const [settingsResponse, setSettingsResponse] = useState<object>(undefined);
7+
const [settingsResponse, setSettingsResponse] = useState<object|undefined>(undefined);
88

99
useEffect((): void => {
1010
LBRY.rpc(

‎src/pages/TagsPage.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Loader from "~/components/Loader";
88

99
function TagsPage(): JSX.Element {
1010
const [localPreferenceResponse, setLocalPreferenceResponse] =
11-
useState<object>(undefined);
11+
useState<object|undefined>(undefined);
1212
const [tags, setTags] = useState<string[]>([]);
1313
const [items, setItems] = useState<object[] | string | null>(null);
1414
const [toggle, setToggle] = useState<string>("new");
@@ -99,7 +99,7 @@ function TagsPage(): JSX.Element {
9999
}}
100100
style={{
101101
backgroundColor:
102-
toggle == "new"
102+
toggle === "new"
103103
? "rgb(17, 17, 17)"
104104
: "rgba(17, 17, 17, 0.4)",
105105
// backgroundColorHover: 'rgba(17, 17, 17, 0.7)',
@@ -123,7 +123,7 @@ function TagsPage(): JSX.Element {
123123
}}
124124
style={{
125125
backgroundColor:
126-
toggle == "trending"
126+
toggle === "trending"
127127
? "rgb(17, 17, 17)"
128128
: "rgba(17, 17, 17, 0.4)",
129129
// backgroundColorHover: 'rgba(17, 17, 17, 0.7)',
@@ -146,7 +146,7 @@ function TagsPage(): JSX.Element {
146146
}}
147147
style={{
148148
backgroundColor:
149-
toggle == "top"
149+
toggle === "top"
150150
? "rgb(17, 17, 17)"
151151
: "rgba(17, 17, 17, 0.4)",
152152
// backgroundColorHover: 'rgba(17, 17, 17, 0.7)',

‎src/pages/WalletPage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import Error from "~/components/Error";
55
import Loader from "~/components/Loader";
66

77
function WalletPage(): JSX.Element {
8-
const [walletResponse, setWalletResponse] = useState<object>(undefined);
8+
const [walletResponse, setWalletResponse] = useState<object|undefined>(undefined);
99
const [transactionsResponse, setTransactionsResponse] =
10-
useState<object>(undefined);
10+
useState<object|undefined>(undefined);
1111

1212
useEffect((): void => {
1313
LBRY.rpc(

0 commit comments

Comments
 (0)