vynte-infra/calendar
2
0
Fork 0
Code Issues Pull Requests Actions 1.9k Packages Projects Releases Wiki Activity

refactor: Minor settings style & copy alterations (#17178)

Browse Source
This commit is contained in:
Bailey Pumfleet
2024-10-19 04:08:49 +00:00
committed by GitHub
parent 76a2822753
commit 474f81f08e
5 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/components/settings/CustomEmailTextField.tsx
+1 -1
View File
@@ -45,7 +45,7 @@ const CustomEmailTextField = ({
return (
<>
<div
className={`border-default mt-2 flex items-center rounded-md border ${
className={`border-default mt-2 flex w-full items-center rounded-md border ${
inputFocus ? "ring-brand-default border-neutral-300 ring-2" : ""
}`}>
<TextField
apps/web/components/settings/SecondaryEmailModal.tsx
+1
View File
@@ -57,6 +57,7 @@ const SecondaryEmailModal = ({
type="creation"
data-testid="secondary-email-add-dialog">
<Form form={formMethods} handleSubmit={handleAddEmail}>
<div className="text-subtle mb-4 text-sm">{t("change_email_hint")}</div>
<TextField
label={t("email_address")}
data-testid="secondary-email-input"
apps/web/modules/settings/my-account/general-view.tsx
+6 -2
View File
@@ -235,7 +235,11 @@ const GeneralView = ({ localeProp, user, travelSchedules, revalidatePage }: Gene
)}
/>
{!watchedTzSchedules.length ? (
<Button color="minimal" className="mt-2" onClick={() => setIsTZScheduleOpen(true)}>
<Button
color="secondary"
className="mt-2"
StartIcon="calendar"
onClick={() => setIsTZScheduleOpen(true)}>
{t("schedule_timezone_change")}
</Button>
) : (
@@ -310,7 +314,7 @@ const GeneralView = ({ localeProp, user, travelSchedules, revalidatePage }: Gene
</>
)}
/>
<div className="text-gray text-default mt-2 flex items-center text-sm">
<div className="text-gray text-subtle mt-2 flex items-center text-xs">
{t("timeformat_profile_hint")}
</div>
<Controller
apps/web/modules/settings/my-account/profile-view.tsx
+32 -31
View File
@@ -335,7 +335,7 @@ const ProfileView = () => {
Icon="triangle-alert">
<>
<div className="mb-10">
<p className="text-default mb-4">{t("delete_account_confirmation_message")}</p>
<p className="text-subtle mb-4 text-sm">{t("delete_account_confirmation_message")}</p>
{isCALIdentityProvider && (
<PasswordField
data-testid="password"
@@ -626,7 +626,7 @@ const ProfileForm = ({
onChange(newAvatar);
}}
imageSrc={getUserAvatarUrl({ avatarUrl: value })}
triggerButtonColor={showRemoveAvatarButton ? "secondary" : "primary"}
triggerButtonColor={showRemoveAvatarButton ? "secondary" : "secondary"}
/>
{showRemoveAvatarButton && (
@@ -651,35 +651,36 @@ const ProfileForm = ({
</div>
<div className="mt-6">
<Label>{t("email")}</Label>
{secondaryEmailFields.map((field, index) => (
<CustomEmailTextField
key={field.itemId}
formMethods={formMethods}
formMethodFieldName={`secondaryEmails.${index}.email` as keyof FormValues}
errorMessage={get(formMethods.formState.errors, `secondaryEmails.${index}.email.message`)}
emailVerified={Boolean(field.emailVerified)}
emailPrimary={field.emailPrimary}
dataTestId={`profile-form-email-${index}`}
handleChangePrimary={() => {
const fields = secondaryEmailFields.map((secondaryField, cIndex) => ({
...secondaryField,
emailPrimary: cIndex === index,
}));
updateAllSecondaryEmailFields(fields);
}}
handleVerifyEmail={() => handleResendVerifyEmail(field.email)}
handleItemDelete={() => deleteSecondaryEmail(index)}
/>
))}
<div className="text-default mt-2 flex items-center text-sm">{t("change_email_hint")}</div>
<Button
color="minimal"
StartIcon="plus"
className="mt-2"
onClick={() => handleAddSecondaryEmail()}
data-testid="add-secondary-email">
{t("add_email")}
</Button>
<div className="-mt-2 flex gap-2">
{secondaryEmailFields.map((field, index) => (
<CustomEmailTextField
key={field.itemId}
formMethods={formMethods}
formMethodFieldName={`secondaryEmails.${index}.email` as keyof FormValues}
errorMessage={get(formMethods.formState.errors, `secondaryEmails.${index}.email.message`)}
emailVerified={Boolean(field.emailVerified)}
emailPrimary={field.emailPrimary}
dataTestId={`profile-form-email-${index}`}
handleChangePrimary={() => {
const fields = secondaryEmailFields.map((secondaryField, cIndex) => ({
...secondaryField,
emailPrimary: cIndex === index,
}));
updateAllSecondaryEmailFields(fields);
}}
handleVerifyEmail={() => handleResendVerifyEmail(field.email)}
handleItemDelete={() => deleteSecondaryEmail(index)}
/>
))}
<Button
color="secondary"
StartIcon="plus"
className="mt-2 h-full"
onClick={() => handleAddSecondaryEmail()}
data-testid="add-secondary-email">
{t("add_email")}
</Button>
</div>
</div>
<div className="mt-6">
<Label>{t("about")}</Label>
apps/web/public/static/locales/en/common.json
+8 -8
View File
@@ -462,7 +462,7 @@
"allow_dynamic_booking": "Allow attendees to book you through dynamic group bookings",
"dynamic_booking": "Dynamic group links",
"allow_seo_indexing": "Allow search engines to access your public content",
"seo_indexing": "Allow SEO Indexing",
"seo_indexing": "Allow search engine indexing",
"allow_browser_notifications": "Allow Browser Notifications",
"you_have_denied_notifications": "You have denied notifications. Reset permission in browser settings to enable.",
"disable_browser_notifications": "Disable Browser Notifications",
@@ -673,8 +673,8 @@
"hide_book_a_team_member": "Hide Book a Team Member Button",
"hide_book_a_team_member_description": "Hide Book a Team Member Button from your public pages.",
"danger_zone": "Danger zone",
"account_deletion_cannot_be_undone": "Be Careful. Account deletion cannot be undone.",
"team_deletion_cannot_be_undone": "Be Careful. Team deletion cannot be undone.",
"account_deletion_cannot_be_undone": "Be careful. Account deletion cannot be undone.",
"team_deletion_cannot_be_undone": "Be careful. Team deletion cannot be undone.",
"back": "Back",
"cancel": "Cancel",
"cancel_all_remaining": "Cancel all remaining",
@@ -1566,9 +1566,9 @@
"route_to_the_right_person": "Route to the right person based on the answers to your form",
"form_description": "Create your form to route a booker",
"copy_link_to_form": "Copy link to form",
"theme": "Booking Page Theme",
"theme": "Booking page theme",
"theme_applies_note": "This only applies to your public booking pages",
"app_theme": "Dashboard Theme",
"app_theme": "Dashboard theme",
"app_theme_applies_note": "This only applies to your logged in dashboard",
"theme_system": "System default",
"add_a_team": "Add a team",
@@ -1599,7 +1599,7 @@
"no_calendar_installed": "No calendar installed",
"no_calendar_installed_description": "You have not yet connected any of your calendars",
"add_a_calendar": "Add a calendar",
"change_email_hint": "You may need to log out and back in to see any change take effect",
"change_email_hint": "You may need to log out and back in to see any change take effect.",
"confirm_password_change_email": "Please confirm your password before changing your email address",
"seats": "seats",
"every_app_published": "Every app published on the {{appName}} App Store is open source and thoroughly tested via peer reviews. Nevertheless, {{companyName}} does not endorse or certify these apps unless they are published by {{appName}}. If you encounter inappropriate content or behaviour please report it.",
@@ -1848,7 +1848,7 @@
"setup": "Setup",
"setup_description": "Setup Cal.com instance",
"configure": "Configure",
"sso_configuration": "Single Sign-On",
"sso_configuration": "Single sign-on",
"sso_configuration_description": "Configure SAML/OIDC SSO and allow team members to login using an Identity Provider",
"sso_configuration_description_orgs": "Configure SAML/OIDC SSO and allow organization members to login using an Identity Provider",
"sso_oidc_heading": "SSO with OIDC",
@@ -2222,7 +2222,7 @@
"most_popular_events": "Most Popular Events",
"summary_of_events_for_your_team_for_the_last_30_days": "Here's your summary of popular events for your team {{teamName}} for the last 30 days",
"me": "Me",
"monthly_digest_email": "Monthly Digest Email",
"monthly_digest_email": "Monthly digest email",
"monthly_digest_email_for_teams": "Monthly digest email for teams",
"verify_team_tooltip": "Verify your team to enable sending messages to attendees",
"member_removed": "Member removed",