chore: formatting
continuous-integration/drone/push Build is running Details

This commit is contained in:
Kieran 2023-11-01 00:40:57 +09:00
parent c65bb7a992
commit 6f15580682
Signed by: Kieran
GPG Key ID: DE71CEB3925BE941
13 changed files with 100 additions and 79 deletions

View File

@ -60,4 +60,4 @@ declare const CONFIG: {
/**
* Single relay (Debug)
*/
declare const SINGLE_RELAY: string | undefined;
declare const SINGLE_RELAY: string | undefined;

View File

@ -2,10 +2,18 @@ import { OfflineError } from "@snort/shared";
import { Offline } from "./Offline";
import classNames from "classnames";
export function ErrorOrOffline({ error, onRetry, className }: { error: Error, onRetry?: () => void | Promise<void>, className?: string }) {
if (error instanceof OfflineError) {
return <Offline onRetry={onRetry} className={className} />;
} else {
return <b className={classNames("error", className)}>{error.message}</b>
}
}
export function ErrorOrOffline({
error,
onRetry,
className,
}: {
error: Error;
onRetry?: () => void | Promise<void>;
className?: string;
}) {
if (error instanceof OfflineError) {
return <Offline onRetry={onRetry} className={className} />;
} else {
return <b className={classNames("error", className)}>{error.message}</b>;
}
}

View File

@ -10,9 +10,7 @@ export default function Reveal(props: RevealProps) {
const [reveal, setReveal] = useState(false);
if (!reveal) {
return <WarningNotice onClick={() => setReveal(true)}>
{props.message}
</WarningNotice>
return <WarningNotice onClick={() => setReveal(true)}>{props.message}</WarningNotice>;
} else if (props.children) {
return props.children;
}

View File

@ -3,15 +3,18 @@ import AsyncButton from "./AsyncButton";
import { FormattedMessage } from "react-intl";
import classNames from "classnames";
export function Offline({ onRetry, className }: { onRetry?: () => void | Promise<void>, className?: string }) {
return <div className={classNames("flex items-center g8", className)}>
<Icon name="wifi-off" className="error" />
<div className="error">
<FormattedMessage defaultMessage="Offline" />
</div>
{onRetry &&
<AsyncButton onClick={onRetry}>
<FormattedMessage defaultMessage="Retry" />
</AsyncButton>}
export function Offline({ onRetry, className }: { onRetry?: () => void | Promise<void>; className?: string }) {
return (
<div className={classNames("flex items-center g8", className)}>
<Icon name="wifi-off" className="error" />
<div className="error">
<FormattedMessage defaultMessage="Offline" />
</div>
{onRetry && (
<AsyncButton onClick={onRetry}>
<FormattedMessage defaultMessage="Retry" />
</AsyncButton>
)}
</div>
}
);
}

View File

@ -1,18 +1,17 @@
.warning-notice {
color: var(--font-tertiary-color);
border: 1px solid var(--border-color);
padding: 8px 16px;
border-radius: 12px;
display: flex;
gap: 8px;
}
.warning-notice i {
font-style: normal;
color: var(--font-color);
}
.warning-notice > svg {
color: var(--warning);
}
color: var(--font-tertiary-color);
border: 1px solid var(--border-color);
padding: 8px 16px;
border-radius: 12px;
display: flex;
gap: 8px;
}
.warning-notice i {
font-style: normal;
color: var(--font-color);
}
.warning-notice > svg {
color: var(--warning);
}

View File

@ -1,12 +1,16 @@
import "./WarningNotice.css";
import Icon from "Icons/Icon";
export function WarningNotice({ children, onClick }: { children: React.ReactNode, onClick?: () => void }) {
return <div className="warning-notice" onClick={e => {
export function WarningNotice({ children, onClick }: { children: React.ReactNode; onClick?: () => void }) {
return (
<div
className="warning-notice"
onClick={e => {
e.stopPropagation();
onClick?.();
}}>
<Icon name="alert-circle" size={24} />
<div>{children}</div>
}}>
<Icon name="alert-circle" size={24} />
<div>{children}</div>
</div>
}
);
}

View File

@ -9,8 +9,7 @@ export function useLoginRelays() {
useEffect(() => {
if (relays) {
updateRelayConnections(system, relays.item)
.catch(console.error);
updateRelayConnections(system, relays.item).catch(console.error);
}
}, [relays]);
}
@ -28,4 +27,4 @@ export async function updateRelayConnections(system: SystemInterface, relays: Re
}
}
}
}
}

View File

@ -187,14 +187,14 @@ export default function ProfilePage({ id: propId, state }: ProfilePageProps) {
targets={
lnurl?.lnurl && id
? [
{
type: "lnurl",
value: lnurl?.lnurl,
weight: 1,
name: user?.display_name || user?.name,
zap: { pubkey: id },
} as ZapTarget,
]
{
type: "lnurl",
value: lnurl?.lnurl,
weight: 1,
name: user?.display_name || user?.name,
zap: { pubkey: id },
} as ZapTarget,
]
: undefined
}
show={showLnQr}

