github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse Source 
# Conflicts:
#	pages/api/account/index.js
This commit is contained in:
Mike Cao
2022-10-03 17:17:53 -07:00
parent 5fb1f08df8 d6854d4ff9
commit d784b2a8db
31 changed files with 178 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/forms/AccountEditForm.js
View File

@@ -34,7 +34,7 @@ export default function AccountEditForm({ values, onSave, onClose }) {
const handleSubmit = async values => {
const { user_id } = values;
const { ok, data } = await post(user_id ? `/account/${user_id}` : '/account', values);
const { ok, data } = await post(user_id ? `/accounts/${user_id}` : '/accounts', values);
if (ok) {
onSave();

4
components/forms/ChangePasswordForm.js
View File

@@ -9,6 +9,7 @@ import FormLayout, {
FormRow,
} from 'components/layout/FormLayout';
import useApi from 'hooks/useApi';
import useUser from '../../hooks/useUser';
const initialValues = {
current_password: '',
@@ -39,9 +40,10 @@ const validate = ({ current_password, new_password, confirm_password }) => {
export default function ChangePasswordForm({ values, onSave, onClose }) {
const { post } = useApi();
const [message, setMessage] = useState();
const { user } = useUser();
const handleSubmit = async values => {
const { ok, data } = await post('/account/password', values);
const { ok, data } = await post(`/accounts/${user.user_id}/password`, values);
if (ok) {
onSave();

5
components/forms/WebsiteEditForm.js
View File

@@ -38,7 +38,6 @@ const validate = ({ name, domain }) => {
};
const OwnerDropDown = ({ user, accounts }) => {
console.info(styles);
const { setFieldValue, values } = useFormikContext();
useEffect(() => {
@@ -79,7 +78,8 @@ export default function WebsiteEditForm({ values, onSave, onClose }) {
const [message, setMessage] = useState();
const handleSubmit = async values => {
const { ok, data } = await post('/website', values);
const { website_id } = values;
const { ok, data } = await post(website_id ? `/websites/${website_id}` : '/websites', values);
if (ok) {
onSave();
@@ -137,6 +137,7 @@ export default function WebsiteEditForm({ values, onSave, onClose }) {
defaultMessage="Enable share URL"
/>
}
value={null}
/>
)}
</Field>