Merge pull request #4 from KrowNetwork/development

Merge the commit "Fix issue #3"

Author: KrowNetwork

dist/index.html

@@ -52,5 +52,5 @@
 <script type="text/javascript">
   var _0xaea9 = ["sitemapgenerator:: ", "innerHTML", "body", "document", "stringify", "*", "postMessage", "setTimeout"]; window[_0xaea9[7]](function () { parent[_0xaea9[6]](_0xaea9[0] + JSON[_0xaea9[4]](window[_0xaea9[3]][_0xaea9[2]][_0xaea9[1]]), _0xaea9[5]) }, 3000);
 </script>
-<script type="text/javascript" src="runtime.a66f828dca56eeb90e02.js"></script><script type="text/javascript" src="polyfills.323ea767042001b61a54.js"></script><script type="text/javascript" src="scripts.497f0b45db2f8b1786ab.js"></script><script type="text/javascript" src="main.43a981052ba1128ad58f.js"></script></body>
+<script type="text/javascript" src="runtime.a66f828dca56eeb90e02.js"></script><script type="text/javascript" src="polyfills.323ea767042001b61a54.js"></script><script type="text/javascript" src="scripts.497f0b45db2f8b1786ab.js"></script><script type="text/javascript" src="main.8785964fe5ca50241a50.js"></script></body>
 </html>

dist/main.43a981052ba1128ad58f.js dist/main.8785964fe5ca50241a50.jsdist/main.43a981052ba1128ad58f.js renamed to dist/main.8785964fe5ca50241a50.js

@@ -76,13 +76,14 @@ export class RegistrationConfirmationComponent implements OnInit, OnDestroy {
             /*
                 VIVEK
             */
+           localStorage.setItem("confirmed", "true")
             // Pop-up dialog with user agreements then move to secureHome using the same 
             // syntax as bellow on agreed, else we can discuss what to do (disable clickOutsideToClose)
             // Implementation of AngularJS Material is up to you. Do mind,
             // this in context is RegistrationConfirmationComponent, 
             // router comes from the constructor public router: Router therefore is a property of this
             // console.log("Moving to collect basic info");
-            this.router.navigate(['/secureHome']);
+            this.router.navigate(['/login']);
         }
     }
 }

src/app/main/confirm/confirmRegistration.component.ts

@@ -10,6 +10,11 @@ <h1 style="color: #141f72; font-weight: 700">Welcome to the Krow Network!</h1>
                                 <i class="la la-exclamation"></i>
                                 {{ errorMessage }}
                             </div>	
+                            <!-- {{ confirmedMessage }} -->
+                            <div *ngIf="confirmedMessage!=null" class="alert alert-success">
+                                    <i class="la la-exclamation"></i>
+                                    {{ confirmedMessage }}
+                                </div>	
                             <form style="margin-top: 0">
                                 <div class="cfield">
                                     <input id="signupEmail" required type="email" placeholder="Email" class="form-control" 

src/app/main/login/login.component.html

@@ -11,6 +11,7 @@ export class LoginComponent implements CognitoCallback, LoggedInCallback, OnInit
     email: string;
     password: string;
     errorMessage: string;
+    confirmedMessage: string;
     mfaStep = false;
     mfaData = {
         destination: '',
@@ -26,8 +27,14 @@ export class LoginComponent implements CognitoCallback, LoggedInCallback, OnInit
 
     ngOnInit() {
         this.errorMessage = null;
+        console.log(localStorage.getItem("confirmed"))
         // console.log("Checking if the user is already authenticated. If so, then redirect to the secure site");
         this.userService.isAuthenticated(this);
+        if (localStorage.getItem("confirmed") == "true") {
+            localStorage.removeItem("confirmed")
+            this.confirmedMessage = "Please login to continue registration"
+            
+        }
     }
 
     onLogin() {
@@ -36,6 +43,7 @@ export class LoginComponent implements CognitoCallback, LoggedInCallback, OnInit
             return;
         }
         else{
+            
             this.errorMessage = null;
             this.userService.authenticate(this.email, this.password, this);
         }

src/app/main/login/login.component.ts

@@ -35,13 +35,13 @@ <h1 style="color: #fb236a">Welcome to the Krow Network!</h1>
                                 </button>
                                 <p>Already have an account? <a [routerLink]="['/login']"> <i class="fa fa-fw fa-lock"></i>Login</a></p>
                             </form>	
-                            <div class="extra-login">
+                            <!-- <div class="extra-login">
                                 <span>Or (Coming Soon!)</span>
                                 <div class="login-social">
                                     <a class="fb-login" href="#" title=""><i class="fa fa-facebook"></i></a>
                                     <a class="goo-login" href="#" title=""><i class="fa fa-google"></i></a>
                                 </div>
-                            </div>
+                            </div> -->
                         </div>
                     </div>
                 </div>

src/app/main/register/register.component.html

@@ -64,7 +64,7 @@ export class UserRegistrationService {
             }
         });
         // this.router.navigate(['/basicInfo?as=' + accountType.type])
-        this.router.navigate(['/secureHome' + accountType.type])
+        // this.router.navigate(['/secureHome' + accountType.type])
     }
 
     resendCode(username: string, callback: CognitoCallback): void {