View File

@ -73,10 +73,7 @@ export const GlobalTab = () => {
return (
<div className="flex items-center g8 justify-end nowrap">
<h3>
<FormattedMessage
defaultMessage="Relay"
description="Label for reading global feed from specific relays"
/>
<FormattedMessage defaultMessage="Relay" description="Label for reading global feed from specific relays" />
</h3>
<select
className="f-ellipsis"
@ -126,14 +123,20 @@ export const GlobalTab = () => {
return (
<>
{globalRelaySelector()}
{relay && <Timeline subject={
{
type: "global",
items: [],
relay: [relay.url],
discriminator: `all-${sha256(relay.url)}`,
}
} postsOnly={false} method={"TIME_RANGE"} window={600} now={now} />}
{relay && (
<Timeline
subject={{
type: "global",
items: [],
relay: [relay.url],
discriminator: `all-${sha256(relay.url)}`,
}}
postsOnly={false}
method={"TIME_RANGE"}
window={600}
now={now}
/>
)}
</>
);
};
@ -151,8 +154,8 @@ export const NotesTab = () => {
noteOnClick={
deckContext
? ev => {
deckContext.setThread(NostrLink.fromEvent(ev));
}
deckContext.setThread(NostrLink.fromEvent(ev));
}
: undefined
}
/>

View File

@ -32,8 +32,8 @@ export default function ManageSubscriptionPage() {
loadSubs();
}, []);
if (!(error instanceof SubscriptionError) && error instanceof Error) return <ErrorOrOffline error={error} onRetry={loadSubs} className="main-content p" />;
if (!(error instanceof SubscriptionError) && error instanceof Error)
return <ErrorOrOffline error={error} onRetry={loadSubs} className="main-content p" />;
if (subs === undefined) {
return <PageSpinner />;
}

View File

@ -136,8 +136,7 @@ async function initSite() {
await preload(login.follows.item);
}
updateRelayConnections(System, login.relays.item)
.catch(console.error);
updateRelayConnections(System, login.relays.item).catch(console.error);
try {
if ("registerProtocolHandler" in window.navigator) {

View File

@ -205,6 +205,9 @@
"6/hB3S": {
"defaultMessage": "Watch Replay"
},
"62nsdy": {
"defaultMessage": "Retry"
},
"65BmHb": {
"defaultMessage": "Failed to proxy image from {host}, click here to load directly"
},
@ -235,6 +238,9 @@
"7BX/yC": {
"defaultMessage": "Account Switcher"
},
"7UOvbT": {
"defaultMessage": "Offline"
},
"7hp70g": {
"defaultMessage": "NIP-05"
},
@ -594,6 +600,10 @@
"KAhAcM": {
"defaultMessage": "Enter LNDHub config"
},
"KHK8B9": {
"defaultMessage": "Relay",
"description": "Label for reading global feed from specific relays"
},
"KQvWvD": {
"defaultMessage": "Deleted"
},
@ -1554,10 +1564,6 @@
"yCLnBC": {
"defaultMessage": "LNURL or Lightning Address"
},
"yCmnnm": {
"defaultMessage": "Read global from",
"description": "Label for reading global feed from specific relays"
},
"yNBPJp": {
"defaultMessage": "Help fund the development of {site}"
},

View File

@ -67,6 +67,7 @@
"5ykRmX": "Send zap",
"6/SF6e": "<h1>{n}</h1> Cashu sats",
"6/hB3S": "Watch Replay",
"62nsdy": "Retry",
"65BmHb": "Failed to proxy image from {host}, click here to load directly",
"6OSOXl": "Reason: <i>{reason}</i>",
"6TfgXX": "{site} is an open source project built by passionate people in their free time",
@ -77,6 +78,7 @@
"7+Domh": "Notes",
"7/h1jn": "After submitting the pin there may be a slight delay as we encrypt the key.",
"7BX/yC": "Account Switcher",
"7UOvbT": "Offline",
"7hp70g": "NIP-05",
"8/vBbP": "Reposts ({n})",
"89q5wc": "Confirm Reposts",
@ -195,6 +197,7 @@
"K3r6DQ": "Delete",
"K7AkdL": "Show",
"KAhAcM": "Enter LNDHub config",
"KHK8B9": "Relay",
"KQvWvD": "Deleted",
"KWuDfz": "I have saved my keys, continue",
"KahimY": "Unknown event kind: {kind}",
@ -509,7 +512,6 @@
"xmcVZ0": "Search",
"y1Z3or": "Language",
"yCLnBC": "LNURL or Lightning Address",
"yCmnnm": "Read global from",
"yNBPJp": "Help fund the development of {site}",
"zCb8fX": "Weight",
"zFegDD": "Contact",