From 6d13a84128769f27d798173727c26df622250a34 Mon Sep 17 00:00:00 2001
From: wonderlandpark <wonderlandpark@outlook.kr>
Date: Sun, 30 May 2021 19:54:35 +0900
Subject: [PATCH] fix: #397

---
 pages/bots/[id]/index.tsx |  8 +++++---
 pages/users/[id].tsx      | 10 +++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pages/bots/[id]/index.tsx b/pages/bots/[id]/index.tsx
index 530bfa6..b3ea7e3 100644
--- a/pages/bots/[id]/index.tsx
+++ b/pages/bots/[id]/index.tsx
@@ -16,7 +16,7 @@ import { get } from '@utils/Query'
 import Day from '@utils/Day'
 import { ReportSchema } from '@utils/Yup'
 import Fetch from '@utils/Fetch'
-import { checkBotFlag, checkUserFlag, formatNumber, parseCookie } from '@utils/Tools'
+import { checkBotFlag, checkUserFlag, formatNumber, parseCookie, redirectTo } from '@utils/Tools'
 import { getToken } from '@utils/Csrf'
 
 import NotFound from '../../404'
@@ -35,7 +35,6 @@ const Button = dynamic(() => import('@components/Button'))
 const TextArea = dynamic(() => import('@components/Form/TextArea'))
 const Modal = dynamic(() => import('@components/Modal'))
 const NSFW = dynamic(() => import('@components/NSFW'))
-const Login = dynamic(() => import('@components/Login'))
 
 const Bots: NextPage<BotsProps> = ({ data, desc, date, user, theme, csrfToken }) => {
 	const bg = checkBotFlag(data?.flags, 'trusted') && data?.banner
@@ -208,7 +207,10 @@ const Bots: NextPage<BotsProps> = ({ data, desc, date, user, theme, csrfToken })
 									))}
 									<div className='list grid'>
 										<a className='text-red-600 hover:underline cursor-pointer' onClick={() => {
-											if(!user) return <Login />
+											if(!user) {
+												localStorage.redirectTo = window.location.href
+												redirectTo(router, 'login')
+											}
 											else setReportModal(true)
 										}} aria-hidden='true'>
 											<i className='far fa-flag' /> 신고하기
diff --git a/pages/users/[id].tsx b/pages/users/[id].tsx
index 9038aab..6875d1f 100644
--- a/pages/users/[id].tsx
+++ b/pages/users/[id].tsx
@@ -8,7 +8,7 @@ import { Field, Form, Formik } from 'formik'
 
 import { Bot, User, ResponseProps, Theme } from '@types'
 import { get } from '@utils/Query'
-import { checkUserFlag, parseCookie } from '@utils/Tools'
+import { checkUserFlag, parseCookie, redirectTo } from '@utils/Tools'
 import { getToken } from '@utils/Csrf'
 import Fetch from '@utils/Fetch'
 import { ReportSchema } from '@utils/Yup'
@@ -16,6 +16,7 @@ import { ReportSchema } from '@utils/Yup'
 import NotFound from '../404'
 import { KoreanbotsEndPoints, reportCats } from '@utils/Constants'
 import { NextSeo } from 'next-seo'
+import { useRouter } from 'next/router'
 
 const Container = dynamic(() => import('@components/Container'))
 const DiscordAvatar = dynamic(() => import('@components/DiscordAvatar'))
@@ -29,9 +30,9 @@ const Message = dynamic(() => import('@components/Message'))
 const Modal = dynamic(() => import('@components/Modal'))
 const Button = dynamic(() => import('@components/Button'))
 const TextArea = dynamic(() => import('@components/Form/TextArea'))
-const Login = dynamic(() => import('@components/Login'))
 
 const Users: NextPage<UserProps> = ({ user, data, csrfToken, theme }) => {
+	const router = useRouter()
 	const [ reportModal, setReportModal ] = useState(false)
 	const [ reportRes, setReportRes ] = useState<ResponseProps<null>>(null)
 	if (!data?.id) return <NotFound />
@@ -98,7 +99,10 @@ const Users: NextPage<UserProps> = ({ user, data, csrfToken, theme }) => {
 						)}
 						<div className='list-none mt-2'>
 							<a className='text-red-600 hover:underline cursor-pointer' onClick={() => {
-								if(!user) return <Login />
+								if(!user) {
+									localStorage.redirectTo = window.location.href
+									redirectTo(router, 'login')
+								}
 								else setReportModal(true)
 							}} aria-hidden='true'>
 								<i className='far fa-flag' />