mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 13:05:36 +03:00
rewrite using isToday helper
This commit is contained in:
parent
a3020275a2
commit
af7b9523b5
2 changed files with 6 additions and 17 deletions
|
@ -9,7 +9,7 @@ import { HashLink as Link } from 'react-router-hash-link';
|
|||
import {
|
||||
formatTime,
|
||||
formatDateTime,
|
||||
formatTodayDate,
|
||||
isToday,
|
||||
} from '../../helpers/helpers';
|
||||
import { SERVICES, FILTERED_STATUS, TABLE_DEFAULT_PAGE_SIZE } from '../../helpers/constants';
|
||||
import { getTrackerData } from '../../helpers/trackers/trackers';
|
||||
|
@ -118,8 +118,7 @@ class Logs extends Component {
|
|||
getTimeCell = ({ value }) => (
|
||||
<div className="logs__row">
|
||||
<span className="logs__text" title={formatDateTime(value)}>
|
||||
{formatTodayDate(value) === formatTodayDate(Date.now())
|
||||
? formatTime(value) : formatDateTime(value)}
|
||||
{isToday(value) ? formatTime(value) : formatDateTime(value)}
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
|
|
|
@ -5,6 +5,7 @@ import subHours from 'date-fns/sub_hours';
|
|||
import addHours from 'date-fns/add_hours';
|
||||
import addDays from 'date-fns/add_days';
|
||||
import subDays from 'date-fns/sub_days';
|
||||
import isSameDay from 'date-fns/is_same_day';
|
||||
import round from 'lodash/round';
|
||||
import axios from 'axios';
|
||||
import i18n from 'i18next';
|
||||
|
@ -48,21 +49,10 @@ export const formatDateTime = (dateTime) => {
|
|||
};
|
||||
|
||||
/**
|
||||
* @param string The date to format
|
||||
* @returns string Returns the date in the format DD/MM/YYYY
|
||||
* @param string
|
||||
* @returns boolean
|
||||
*/
|
||||
export const formatTodayDate = (dateTime) => {
|
||||
const currentLanguage = i18n.languages[0] || 'en';
|
||||
const parsedTime = dateParse(dateTime);
|
||||
const options = {
|
||||
year: 'numeric',
|
||||
month: 'numeric',
|
||||
day: 'numeric',
|
||||
hour12: false,
|
||||
};
|
||||
|
||||
return parsedTime.toLocaleString(currentLanguage, options);
|
||||
};
|
||||
export const isToday = date => isSameDay(new Date(date), new Date());
|
||||
|
||||
export const normalizeLogs = logs => logs.map((log) => {
|
||||
const {
|
||||
|
|
Loading…
Reference in a new issue