Skip to content

Commit

Permalink
chore: Better wording for user settings and sign up (#81)
Browse files Browse the repository at this point in the history
  • Loading branch information
rayokamoto authored Feb 19, 2024
1 parent 97af582 commit 4d9496a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
8 changes: 5 additions & 3 deletions src/app/(account)/join/steps/StepFour.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import { useJoinUsStep, useJoinUsStudentInfo, useSetJoinUsHeading } from '../sto

export default function StepFour() {
useSetJoinUsHeading({
title: 'Payment',
description: 'Complete membership payment',
title: 'Confirm Terms',
description:
'You must read and agree to the terms and proceed to complete the membership payment.',
});

const [agreement, setAgreement] = useState(false);
Expand Down Expand Up @@ -42,8 +43,9 @@ export default function StepFour() {
return (
<div>
<div className="mb-4 mt-8">
{/* TODO: Add links to codes of conduct */}
<Field
label="By submitting this form, you agree to abide by the University Code of Conduct and Computer Science Club Code of Conduct. You acknowledge that failure to adhere to these rules may result in my membership being suspended or revoked following formal procedures outlined in the Code of Conduct. You acknowledge that services and events offered by the Club may change at any time upon our discretion without notice."
label="By submitting this form, you agree to abide by the University Code of Conduct and Computer Science Club Code of Conduct. You acknowledge that failure to adhere to these rules may result in your membership being suspended or revoked following formal procedures outlined in the Code of Conduct. You also acknowledge that services and events offered by the Club may change at any time upon our discretion without notice."
value={agreement ? 'Yes' : 'No'}
onChange={toggleAgreement}
error={agreementError}
Expand Down
6 changes: 3 additions & 3 deletions src/app/(account)/settings/Settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ export type SettingData = { membershipPayment: MembershipPayment };
export type SettingTabProps = { settingData: SettingData };
type SettingTabComponent = ({ settingData }: SettingTabProps) => React.ReactNode;
const SETTING_TABS = {
Account: () => <div>WIP</div>,
'Personal Info': () => <div>WIP</div>,
Account: () => <div>Coming soon</div>,
'Personal Info': () => <div>Coming soon</div>,
Membership: MembershipSettings,
Notifications: () => <div>WIP</div>,
Notifications: () => <div>Coming soon</div>,
} as const satisfies Record<TabNames, SettingTabComponent>;

export default function Settings({ settingData }: { settingData: SettingData }) {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/format-date.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
export const formatDate = (date: Date) => {
const day = date.getDate().toString().padStart(2, '0');
const month = (date.getMonth() + 1).toString().padStart(2, '0');
const year = date.getFullYear().toString().slice(2);
const year = date.getFullYear().toString();
return `${day}/${month}/${year}`;
};

0 comments on commit 4d9496a

Please sign in to comment.