Skip to content

Commit 151f93e

Browse files
author
purpleeeee
committed
delete moment of client
1 parent b408c6e commit 151f93e

File tree

4 files changed

+27
-13
lines changed

4 files changed

+27
-13
lines changed

src/client/foundation/pages/Top/Top.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import moment from "moment-timezone";
21
import React, { useCallback, useEffect, useRef, useState } from "react";
32
import { useParams } from "react-router-dom";
43
import styled from "styled-components";
@@ -97,7 +96,9 @@ function useHeroImage(todayRaces) {
9796

9897
/** @type {React.VFC} */
9998
export const Top = () => {
100-
const { date = moment().format("YYYY-MM-DD") } = useParams();
99+
const {
100+
date = new Intl.DateTimeFormat().format(new Date()).replace(/\//g, "-"),
101+
} = useParams();
101102

102103
const ChargeButton = styled.button`
103104
background: ${Color.mono[700]};
@@ -136,7 +137,7 @@ export const Top = () => {
136137
? [...raceData.races]
137138
.sort(
138139
(/** @type {Model.Race} */ a, /** @type {Model.Race} */ b) =>
139-
moment(a.startAt) - moment(b.startAt),
140+
new Date(a.startAt).getTime() - new Date(b.startAt).getTime(),
140141
)
141142
.filter((/** @type {Model.Race} */ race) =>
142143
isSameDay(race.startAt, date),

src/client/foundation/pages/races/Odds/Odds.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import moment from "moment-timezone";
21
import React, { useCallback, useRef, useState } from "react";
32
import { useParams } from "react-router-dom";
43
import styled from "styled-components";
@@ -11,7 +10,7 @@ import { TabNav } from "../../../components/navs/TabNav";
1110
import { Heading } from "../../../components/typographies/Heading";
1211
import { useFetch } from "../../../hooks/useFetch";
1312
import { Color, Radius, Space } from "../../../styles/variables";
14-
import { formatTime } from "../../../utils/DateUtils";
13+
import { formatTime, isBefore } from "../../../utils/DateUtils";
1514
import { jsonFetcher } from "../../../utils/HttpUtils";
1615

1716
import { OddsRankingList } from "./internal/OddsRankingList";
@@ -61,7 +60,7 @@ export const Odds = () => {
6160
return <Container>Loading...</Container>;
6261
}
6362

64-
const isRaceClosed = moment(data.closeAt).isBefore(new Date());
63+
const isRaceClosed = isBefore(new Date(), new Date(data.closeAt));
6564

6665
return (
6766
<Container>
Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
1-
import moment from "moment-timezone";
1+
export const isBefore = (dateLeft, dateRight) => {
2+
return new Date(dateLeft).getTime() < new Date(dateRight).getTime();
3+
};
4+
5+
const isAfter = (dateLeft, dateRight) => {
6+
return new Date(dateLeft).getTime() > new Date(dateRight).getTime();
7+
};
28
/**
39
* @param {string} dateLeft
410
* @param {string} dateRight
511
* @returns {boolean}
612
*/
713
export const isSameDay = (dateLeft, dateRight) => {
8-
return moment(dateLeft).isSame(moment(dateRight), "day");
14+
const left = new Date(dateLeft);
15+
left.setHours(0, 0, 0, 0);
16+
const right = new Date(dateRight);
17+
right.setHours(0, 0, 0, 0);
18+
return left.getTime() === right.getTime();
919
};
1020

1121
/**
@@ -14,7 +24,10 @@ export const isSameDay = (dateLeft, dateRight) => {
1424
* @returns {string}
1525
*/
1626
export const formatTime = (ts) => {
17-
return moment(ts).format("H:mm");
27+
return new Intl.DateTimeFormat("ja-jp", {
28+
hour: "numeric",
29+
minute: "2-digit",
30+
}).format(new Date(ts));
1831
};
1932

2033
/**
@@ -23,13 +36,14 @@ export const formatTime = (ts) => {
2336
* @returns {string}
2437
*/
2538
export const formatCloseAt = (closeAt, now = new Date()) => {
26-
if (moment(closeAt).isBefore(now)) {
39+
if (isBefore(new Date(closeAt), now)) {
2740
return "投票締切";
2841
}
2942

30-
if (moment(closeAt).isAfter(moment(now).add(2, "hours"))) {
43+
if (isAfter(new Date(closeAt), new Date(now.setHours(now.getHours() + 2)))) {
3144
return "投票受付中";
3245
}
3346

34-
return `締切${moment(closeAt).diff(now, "minutes")}分前`;
47+
const diff = (now.getTime() - new Date(closeAt).getTime()) / 3600000;
48+
return `締切${Math.trunc(diff)}分前`;
3549
};

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* eslint-disable @typescript-eslint/no-var-requires */
22
const path = require("path");
3+
34
const BundleAnalyzerPlugin =
45
require("webpack-bundle-analyzer").BundleAnalyzerPlugin;
5-
66
const CopyPlugin = require("copy-webpack-plugin");
77
const nodeExternals = require("webpack-node-externals");
88

0 commit comments

Comments
 (0)