✏️ Changes

webgem-xyz · Jan 28, 2018 · 22c5f03 · 22c5f03
1 parent 8e4280f
commit 22c5f03
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 20 deletions.
diff --git a/src/components/app.js b/src/components/app.js
@@ -1,3 +1,8 @@
+// All the code in this project is licensed under the terms of the GNU AGPLv3 license.
+// COPYRIGHT (C) Webgem ALL RIGHTS RESERVED.
+// More INFO AT https://github.com/webgem-xyz/UVA-React#license-information
+// All code can be found at https://github.com/webgem-xyz/UVA-React
+// You can read our LICENSE at https://github.com/webgem-xyz/UVA-React/blob/master/LICENSE
 import { Component } from 'preact';
 import { Router, route } from 'preact-router';
 import firebase from 'firebase/app';

diff --git a/src/routes/account/index.js b/src/routes/account/index.js
@@ -13,9 +13,7 @@ export default class Account extends Component {
       <div class={style.account}>
         <Header title="account" />
         <div class={style.accountSec}>
-          <p>
-            <span>Last connection:</span> {this.props.login}
-          </p>
+          <p class={style.headerP}>Account Details</p>
           <p>
             <span>Username:</span> {this.props.email}
           </p>

diff --git a/src/routes/account/style.scss b/src/routes/account/style.scss
@@ -6,15 +6,23 @@
   padding: 2.5px 16px 5px;
 
   p {
+    display: flex;
     font-size: 16px;
     margin: 2px 0;
 
     span {
       font-weight: 700;
+      width: 50%;
     }
   }
 }
 
+.headerP {
+  color: var(--main-blue);
+  font-weight: 700;
+  padding: 5px 0 10px;
+}
+
 .logout {
   background: var(--main-color);
   // border: 1px solid var(--main-color);

diff --git a/src/routes/edit/index.js b/src/routes/edit/index.js
@@ -1,6 +1,8 @@
 import { Component } from 'preact';
 import { PropTypes } from 'preact-compat';
 import { route } from 'preact-router';
+import moment from 'moment';
+import DatePicker from 'react-datepicker';
 
 import base from '../../base';
 
@@ -66,15 +68,17 @@ export default class Edit extends Component {
       <div class={style.edit}>
         <Header title="Edit measurement" to={`/mes/${this.props.measurementId}`} />
         <section class={style.editMain}>
-          <InputGroup
-            value={measurement.date}
-            kind="date"
-            label="Date"
-            handleState={this.handleState}
-            fullWidth
-            placeholder=""
-          />
-
+          <div class={style.inputWrap}>
+            <InputGroup
+              value={measurement.date}
+              kind="date"
+              label="Date"
+              handleState={this.handleState}
+              fullWidth
+              placeholder=""
+            />
+            <i className="material-icons">date_range</i>
+          </div>
           <section class={style.locationEdit}>
             <label>Location</label>
             <button onClick={e => this.showPopup(e)}>

diff --git a/src/routes/edit/style.scss b/src/routes/edit/style.scss
@@ -104,6 +104,18 @@
   transform: translateX(-50%);
 }
 
+.inputWrap {
+  position: relative;
+
+  i {
+    position: absolute;
+    pointer-events: none;
+    right: 5px;
+    top: 72.5%;
+    transform: translateY(-50%);
+  }
+}
+
 .locationEdit {
   display: block;
   padding: 10px 0 0;

diff --git a/src/routes/editMedia/index.js b/src/routes/editMedia/index.js
@@ -77,14 +77,17 @@ export default class EditMedia extends Component {
       <div class={style.edit}>
         <Header title="Edit media" to={`/med/${this.props.mediaId}`} />
         <section class={style.editMain}>
-          <InputGroup
-            value={measurement.date}
-            kind="date"
-            label="Date"
-            handleState={this.handleState}
-            fullWidth
-            placeholder=""
-          />
+          <div class={style.inputWrap}>
+            <InputGroup
+              value={measurement.date}
+              kind="date"
+              label="Date"
+              handleState={this.handleState}
+              fullWidth
+              placeholder=""
+            />
+            <i className="material-icons">date_range</i>
+          </div>
           <section class={style.locationEdit}>
             <label>Location</label>
             <button onClick={e => this.showPopup(e)}>

diff --git a/src/routes/editMedia/style.scss b/src/routes/editMedia/style.scss
@@ -203,6 +203,18 @@ select:-moz-focusring {
   transform: translateX(-50%);
 }
 
+.inputWrap {
+  position: relative;
+
+  i {
+    position: absolute;
+    pointer-events: none;
+    right: 5px;
+    top: 72.5%;
+    transform: translateY(-50%);
+  }
+}
+
 .imgWrap {
   // border: 1px solid var(--main-color);
   border: 0;