Merge pull request #70 from RobertoLewis/dev

[progress] authentication status changes options in menu

applications/auth/configSecretExample.js

@@ -0,0 +1,3 @@
+module.exports = {
+  secret:'insert secret here'
+}

applications/kcp-main/shared/components/Profile/login.js

@@ -40,7 +40,7 @@ import * as actions from '../../redux/actions';
             </fieldset>
             <fieldset className="form-group">
               <label>password:</label>
-              <input {...password} className="form-control" type="text" placeholder="password"/>
+              <input {...password} type="password" className="form-control"  placeholder="password"/>
             </fieldset>
             {this.renderAlert()}
             <button action="submit" className="btn btn-default btn-lg" >log in</button>

applications/kcp-main/shared/components/header.js

@@ -1,14 +1,34 @@
 import React, {PropTypes, Component} from 'react';
 import { browserHistory } from 'react-router';
+import { connect } from 'react-redux';
+import { Link } from 'react-router';
 
-export default class Header extends Component {
+class Header extends Component {
   constructor(props) {
     super(props);
   }
 
+  renderLinks() {
+    //if authenticated
+    if(this.props.authenticated) {
+      console.log("authenticated? ", this.props.authenticated);
+      return [
+        <li><div onClick={event => this.goToProfilePage()} href="#" key={1}>profile</div></li>,
+        <li><div onClick={event => this.goToPasswordReset()} href="#" key={2}>change password</div></li>,
+        <li role="separator" className="divider" key={3}></li>,
+        <li><div href="#" key={4}>log out</div></li>
+      ];
+
+    } else {
+      console.log("authenticated? ", this.props.authenticated);
+      return [
+        <li><div onClick={event => this.goToRegister()} href="#" key={5}>register</div></li>,
+        <li role="separator" className="divider" key={6}></li>,
+        <li><div onClick={event => this.goToLogin()} href="#" key={7}>log in</div></li>
+      ];
+    }
 
-
-
+  }
 
 
   render() {
@@ -21,12 +41,7 @@ export default class Header extends Component {
                 <button href="#" className="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">menu <span className="caret"></span></button>
                 <ul className="dropdown-menu">
                   <li><div onClick={event => this.homeReturn()} href="#">home</div></li>
-                  <li><div onClick={event => this.goToProfilePage()} href="#">profile</div></li>
-                  <li><div onClick={event => this.goToPasswordReset()} href="#">change password</div></li>
-                  <li><div onClick={event => this.goToRegister()} href="#">register</div></li>
-                  <li role="separator" className="divider"></li>
-                  <li><div onClick={event => this.goToLogin()} href="#">log in</div></li>
-                  <li><div href="#">log out</div></li>
+                  {this.renderLinks()}
                 </ul>
               </li>
             </ul>
@@ -64,3 +79,13 @@ export default class Header extends Component {
 
 
 };
+
+function mapStateToProps(state) {
+  return {
+    authenticated: state.auth.authenticated
+  };
+
+}
+
+
+export default connect(mapStateToProps)(Header);

applications/kcp-main/shared/styles/style.css

@@ -1,3 +1,52 @@
+/*begin form*/
+
+.login-page {
+  width: 360px;
+  padding: 8% 0 0;
+  margin: auto;
+}
+.form {
+  position: relative;
+  z-index: 1;
+  background: #FFFFFF;
+  max-width: 360px;
+  margin: 0 auto 100px;
+  padding: 45px;
+  text-align: center;
+  box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.2), 0 5px 5px 0 rgba(0, 0, 0, 0.24);
+}
+.form input {
+  font-family: "Roboto", sans-serif;
+  outline: 0;
+  background: #f2f2f2;
+  width: 100%;
+  border: 0;
+  margin: 0 0 15px;
+  padding: 15px;
+  box-sizing: border-box;
+  font-size: 14px;
+}
+.form button {
+  font-family: "Roboto", sans-serif;
+  text-transform: uppercase;
+  outline: 0;
+  background: #4CAF50;
+  width: 100%;
+  border: 0;
+  padding: 15px;
+  color: #FFFFFF;
+  font-size: 14px;
+  -webkit-transition: all 0.3 ease;
+  transition: all 0.3 ease;
+  cursor: pointer;
+}
+.form button:hover,.form button:active,.form button:focus {
+  background: #43A047;
+}
+
+/*end form*/
+
+
 .galleryWrap {
     width: 131%;
     /* border: 1px solid #0099cc; */
@@ -121,7 +170,7 @@ iframe img {
     left: 0px;
     background-position: -1px 1px;
     background-repeat: no-repeat;
-    
+
     background-color: white;
 }
 
@@ -369,7 +418,7 @@ button.filterButtons.btn.btn-primary {
   height: 200px;
   width: 200px;
   border-radius: 110%;
-} 
+}
 
 .bg i {
     color: #9fe7ff;
@@ -425,7 +474,7 @@ button.filterButtons.btn.btn-primary {
   border-radius: 4px;
   padding: 10px 16px;
 }
-  
+
 .btn-lg {
   font-size: 18px;
   line-height: 1.33;

media/aliases/ae04aac4-3cfe-11e6-a2ad-eba45cecdde6.gif.alias

@@ -0,0 +1,18 @@
+{
+    "src": "local",
+    "uuid": "ae04aac4-3cfe-11e6-a2ad-eba45cecdde6",
+    "uuid_dir": "/media",
+    "uuid_etag": "",
+    "uuid_file_size": 8156,
+    "uuid_file_ext": ".gif",
+    "uuid_mime_type": "",
+    "alias_title": "",
+    "alias_url_name": "",
+    "alias_alt_tag": "",
+    "alias_details": "",
+    "status": "active",
+    "source_name": "bear.gif",
+    "source_path": "../../media/incoming/coloring pages/animals/bear.gif",
+    "source_dirname": "../../media/incoming/coloring pages/animals",
+    "type": "file"
+}