Registration controller and view

.gitignore

@@ -23,6 +23,8 @@ coverage
 # node-waf configuration
 .lock-wscript
 
+.DS_Store
+
 # Compiled binary addons (http://nodejs.org/api/addons.html)
 build/Release
 
@@ -39,4 +41,6 @@ typings
 
 # Generated files
 client/app/**/*.js
-client/app/**/*.js.map
+client/app/**/*.js.map
+client/package-lock.json
+server/package-lock.json

README.md

@@ -1,5 +1,3 @@
-# mean-angular2-registration-login-example
+# Omnivalley
 
-MEAN Stack with Angular 2 - User Registration and Login Example & Tutorial
-
-For details and documentation go to http://jasonwatmore.com/post/2017/02/22/mean-with-angular-2-user-registration-and-login-example-tutorial
+Repository for the tech stack of OmniValley

client/app.css

@@ -1,7 +1,326 @@
-a {
-    cursor: pointer;
+/*!
+ * Start Bootstrap - Landing Page (https://startbootstrap.com/template-overviews/landing-page)
+ * Copyright 2013-2017 Start Bootstrap
+ * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-landing-page/blob/master/LICENSE)
+ */
+
+body, html {
+  width: 100%;
+  height: 100%;
+}
+
+body, h1, h2, h3, h4, h5, h6 {
+  font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 700;
+  background-color: #fff;
+}
+
+h2 {
+  font-size: 24px;
+  font-weight: 600;
+  margin-top: 8px;
+}
+
+h3 {
+  font-size: 18px;
+}
+
+hr{
+    width: 80%;
+    border-color: rgba(135,135,135,0.5);
+}
+
+.navbar, .alert {
+  margin-bottom: 0px;
+}
+
+.menu-heading {
+  padding: 8px 10px;
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: 16px;
+  font-weight: 600;
+  line-height: 20px;
+  color: #586069;
+  background-color: #f3f5f8;
+  border-bottom: 1px solid #e1e4e8;
+}
+
+.Subhead-heading {
+  border-bottom: 1px #e1e4e8 solid;
+  padding-bottom: 8px;
+  margin-bottom: 16px;
+  font-size: 24px;
+  font-weight: normal;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1 1 auto;
+  flex: 1 1 auto;
+}
+
+.Subhead--spacious {
+    margin-top: 40px;
+}
+
+.Subtext-heading {
+  padding-bottom: 8px;
+  font-size: 18px;
+  font-weight: normal;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1 1 auto;
+  flex: 1 1 auto;
+}
+
+.member{
+  display: inline-block;
+  width: 150px;
+  margin: 10px;
+}
+
+.member_photo{
+  width:150px;
+}
+
+.member_name{
+}
+
+.member_buttons{
+
+}
+
+.navbar{
+  margin-bottom: 0px;
+}
+
+.body {
+  padding-top: 30px;
+  padding-bottom: 30px;
+  margin-bottom: 60px;
+  color: inherit;
+  min-height: 400px;
+  clear: both;
+}
+
+.body::before, .body::after {
+  clear: both;
+  content: ".";
+  display: block;
+  visibility: hidden;
+}
+
+#footer {
+  bottom: 0;
+  width: 100%;
+  position: absolute;
+  height: 60px;
+  background-color: #f5f5f5;
+}
+
+#copyright{
+  padding: 20px;
+}
+
+#container {
+  position: relative;
+  overflow: auto;
+  clear: both;
+  min-height: 100%;
+}
+
+#container {
+  position: relative;
+  overflow: auto;
+  clear: both;
+  min-height: 100%;
+}
+
+.col-md-3{
+    border-radius: 9px;
+    box-shadow: rgba(0, 0, 0, 0.2) 0px 4px 8px 0px;
+    background-color: rgb(255, 255, 255);
+    margin: 20px;
+}
+
+.profile{
+    border-radius: 50%;
+    width:  60%;
+    margin: auto;
+    display: block;
+}
+
+.menu{
+  margin-bottom: 15px;
+  list-style: none;
+  background-color: #fff;
+  border: 1px solid #d1d5da;
+  border-radius: 3px;
+  min-width: 130px;
+  padding-right: 0;
+  padding-left: 0;
+}
+
+.intro-header {
+  padding-top: 50px;
+  padding-bottom: 50px;
+  text-align: center;
+  color: #f8f8f8;
+  background: url(../img/intro-bg.jpg) no-repeat center center;
+  background-size: cover;
+}
+
+.intro-message {
+  position: relative;
+  padding-top: 20%;
+  padding-bottom: 20%;
+}
+
+.intro-message>h1 {
+  margin: 0;
+  text-shadow: 2px 2px 3px rgba(0, 0, 0, 0.6);
+  font-size: 5em;
+}
+
+.intro-divider {
+  width: 400px;
+  border-top: 1px solid #f8f8f8;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+}
+
+.intro-message>h3 {
+  text-shadow: 2px 2px 3px rgba(0, 0, 0, 0.6);
+}
+
+.intro-social-buttons i {
+  font-size: 80%;
+}
+
+@media(max-width:767px) {
+  .intro-message {
+    padding-bottom: 15%;
+  }
+  .intro-message>h1 {
+    font-size: 3em;
+  }
+  ul.intro-social-buttons>li {
+    display: block;
+    margin-bottom: 20px;
+    padding: 0;
+  }
+  ul.intro-social-buttons>li:last-child {
+    margin-bottom: 0;
+  }
+  .intro-divider {
+    width: 100%;
+  }
+}
+
+.network-name {
+  text-transform: uppercase;
+  font-size: 14px;
+  font-weight: 400;
+  letter-spacing: 2px;
+}
+
+.content-section-a {
+  padding: 50px 0;
+  background-color: #f8f8f8;
+}
+
+.content-section-b {
+  padding: 50px 0;
+  border-top: 1px solid #e7e7e7;
+  border-bottom: 1px solid #e7e7e7;
+}
+
+.section-heading {
+  margin-bottom: 30px;
+}
+
+.section-heading-spacer {
+  float: left;
+  width: 200px;
+  border-top: 3px solid #e7e7e7;
+}
+
+.banner {
+  padding: 100px 0;
+  color: #f8f8f8;
+  background: url(../img/banner-bg.jpg) no-repeat center center;
+  background-size: cover;
+}
+
+.banner h2 {
+  margin: 0;
+  text-shadow: 2px 2px 3px rgba(0, 0, 0, 0.6);
+  font-size: 3em;
+}
+
+.banner ul {
+  margin-bottom: 0;
+}
+
+.banner-social-buttons {
+  float: right;
+  margin-top: 0;
+}
+
+@media(max-width:1199px) {
+  ul.banner-social-buttons {
+    float: left;
+    margin-top: 15px;
+  }
+}
+
+@media(max-width:767px) {
+  .banner h2 {
+    margin: 0;
+    text-shadow: 2px 2px 3px rgba(0, 0, 0, 0.6);
+    font-size: 3em;
+  }
+  ul.banner-social-buttons>li {
+    display: block;
+    margin-bottom: 20px;
+    padding: 0;
+  }
+  ul.banner-social-buttons>li:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.form-group .form-control {
+    width: 440px;
+    max-width: 100%;
+    margin-right: 5px;
+    background-color: #fafbfc;
+}
+
+.form-control, .form-select {
+  min-height: 34px;
+  padding: 6px 8px;
+  font-size: 14px;
+  line-height: 20px;
+  color: #24292e;
+  vertical-align: middle;
+  background-color: #fff;
+  background-repeat: no-repeat;
+  background-position: right 8px center;
+  border: 1px solid #d1d5da;
+  border-radius: 3px;
+  outline: none;
+  box-shadow: inset 0 1px 2px rgba(27,31,35,0.075);
+}
+
+.btn {
+    color: #24292e;
+    background-color: #eff3f6;
+    background-image: -webkit-linear-gradient(270deg, #fafbfc 0%, #eff3f6 90%);
+    background-image: linear-gradient(-180deg, #fafbfc 0%, #eff3f6 90%);
+}
+
+.mr-2 {
+    margin-right: 8px !important;
+}
+
+label{
+  margin-top: 5px;
 }
 
-.help-block {
-    font-size: 12px;
-}

client/app/_guards/auth.guard.ts

@@ -12,8 +12,14 @@ export class AuthGuard implements CanActivate {
             return true;
         }
 
-        // not logged in so redirect to login page with the return url
-        this.router.navigate(['/login'], { queryParams: { returnUrl: state.url }});
+        if(state.url == "/"){
+          this.router.navigate(['/landing'], { skipLocationChange: true });
+        }
+        else{
+          // not logged in so redirect to login page with the return url
+          //window.location = "http://www.domain.com/login"
+          this.router.navigate(['/login'], { queryParams: { returnUrl: state.url }});
+        }
         return false;
     }
-}
+}