From 3fd31245eec072c488eba1accf7f32f9f3cb5d76 Mon Sep 17 00:00:00 2001
From: Jeffrey Li <dr.cheddar@outlook.com>
Date: Mon, 17 Aug 2020 14:54:10 -0400
Subject: [PATCH] kms literally

---
 middleware/router-auth.ts | 4 +++-
 pages/index.vue           | 8 ++++++--
 types/schools.ts          | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/middleware/router-auth.ts b/middleware/router-auth.ts
index ed03133..98e4362 100644
--- a/middleware/router-auth.ts
+++ b/middleware/router-auth.ts
@@ -11,7 +11,8 @@ export default function({store, redirect, route} : Context)
     {
         redirect('/home')
     }
-    if(store.state.auth.user == null && (route.name == null || isAdminRoute(route))) {
+    if(store.state.auth.user == null && (route.name == null || isAdminRoute(route)) && route.name != "auth/Login" && route.name!="auth/Signup") {
+
         redirect('/auth/login')
     };
 }
@@ -22,4 +23,5 @@ function isAdminRoute(route : Route)
     {
         return true
     }
+    return false
 }
\ No newline at end of file
diff --git a/pages/index.vue b/pages/index.vue
index 0d87cc0..69b2a8b 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -23,7 +23,7 @@
             <div data-aos="fade-up" data-aos-duration="1000" data-aos-delay="3000"><h1 style="color:white;">School is hard.<br>Learning doesn't have to be.</h1>
             <h2 style="color:white;" class="mt-4">Quento’s suite of tools helps you streamline your studying like never before.</h2></div>
             <button class="link2 text-ginger inline-block" data-aos="fade-right" data-aos-duration="1000" style="transition-delay:4.2s;" @click="$router.push('/auth/signup')">Sign up for the BETA</button>
-            <button data-aos="fade-right" data-aos-duration="1000" style="background:rgba(255,255,255,0.3);color:white;transition-delay:4.2s;" class="link1 text-ginger"><a href="https://discord.gg/pfyFWus" style="color:white;"><img src="../assets/images/discord_logo.png">Join us on Discord</a></button>
+            <button data-aos="fade-right" data-aos-duration="1000" style="background:rgba(255,255,255,0.3);color:white;transition-delay:4.2s;" class="link1 text-ginger"><a href="https://discord.com/invite/vHhtD38" style="color:white;"><img src="../assets/images/discord_logo.png">Join us on Discord</a></button>
          </div>
          <div class="scrollDown absolute text-center" style="left:50%;transform:translate(-50%);" :class="pageLoaded ? 'animate-flicker' : ''">
             <h1 style="color:white;font-family:ginger-normal;">Scroll Down</h1>
@@ -176,7 +176,7 @@
          <div >
             <h1>For students, by students</h1>
             <p>Every day, youth around the world face the many challenges that come with being a student— from teaching yourself something the teacher glossed over to losing track of what’s due, we totally get what it’s like.<br><br>No worries, Quento’s got your back. As students ourselves, we’ve designed our toolkit to allow you to improve your academic performance while staying on top of your school’s latest happenings. Every single feature of our platform has been built with YOU in mind. What are you waiting for? Join the revolution today!<br><br></p>
-            <button>Join Quento</button>
+            <button @click="footerClicked()">Join Quento</button>
          </div>
       </section>
 </section>
@@ -203,6 +203,10 @@ import AOS from 'aos'
 
 export default class Splash extends Vue {
 
+   footerClicked()
+   {
+      this.$router.push("/auth/Login");
+   }
 
    formSubmitted = false;
    loading = true;
diff --git a/types/schools.ts b/types/schools.ts
index 3aa426a..c5c8839 100644
--- a/types/schools.ts
+++ b/types/schools.ts
@@ -5,7 +5,7 @@ export const SchoolList = [
   'Bell High School',
   'Longfields-Davidson Heights Secondary School',
   'Merivale High School',
-  'John Mccrae Secondary School',
+  'John McCrae Secondary School',
   'Other'
 ] as const