Put the layout of this shit down, i gotta go to lunch

This commit is contained in:
Cooper 2024-08-25 16:20:54 +00:00
parent fa08d41aae
commit c24252c002
2 changed files with 69 additions and 1 deletions

View File

@ -11,7 +11,11 @@ import { Paragraph } from "@/components/text/Paragraph";
import { Title } from "@/components/text/Title"; import { Title } from "@/components/text/Title";
import { ScrapingItems, ScrapingSegment } from "@/hooks/useProviderScrape"; import { ScrapingItems, ScrapingSegment } from "@/hooks/useProviderScrape";
import { ErrorContainer, ErrorLayout } from "@/pages/layouts/ErrorLayout"; import { ErrorContainer, ErrorLayout } from "@/pages/layouts/ErrorLayout";
import { getExtensionState } from "@/utils/extension"; import {
ExtensionVersion,
getExtensionState,
getExtensionVersion,
} from "@/utils/extension";
import type { ExtensionStatus } from "@/utils/extension"; import type { ExtensionStatus } from "@/utils/extension";
import { getProviderApiUrls } from "@/utils/proxyUrls"; import { getProviderApiUrls } from "@/utils/proxyUrls";
@ -30,6 +34,8 @@ export function ScrapeErrorPart(props: ScrapeErrorPartProps) {
const location = useLocation(); const location = useLocation();
const [extensionState, setExtensionState] = const [extensionState, setExtensionState] =
useState<ExtensionStatus>("unknown"); useState<ExtensionStatus>("unknown");
const [extensionVersion, setExtensionVersion] =
useState<ExtensionVersion>("unknown");
const navigate = useNavigate(); const navigate = useNavigate();
const error = useMemo(() => { const error = useMemo(() => {
@ -52,6 +58,9 @@ export function ScrapeErrorPart(props: ScrapeErrorPartProps) {
getExtensionState().then((state: ExtensionStatus) => { getExtensionState().then((state: ExtensionStatus) => {
setExtensionState(state); setExtensionState(state);
}); });
getExtensionVersion().then((state: ExtensionVersion) => {
setExtensionVersion(state);
});
}, [t]); }, [t]);
if (extensionState === "disallowed") { if (extensionState === "disallowed") {
@ -100,6 +109,49 @@ export function ScrapeErrorPart(props: ScrapeErrorPartProps) {
); );
} }
// Ill do the rest later :shrug:
if (extensionVersion === ExtensionVersion.Version_1_1_5) {
<ErrorLayout>
<ErrorContainer>
<IconPill icon={Icons.LOCK}>
{t("player.scraping.extensionFailure.badge")}
</IconPill>
<Title>{t("player.scraping.extensionFailure.title")}</Title>
<Paragraph>
<Trans
i18nKey="player.scraping.extensionFailure.text"
components={{
bold: <span className="font-bold" style={{ color: "#cfcfcf" }} />,
}}
/>
</Paragraph>
<div className="flex gap-3">
<Button
href="/"
theme="secondary"
padding="md:px-12 p-2.5"
className="mt-6"
>
{t("player.scraping.extensionFailure.homeButton")}
</Button>
<Button
onClick={() => {
sendPage({
page: "PermissionGrant",
redirectUrl: window.location.href,
});
}}
theme="purple"
padding="md:px-12 p-2.5"
className="mt-6"
>
{t("player.scraping.extensionFailure.enableExtension")}
</Button>
</div>
</ErrorContainer>
</ErrorLayout>;
}
return ( return (
<ErrorLayout> <ErrorLayout>
<ErrorContainer> <ErrorContainer>

View File

@ -9,6 +9,11 @@ export type ExtensionStatus =
| "outdated" | "outdated"
| "success"; | "success";
export enum ExtensionVersion {
unknown = "unknown",
Version_1_1_5 = "1.1.5",
}
export async function getExtensionState(): Promise<ExtensionStatus> { export async function getExtensionState(): Promise<ExtensionStatus> {
const info = await extensionInfo(); const info = await extensionInfo();
if (!info) return "unknown"; // cant talk to extension if (!info) return "unknown"; // cant talk to extension
@ -18,3 +23,14 @@ export async function getExtensionState(): Promise<ExtensionStatus> {
if (!isAllowedExtensionVersion(info.version)) return "outdated"; // extension is too old if (!isAllowedExtensionVersion(info.version)) return "outdated"; // extension is too old
return "success"; // no problems return "success"; // no problems
} }
export async function getExtensionVersion(): Promise<ExtensionVersion> {
const info = await extensionInfo();
if (!info || !info.success) return ExtensionVersion.unknown; // we dont know info
switch (info.version) {
case ExtensionVersion.Version_1_1_5:
return ExtensionVersion.Version_1_1_5;
default:
return ExtensionVersion.unknown;
}
}