Skip to content

Commit bec3a1f

Browse files
committed
redirect was on wrong page, testing successful
1 parent 770d626 commit bec3a1f

2 files changed

Lines changed: 23 additions & 6 deletions

File tree

ui/src/pages/hackers/hackerLanding.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,6 @@ export default function UserHomepage() {
105105
navigate("/user/create");
106106
}
107107

108-
const [searchParams, setSearchParams] = useSearchParams();
109-
if (searchParams.get('code') && searchParams.get('state')){
110-
navigate("discord/callback?code="+searchParams.get('code')+"&state="+searchParams.get('state'))
111-
}
112-
113108
if (userData?.error){
114109
navigate("/notFound")
115110
} else if (!userData?.data){

ui/src/pages/wichacksLanding.js

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,32 @@
1-
import {useNavigate} from "react-router-dom";
1+
import {useNavigate, useSearchParams, createSearchParams} from "react-router-dom";
22
import {Grommet, Button, Box, Heading, Paragraph, Image, Text } from "grommet";
33
import { Home } from "grommet-icons";
44
import NavBar from "../components/navBar";
5+
import {useEffect} from "react";
6+
7+
// @TODO: Remove hotfix
8+
const checkDiscordIntegration = (searchParams, navigate) => {
9+
if (searchParams.get('code') && searchParams.get('state')){
10+
console.log("navigate")
11+
navigate({
12+
pathname: "discord/callback",
13+
search: '?' + createSearchParams({
14+
"code": searchParams.get('code'),
15+
"state": searchParams.get('state')
16+
})
17+
})
18+
}
19+
}
520

621
export default function WiCHacksLanding() {
722
let navigate = useNavigate()
23+
24+
const [searchParams, setSearchParams] = useSearchParams();
25+
useEffect(() => {
26+
checkDiscordIntegration(searchParams, navigate)
27+
}, [])
28+
29+
830
return (
931
<Grommet>
1032
<NavBar title="WiCHacks" />

0 commit comments

Comments
 (0)