From cbc42304cf604ad45f1bbe1c28b0945077f5f018 Mon Sep 17 00:00:00 2001 From: i-vall <ivallanzasca@gmail.com> Date: Wed, 3 Jul 2019 15:35:29 +0200 Subject: [PATCH] fix: timezone & datepicker appearance --- package.json | 1 + src/components/DayPicker.jsx | 2 ++ src/components/Enedis/index.jsx | 7 +++++-- src/components/Graphe.jsx | 3 +++ src/styles/index.styl | 7 +++++++ yarn.lock | 9 ++++++++- 6 files changed, 26 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a08af8b..8570335 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "cozy-ui": "17.6.0", "eslint-config-cozy-app": "1.1.8", "moment": "^2.24.0", + "moment-timezone": "^0.5.25", "react": "16.7.0", "react-dates": "^20.2.2", "react-dom": "16.7.0", diff --git a/src/components/DayPicker.jsx b/src/components/DayPicker.jsx index 128b94c..df48dda 100644 --- a/src/components/DayPicker.jsx +++ b/src/components/DayPicker.jsx @@ -5,8 +5,10 @@ import { isInclusivelyAfterDay, isInclusivelyBeforeDay } from 'react-dates' +import 'moment-timezone' moment.locale('fr') +moment.tz.setDefault('Europe/Paris') export default class DayPicker extends React.Component { state = { diff --git a/src/components/Enedis/index.jsx b/src/components/Enedis/index.jsx index 7064b8b..6086db2 100644 --- a/src/components/Enedis/index.jsx +++ b/src/components/Enedis/index.jsx @@ -8,8 +8,10 @@ import DayPicker from '../DayPicker' import 'react-dates/lib/css/_datepicker.css' import moment from 'moment' import Spinner from 'cozy-ui/react/Spinner' +import 'moment-timezone' moment.locale('fr') +moment.tz.setDefault('Europe/Paris') class Enedis extends React.Component { constructor(props) { @@ -57,9 +59,10 @@ class Enedis extends React.Component { // data is loaded return ( <div> - <DayPicker data={data} onChange={this.onDateChange} /> + <div> + <DayPicker data={data} onChange={this.onDateChange} /> + </div> <Graphe loadprofile={data} day={this.state.day} format="hourly" /> - <p>{data[data.length - 1].time}</p> </div> ) } diff --git a/src/components/Graphe.jsx b/src/components/Graphe.jsx index ac6fbaa..db321b7 100644 --- a/src/components/Graphe.jsx +++ b/src/components/Graphe.jsx @@ -8,7 +8,10 @@ import { VictoryVoronoiContainer } from 'victory' import moment from 'moment' +import 'moment-timezone' + moment.locale('fr') +moment.tz.setDefault('Europe/Paris') const Graphe = function({ loadprofile, format, day }) { var tickForm, domain diff --git a/src/styles/index.styl b/src/styles/index.styl index 2964f78..00939bc 100644 --- a/src/styles/index.styl +++ b/src/styles/index.styl @@ -3,3 +3,10 @@ .app-content margin 1rem 0 2rem 2rem + +html { + box-sizing: border-box; +} +*, *:before, *:after { + box-sizing: inherit; +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 0c7119b..59218a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7128,7 +7128,14 @@ mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@0.x.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~ dependencies: minimist "0.0.8" -moment@>=1.6.0, moment@^2.24.0: +moment-timezone@^0.5.25: + version "0.5.25" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.25.tgz#a11bfa2f74e088327f2cd4c08b3e7bdf55957810" + integrity sha512-DgEaTyN/z0HFaVcVbSyVCUU6HeFdnNC3vE4c9cgu2dgMTvjBUBdBzWfasTBmAW45u5OIMeCJtU8yNjM22DHucw== + dependencies: + moment ">= 2.9.0" + +"moment@>= 2.9.0", moment@>=1.6.0, moment@^2.24.0: version "2.24.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== -- GitLab