Pass return_url parameter on link to download file

pi-top · Aug 28, 2023 · 8bce2b2 · 8bce2b2
1 parent 0e0c89d
commit 8bce2b2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/frontend/src/components/optionCard/OptionCard.module.css b/frontend/src/components/optionCard/OptionCard.module.css
@@ -2,8 +2,6 @@
 @value large from '../../globalStyles/breakpoints.module.css'; */
 
 .root {
-  /* height: 100%;
-  width: 100%; */
   display: flex;
   flex-direction: column;
   align-items: center;

diff --git a/frontend/src/msw/handlers.ts b/frontend/src/msw/handlers.ts
@@ -42,7 +42,7 @@ export default [
     return res(ctx.body("OK"));
   }),
   rest.get("/is-connected", (_, res, ctx) => {
-    return res(ctx.json({ connected: false }));
+    return res(ctx.json({ connected: true }));
   }),
   rest.get("/is-connected-through-ap", (_, res, ctx) => {
     return res(ctx.json({ isUsingAp: true }));

diff --git a/frontend/src/pages/schoolPage/SchoolPage.tsx b/frontend/src/pages/schoolPage/SchoolPage.tsx
@@ -37,7 +37,7 @@ export default ({
       </>
     }
     return <>
-      <p>If you don't have a setup bundle, download one <a className={styles.link} href="https://further.pi-top.com/setup-devices">here</a>.</p>
+      <p>If you don't have a setup bundle, download one <a className={styles.link} href={`https://further.pi-top.com/setup-devices?return_url=${window.location.href}`}>here</a>.</p>
       <p>When configuring multiple devices, it may be faster to put this file on a USB and plug it into each pi-top[4].</p>
     </>
   }

diff --git a/frontend/src/pages/schoolPage/__tests__/__snapshots__/SchoolPage.test.tsx.snap b/frontend/src/pages/schoolPage/__tests__/__snapshots__/SchoolPage.test.tsx.snap
@@ -126,7 +126,7 @@ exports[`SchoolPage renders explanation 1`] = `
     If you don't have a setup bundle, download one 
     <a
       class="link"
-      href="https://further.pi-top.com/setup-devices"
+      href="https://further.pi-top.com/setup-devices?return_url=http://localhost/"
     >
       here
     </a>