Fix timezone issues.

pull/1/head
Icedream 2017-08-19 10:13:04 +08:00
parent 9e324a1f94
commit b6de980119
Signed by: icedream
GPG Key ID: 1573F6D8EFE4D0CF
5 changed files with 15 additions and 6 deletions

12
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "carl-kittelberger-website",
"version": "0.0.1",
"name": "vizon-countdown-website",
"version": "0.1.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -6547,6 +6547,14 @@
"resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
"integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
},
"moment-timezone": {
"version": "0.5.13",
"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz",
"integrity": "sha1-mc5cfYJyYusPH3AgRBd/YHRde5A=",
"requires": {
"moment": "2.18.1"
}
},
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",

View File

@ -43,7 +43,7 @@
"svg-inline-loader": "^0.8.0"
},
"dependencies": {
"moment": "^2.18.1",
"moment-timezone": "^0.5.13",
"normalize-scss": "^7.0.0",
"prop-types": "^15.5.10",
"react": "^15.6.1",

View File

@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import moment from 'moment';
import moment from 'moment-timezone';
import Countdown from './Countdown';
import Header from './Header';
import ProgressCircle from './ProgressCircle';

View File

@ -1,5 +1,5 @@
import React from 'react';
import moment from 'moment';
import moment from 'moment-timezone';
import PropTypes from 'prop-types';
import DigitBlock from './DigitBlock';
import ProgressCircle from './ProgressCircle';

View File

@ -1,7 +1,8 @@
import moment from 'moment';
import moment from 'moment-timezone';
export default function getUpcomingDate(now, weekday: String) {
let wanted = moment()
.tz('CET')
.isoWeekday(weekday)
.second(0)
.minute(0)