Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Merge branch 'dev' of https://github.com/umami-software/umami into dev
Mike Caodb6a6d6055df
diff --cc components/forms/UserPasswordForm.jsindex 83eaaa81e,c28d96241..ff4746080--- a/components/forms/UserPasswordForm.js+++ b/components/forms/UserPasswordForm.js@@@ -1,16 -1,19 +1,15 @@@import { useRef } from 'react';import { Form, FormInput, FormButtons, PasswordField, Button } from 'react-basics';import useApi from 'hooks/useApi';--import { useMutation } from '@tanstack/react-query';-import { getClientAuthToken } from 'lib/client';import styles from './UserPasswordForm.module.css';import useUser from 'hooks/useUser';- export default function UserPasswordForm({ onSave, userId }) {+ export default function UserPasswordForm({ onSave, onClose, userId }) {- const {- user: { id },- } = useUser();+ const user = useUser();- const isCurrentUser = !userId || id === userId;- const url = isCurrentUser ? `/users/${id}/password` : `/users/${id}`;- const { post } = useApi(getClientAuthToken());+ const isCurrentUser = !userId || user?.id === userId;+ const url = isCurrentUser ? `/users/${user?.id}/password` : `/users/${user?.id}`;- const { post } = useApi();++ const { post, useMutation } = useApi();const { mutate, error, isLoading } = useMutation(data => post(url, data));const ref = useRef(null);diff --cc components/pages/Dashboard.jsindex e1c948af0,452288dd7..c979c1306--- a/components/pages/Dashboard.js+++ b/components/pages/Dashboard.js@@@ -1,11 -1,11 +1,11 @@@import { useState } from 'react';++import { Button, Loading } from 'react-basics';import { defineMessages, useIntl } from 'react-intl';import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';- import WebsiteList from 'components/pages/WebsiteList';- import { Button, Loading } from 'react-basics';+ import WebsiteChartList from 'components/pages/WebsiteChartList';-import { Button } from 'react-basics';import DashboardSettingsButton from 'components/settings/DashboardSettingsButton';-import useFetch from 'hooks/useFetch';+import useApi from 'hooks/useApi';import useDashboard from 'store/dashboard';import DashboardEdit from './DashboardEdit';import styles from './WebsiteList.module.css';diff --cc components/pages/UserSettings.jsindex 52f2d9d81,f53678ce2..32edcb486--- a/components/pages/UserSettings.js+++ b/components/pages/UserSettings.js@@@ -8,12 -9,14 +8,14 @@@ import useApi from 'hooks/useApi'import Link from 'next/link';import { useRouter } from 'next/router';import { useEffect, useState } from 'react';- import { Breadcrumbs, Item, Tabs, useToast } from 'react-basics';+ import { Breadcrumbs, Item, Icon, Tabs, useToast, Modal, Button } from 'react-basics';+ import Pen from 'assets/pen.svg';export default function UserSettings({ userId }) {+ const [edit, setEdit] = useState(false);const [values, setValues] = useState(null);const [tab, setTab] = useState('general');- const { get } = useApi(getClientAuthToken());+ const { get } = useApi();const { toast, showToast } = useToast();const router = useRouter();const { data, isLoading } = useQuery(