From 074709b60751ce35f67bb629561cb82a3cf48a96 Mon Sep 17 00:00:00 2001 From: qt-coder Date: Mon, 5 Jul 2021 18:01:49 +0800 Subject: [PATCH] Implemented sidebar and changed linting rules --- .eslintrc | 6 ++++- components/Sidebar/Sidebar.js | 50 ++++++++++++++++++++--------------- pages/_app.js | 15 ++++++++--- pages/index.js | 2 ++ 4 files changed, 47 insertions(+), 26 deletions(-) diff --git a/.eslintrc b/.eslintrc index 97a2bb8..1471db4 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,3 +1,7 @@ { - "extends": ["next", "next/core-web-vitals"] + "extends": ["next", "next/core-web-vitals"], + "rules": { + "react/no-unescaped-entities": "off", + "@next/next/no-page-custom-font": "off" + } } diff --git a/components/Sidebar/Sidebar.js b/components/Sidebar/Sidebar.js index a65f80b..ae1ba42 100644 --- a/components/Sidebar/Sidebar.js +++ b/components/Sidebar/Sidebar.js @@ -20,7 +20,10 @@ import { AiFillGift } from "react-icons/ai"; import { FiMenu, FiSearch } from "react-icons/fi"; import { HiCode } from "react-icons/hi"; import { MdKeyboardArrowRight, MdHome } from "react-icons/md"; +import AuthButton from '../AuthButton' +import Link from 'next/link' import React from "react"; +import {session} from 'next-auth/client' export default function Sidebar({children}) { const sidebar = useDisclosure(); @@ -77,16 +80,18 @@ export default function Sidebar({children}) { w="60" {...props} > - - - Cath.exe - - + + + + Cath.exe + + + - - Main - - - Commands - + + + Main + + + + + Commands + + Coming Soon + ); @@ -151,10 +161,8 @@ export default function Sidebar({children}) { icon={} size="sm" /> - - } /> - - + + @@ -162,7 +170,7 @@ export default function Sidebar({children}) { ml="4" size="sm" name="anubra266" - src="https://avatars.githubusercontent.com/u/30869823?v=4" + src='' cursor="pointer" /> diff --git a/pages/_app.js b/pages/_app.js index 5782d9f..265209d 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -19,10 +19,17 @@ function MyApp({ Component, pageProps }) { -
-
- -
+ {!session && +
+ +
+
} + {session && <> +
+
+ +
+ } ) diff --git a/pages/index.js b/pages/index.js index 07eaab9..b64dfe2 100644 --- a/pages/index.js +++ b/pages/index.js @@ -49,6 +49,8 @@ export default function Home() { + + {JSON.stringify(session.user)} }