v3: src/components sorted into feature folders, the four largest files split, and the component tests mirror the new layout — 48 components sat in one flat folder, ChatModal ran to 1301 lines, DumpCreateModal to 983, and the tests were grouped by theme, so there was no telling which component had none. Components now live in category/, chat/, comment/, dump/ (with dump/create/ for the new-dump wizard), editor/, form/, layout/ (header, page shell, floating buttons), player/, playlist/, profile/, social/ (vote, like, follow, the who-voted popover) and ui/; FeedTabBar and PresenceRow, used by the index page alone, move to pages/index/. ChatModal gives up ChatMessageItem, PendingItem, ChatEditBox and ReplyRef, the message limits and text helpers (chat/message.ts), the day and clock labels (chat/time.ts) and the draft storage (utils/chatDraft.ts, next to dumpDraft.ts). DumpCreateModal gives up StepIndicator, LocalFilePreview, TitleField and DuplicateNotice; CommentThread gives up CommentForm and CommentNode; TextEditor gives up the emoji picker popup and its skin-tone storage; MediaPlayer gives up its icons (which FilePreview imported from it), Waveform, SeekBar and the remembered volume. NewPlaylistForm, a button that opens a modal holding the form, is NewPlaylistButton now, and Thumbnail, ThumbnailPlaceholder, FilePreview and RichContentCard use named exports like everything else. The tests are split one file per component under src/test/components/<folder>/ (and src/test/pages/index/), the same 625 of them. No behaviour changes; the catalogues only move their source references.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
khannurien
116
src/components/profile/ChangePasswordModal.tsx
Normal file
116
src/components/profile/ChangePasswordModal.tsx
Normal file
@@ -0,0 +1,116 @@
|
||||
import { useState } from "react";
|
||||
import { t } from "@lingui/core/macro";
|
||||
import { Trans } from "@lingui/react/macro";
|
||||
import { API_URL, VALIDATION } from "../../config/api.ts";
|
||||
import { useAuth } from "../../hooks/useAuth.ts";
|
||||
import { Modal } from "../ui/Modal.tsx";
|
||||
import {
|
||||
expectOk,
|
||||
FormActions,
|
||||
FormError,
|
||||
FormProvider,
|
||||
SubmitButton,
|
||||
TextField,
|
||||
useApiForm,
|
||||
} from "../form/index.ts";
|
||||
|
||||
interface ChangePasswordModalProps {
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
interface Values {
|
||||
currentPassword: string;
|
||||
newPassword: string;
|
||||
confirmPassword: string;
|
||||
}
|
||||
|
||||
export function ChangePasswordModal({ onClose }: ChangePasswordModalProps) {
|
||||
const { authFetch, updateSession } = useAuth();
|
||||
const [done, setDone] = useState(false);
|
||||
const form = useApiForm<Values>({
|
||||
mode: "onChange",
|
||||
defaultValues: {
|
||||
currentPassword: "",
|
||||
newPassword: "",
|
||||
confirmPassword: "",
|
||||
},
|
||||
});
|
||||
|
||||
const onSubmit = form.submit(async ({ currentPassword, newPassword }) => {
|
||||
// The change signs out every session opened with the old password, this
|
||||
// one included, so keep the fresh tokens it hands back.
|
||||
const tokens = await expectOk<{ token: string; mediaToken: string }>(
|
||||
await authFetch(`${API_URL}/api/users/me/change-password`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ currentPassword, newPassword }),
|
||||
}),
|
||||
);
|
||||
updateSession(tokens);
|
||||
setDone(true);
|
||||
});
|
||||
|
||||
return (
|
||||
<Modal title={t`Change password`} onClose={onClose}>
|
||||
{done
|
||||
? (
|
||||
<div className="form">
|
||||
<p className="form-success">
|
||||
<Trans>Password changed successfully.</Trans>
|
||||
</p>
|
||||
<FormActions>
|
||||
<button type="button" className="btn-primary" onClick={onClose}>
|
||||
<Trans>Close</Trans>
|
||||
</button>
|
||||
</FormActions>
|
||||
</div>
|
||||
)
|
||||
: (
|
||||
<FormProvider {...form}>
|
||||
<form className="form" onSubmit={onSubmit}>
|
||||
<TextField<Values>
|
||||
name="currentPassword"
|
||||
type="password"
|
||||
label={t`Current password`}
|
||||
autoComplete="current-password"
|
||||
autoFocus
|
||||
rules={{ required: true }}
|
||||
/>
|
||||
<TextField<Values>
|
||||
name="newPassword"
|
||||
type="password"
|
||||
label={t`New password`}
|
||||
autoComplete="new-password"
|
||||
maxLength={VALIDATION.PASSWORD_MAX}
|
||||
rules={{
|
||||
required: true,
|
||||
minLength: {
|
||||
value: VALIDATION.PASSWORD_MIN,
|
||||
message: t`At least ${VALIDATION.PASSWORD_MIN} characters`,
|
||||
},
|
||||
}}
|
||||
/>
|
||||
<TextField<Values>
|
||||
name="confirmPassword"
|
||||
type="password"
|
||||
label={t`Confirm new password`}
|
||||
autoComplete="new-password"
|
||||
rules={{
|
||||
required: true,
|
||||
validate: (value, values) =>
|
||||
value === values.newPassword ||
|
||||
t`Passwords do not match`,
|
||||
}}
|
||||
/>
|
||||
<FormError title={t`Could not change password`} />
|
||||
<FormActions onCancel={onClose}>
|
||||
<SubmitButton pendingLabel={<Trans>Saving…</Trans>}>
|
||||
<Trans>Change password</Trans>
|
||||
</SubmitButton>
|
||||
</FormActions>
|
||||
</form>
|
||||
</FormProvider>
|
||||
)}
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
33
src/components/profile/ProfileSubpageHeader.tsx
Normal file
33
src/components/profile/ProfileSubpageHeader.tsx
Normal file
@@ -0,0 +1,33 @@
|
||||
import type { ReactNode } from "react";
|
||||
import { Link } from "react-router";
|
||||
import type { PublicUser } from "../../model.ts";
|
||||
import { Avatar } from "../ui/Avatar.tsx";
|
||||
|
||||
interface ProfileSubpageHeaderProps {
|
||||
username: string;
|
||||
profileUser: PublicUser;
|
||||
title: string;
|
||||
actions?: ReactNode;
|
||||
}
|
||||
|
||||
export function ProfileSubpageHeader(
|
||||
{ username, profileUser, title, actions }: ProfileSubpageHeaderProps,
|
||||
) {
|
||||
return (
|
||||
<div className="profile-subpage-header">
|
||||
<Link to={`/users/${username}`} className="profile-subpage-back">
|
||||
← {profileUser.username}
|
||||
</Link>
|
||||
<div className="profile-subpage-title-row">
|
||||
<Avatar
|
||||
userId={profileUser.id}
|
||||
username={profileUser.username}
|
||||
hasAvatar={!!profileUser.avatarMime}
|
||||
size={36}
|
||||
/>
|
||||
<h1 className="profile-subpage-title">{title}</h1>
|
||||
{actions}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user