Merge pull request #161 from mikecao/dev

v0.33.0
This commit is contained in:
Mike Cao 2020-09-14 08:51:20 -07:00 committed by GitHub
commit 8727dbf282
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 8 additions and 19 deletions

View File

@ -105,7 +105,7 @@ export default function Calendar({ date, minDate, maxDate, onChange }) {
const DaySelector = ({ date, minDate, maxDate, locale, onSelect }) => {
const startWeek = startOfWeek(date);
const startMonth = startOfMonth(date);
const startDay = subDays(startMonth, startMonth.getDay() + 1);
const startDay = subDays(startMonth, startMonth.getDay());
const month = date.getMonth();
const year = date.getFullYear();

View File

@ -8,6 +8,7 @@
.calendar table {
flex: 1;
border-spacing: 5px;
}
.calendar td {
@ -18,10 +19,12 @@
height: 40px;
min-width: 40px;
border-radius: 5px;
border: 1px solid transparent;
}
.calendar td:hover {
background: var(--gray100);
border: 1px solid var(--gray300);
background: var(--gray75);
}
.calendar td.faded {
@ -45,6 +48,7 @@
.calendar td.disabled:hover {
cursor: default;
background: var(--gray75);
border-color: transparent;
}
.calendar td.faded.disabled {

View File

@ -48,7 +48,7 @@ export default function LanguageButton({ menuPosition = 'bottom', menuAlign = 'l
</Head>
<div ref={ref} className={styles.container}>
<Button icon={<Globe />} onClick={toggleMenu} size="small">
<div className={locale}>{selectedLocale}</div>
<div>{selectedLocale}</div>
</Button>
{showMenu && (
<Menu

View File

@ -1,6 +1,6 @@
{
"name": "umami",
"version": "0.32.0",
"version": "0.33.0",
"description": "A simple, fast, website analytics alternative to Google Analytics. ",
"author": "Mike Cao <mike@mikecao.com>",
"license": "MIT",

View File

@ -1,10 +1,7 @@
import { getActiveVisitors } from 'lib/queries';
import { methodNotAllowed, ok } from 'lib/response';
import { useAuth } from 'lib/middleware';
export default async (req, res) => {
await useAuth(req, res);
if (req.method === 'GET') {
const { id } = req.query;
const website_id = +id;

View File

@ -1,13 +1,10 @@
import moment from 'moment-timezone';
import { getEvents } from 'lib/queries';
import { ok, badRequest, methodNotAllowed } from 'lib/response';
import { useAuth } from 'lib/middleware';
const unitTypes = ['year', 'month', 'hour', 'day'];
export default async (req, res) => {
await useAuth(req, res);
if (req.method === 'GET') {
const { id, start_at, end_at, unit, tz } = req.query;

View File

@ -1,10 +1,7 @@
import { getMetrics } from 'lib/queries';
import { methodNotAllowed, ok } from 'lib/response';
import { useAuth } from 'lib/middleware';
export default async (req, res) => {
await useAuth(req, res);
if (req.method === 'GET') {
const { id, start_at, end_at } = req.query;
const websiteId = +id;

View File

@ -1,13 +1,10 @@
import moment from 'moment-timezone';
import { getPageviews } from 'lib/queries';
import { ok, badRequest, methodNotAllowed } from 'lib/response';
import { useAuth } from 'lib/middleware';
const unitTypes = ['year', 'month', 'hour', 'day'];
export default async (req, res) => {
await useAuth(req, res);
if (req.method === 'GET') {
const { id, start_at, end_at, unit, tz } = req.query;

View File

@ -1,7 +1,6 @@
import { getRankings } from 'lib/queries';
import { ok, badRequest, methodNotAllowed } from 'lib/response';
import { DOMAIN_REGEX } from 'lib/constants';
import { useAuth } from 'lib/middleware';
const sessionColumns = ['browser', 'os', 'device', 'country'];
const pageviewColumns = ['url', 'referrer'];
@ -26,8 +25,6 @@ function getColumn(type) {
}
export default async (req, res) => {
await useAuth(req, res);
if (req.method === 'GET') {
const { id, type, start_at, end_at, domain } = req.query;
const websiteId = +id;