diff --git a/app/components/Layout/UserItem.tsx b/app/components/Layout/UserItem.tsx index 66ff05522..9759d150a 100644 --- a/app/components/Layout/UserItem.tsx +++ b/app/components/Layout/UserItem.tsx @@ -1,7 +1,10 @@ import { useLocation } from "remix"; -import { getLogInUrl } from "~/utils"; import { useUser } from "~/hooks/common"; +import { getLogInUrl } from "~/utils"; +import { Button } from "../Button"; import { DiscordIcon } from "../icons/Discord"; +import { LogOutIcon } from "../icons/LogOut"; +import { Popover } from "../Popover"; export function UserItem() { const user = useUser(); @@ -9,10 +12,20 @@ export function UserItem() { if (user && user.discordAvatar) return ( - + + } + > +
+ +
+
); // TODO: just show text... my profile? diff --git a/app/components/Popover.tsx b/app/components/Popover.tsx index ccfa7fa13..341f873a5 100644 --- a/app/components/Popover.tsx +++ b/app/components/Popover.tsx @@ -2,7 +2,13 @@ import { Popover as HeadlessPopover } from "@headlessui/react"; import * as React from "react"; import { usePopper } from "react-popper"; -export function Popover({ children }: { children: React.ReactNode }) { +export function Popover({ + children, + trigger, +}: { + children: React.ReactNode; + trigger: React.ReactNode; +}) { const [referenceElement, setReferenceElement] = React.useState(); const [popperElement, setPopperElement] = React.useState(); const { styles, attributes } = usePopper(referenceElement, popperElement); @@ -14,7 +20,7 @@ export function Popover({ children }: { children: React.ReactNode }) { ref={setReferenceElement} className="minimal tiny" > - INFO + {trigger} + + + ); +} diff --git a/app/components/play/GroupMembers.tsx b/app/components/play/GroupMembers.tsx index 0b776b2df..3832fd73c 100644 --- a/app/components/play/GroupMembers.tsx +++ b/app/components/play/GroupMembers.tsx @@ -90,7 +90,9 @@ function Contents({ members }: { members: LookingLoaderDataGroup["members"] }) { )}
- {member.miniBio && {member.miniBio}} + {member.miniBio && ( + {member.miniBio} + )}
); diff --git a/server/auth.ts b/server/auth.ts index 134b75f97..075007ea0 100644 --- a/server/auth.ts +++ b/server/auth.ts @@ -135,10 +135,10 @@ export function setUpAuth(app: Express): void { successRedirect: returnTo, })(req, res, next); }); - // app.post("/logout", function (req, res) { - // req.logout(); - // res.redirect("/"); - // }); + app.post("/logout", function (req, res) { + req.logout(); + res.redirect("/"); + }); app.use(function (req, _res, next) { if (req.session?.returnTo) {