mirror of
https://github.com/umami-software/umami.git
synced 2026-02-05 13:17:19 +01:00
New goals page. Upgraded prisma.
This commit is contained in:
parent
99330a1a4d
commit
49bcbfd7f9
65 changed files with 769 additions and 1195 deletions
|
|
@ -1,5 +1,5 @@
|
|||
import { useState, Key, Fragment } from 'react';
|
||||
import { Modal, Select, ListItem, ListSeparator, Dialog } from '@umami/react-zen';
|
||||
import { Modal, Select, ListItem, ListSeparator, Dialog, Row } from '@umami/react-zen';
|
||||
import { endOfYear } from 'date-fns';
|
||||
import { DatePickerForm } from '@/components/metrics/DatePickerForm';
|
||||
import { useMessages } from '@/components/hooks';
|
||||
|
|
@ -100,7 +100,7 @@ export function DateFilter({
|
|||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<Row width="200px">
|
||||
<Select
|
||||
value={value}
|
||||
placeholder={formatMessage(labels.selectDate)}
|
||||
|
|
@ -131,6 +131,6 @@ export function DateFilter({
|
|||
</Dialog>
|
||||
</Modal>
|
||||
)}
|
||||
</>
|
||||
</Row>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
0
src/components/input/DeleteButton.tsx
Normal file
0
src/components/input/DeleteButton.tsx
Normal file
|
|
@ -13,9 +13,8 @@ import {
|
|||
Row,
|
||||
Box,
|
||||
} from '@umami/react-zen';
|
||||
import { User, Users } from 'lucide-react';
|
||||
import { useLoginQuery, useMessages, useTeamsQuery, useNavigation } from '@/components/hooks';
|
||||
import { Chevron } from '@/components/icons';
|
||||
import { Chevron, User, Users } from '@/components/icons';
|
||||
|
||||
export function TeamsButton({
|
||||
className,
|
||||
|
|
|
|||
|
|
@ -63,13 +63,13 @@ export function WebsiteDateFilter({
|
|||
<Row gap="3">
|
||||
{showButtons && !isAllTime && !isCustomRange && (
|
||||
<Row gap="1">
|
||||
<Button onPress={() => handleIncrement(-1)} variant="quiet">
|
||||
<Icon size="xs" rotate={180}>
|
||||
<Button onPress={() => handleIncrement(-1)} variant="outline">
|
||||
<Icon rotate={180}>
|
||||
<Chevron />
|
||||
</Icon>
|
||||
</Button>
|
||||
<Button onPress={() => handleIncrement(1)} variant="quiet" isDisabled={disableForward}>
|
||||
<Icon size="xs">
|
||||
<Button onPress={() => handleIncrement(1)} variant="outline" isDisabled={disableForward}>
|
||||
<Icon>
|
||||
<Chevron />
|
||||
</Icon>
|
||||
</Button>
|
||||
|
|
@ -86,10 +86,16 @@ export function WebsiteDateFilter({
|
|||
{!isAllTime && compare && (
|
||||
<Row alignItems="center" gap>
|
||||
<Text weight="bold">VS</Text>
|
||||
<Select value={compare} onChange={handleSelect} popoverProps={{ style: { width: 200 } }}>
|
||||
<ListItem id="prev">{formatMessage(labels.previousPeriod)}</ListItem>
|
||||
<ListItem id="yoy">{formatMessage(labels.previousYear)}</ListItem>
|
||||
</Select>
|
||||
<Row width="200px">
|
||||
<Select
|
||||
value={compare}
|
||||
onChange={handleSelect}
|
||||
popoverProps={{ style: { width: 200 } }}
|
||||
>
|
||||
<ListItem id="prev">{formatMessage(labels.previousPeriod)}</ListItem>
|
||||
<ListItem id="yoy">{formatMessage(labels.previousYear)}</ListItem>
|
||||
</Select>
|
||||
</Row>
|
||||
</Row>
|
||||
)}
|
||||
{!isAllTime && allowCompare && (
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue