Skip to content

Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️

remove account email

Dave Earley623ae715fb24
diff --git a/backend/app/Resources/Account/AccountResource.php b/backend/app/Resources/Account/AccountResource.php
index 630584e01..cbffa0584 100644
--- a/backend/app/Resources/Account/AccountResource.php
+++ b/backend/app/Resources/Account/AccountResource.php
@@ -16,7 +16,6 @@ class AccountResource extends JsonResource
return [
'id' => $this->getId(),
'name' => $this->getName(),
- 'email' => $this->getEmail(),
'currency_code' => $this->getCurrencyCode(),
'timezone' => $this->getTimezone(),
'updated_at' => $this->getUpdatedAt(),
diff --git a/backend/resources/views/emails/auth/reset-password-success.blade.php b/backend/resources/views/emails/auth/reset-password-success.blade.php
index 5508a7f9b..d89eca7ce 100644
--- a/backend/resources/views/emails/auth/reset-password-success.blade.php
+++ b/backend/resources/views/emails/auth/reset-password-success.blade.php
@@ -3,7 +3,7 @@ Hello,
Your password has been reset for your account on {{ config('app.name') }}.
-If you did not request a password reset, please let us know.
+If you did not request a password reset, please immediately contact reset your password.
Thank you
</x-mail::message>
diff --git a/frontend/src/components/routes/account/ManageAccount/sections/AccountSettings/index.tsx b/frontend/src/components/routes/account/ManageAccount/sections/AccountSettings/index.tsx
index 4580ad12b..f6adbb9aa 100644
--- a/frontend/src/components/routes/account/ManageAccount/sections/AccountSettings/index.tsx
+++ b/frontend/src/components/routes/account/ManageAccount/sections/AccountSettings/index.tsx
@@ -21,7 +21,6 @@ const AccountSettings = () => {
name: '',
currency_code: '',
timezone: '',
- email: '',
}
});
const accountQuery = useGetAccount();
@@ -57,20 +56,13 @@ const AccountSettings = () => {
<Card className={classes.tabContent}>
<LoadingMask/>
<fieldset disabled={updateMutation.isLoading || accountQuery.isLoading || !isUserAdmin}>
- <form onSubmit={form.onSubmit(handleSubmit)}>
+ <form onSubmit={form.onSubmit(handleSubmit as any)}>
<TextInput
{...form.getInputProps('name')}
label={t`Account Name`}
placeholder={t`Name`}
description={t`Your account name is used on event pages and in emails.`}
/>
- <TextInput
- type={'email'}
- {...form.getInputProps('email')}
- label={t`Account Email`}
- placeholder={t`Email`}
- description={t`Your account email in outgoing emails.`}
- />
<Select
searchable
data={Object.entries(currencies).map(([key, value]) => ({
diff --git a/frontend/src/components/routes/auth/ResetPassword/ResetPassword.module.scss b/frontend/src/components/routes/auth/ResetPassword/ResetPassword.module.scss
new file mode 100644
index 000000000..017304fe0
--- /dev/null
+++ b/frontend/src/components/routes/auth/ResetPassword/ResetPassword.module.scss
@@ -0,0 +1,12 @@
+.header {
+ text-align: center;
+ margin-bottom: 30px;
+
+ h2 {
+ margin: 0;
+ }
+
+ p {
+ margin-top: -0;
+ }
+}
\ No newline at end of file
diff --git a/frontend/src/components/routes/auth/ResetPassword/index.tsx b/frontend/src/components/routes/auth/ResetPassword/index.tsx
index 071fe7491..7bb58c3f8 100644
--- a/frontend/src/components/routes/auth/ResetPassword/index.tsx
+++ b/frontend/src/components/routes/auth/ResetPassword/index.tsx
@@ -9,6 +9,7 @@ import {ResetPasswordRequest} from "../../../../types.ts";
import {useFormErrorResponseHandler} from "../../../../hooks/useFormErrorResponseHandler.tsx";
import {t} from "@lingui/macro";
import {Card} from "../../../common/Card";
+import classes from "./ResetPassword.module.scss";
export const ResetPassword = () => {
const form = useForm({
@@ -48,18 +49,25 @@ export const ResetPassword = () => {
});
return (
- <Card>
- <form onSubmit={form.onSubmit(handleSubmit)}>
- <PasswordInput {...form.getInputProps('password')} label={t`New Password`} required/>
- <PasswordInput {...form.getInputProps('password_confirmation')} label={t`Confirm Password`} required/>
- <Button type="submit" fullWidth disabled={mutate.isLoading}>
- {mutate.isLoading ? t`Working...` : t`Reset password`}
- </Button>
- </form>
- <footer>
- <NavLink to={'/auth/login'}>{t`Back to login`}</NavLink>
- </footer>
- </Card>
+ <>
+ <header className={classes.header}>
+ <h2>{t`Reset Password`}</h2>
+ <p>{t`Please enter your new password`}</p>
+ </header>
+ <Card>
+ <form onSubmit={form.onSubmit(handleSubmit)}>
+ <PasswordInput {...form.getInputProps('password')} label={t`New Password`} required/>
+ <PasswordInput {...form.getInputProps('password_confirmation')} label={t`Confirm Password`} required/>
+ <Button type="submit" fullWidth disabled={mutate.isLoading}>
+ {mutate.isLoading ? t`Working...` : t`Reset password`}
+ </Button>
+ </form>
+ <footer>
+ <NavLink to={'/auth/login'}>{t`Back to login`}</NavLink>
+ </footer>
+ </Card>
+ </>
+
)
}