- {formatMessage(messages.dashboard)}
+
{!editing &&
{editing &&
+
+
+ Change Password
+
+ {edit && (
+
+ {() =>
+ )}
+
+ );
+}
diff --git a/components/pages/settings/profile/PasswordEditForm.js b/components/pages/settings/profile/PasswordEditForm.js
new file mode 100644
index 00000000..6b446d75
--- /dev/null
+++ b/components/pages/settings/profile/PasswordEditForm.js
@@ -0,0 +1,76 @@
+import { useRef } from 'react';
+import { Form, FormRow, FormInput, FormButtons, PasswordField, Button } from 'react-basics';
+import useApi from 'hooks/useApi';
+import useUser from 'hooks/useUser';
+
+export default function PasswordEditForm({ userId, onSave, onClose }) {
+ const user = useUser();
+ const isCurrentUser = !userId || user?.id === userId;
+ const url = isCurrentUser ? `/users/${user?.id}/password` : `/users/${user?.id}`;
+ const { post, useMutation } = useApi();
+ const { mutate, error, isLoading } = useMutation(data => post(url, data));
+ const ref = useRef(null);
+
+ const handleSubmit = async data => {
+ const payload = isCurrentUser
+ ? data
+ : {
+ password: data.newPassword,
+ };
+
+ mutate(payload, {
+ onSuccess: async () => {
+ onSave();
+ ref.current.reset();
+ },
+ });
+ };
+
+ const samePassword = value => {
+ if (value !== ref?.current?.getValues('newPassword')) {
+ return "Passwords don't match";
+ }
+ return true;
+ };
+
+ return (
+
+ );
+}
diff --git a/components/pages/settings/profile/ProfileSettings.js b/components/pages/settings/profile/ProfileSettings.js
index aee41eaf..8a0323f8 100644
--- a/components/pages/settings/profile/ProfileSettings.js
+++ b/components/pages/settings/profile/ProfileSettings.js
@@ -1,48 +1,26 @@
+import { Breadcrumbs, Item } from 'react-basics';
+import { defineMessages, useIntl } from 'react-intl';
import Page from 'components/layout/Page';
import PageHeader from 'components/layout/PageHeader';
-import ProfileDetails from 'components/pages/settings/profile/ProfileDetails';
-import { useState } from 'react';
-import { Breadcrumbs, Icon, Item, useToast, Modal, Button } from 'react-basics';
-import UserPasswordForm from 'components/pages/settings/users/UserPasswordForm';
-import Lock from 'assets/lock.svg';
+import ProfileDetails from './ProfileDetails';
+import ChangePasswordButton from './ChangePasswordButton';
+
+const messages = defineMessages({
+ profile: { id: 'label.profile', defaultMessage: 'Profile' },
+});
export default function ProfileSettings() {
- const [edit, setEdit] = useState(false);
- const { toast, showToast } = useToast();
-
- const handleSave = () => {
- showToast({ message: 'Saved successfully.', variant: 'success' });
- setEdit(false);
- };
-
- const handleAdd = () => {
- setEdit(true);
- };
-
- const handleClose = () => {
- setEdit(false);
- };
+ const { formatMessage } = useIntl();
return (
- {toast}
- - Profile
+ - {formatMessage(messages.profile)}
-
-
-
- Change Password
-
+
- {close =>
- )}
);
}
diff --git a/components/pages/settings/users/UserAddForm.js b/components/pages/settings/users/UserAddForm.js
new file mode 100644
index 00000000..64e43b60
--- /dev/null
+++ b/components/pages/settings/users/UserAddForm.js
@@ -0,0 +1,65 @@
+import {
+ Dropdown,
+ Item,
+ Form,
+ FormRow,
+ FormButtons,
+ FormInput,
+ TextField,
+ PasswordField,
+ SubmitButton,
+} from 'react-basics';
+import { useIntl, defineMessages } from 'react-intl';
+import useApi from 'hooks/useApi';
+import { ROLES } from 'lib/constants';
+
+const messages = defineMessages({
+ username: { id: 'label.username', defaultMessage: 'Username' },
+ password: { id: 'label.password', defaultMessage: 'Password' },
+ role: { id: 'label.role', defaultMessage: 'Role' },
+ user: { id: 'label.user', defaultMessage: 'User' },
+ admin: { id: 'label.admin', defaultMessage: 'Admin' },
+ save: { id: 'label.save', defaultMessage: 'Save' },
+ cancel: { id: 'label.cancel', defaultMessage: 'Cancel' },
+ required: { id: 'label.required', defaultMessage: 'Required' },
+});
+
+export default function UserAddForm({ onSave }) {
+ const { post, useMutation } = useApi();
+ const { mutate, error } = useMutation(data => post(`/users`, data));
+ const { formatMessage } = useIntl();
+
+ const handleSubmit = async data => {
+ mutate(data, {
+ onSuccess: async () => {
+ onSave(data);
+ },
+ });
+ };
+
+ return (
+
+ );
+}
diff --git a/components/pages/settings/users/UserEditForm.js b/components/pages/settings/users/UserEditForm.js
index 3e7f8d0d..eb1d921f 100644
--- a/components/pages/settings/users/UserEditForm.js
+++ b/components/pages/settings/users/UserEditForm.js
@@ -9,7 +9,6 @@ import {
SubmitButton,
} from 'react-basics';
import { useRef } from 'react';
-import { useMutation } from '@tanstack/react-query';
import useApi from 'hooks/useApi';
import { ROLES } from 'lib/constants';
@@ -26,7 +25,7 @@ const items = [
export default function UserEditForm({ data, onSave }) {
const { id } = data;
- const { post } = useApi();
+ const { post, useMutation } = useApi();
const { mutate, error } = useMutation(({ username }) => post(`/user/${id}`, { username }));
const ref = useRef(null);
diff --git a/components/pages/settings/users/UserPasswordForm.js b/components/pages/settings/users/UserPasswordForm.js
index 6cf2c4d0..218d8469 100644
--- a/components/pages/settings/users/UserPasswordForm.js
+++ b/components/pages/settings/users/UserPasswordForm.js
@@ -5,7 +5,6 @@ import useUser from 'hooks/useUser';
export default function UserPasswordForm({ onSave, onClose, userId }) {
const user = useUser();
-
const isCurrentUser = !userId || user?.id === userId;
const url = isCurrentUser ? `/users/${user?.id}/password` : `/users/${user?.id}`;
const { post, useMutation } = useApi();
diff --git a/components/pages/settings/users/UserSettings.js b/components/pages/settings/users/UserSettings.js
index 596fd725..993750c6 100644
--- a/components/pages/settings/users/UserSettings.js
+++ b/components/pages/settings/users/UserSettings.js
@@ -1,21 +1,30 @@
-import { useQuery } from '@tanstack/react-query';
+import { useEffect, useState } from 'react';
+import { defineMessages, useIntl } from 'react-intl';
+import { Breadcrumbs, Item, Tabs, useToast } from 'react-basics';
+import Link from 'next/link';
+import { useRouter } from 'next/router';
import UserDelete from 'components/pages/settings/users/UserDelete';
-import UserEditForm from 'components/pages/settings/users/UserEditForm';
+import UserEditForm from 'components/pages/settings/users//UserEditForm';
import UserPasswordForm from 'components/pages/settings/users/UserPasswordForm';
import Page from 'components/layout/Page';
import PageHeader from 'components/layout/PageHeader';
import useApi from 'hooks/useApi';
-import Link from 'next/link';
-import { useRouter } from 'next/router';
-import { useEffect, useState } from 'react';
-import { Breadcrumbs, Item, Icon, Tabs, useToast, Modal, Button } from 'react-basics';
-import Pen from 'assets/pen.svg';
+
+const messages = defineMessages({
+ users: { id: 'label.users', defaultMessage: 'Users' },
+ details: { id: 'label.details', defaultMessage: 'Details' },
+ changePassword: { id: 'label.change-password', defaultMessage: 'Change password' },
+ actions: { id: 'label.actions', defaultMessage: 'Actions' },
+ saved: { id: 'message.saved-successfully', defaultMessage: 'Saved successfully.' },
+ delete: { id: 'message.delete-successfully', defaultMessage: 'Delete successfully.' },
+});
export default function UserSettings({ userId }) {
+ const { formatMessage } = useIntl();
const [edit, setEdit] = useState(false);
const [values, setValues] = useState(null);
- const [tab, setTab] = useState('general');
- const { get } = useApi();
+ const [tab, setTab] = useState('details');
+ const { get, useQuery } = useApi();
const { toast, showToast } = useToast();
const router = useRouter();
const { data, isLoading } = useQuery(
@@ -39,14 +48,6 @@ export default function UserSettings({ userId }) {
}
};
- const handleAdd = () => {
- setEdit(true);
- };
-
- const handleClose = () => {
- setEdit(false);
- };
-
const handleDelete = async () => {
showToast({ message: 'Deleted successfully.', variant: 'danger' });
await router.push('/users');
@@ -64,30 +65,19 @@ export default function UserSettings({ userId }) {
-
-
- {values?.username}
-
-
-
- Change Password
-
- - General
- - Danger Zone
+ - {formatMessage(messages.details)}
+ - {formatMessage(messages.changePassword)}
+ - {formatMessage(messages.actions)}
- {tab === 'general' &&
- {close => (
-
- )}