From fb6f450dfac6a082aecff8c3a17c26b32014ab7a Mon Sep 17 00:00:00 2001
From: davids700 <dsolano7@csu.fullerton.edu>
Date: Sat, 19 Nov 2022 18:22:39 -0800
Subject: [PATCH 1/2] Redirected 404 Button to stay on the original tab.

First bug squashed.
---
 src/lib/components/button/button.svelte | 3 ++-
 src/routes/+error.svelte                | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/button/button.svelte b/src/lib/components/button/button.svelte
index 56edaa08a..1813fba23 100644
--- a/src/lib/components/button/button.svelte
+++ b/src/lib/components/button/button.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
   export let link = '#';
+  export let redirect = "_blank";
   export let text = 'Submit';
 </script>
 
-<a class="brand-header size-md" role="button" href={link} target="_blank" rel="noopener norefferer">
+<a class="brand-header size-md" role="button" href={link} target={redirect} rel="noopener norefferer">
   {text}
 </a>
 
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
index b655e4721..e32e72041 100644
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -14,7 +14,7 @@
 <section title={$page.error?.message}>
   <em>404</em>
   <h1>Frank can't find where you're going!</h1>
-  <Button text={'Return to Home'} link={'/'} />
+  <Button text={'Return to Home'} link={'/'} redirect={'_self'} />
   <img src="/assets/png/lost-frank.png" alt="404 - Page Not Found" />
 </section>
 

From ed78e483ecc4f25ff408166e4b0fe315267a3aca Mon Sep 17 00:00:00 2001
From: davids700 <dsolano7@csu.fullerton.edu>
Date: Sat, 19 Nov 2022 19:35:01 -0800
Subject: [PATCH 2/2] Tweaked solution

Changed prop behavior so that redirect is automatically set to false.
---
 src/lib/components/button/button.svelte | 10 ++++++++--
 src/routes/(site)/hero.svelte           |  2 +-
 src/routes/(site)/ready-up.svelte       |  2 +-
 src/routes/+error.svelte                |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/lib/components/button/button.svelte b/src/lib/components/button/button.svelte
index 1813fba23..5283f6070 100644
--- a/src/lib/components/button/button.svelte
+++ b/src/lib/components/button/button.svelte
@@ -1,10 +1,16 @@
 <script lang="ts">
   export let link = '#';
-  export let redirect = "_blank";
+  export let redirect = false;
   export let text = 'Submit';
 </script>
 
-<a class="brand-header size-md" role="button" href={link} target={redirect} rel="noopener norefferer">
+<a
+  class="brand-header size-md"
+  role="button"
+  href={link}
+  target={redirect ? '_blank' : '_self'}
+  rel="noopener norefferer"
+>
   {text}
 </a>
 
diff --git a/src/routes/(site)/hero.svelte b/src/routes/(site)/hero.svelte
index d47fb5477..d6440a736 100644
--- a/src/routes/(site)/hero.svelte
+++ b/src/routes/(site)/hero.svelte
@@ -10,7 +10,7 @@
         <b class="acm-blue">CSUF</b>
       </h1>
 
-      <AcmButton text="Join us today!" link="/discord" />
+      <AcmButton text="Join us today!" link="/discord" redirect={true}/>
     </div>
 
     <img
diff --git a/src/routes/(site)/ready-up.svelte b/src/routes/(site)/ready-up.svelte
index b9e589f65..9f996b94b 100644
--- a/src/routes/(site)/ready-up.svelte
+++ b/src/routes/(site)/ready-up.svelte
@@ -21,7 +21,7 @@
       </p>
     </div>
 
-    <AcmButton text="Join us today!" link="/discord" />
+    <AcmButton text="Join us today!" link="/discord" redirect={true} />
   </div>
 </section>
 
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
index e32e72041..b655e4721 100644
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -14,7 +14,7 @@
 <section title={$page.error?.message}>
   <em>404</em>
   <h1>Frank can't find where you're going!</h1>
-  <Button text={'Return to Home'} link={'/'} redirect={'_self'} />
+  <Button text={'Return to Home'} link={'/'} />
   <img src="/assets/png/lost-frank.png" alt="404 - Page Not Found" />
 </section>