diff --git a/frontend/src/components/organisms/RightBar/index.tsx b/frontend/src/components/organisms/RightBar/index.tsx index f0269cc9476cab9f24d2582684a778d0826513a5..44f08ec015ade979766289c0f58735d0d6dc6a35 100644 --- a/frontend/src/components/organisms/RightBar/index.tsx +++ b/frontend/src/components/organisms/RightBar/index.tsx @@ -19,7 +19,7 @@ class RightBar extends React.Component<{}, RightBarState> { this.timerID = window.setInterval( () => this.setState({ - date: new Date(), + date: new Date() }), 1000 ); @@ -33,20 +33,29 @@ class RightBar extends React.Component<{}, RightBarState> { let buttons = [ { title: "Settings", - icon: faCog, + icon: faCog }, { title: "Sign Out", - icon: faSignOutAlt, - }, + icon: faSignOutAlt + } ]; - let timeOptions = { timeZone: "Europe/London", hourCycle: "h23" }; + let timeOptions = { + timeZone: "Europe/London", + dateStyle: "long", + hourCycle: "h23", + hour: "2-digit", + minute: "2-digit", + second: "2-digit", + weekday: "short", + day: "2-digit", + month: "short" + }; return ( <div id={styles.rightbarWrapper}> <p className={styles.rightbarStatus}> - {/* yyyy-MM-dd HH:mm:ss, we have the duty to promote the spread of ISO8601 */} - {this.state.date.toLocaleString("en-CA", timeOptions)} + {this.state.date.toLocaleString("en-GB", timeOptions)} </p> <CalendarGroup /> <SideBarTabGroup title="Account" buttons={buttons} /> diff --git a/frontend/src/components/organisms/RightBar/style.module.scss b/frontend/src/components/organisms/RightBar/style.module.scss index 7ea200ada233090b8bb4309aea76fbda4bbe518e..58a26d8cfa016e92d5c9c69b2d5f626b8d22f64d 100644 --- a/frontend/src/components/organisms/RightBar/style.module.scss +++ b/frontend/src/components/organisms/RightBar/style.module.scss @@ -65,6 +65,7 @@ letter-spacing: 0; position: relative; width: max-content; + text-transform: uppercase; } #rightbarWrapper { diff --git a/frontend/src/components/pages/StandardView/index.tsx b/frontend/src/components/pages/StandardView/index.tsx index 9dff5f920f56a16709e069511bbac2552c2e81db..aad2d02749a3711ef8f11f22d9b9a578f6e17532 100644 --- a/frontend/src/components/pages/StandardView/index.tsx +++ b/frontend/src/components/pages/StandardView/index.tsx @@ -36,6 +36,7 @@ const StandardView: React.FC<StandardViewProps> = ({ toggledRight: toggledRight, })} > + <RightBar /> <Switch> <Route path="/modules/:id"> <LeftBarModule /> @@ -50,7 +51,6 @@ const StandardView: React.FC<StandardViewProps> = ({ </Route> </Switch> - <RightBar /> <div id="sidenav-overlay" onClick={(e) => onOverlayClick(e)}></div> <Switch> diff --git a/frontend/src/components/pages/StandardView/style.scss b/frontend/src/components/pages/StandardView/style.scss index 90406cd5471f8b19c5e043527e5900941d4570b9..5fac97fb792d6993d0fbe497d8203750092039aa 100644 --- a/frontend/src/components/pages/StandardView/style.scss +++ b/frontend/src/components/pages/StandardView/style.scss @@ -5,6 +5,7 @@ -moz-transition: all 0.5s ease; -o-transition: all 0.5s ease; transition: all 0.5s ease; + z-index: 5050; } #sidenav-overlay {