Remove withoutAuth

context/Auth/index.ts

@@ -1,4 +1,3 @@
 export { AuthProvider } from "./AuthContext";
 export { useAuth } from "./AuthContext";
 export { withAuth } from "./withAuth";
-export { withoutAuth } from "./withoutAuth";

generator/templates/layouts/layout.tsx.hbs

@@ -1,6 +1,7 @@
-import {
-{{#if shouldAddAuth}}withAuth{{else}}withoutAuth{{/if}}
-} from "@context/Auth";
+
+{{#if shouldAddAuth}}
+import { withAuth } from "@context/Auth";
+{{/if}}
 
 {{#if shouldAddComponents}}
   import { Component } from "./components";
@@ -14,4 +15,4 @@ type
   <h1>{{pascalCase name}}</h1>
 </div>
 ); } export default
-{{#if shouldAddAuth}}withAuth{{else}}withoutAuth{{/if}}({{pascalCase name}});
+{{#if shouldAddAuth}}withAuth({{pascalCase name}}){{else}}{{pascalCase name}}{{/if}};

layout/Challenges/Challenges.tsx

@@ -1,5 +1,3 @@
-import { withoutAuth } from "@context/Auth";
-
 import Navbar from "@components/Navbar";
 import Footer from "@components/Footer";
 

layout/FAQs/FAQs.tsx

@@ -1,5 +1,3 @@
-import { withoutAuth } from "@context/Auth";
-
 import Navbar from "@components/Navbar";
 import Footer from "@components/Footer";
 

layout/ForgotPassword/ForgotPassword.tsx

@@ -1,5 +1,3 @@
-import { withoutAuth } from "@context/Auth";
-
 import { motion as Motion } from "framer-motion";
 
 import Card from "@components/Card";

layout/Hackathon/Hackathon.tsx

@@ -1,5 +1,3 @@
-import { withoutAuth } from "@context/Auth";
-
 import { Hero, Awards, Regulations } from "./components";
 
 import PeopleShowcase from "@components/PeopleShowcase";

layout/Home/Home.tsx

@@ -1,5 +1,3 @@
-import { withoutAuth } from "@context/Auth";
-
 import { Hero, Sponsors, Hackathon, Speakers, Partners } from "./components";
 
 import Navbar from "@components/Navbar";

layout/Login/Login.tsx

@@ -3,9 +3,10 @@
 
 import { motion as Motion } from "framer-motion";
 
-import { withoutAuth } from "@context/Auth";
+import { useAuth } from "@context/Auth";
 
 import Card from "@components/Card";
+import { Router, useRouter } from "next/router";
 
 import Return from "@components/Return";
 
@@ -14,6 +15,17 @@ import Text from "@layout/moonstone/authentication/Text";
 import { LoginForm } from "./components";
 
 function Login() {
+  const router = useRouter();
+  const { user } = useAuth();
+
+  if (user) {
+    router.replace(
+      (router.query.from && decodeURIComponent(router.query.from as string)) ??
+        "/"
+    );
+    return null;
+  }
+
   return (
     <div className="min-h-screen overflow-hidden bg-secondary">
       <Return componentStyle="sm:ml-20 mt-20 sm:mt-20" />
@@ -46,4 +58,4 @@ function Login() {
   );
 }
 
-export default withoutAuth(Login);
+export default Login;

layout/ResetPassword/ResetPassword.tsx

@@ -1,5 +1,3 @@
-import { withoutAuth } from "@context/Auth";
-
 import { motion as Motion } from "framer-motion";
 
 import Card from "@components/Card";

layout/Schedule/Schedule.tsx

@@ -1,5 +1,3 @@
-import { withoutAuth } from "@context/Auth";
-
 import { Hero } from "./components";
 
 import Navbar from "@components/Navbar";

layout/SignUp/SignUp.tsx

@@ -1,5 +1,3 @@
-import { withoutAuth } from "@context/Auth";
-
 import { motion as Motion } from "framer-motion";
 
 import Card from "@components/Card";

layout/Speakers/Speakers.tsx

@@ -1,5 +1,4 @@
 import { useRouter } from "next/router";
-import { withoutAuth } from "@context/Auth";
 
 import { Hero, Schedule } from "./components";
 

layout/Team/Team.tsx

@@ -1,5 +1,3 @@
-import { withoutAuth } from "@context/Auth";
-
 import { Hero, FindUs, Organization } from "./components";
 
 import Navbar from "@components/Navbar";

pages/register/[uuid].js

@@ -2,8 +2,6 @@ import { useState } from "react";
 import { useRouter } from "next/router";
 import { motion as Motion } from "framer-motion";
 
-import { withoutAuth, useAuth } from "@context/Auth";
-
 import Button from "@components/Button";
 import Card from "@components/Card";
 import Return from "@components/Return";