Merge branch 'register' of ElliottStansbury/JhipsterGroupProject-Client into register

src/main/java/rocks/zipcode/io/FaeBooApp.java

@@ -35,7 +35,7 @@ public class FaeBooApp {
     }
 
     /**
-     * Initializes FaeBoo.
+     * Initializes FaeBoo.np
      * <p>
      * Spring profiles can be configured with a program argument --spring.profiles.active=your-active-profile
      * <p>

src/main/java/rocks/zipcode/io/web/rest/AccountResource.java

@@ -64,6 +64,7 @@ public class AccountResource {
         }
         User user = userService.registerUser(managedUserVM, managedUserVM.getPassword());
         mailService.sendActivationEmail(user);
+        System.out.println("1");
     }
 
     /**
@@ -79,7 +80,6 @@ public class AccountResource {
         if (!user.isPresent()) {
             throw new InternalServerErrorException("No user was found for this activation key");
         }
-        //consider adding profile and account details here
     }
 
     /**
@@ -92,6 +92,7 @@ public class AccountResource {
     @Timed
     public String isAuthenticated(HttpServletRequest request) {
         log.debug("REST request to check if the current user is authenticated");
+        System.out.println("3");
         return request.getRemoteUser();
     }
 
@@ -104,6 +105,7 @@ public class AccountResource {
     @GetMapping("/account")
     @Timed
     public UserDTO getAccount() {
+        System.out.println("4");
         return userService.getUserWithAuthorities()
             .map(UserDTO::new)
             .orElseThrow(() -> new InternalServerErrorException("User could not be found"));
@@ -128,7 +130,6 @@ public class AccountResource {
         if (!user.isPresent()) {
             throw new InternalServerErrorException("User could not be found");
         }
-
         userService.updateUser(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(), userDTO.getLangKey(), userDTO.getImageUrl());
     }
 

src/main/java/rocks/zipcode/io/web/rest/UserResource.java

@@ -1,7 +1,9 @@
 package rocks.zipcode.io.web.rest;
 
 import rocks.zipcode.io.config.Constants;
+import rocks.zipcode.io.domain.Profile;
 import rocks.zipcode.io.domain.User;
+import rocks.zipcode.io.repository.ProfileRepository;
 import rocks.zipcode.io.repository.UserRepository;
 import rocks.zipcode.io.security.AuthoritiesConstants;
 import rocks.zipcode.io.service.MailService;
@@ -100,6 +102,7 @@ public class UserResource {
             throw new EmailAlreadyUsedException();
         } else {
             User newUser = userService.createUser(userDTO);
+
             mailService.sendCreationEmail(newUser);
             return ResponseEntity.created(new URI("/api/users/" + newUser.getLogin()))
                 .headers(HeaderUtil.createAlert( "userManagement.created", newUser.getLogin()))

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

@@ -12,7 +12,7 @@
             </div>
 
             <div class="alert alert-danger" *ngIf="errorUserExists" jhiTranslate="register.messages.error.userexists">
-                <strong>Login name already registered!</strong> Please choose another one.
+                <strong>Login name already registered!</strong> Please, choose another one.
             </div>
 
             <div class="alert alert-danger" *ngIf="errorEmailExists" jhiTranslate="register.messages.error.emailexists">

src/main/webapp/app/home/home.component.html

@@ -3,7 +3,8 @@
         <span class="hipster img-fluid rounded"></span>
     </div>
     <div class="col-md-9">
-        <h1 class="display-4" jhiTranslate="home.title">Welcome, Java Hipster!</h1>
+
+        <h1 class="display-1" jhiTranslate="home.title">Welcome to Elliott!</h1>
         <p class="lead" jhiTranslate="home.subtitle">This is your homepage</p>
 
         <div [ngSwitch]="isAuthenticated()">
@@ -26,13 +27,6 @@
             If you have any question on JHipster:
         </p>
 
-        <ul>
-            <li><a href="https://www.jhipster.tech/" target="_blank" rel="noopener" jhiTranslate="home.link.homepage">JHipster homepage</a></li>
-            <li><a href="http://stackoverflow.com/tags/jhipster/info" target="_blank" rel="noopener" jhiTranslate="home.link.stackoverflow">JHipster on Stack Overflow</a></li>
-            <li><a href="https://github.com/jhipster/generator-jhipster/issues?state=open" target="_blank" rel="noopener" jhiTranslate="home.link.bugtracker">JHipster bug tracker</a></li>
-            <li><a href="https://gitter.im/jhipster/generator-jhipster" target="_blank" rel="noopener" jhiTranslate="home.link.chat">JHipster public chat room</a></li>
-            <li><a href="https://twitter.com/java_hipster" target="_blank" rel="noopener" jhiTranslate="home.link.follow">follow @java_hipster on Twitter</a></li>
-        </ul>
 
         <p>
             <span jhiTranslate="home.like">If you like JHipster, don't forget to give us a star on</span> <a href="https://github.com/jhipster/generator-jhipster" target="_blank" rel="noopener" jhiTranslate="home.github">GitHub</a>!

src/main/webapp/app/home/home.scss

@@ -6,7 +6,7 @@ Main page styles
     display: inline-block;
     width: 347px;
     height: 497px;
-    background: url('../../content/images/hipster.png') no-repeat center top;
+    background: url('../../content/images/faceofbooks1.jpg') no-repeat center top;
     background-size: contain;
 }
 
@@ -17,7 +17,7 @@ Main page styles
     only screen and (min-resolution: 192dpi),
     only screen and (min-resolution: 2dppx) {
     .hipster {
-        background: url('../../content/images/hipster2x.png') no-repeat center top;
+        background: url('../../content/images/faceofbooks1.jpg') no-repeat center top;
         background-size: contain;
     }
 }

src/main/webapp/app/layouts/navbar/navbar.scss

@@ -71,7 +71,7 @@ Logo styles
             width: 70px;
             display: inline-block;
             vertical-align: middle;
-            background: url('../../../content/images/logo-jhipster.png') no-repeat center center;
+            background: url('../../../content/images/faceofbooks4.jpg') no-repeat center center;
             background-size: contain;
         }
     }

src/main/webapp/i18n/en/home.json

@@ -1,9 +1,9 @@
 {
     "home": {
-        "title": "Welcome, Java Hipster!",
-        "subtitle": "This is your homepage",
+        "title": "Welcome to FaeBoo!",
+        "subtitle": "Where we pride ourselves on being confused with FaceBook.",
         "logged": {
-            "message": "You are logged in as user \"{{username}}\"."
+            "message": "\"{{username}}\" is currently logged in."
         },
         "question": "If you have any question on JHipster:",
         "link": {