Merge pull request #940 from qtchaos/remove-default-setup

Disable default setup option if no proxies are set, remove extension help once it succeeds

public/config.js

@@ -1,6 +1,7 @@
 window.__CONFIG__ = {
   // The URL for the CORS proxy, the URL must NOT end with a slash!
-  VITE_CORS_PROXY_URL: "CHANGEME",
+  // If not specified, the onboarding will not allow a "default setup". The user will have to use the extension or set up a proxy themselves
+  VITE_CORS_PROXY_URL: "",
 
   // The READ API key to access TMDB
   VITE_TMDB_READ_API_KEY: "CHANGEME",

src/pages/onboarding/Onboarding.tsx

@@ -13,6 +13,7 @@ import {
 } from "@/pages/onboarding/onboardingHooks";
 import { Card, CardContent, Link } from "@/pages/onboarding/utils";
 import { PageTitle } from "@/pages/parts/util/PageTitle";
+import { getProxyUrls } from "@/utils/proxyUrls";
 
 function VerticalLine(props: { className?: string }) {
   return (
@@ -27,6 +28,7 @@ export function OnboardingPage() {
   const skipModal = useModal("skip");
   const { completeAndRedirect } = useRedirectBack();
   const { t } = useTranslation();
+  const noProxies = getProxyUrls().length === 0;
 
   return (
     <MinimalPageLayout>
@@ -85,32 +87,34 @@ export function OnboardingPage() {
             </CardContent>
           </Card>
         </div>
-
+        {noProxies ? null : (
-        <p className="text-center hidden md:block mt-12">
+          <>
-          <Trans i18nKey="onboarding.start.options.default.text">
+            <p className="text-center hidden md:block mt-12">
-            <br />
-            <a
-              onClick={skipModal.show}
-              type="button"
-              className="text-onboarding-link hover:opacity-75 cursor-pointer"
-            />
-          </Trans>
-        </p>
-
-        <div className=" max-w-[300px] mx-auto md:hidden mt-12 ">
-          <Button
-            className="!text-type-text !bg-opacity-50"
-            theme="secondary"
-            onClick={skipModal.show}
-          >
-            <span>
               <Trans i18nKey="onboarding.start.options.default.text">
-                <span />
+                <br />
-                <span />
+                <a
+                  onClick={skipModal.show}
+                  type="button"
+                  className="text-onboarding-link hover:opacity-75 cursor-pointer"
+                />
               </Trans>
-            </span>
+            </p>
-          </Button>
+            <div className=" max-w-[300px] mx-auto md:hidden mt-12 ">
-        </div>
+              <Button
+                className="!text-type-text !bg-opacity-50"
+                theme="secondary"
+                onClick={skipModal.show}
+              >
+                <span>
+                  <Trans i18nKey="onboarding.start.options.default.text">
+                    <span />
+                    <span />
+                  </Trans>
+                </span>
+              </Button>
+            </div>
+          </>
+        )}
       </CenterContainer>
     </MinimalPageLayout>
   );

src/pages/onboarding/OnboardingExtension.tsx

@@ -115,7 +115,7 @@ export function ExtensionStatus(props: {
         </div>
       </Card>
       {lastKnownStatus === "unknown" ? <RefreshBar /> : null}
-      {props.showHelp ? (
+      {props.showHelp && props.status !== "success" ? (
         <Card className="mt-4">
           <div className="flex items-center space-x-7">
             <Icon icon={Icons.WARNING} className="text-type-danger text-2xl" />