Merge branch 'login' of jonathan-hinds/JhipsterGroupProject-Client into login

jhipster-jdl-3.jh

@@ -0,0 +1,117 @@
+entity AccountDetails{
+    profile Profile,
+    firstName String,
+    lastName String,
+    password Password,
+    securityQuestion String,
+    securityAnswer SecurityAnswer,
+    email String,
+    phoneNumber String
+}
+
+entity Profile{
+	account AccountDetails,
+    profilePic Photo,
+    bio String,
+    featurePhotos Album,
+    private Boolean
+}
+
+entity Post {
+    profile Profile,
+	comment Comment,
+    commentCount Long,
+    timeStamp Date,
+    scheduleTime Date,
+    content String,
+    photo Photo,
+    video Video,
+    memo Memo,
+  	likes Long,
+    dislikes Long
+}
+
+entity Comment {
+	profile Profile,
+    timeStamp Date,
+    content String,
+    likes Long,
+    dislikes Long
+}
+
+entity Album{
+    photo Photo,
+    name String,
+    description String,
+    creationDate Date
+}
+
+entity Friend{
+	user Profile,
+    friend Profile,
+    status String,
+    topFriend Boolean
+}
+
+entity Memo{
+	memoURL String,
+    size Long,
+    type String
+}
+
+entity Video {
+    videoURL String,
+    size Long,
+    type String
+}
+
+entity Photo {
+    userId Long,
+ 	imageURL String,
+    size Long,
+    type String
+}
+
+relationship OneToOne {
+	AccountDetails to User  
+}
+
+relationship OneToOne {
+	User to Profile
+}
+
+relationship OneToMany {
+	Profile to Post
+}
+
+relationship OneToMany {
+	Post to Comment
+}
+
+relationship OneToMany {
+	Profile to Album
+}
+
+relationship ManyToMany {
+	Album to Photo
+}
+
+relationship ManyToMany{
+	Post to Photo
+}
+
+relationship ManyToMany{
+    Post to Video
+}
+
+relationship ManyToMany{
+    Post to Memo
+}
+
+relationship OneToMany{
+	Profile to Friend{user}
+}
+
+relationship ManyToOne{
+	Friend{friend} to Profile
+}

src/main/webapp/app/layouts/navbar/navbar.component.html

@@ -11,7 +11,7 @@
     <div class="navbar-collapse collapse" id="navbarResponsive" [ngbCollapse]="isNavbarCollapsed" [ngSwitch]="isAuthenticated()">
         <ul class="navbar-nav ml-auto">
             <li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
-                <a class="nav-link" routerLink="/" (click)="collapseNavbar()">
+                <a class="nav-link" routerLink="/" (click)="collapseNavbar();trace();">
                     <span>
                         <fa-icon icon="home"></fa-icon>
                         <span jhiTranslate="global.menu.home">Home</span>

src/main/webapp/app/layouts/navbar/navbar.component.ts

@@ -3,7 +3,6 @@ import { Router } from '@angular/router';
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { JhiLanguageService } from 'ng-jhipster';
 import { SessionStorageService } from 'ngx-webstorage';
-
 import { VERSION } from 'app/app.constants';
 import { JhiLanguageHelper, Principal, LoginModalService, LoginService } from 'app/core';
 import { ProfileService } from '../profiles/profile.service';
@@ -46,6 +45,10 @@ export class NavbarComponent implements OnInit {
         });
     }
 
+    trace() {
+        console.log('here you are');
+    }
+
     changeLanguage(languageKey: string) {
         this.sessionStorage.store('locale', languageKey);
         this.languageService.changeLanguage(languageKey);

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

@@ -1,6 +1,6 @@
 <div class="modal-header">
     <h4 class="modal-title" jhiTranslate="login.title">Sign in</h4>
-    <button aria-label="Close" data-dismiss="modal" class="close" type="button" (click)="activeModal.dismiss('closed')"><span aria-hidden="true">x</span>
+    <button aria-label="Close" data-dismiss="modal" class="close" type="button"><span aria-hidden="true">x</span>
     </button>
 </div>
 <div class="modal-body">
@@ -14,13 +14,11 @@
             <form class="form" role="form" (ngSubmit)="login()">
                 <div class="form-group">
                     <label class="username-label" for="username" jhiTranslate="global.form.username">Login</label>
-                    <input type="text" class="form-control" name="username" id="username" placeholder="{{'global.form.username.placeholder' | translate}}"
-                    [(ngModel)]="username">
+                    <input type="text" class="form-control" name="username" id="username" placeholder="{{'global.form.username.placeholder' | translate}}" [(ngModel)]="username">
                 </div>
                 <div class="form-group">
                     <label for="password" jhiTranslate="login.form.password">Password</label>
-                    <input type="password" class="form-control" name="password" id="password" placeholder="{{'login.form.password.placeholder' | translate}}"
-                           [(ngModel)]="password">
+                    <input type="password" class="form-control" name="password" id="password" placeholder="{{'login.form.password.placeholder' | translate}}" [(ngModel)]="password">
                 </div>
                 <div class="form-check">
                     <label class="form-check-label" for="rememberMe">

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

@@ -1,5 +1,4 @@
 import { Component, AfterViewInit, Renderer, ElementRef } from '@angular/core';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Router } from '@angular/router';
 import { JhiEventManager } from 'ng-jhipster';
 
@@ -23,8 +22,7 @@ export class JhiLoginModalComponent implements AfterViewInit {
         private stateStorageService: StateStorageService,
         private elementRef: ElementRef,
         private renderer: Renderer,
-        private router: Router,
-        public activeModal: NgbActiveModal
+        private router: Router // public activeModal: NgbActiveModal
     ) {
         this.credentials = {};
     }
@@ -40,7 +38,7 @@ export class JhiLoginModalComponent implements AfterViewInit {
             rememberMe: true
         };
         this.authenticationError = false;
-        this.activeModal.dismiss('cancel');
+        // this.activeModal.dismiss('cancel');
     }
 
     login() {
@@ -52,7 +50,7 @@ export class JhiLoginModalComponent implements AfterViewInit {
             })
             .then(() => {
                 this.authenticationError = false;
-                this.activeModal.dismiss('login success');
+                // this.activeModal.dismiss('login success');
                 if (this.router.url === '/register' || /^\/activate\//.test(this.router.url) || /^\/reset\//.test(this.router.url)) {
                     this.router.navigate(['']);
                 }
@@ -76,12 +74,12 @@ export class JhiLoginModalComponent implements AfterViewInit {
     }
 
     register() {
-        this.activeModal.dismiss('to state register');
+        // this.activeModal.dismiss('to state register');
         this.router.navigate(['/register']);
     }
 
     requestResetPassword() {
-        this.activeModal.dismiss('to state requestReset');
+        // this.activeModal.dismiss('to state requestReset');
         this.router.navigate(['/reset', 'request']);
     }
 }

src/main/webapp/app/shared/login/login.route.ts

@@ -1,6 +1,4 @@
 import { Route } from '@angular/router';
-
-import { RegisterComponent } from 'app/account';
 import { JhiLoginModalComponent } from 'app/shared';
 
 export const loginRoute: Route = {