feat(frontend): show user profile fields

This commit is contained in:
sam 2024-09-25 16:43:53 +02:00
parent 4ba28bbfde
commit 4732451040
Signed by: sam
GPG key ID: B4EF20DDE721CAA1
7 changed files with 95 additions and 55 deletions

View file

@ -0,0 +1,25 @@
import { CustomPreference, FieldEntry, Pronoun } from "~/lib/api/user";
import StatusLine from "~/components/StatusLine";
export default function ProfileField({
name,
entries,
preferences,
}: {
name: string;
entries: Array<FieldEntry | Pronoun>;
preferences: Record<string, CustomPreference>;
}) {
return (
<div className="col">
<h3>{name}</h3>
<ul className="list-unstyled fs-5">
{entries.map((e, i) => (
<li key={i}>
<StatusLine entry={e} preferences={preferences} />
</li>
))}
</ul>
</div>
);
}

View file

@ -8,15 +8,14 @@ import {
import classNames from "classnames";
import { ReactNode } from "react";
import StatusIcon from "~/components/StatusIcon";
import PronounLink from "~/components/PronounLink";
export default function StatusLine({
entry,
preferences,
children,
}: {
entry: FieldEntry | Pronoun;
preferences: Record<string, CustomPreference>;
children: ReactNode;
}) {
const mergedPrefs = Object.assign({}, defaultPreferences, preferences);
const currentPref =
@ -28,9 +27,19 @@ export default function StatusLine({
"fs-6": currentPref.size == PreferenceSize.Small,
});
if ("display_text" in entry) {
const pronoun = entry as Pronoun;
return (
<span className={classes}>
<StatusIcon preferences={preferences} status={entry.status} />{" "}
<PronounLink pronoun={pronoun} />
</span>
);
}
return (
<span className={classes}>
<StatusIcon preferences={preferences} status={entry.status} /> {children}
<StatusIcon preferences={preferences} status={entry.status} /> {entry.value}
</span>
);
}

View file

@ -3,7 +3,7 @@ import { Nav, Navbar } from "react-bootstrap";
import { Link } from "@remix-run/react";
import Logo from "~/components/nav/Logo";
export default function BaseNavbar({ children }: { children?: ReactNode; }) {
export default function BaseNavbar({ children }: { children?: ReactNode }) {
return (
<Navbar expand="lg" className={`mb-4 mx-2`}>
<Navbar.Brand to="/" as={Link}>

View file

@ -6,12 +6,7 @@ import { Nav, NavDropdown } from "react-bootstrap";
import { useTranslation } from "react-i18next";
import BaseNavbar from "~/components/nav/BaseNavbar";
export default function MainNavbar({
user,
}: {
meta: Meta;
user?: User;
}) {
export default function MainNavbar({ user }: { meta: Meta; user?: User }) {
const fetcher = useFetcher();
const { t } = useTranslation();
@ -35,10 +30,6 @@ export default function MainNavbar({
{t("navbar.log-in")}
</Nav.Link>
);
return (
<BaseNavbar>
{userMenu}
</BaseNavbar>
);
return <BaseNavbar>{userMenu}</BaseNavbar>;
}