From 7d179ae3b42d8ffae5e1b6e266038793260f1bbe Mon Sep 17 00:00:00 2001 From: Alexander Zoitos Date: Wed, 19 Aug 2020 23:00:23 -0400 Subject: [PATCH] feat(login route conditional): on login route, do not display layout --- src/components/Login/index.tsx | 2 +- src/pages/_app.tsx | 17 +++++++++++------ src/pages/login.tsx | 6 +----- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/components/Login/index.tsx b/src/components/Login/index.tsx index e369f7c2..c152e075 100644 --- a/src/components/Login/index.tsx +++ b/src/components/Login/index.tsx @@ -3,7 +3,7 @@ import PlexLoginButton from '../PlexLoginButton'; const Login: React.FC = () => { return ( -
+
Overseerr diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 63eaedea..1f02ea2f 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -2,15 +2,20 @@ import React from 'react'; import '../styles/globals.css'; import App from 'next/app'; import Layout from '../components/Layout'; +import LoginPage from './login'; class CoreApp extends App { public render(): JSX.Element { - const { Component, pageProps } = this.props; - return ( - - - - ); + const { Component, pageProps, router } = this.props; + if (router.asPath == '/login') { + return ; + } else { + return ( + + + + ); + } } } diff --git a/src/pages/login.tsx b/src/pages/login.tsx index 5b390e2d..cb975e43 100644 --- a/src/pages/login.tsx +++ b/src/pages/login.tsx @@ -3,11 +3,7 @@ import { NextPage } from 'next'; import Login from '../components/Login'; const LoginPage: NextPage = () => { - return ( -
- -
- ); + return ; }; export default LoginPage;