diff --git a/.env b/.env index a1c899d42..73496e2ef 100644 --- a/.env +++ b/.env @@ -5,7 +5,7 @@ DATABASE_URL=postgresql://sendou@localhost:5432/sendou_ink_trpc?schema=public // you can get them by making an application on https://discord.com/developers DISCORD_CLIENT_ID=581483359159582722 DISCORD_CLIENT_SECRET=qxFxBlALcRsqUG2m7WYLHJ8rzjbddBTx -DISCORD_CALLBACK_URL=http://localhost:3001/auth/discord/callback +DISCORD_CALLBACK_URL=http://localhost:3000/auth/discord/callback COOKIE_SECRET=secret FRONTEND_URL=http://localhost:3000 diff --git a/.env.example b/.env.example index c5a374ac4..87aecf84b 100644 --- a/.env.example +++ b/.env.example @@ -5,8 +5,5 @@ DATABASE_URL=postgresql://sendou@localhost:5432/sendou_ink?schema=public // you can get them by making an application on https://discord.com/developers DISCORD_CLIENT_ID= DISCORD_CLIENT_SECRET= -DISCORD_CALLBACK_URL=http://localhost:3001/auth/discord/callback +DISCORD_CALLBACK_URL=http://localhost:3000/auth/discord/callback COOKIE_SECRET= -FRONTEND_URL=http://localhost:3000 - -VITE_BACKEND_URL=http://localhost:3001 diff --git a/app/components/Layout/UserItem.tsx b/app/components/Layout/UserItem.tsx index 56d9f08cb..6d95362ae 100644 --- a/app/components/Layout/UserItem.tsx +++ b/app/components/Layout/UserItem.tsx @@ -1,19 +1,20 @@ +import { useUserContext } from "~/root"; import { DiscordIcon } from "../icons/Discord"; // TODO: redirect to same page on login export function UserItem() { - const user = null; + const user = useUserContext(); if (user) return ( ); return ( -
+