From a58aa22bbfe87d11bb4633a0479a8554a98a7a56 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Thu, 16 Jan 2020 02:03:23 +0000 Subject: [PATCH] Display times in local timezone --- webclient/src/Classes.js | 8 ++++---- webclient/src/Courses.js | 4 ++-- webclient/src/Members.js | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/webclient/src/Classes.js b/webclient/src/Classes.js index 38795bb..5cabf98 100644 --- a/webclient/src/Classes.js +++ b/webclient/src/Classes.js @@ -30,10 +30,10 @@ function ClassTable(props) { {x.course_name} - {moment.utc(x.datetime).format('ll')} + {moment.utc(x.datetime).local().format('ll')} - {x.is_cancelled ? 'Cancelled' : moment.utc(x.datetime).format('LT')} + {x.is_cancelled ? 'Cancelled' : moment.utc(x.datetime).local().format('LT')} {x.instructor_name} {x.cost === '0.00' ? 'Free' : '$'+x.cost} {x.student_count} @@ -125,13 +125,13 @@ export function ClassDetail(props) { Date: - {moment.utc(clazz.datetime).format('ll')} + {moment.utc(clazz.datetime).local().format('ll')} Time: - {clazz.is_cancelled ? 'Cancelled' : moment.utc(clazz.datetime).format('LT')} + {clazz.is_cancelled ? 'Cancelled' : moment.utc(clazz.datetime).local().format('LT')} diff --git a/webclient/src/Courses.js b/webclient/src/Courses.js index 86f4842..51fddc0 100644 --- a/webclient/src/Courses.js +++ b/webclient/src/Courses.js @@ -119,10 +119,10 @@ export function CourseDetail(props) { - {moment.utc(x.datetime).format('ll')} + {moment.utc(x.datetime).local().format('ll')} - {x.is_cancelled ? 'Cancelled' : moment.utc(x.datetime).format('LT')} + {x.is_cancelled ? 'Cancelled' : moment.utc(x.datetime).local().format('LT')} {x.instructor_name} {x.cost === '0.00' ? 'Free' : '$'+x.cost} diff --git a/webclient/src/Members.js b/webclient/src/Members.js index 0e717c4..571e574 100644 --- a/webclient/src/Members.js +++ b/webclient/src/Members.js @@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react'; import { BrowserRouter as Router, Switch, Route, Link, useParams } from 'react-router-dom'; import './light.css'; import { Button, Container, Divider, Dropdown, Form, Grid, Header, Icon, Image, Input, Item, Menu, Message, Segment, Table } from 'semantic-ui-react'; -import moment from 'moment'; import { isAdmin, BasicTable, staticUrl, requester } from './utils.js'; import { NotFound, PleaseLogin } from './Misc.js'; import { AdminMemberInfo, AdminMemberForm, AdminMemberCards } from './Admin.js';