sam/Foxnouns.NET
sam/Foxnouns.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: sam:0bdd0148d2307e5aff89ccdac7d73863ffc393b9
Branches Tags
sam:main
sam:feat/reports
sam:v2024.12.2
sam:v2024.12.1
sam:v2024.12.0
sam:v0.1.0
..
compare: sam:45142164055a993e212c7a60264de54179211984
Branches Tags
sam:main
sam:feat/reports
sam:v2024.12.2
sam:v2024.12.1
sam:v2024.12.0
sam:v0.1.0

No commits in common. "0bdd0148d2307e5aff89ccdac7d73863ffc393b9" and "45142164055a993e212c7a60264de54179211984" have entirely different histories.
0bdd0148d2 ... 4514216405

6 changed files with 102 additions and 184 deletions
Show stats Expand all files Collapse all files

32
Foxnouns.Frontend/app/components/profile/BaseProfile.tsx
View file

@ -10,14 +10,14 @@ import { renderMarkdown } from "~/lib/markdown";
export type Props = { export type Props = {
name: string; name: string;
fullName?: string; fullName?: string;
userI18nKeys: boolean; avatarI18nKey: string;
profile: User | Member; profile: User | Member;
customPreferences: Record<string, CustomPreference>; customPreferences: Record<string, CustomPreference>;
}; };
export default function BaseProfile({ export default function BaseProfile({
name, name,
userI18nKeys, avatarI18nKey,
fullName, fullName,
profile, profile,
customPreferences, customPreferences,
@ -30,23 +30,13 @@ export default function BaseProfile({
<div className="grid row-gap-3"> <div className="grid row-gap-3">
<div className="row"> <div className="row">
<div className="col-md-4 text-center"> <div className="col-md-4 text-center">
{userI18nKeys ? ( <img
<img src={profile.avatar_url || defaultAvatarUrl}
src={profile.avatar_url || defaultAvatarUrl} alt={t(avatarI18nKey, { username: name })}
alt={t("user.avatar-alt", { username: name })} width={200}
width={200} height={200}
height={200} className="rounded-circle img-fluid"
className="rounded-circle img-fluid" />
/>
) : (
<img
src={profile.avatar_url || defaultAvatarUrl}
alt={t("member.avatar-alt", { name: name })}
width={200}
height={200}
className="rounded-circle img-fluid"
/>
)}
{profile.flags && profile.bio && ( {profile.flags && profile.bio && (
<div className="d-flex flex-wrap m-4"> <div className="d-flex flex-wrap m-4">
{profile.flags.map((f, i) => ( {profile.flags.map((f, i) => (
@ -56,9 +46,9 @@ export default function BaseProfile({
)} )}
</div> </div>
<div className="col-md"> <div className="col-md">
{profile.display_name || fullName ? ( {profile.display_name ? (
<> <>
<h2>{profile.display_name || name}</h2> <h2>{profile.display_name}</h2>
<p className="fs-5 text-body-secondary">{fullName || `@${name}`}</p> <p className="fs-5 text-body-secondary">{fullName || `@${name}`}</p>
</> </>
) : ( ) : (

4
Foxnouns.Frontend/app/lib/api/member.ts
View file

@ -1,9 +1,7 @@
import { Field, PartialMember, PartialUser, PrideFlag } from "~/lib/api/user"; import { Field, PartialMember, PrideFlag } from "~/lib/api/user";
export type Member = PartialMember & { export type Member = PartialMember & {
fields: Field[]; fields: Field[];
flags: PrideFlag[]; flags: PrideFlag[];
links: string[]; links: string[];
user: PartialUser;
}; };

2
Foxnouns.Frontend/app/routes/$username/MemberCard.tsx
View file

@ -47,7 +47,7 @@ export default function MemberCard({ user, member }: { user: PartialUser; member
/> />
</Link> </Link>
<p className="m-2"> <p className="m-2">
<Link to={`/@${user.username}/${member.name}`} className="text-reset fs-5 text-break"> <Link to={`/@${user.username}/${member.name}`}>
{member.display_name ?? member.name} {member.display_name ?? member.name}
{member.unlisted === true && ( {member.unlisted === true && (
<> <>

7
Foxnouns.Frontend/app/routes/$username/route.tsx
View file

@ -5,6 +5,7 @@ import serverRequest from "~/lib/request.server";
import { loader as rootLoader } from "~/root"; import { loader as rootLoader } from "~/root";
import { Alert, Button, Pagination } from "react-bootstrap"; import { Alert, Button, Pagination } from "react-bootstrap";
import { Trans, useTranslation } from "react-i18next"; import { Trans, useTranslation } from "react-i18next";
import { renderMarkdown } from "~/lib/markdown";
import { PersonPlusFill } from "react-bootstrap-icons"; import { PersonPlusFill } from "react-bootstrap-icons";
import MemberCard from "~/routes/$username/MemberCard"; import MemberCard from "~/routes/$username/MemberCard";
import { ReactNode } from "react"; import { ReactNode } from "react";
@ -55,14 +56,12 @@ export default function UserPage() {
<Pagination className="justify-content-center"> <Pagination className="justify-content-center">
<Pagination.Prev <Pagination.Prev
as={Link} as={Link}
// @ts-expect-error using as=Link causes an error here, even though it runs completely fine
to={`/@${user.username}?page=${currentPage - 1}`} to={`/@${user.username}?page=${currentPage - 1}`}
disabled={currentPage === 0} disabled={currentPage === 0}
/> />
{paginationItems} {paginationItems}
<Pagination.Next <Pagination.Next
as={Link} as={Link}
// @ts-expect-error using as=Link causes an error here, even though it runs completely fine
to={`/@${user.username}?page=${currentPage + 1}`} to={`/@${user.username}?page=${currentPage + 1}`}
disabled={currentPage === pageCount - 1} disabled={currentPage === pageCount - 1}
/> />
@ -76,13 +75,13 @@ export default function UserPage() {
<Trans t={t} i18nKey="user.own-profile-alert"> <Trans t={t} i18nKey="user.own-profile-alert">
You are currently viewing your <strong>public</strong> profile. You are currently viewing your <strong>public</strong> profile.
<br /> <br />
<Link to="/settings/profile">Edit your profile</Link> <Link to="/edit/profile">Edit your profile</Link>
</Trans> </Trans>
</Alert> </Alert>
)} )}
<BaseProfile <BaseProfile
name={user.username} name={user.username}
userI18nKeys={true} avatarI18nKey={"user.avatar-alt"}
profile={user} profile={user}
customPreferences={user.custom_preferences} customPreferences={user.custom_preferences}
/> />

64
Foxnouns.Frontend/app/routes/$username_.$member/route.tsx
View file

@ -1,64 +0,0 @@
import { json, LoaderFunctionArgs, MetaFunction } from "@remix-run/node";
import { Link, redirect, useLoaderData, useRouteLoaderData } from "@remix-run/react";
import serverRequest from "~/lib/request.server";
import { Member } from "~/lib/api/member";
import BaseProfile from "~/components/profile/BaseProfile";
import { loader as rootLoader } from "~/root";
import { Alert, Button } from "react-bootstrap";
import { Trans, useTranslation } from "react-i18next";
import { ArrowLeft } from "react-bootstrap-icons";
export const meta: MetaFunction<typeof loader> = ({ data }) => {
const { member } = data!;
return [
{ title: `${member.display_name ?? member.name} • @${member.user.username} • pronouns.cc` },
];
};
export const loader = async ({ params }: LoaderFunctionArgs) => {
let username = params.username!;
const memberName = params.member!;
if (!username.startsWith("@")) throw redirect(`/@${username}/${memberName}`);
username = username.substring("@".length);
const member = await serverRequest<Member>("GET", `/users/${username}/members/${memberName}`);
return json({ member });
};
export default function MemberPage() {
const { t } = useTranslation();
const { member } = useLoaderData<typeof loader>();
const { meUser } = useRouteLoaderData<typeof rootLoader>("root") || { meUser: undefined };
const isMeUser = meUser && meUser.id === member.user.id;
const memberName = member.name;
return (
<>
{isMeUser && (
<Alert variant="secondary">
<Trans t={t} i18nKey="member.own-profile-alert" values={{ memberName: member.name }}>
You are currently viewing the <strong>public</strong> profile of {{ memberName }}.
<br />
<Link to={`/settings/profile/${member.id}`}>Edit your profile</Link>
</Trans>
</Alert>
)}
<div className="m-3">
{/* @ts-expect-error using as=Link causes an error here, even though it runs completely fine */}
<Button variant="secondary" as={Link} to={`/@${member.user.username}`}>
<ArrowLeft />{" "}
{t("member.back", { name: member.user.display_name ?? member.user.username })}
</Button>
</div>
<BaseProfile
name={member.name}
fullName={`${member.name} (@${member.user.username})`}
userI18nKeys={false}
profile={member}
customPreferences={member.user.custom_preferences}
/>
</>
);
}

177
Foxnouns.Frontend/public/locales/en.json
View file

@ -1,93 +1,88 @@
{ {
"error": { "error": {
"heading": "An error occurred", "heading": "An error occurred",
"validation": { "validation": {
"too-long": "Value is too long, maximum length is {{maxLength}}, current length is {{actualLength}}.", "too-long": "Value is too long, maximum length is {{maxLength}}, current length is {{actualLength}}.",
"too-short": "Value is too short, minimum length is {{minLength}}, current length is {{actualLength}}.", "too-short": "Value is too short, minimum length is {{minLength}}, current length is {{actualLength}}.",
"disallowed-value": "The value <1>{{actualValue}}</1> is not allowed here. Allowed values are: <4>{{allowedValues}}</4>", "disallowed-value": "The value <1>{{actualValue}}</1> is not allowed here. Allowed values are: <4>{{allowedValues}}</4>",
"generic": "The value <1>{{actualValue}}</1> is not allowed here. Reason: {{reason}}", "generic": "The value <1>{{actualValue}}</1> is not allowed here. Reason: {{reason}}",
"generic-no-value": "The value you entered is not allowed here. Reason: {{reason}}" "generic-no-value": "The value you entered is not allowed here. Reason: {{reason}}"
}, },
"errors": { "errors": {
"authentication-error": "There was an error validating your credentials.", "authentication-error": "There was an error validating your credentials.",
"authentication-required": "You need to log in.", "authentication-required": "You need to log in.",
"bad-request": "Server rejected your input, please check anything for errors.", "bad-request": "Server rejected your input, please check anything for errors.",
"forbidden": "You are not allowed to perform that action.", "forbidden": "You are not allowed to perform that action.",
"generic-error": "An unknown error occurred.", "generic-error": "An unknown error occurred.",
"internal-server-error": "Server experienced an internal error, please try again later.", "internal-server-error": "Server experienced an internal error, please try again later.",
"member-not-found": "Member not found, please check your spelling and try again.", "member-not-found": "Member not found, please check your spelling and try again.",
"user-not-found": "User not found, please check your spelling and try again." "user-not-found": "User not found, please check your spelling and try again."
}, },
"title": "An error occurred", "title": "An error occurred",
"more-info": "Click here for a more detailed error" "more-info": "Click here for a more detailed error"
}, },
"navbar": { "navbar": {
"view-profile": "View profile", "view-profile": "View profile",
"settings": "Settings", "settings": "Settings",
"log-out": "Log out", "log-out": "Log out",
"log-in": "Log in or sign up" "log-in": "Log in or sign up"
}, },
"user": { "user": {
"avatar-alt": "Avatar for @{{username}}", "member-avatar-alt": "Avatar for {{name}}",
"heading": { "member-hidden": "This member is unlisted, and not shown in your public member list.",
"names": "Names", "own-profile-alert": "You are currently viewing your <1>public</1> profile.<3></3><4>Edit your profile</4>",
"pronouns": "Pronouns", "avatar-alt": "Avatar for @{{username}}",
"members": "Members" "heading": {
}, "names": "Names",
"member-avatar-alt": "Avatar for {{name}}", "pronouns": "Pronouns",
"member-hidden": "This member is unlisted, and not shown in your public member list.", "members": "Members"
"own-profile-alert": "You are currently viewing your <1>public</1> profile.<3></3><4>Edit your profile</4>", },
"create-member-button": "Create member", "create-member-button": "Create member",
"no-members-blurb": "You don't have any members yet.<1></1>Members are sub-profiles that can have their own avatar, names, pronouns, and preferred terms.<3></3>You can create a new member with the \"Create member\" button above. <6>(only you can see this)</6>" "no-members-blurb": "You don't have any members yet.<1></1>Members are sub-profiles that can have their own avatar, names, pronouns, and preferred terms.<3></3>You can create a new member with the \"Create member\" button above. <6>(only you can see this)</6>"
}, },
"member": { "log-in": {
"avatar-alt": "Avatar for {{name}}", "callback": {
"own-profile-alert": "You are currently viewing the <1>public</1> profile of {{memberName}}.<5></5><6>Edit your profile</6>", "title": {
"back": "Back to {{name}}" "discord-success": "Log in with Discord",
}, "discord-register": "Register with Discord"
"log-in": { },
"callback": { "success": "Successfully logged in!",
"title": { "success-link": "Welcome back, <1>@{{username}}</1>!",
"discord-success": "Log in with Discord", "redirect-hint": "If you're not redirected to your profile in a few seconds, press the link above.",
"discord-register": "Register with Discord" "remote-username": {
}, "discord": "Your discord username"
"success": "Successfully logged in!", },
"success-link": "Welcome back, <1>@{{username}}</1>!", "username": "Username",
"redirect-hint": "If you're not redirected to your profile in a few seconds, press the link above.", "sign-up-button": "Sign up",
"remote-username": { "invalid-ticket": "Invalid ticket (it might have been too long since you logged in with Discord), please <2>try again</2>.",
"discord": "Your discord username" "invalid-username": "Invalid username",
}, "username-taken": "That username is already taken, please try something else."
"username": "Username", },
"sign-up-button": "Sign up", "title": "Log in",
"invalid-ticket": "Invalid ticket (it might have been too long since you logged in with Discord), please <2>try again</2>.", "form-title": "Log in with email",
"invalid-username": "Invalid username", "email": "Email address",
"username-taken": "That username is already taken, please try something else." "password": "Password",
}, "log-in-button": "Log in",
"title": "Log in", "register-with-email": "Register with email",
"form-title": "Log in with email", "3rd-party": {
"email": "Email address", "title": "Log in with another service",
"password": "Password", "desc": "If you prefer, you can also log in with one of these services:",
"log-in-button": "Log in", "discord": "Log in with Discord",
"register-with-email": "Register with email", "google": "Log in with Google",
"3rd-party": { "tumblr": "Log in with Tumblr"
"title": "Log in with another service", },
"desc": "If you prefer, you can also log in with one of these services:", "invalid-credentials": "Invalid email address or password, please check your spelling and try again."
"discord": "Log in with Discord", },
"google": "Log in with Google", "welcome": {
"tumblr": "Log in with Tumblr" "title": "Welcome",
}, "header": "Welcome to pronouns.cc!",
"invalid-credentials": "Invalid email address or password, please check your spelling and try again." "blurb": "{welcome.blurb}",
}, "customize-profile": "Customize your profile",
"welcome": { "customize-profile-blurb": "{welcome.customize-profile-blurb}",
"title": "Welcome", "create-members": "Create members",
"header": "Welcome to pronouns.cc!", "create-members-blurb": "{welcome.create-members-blurb}",
"blurb": "{welcome.blurb}", "custom-preferences": "Customize your preferences",
"customize-profile": "Customize your profile", "custom-preferences-blurb": "{welcome.custom-preferences-blurb}",
"customize-profile-blurb": "{welcome.customize-profile-blurb}", "profile-button": "Go to your profile"
"create-members": "Create members", }
"create-members-blurb": "{welcome.create-members-blurb}",
"custom-preferences": "Customize your preferences",
"custom-preferences-blurb": "{welcome.custom-preferences-blurb}",
"profile-button": "Go to your profile"
}
} }