roland/stream
1
0
Fork 0
forked from Kieran/zap.stream
Code Pull Requests Activity

chore: Run prettier

Browse Source
This commit is contained in:
Kieran 2023-08-01 17:09:47 +01:00
parent 90a7d2ca7e
commit 48c48c90c4
Signed by: Kieran
GPG Key ID: DE71CEB3925BE941
8 changed files with 78 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/element/new-stream.css
View File

@ -53,4 +53,4 @@
.new-stream .tos-link:hover {
text-decoration: underline;
}
}

8
src/element/new-stream.tsx
View File

@ -17,7 +17,11 @@ function NewStream({ ev, onFinish }: StreamEditorProps) {
useEffect(() => {
if (!currentProvider) {
setCurrentProvider(ev !== undefined ? providers.find(a => a.name.toLowerCase() === "manual")! : providers.at(0));
setCurrentProvider(
ev !== undefined
? providers.find((a) => a.name.toLowerCase() === "manual")!
: providers.at(0)
);
}
}, [providers, currentProvider]);
@ -32,7 +36,7 @@ function NewStream({ ev, onFinish }: StreamEditorProps) {
currentProvider.updateStreamInfo(ex);
if (!ev) {
navigate(`/${eventLink(ex)}`, {
state: ev
state: ev,
});
} else {
onFinish?.(ev);

82
src/element/nostr-provider-dialog.tsx
View File

@ -88,26 +88,41 @@ export function NostrProviderDialog({
function tosInput() {
if (!info) return;
return <>
<div>
<div className="flex g12">
<input type="checkbox" checked={tos} onChange={e => setTos(e.target.checked)} />
<p>
I have read and agree with {info.name}'s <span className="tos-link" onClick={() => window.open(info.tosLink, "popup", "width=400,height=800")}>terms and conditions</span>.
</p>
return (
<>
<div>
<div className="flex g12">
<input
type="checkbox"
checked={tos}
onChange={(e) => setTos(e.target.checked)}
/>
<p>
I have read and agree with {info.name}'s{" "}
<span
className="tos-link"
onClick={() =>
window.open(info.tosLink, "popup", "width=400,height=800")
}
>
terms and conditions
</span>
.
</p>
</div>
</div>
</div>
<div>
<AsyncButton
type="button"
className="btn btn-primary wide"
disabled={!tos}
onClick={acceptTos}
>
Continue
</AsyncButton>
</div>
</>
<div>
<AsyncButton
type="button"
className="btn btn-primary wide"
disabled={!tos}
onClick={acceptTos}
>
Continue
</AsyncButton>
</div>
</>
);
}
return (
@ -167,26 +182,33 @@ export function NostrProviderDialog({
))}
</div>
</div>
{info.tosAccepted === false ? tosInput() :
{info.tosAccepted === false ? (
tosInput()
) : (
<StreamEditor
onFinish={(ex) => {
provider.updateStreamInfo(ex);
others.onFinish?.(ex);
}}
ev={{
tags: [
["title", info.streamInfo?.title ?? ""],
["summary", info.streamInfo?.summary ?? ""],
["image", info.streamInfo?.image ?? ""],
...(info.streamInfo?.content_warning ? [["content-warning", info.streamInfo?.content_warning]] : []),
...(info.streamInfo?.tags?.map(a => ["t", a]) ?? [])
]
} as NostrEvent}
ev={
{
tags: [
["title", info.streamInfo?.title ?? ""],
["summary", info.streamInfo?.summary ?? ""],
["image", info.streamInfo?.image ?? ""],
...(info.streamInfo?.content_warning
? [["content-warning", info.streamInfo?.content_warning]]
: []),
...(info.streamInfo?.tags?.map((a) => ["t", a]) ?? []),
],
} as NostrEvent
}
options={{
canSetStream: false,
canSetStatus: false,
}}
/>}
/>
)}
</>
);
}

4
src/index.tsx
View File

@ -61,8 +61,8 @@ const router = createBrowserRouter([
},
{
path: "*",
element: <CatchAllRoutePage />
}
element: <CatchAllRoutePage />,
},
],
},
{

9
src/pages/catch-all.tsx
View File

@ -1,6 +1,5 @@
export function CatchAllRoutePage() {
//const { ["*"]: param } = useParams();
return <b className="error">Not found :(</b>
}
//const { ["*"]: param } = useParams();
return <b className="error">Not found :(</b>;
}

7
src/pages/stream-page.tsx
View File

@ -4,7 +4,12 @@ import { useLocation, useNavigate, useParams } from "react-router-dom";
import { Helmet } from "react-helmet";
import { LiveVideoPlayer } from "element/live-video-player";
import { createNostrLink, findTag, getEventFromLocationState, getHost } from "utils";
import {
createNostrLink,
findTag,
getEventFromLocationState,
getHost,
} from "utils";
import { Profile, getName } from "element/profile";
import { LiveChat } from "element/live-chat";
import AsyncButton from "element/async-button";

12
src/providers/index.ts
View File

@ -53,7 +53,7 @@ export interface StreamProviderInfo {
balance?: number;
endpoints: Array<StreamProviderEndpoint>;
tosAccepted?: boolean;
tosLink?: string
tosLink?: string;
}
export interface StreamProviderEndpoint {
@ -66,11 +66,11 @@ export interface StreamProviderEndpoint {
}
export interface StreamProviderStreamInfo {
title: string
summary: string
image: string
tags: Array<string>
content_warning: string
title: string;
summary: string;
image: string;
tags: Array<string>;
content_warning: string;
}
export class ProviderStore extends ExternalStore<Array<StreamProvider>> {

2
src/providers/owncast.ts
View File

@ -51,7 +51,7 @@ export class OwncastProvider implements StreamProvider {
acceptTos(): Promise<void> {
throw new Error("Method not implemented.");
}
async #getJson<T>(
method: "GET" | "POST",
path: string,