diff --git a/README.md b/README.md index 6898e02..bd8b164 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,11 @@ Installation ## Screenshots -![SC open](./screenshots/sc_5-logging-green.png) +![SC open](./screenshots/sc_6-green.png) -![SC open](./screenshots/sc_5-logging-red.png) +![SC open](./screenshots/sc_6-red.png) + +![SC open](./screenshots/sc_6-open.png) ![Options SC](./screenshots/sc_4-options.png) diff --git a/assets/js/components/MainList.react.js b/assets/js/components/MainList.react.js index d2ced81..5ede043 100644 --- a/assets/js/components/MainList.react.js +++ b/assets/js/components/MainList.react.js @@ -22,14 +22,6 @@ class MainList extends React.Component { if (this.props.loggedIn === true) { return (
- - - Custom Rules - - - - Dashboard - Logout @@ -51,13 +43,11 @@ class MainList extends React.Component { if(this.props.loggingEnabled === true && this.props.loggedIn === true) { return ( -
-
-
-
- Disable logging -
-
+
+
+

+ Disable logging +

); @@ -65,36 +55,26 @@ class MainList extends React.Component { else if(this.props.loggingEnabled === false && this.props.loggedIn === true) { return ( -
-
-
- -
+
+
); } }; - var signedInAs = () => { + var totalTimeLoggedToday = () => { if (this.props.loggedIn === true) { return ( -
-
-
-
- -
-
- Signed in as  - {this.props.user.full_name} -
- {this.props.user.email} -
-
- +
+
+
+

{this.props.totalTimeLoggedToday}

+ TOTAL TIME LOGGED TODAY +
); @@ -104,7 +84,7 @@ class MainList extends React.Component { return (
- {signedInAs()} + {totalTimeLoggedToday()} {loggingStatus()} diff --git a/assets/js/components/Navbar.react.js b/assets/js/components/Navbar.react.js index d742ee8..8e33d05 100644 --- a/assets/js/components/Navbar.react.js +++ b/assets/js/components/Navbar.react.js @@ -5,6 +5,41 @@ var React = require('react'); class Navbar extends React.Component { render() { + + var signedInAs = () => { + if (this.props.loggedIn === true) { + return ( + + ); + } + }; + + var dashboard = () => { + if (this.props.loggedIn === true) { + return ( +
  • + + + Dashboard + +
  • + ); + } + }; + + var customRules = () => { + if (this.props.loggedIn === true) { + return ( +
  • + + + Custom Rules + +
  • + ); + } + }; + return (