#6 updated homepage

병합
ElliottStansbury ElliottStansbury/JhipsterGroupProject-Client:register 에서 register 로 4 commits 를 머지했습니다 7 년 전

+ 1
- 1
src/main/java/rocks/zipcode/io/FaeBooApp.java 파일 보기

35
     }
35
     }
36
 
36
 
37
     /**
37
     /**
38
-     * Initializes FaeBoo.
38
+     * Initializes FaeBoo.np
39
      * <p>
39
      * <p>
40
      * Spring profiles can be configured with a program argument --spring.profiles.active=your-active-profile
40
      * Spring profiles can be configured with a program argument --spring.profiles.active=your-active-profile
41
      * <p>
41
      * <p>

+ 3
- 2
src/main/java/rocks/zipcode/io/web/rest/AccountResource.java 파일 보기

64
         }
64
         }
65
         User user = userService.registerUser(managedUserVM, managedUserVM.getPassword());
65
         User user = userService.registerUser(managedUserVM, managedUserVM.getPassword());
66
         mailService.sendActivationEmail(user);
66
         mailService.sendActivationEmail(user);
67
+        System.out.println("1");
67
     }
68
     }
68
 
69
 
69
     /**
70
     /**
79
         if (!user.isPresent()) {
80
         if (!user.isPresent()) {
80
             throw new InternalServerErrorException("No user was found for this activation key");
81
             throw new InternalServerErrorException("No user was found for this activation key");
81
         }
82
         }
82
-        //consider adding profile and account details here
83
     }
83
     }
84
 
84
 
85
     /**
85
     /**
92
     @Timed
92
     @Timed
93
     public String isAuthenticated(HttpServletRequest request) {
93
     public String isAuthenticated(HttpServletRequest request) {
94
         log.debug("REST request to check if the current user is authenticated");
94
         log.debug("REST request to check if the current user is authenticated");
95
+        System.out.println("3");
95
         return request.getRemoteUser();
96
         return request.getRemoteUser();
96
     }
97
     }
97
 
98
 
104
     @GetMapping("/account")
105
     @GetMapping("/account")
105
     @Timed
106
     @Timed
106
     public UserDTO getAccount() {
107
     public UserDTO getAccount() {
108
+        System.out.println("4");
107
         return userService.getUserWithAuthorities()
109
         return userService.getUserWithAuthorities()
108
             .map(UserDTO::new)
110
             .map(UserDTO::new)
109
             .orElseThrow(() -> new InternalServerErrorException("User could not be found"));
111
             .orElseThrow(() -> new InternalServerErrorException("User could not be found"));
128
         if (!user.isPresent()) {
130
         if (!user.isPresent()) {
129
             throw new InternalServerErrorException("User could not be found");
131
             throw new InternalServerErrorException("User could not be found");
130
         }
132
         }
131
-
132
         userService.updateUser(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(), userDTO.getLangKey(), userDTO.getImageUrl());
133
         userService.updateUser(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(), userDTO.getLangKey(), userDTO.getImageUrl());
133
     }
134
     }
134
 
135
 

+ 3
- 0
src/main/java/rocks/zipcode/io/web/rest/UserResource.java 파일 보기

1
 package rocks.zipcode.io.web.rest;
1
 package rocks.zipcode.io.web.rest;
2
 
2
 
3
 import rocks.zipcode.io.config.Constants;
3
 import rocks.zipcode.io.config.Constants;
4
+import rocks.zipcode.io.domain.Profile;
4
 import rocks.zipcode.io.domain.User;
5
 import rocks.zipcode.io.domain.User;
6
+import rocks.zipcode.io.repository.ProfileRepository;
5
 import rocks.zipcode.io.repository.UserRepository;
7
 import rocks.zipcode.io.repository.UserRepository;
6
 import rocks.zipcode.io.security.AuthoritiesConstants;
8
 import rocks.zipcode.io.security.AuthoritiesConstants;
7
 import rocks.zipcode.io.service.MailService;
9
 import rocks.zipcode.io.service.MailService;
100
             throw new EmailAlreadyUsedException();
102
             throw new EmailAlreadyUsedException();
101
         } else {
103
         } else {
102
             User newUser = userService.createUser(userDTO);
104
             User newUser = userService.createUser(userDTO);
105
+
103
             mailService.sendCreationEmail(newUser);
106
             mailService.sendCreationEmail(newUser);
104
             return ResponseEntity.created(new URI("/api/users/" + newUser.getLogin()))
107
             return ResponseEntity.created(new URI("/api/users/" + newUser.getLogin()))
105
                 .headers(HeaderUtil.createAlert( "userManagement.created", newUser.getLogin()))
108
                 .headers(HeaderUtil.createAlert( "userManagement.created", newUser.getLogin()))

+ 1
- 1
src/main/webapp/app/account/register/register.component.html 파일 보기

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

+ 2
- 8
src/main/webapp/app/home/home.component.html 파일 보기

3
         <span class="hipster img-fluid rounded"></span>
3
         <span class="hipster img-fluid rounded"></span>
4
     </div>
4
     </div>
5
     <div class="col-md-9">
5
     <div class="col-md-9">
6
-        <h1 class="display-4" jhiTranslate="home.title">Welcome, Java Hipster!</h1>
6
+
7
+        <h1 class="display-1" jhiTranslate="home.title">Welcome to Elliott!</h1>
7
         <p class="lead" jhiTranslate="home.subtitle">This is your homepage</p>
8
         <p class="lead" jhiTranslate="home.subtitle">This is your homepage</p>
8
 
9
 
9
         <div [ngSwitch]="isAuthenticated()">
10
         <div [ngSwitch]="isAuthenticated()">
26
             If you have any question on JHipster:
27
             If you have any question on JHipster:
27
         </p>
28
         </p>
28
 
29
 
29
-        <ul>
30
-            <li><a href="https://www.jhipster.tech/" target="_blank" rel="noopener" jhiTranslate="home.link.homepage">JHipster homepage</a></li>
31
-            <li><a href="http://stackoverflow.com/tags/jhipster/info" target="_blank" rel="noopener" jhiTranslate="home.link.stackoverflow">JHipster on Stack Overflow</a></li>
32
-            <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>
33
-            <li><a href="https://gitter.im/jhipster/generator-jhipster" target="_blank" rel="noopener" jhiTranslate="home.link.chat">JHipster public chat room</a></li>
34
-            <li><a href="https://twitter.com/java_hipster" target="_blank" rel="noopener" jhiTranslate="home.link.follow">follow @java_hipster on Twitter</a></li>
35
-        </ul>
36
 
30
 
37
         <p>
31
         <p>
38
             <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>!
32
             <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>!

+ 2
- 2
src/main/webapp/app/home/home.scss 파일 보기

6
     display: inline-block;
6
     display: inline-block;
7
     width: 347px;
7
     width: 347px;
8
     height: 497px;
8
     height: 497px;
9
-    background: url('../../content/images/hipster.png') no-repeat center top;
9
+    background: url('../../content/images/faceofbooks1.jpg') no-repeat center top;
10
     background-size: contain;
10
     background-size: contain;
11
 }
11
 }
12
 
12
 
17
     only screen and (min-resolution: 192dpi),
17
     only screen and (min-resolution: 192dpi),
18
     only screen and (min-resolution: 2dppx) {
18
     only screen and (min-resolution: 2dppx) {
19
     .hipster {
19
     .hipster {
20
-        background: url('../../content/images/hipster2x.png') no-repeat center top;
20
+        background: url('../../content/images/faceofbooks1.jpg') no-repeat center top;
21
         background-size: contain;
21
         background-size: contain;
22
     }
22
     }
23
 }
23
 }

+ 1
- 1
src/main/webapp/app/layouts/navbar/navbar.scss 파일 보기

71
             width: 70px;
71
             width: 70px;
72
             display: inline-block;
72
             display: inline-block;
73
             vertical-align: middle;
73
             vertical-align: middle;
74
-            background: url('../../../content/images/logo-jhipster.png') no-repeat center center;
74
+            background: url('../../../content/images/faceofbooks4.jpg') no-repeat center center;
75
             background-size: contain;
75
             background-size: contain;
76
         }
76
         }
77
     }
77
     }

BIN
src/main/webapp/content/images/faceofbooks1.jpg 파일 보기


BIN
src/main/webapp/content/images/faceofbooks2.jpg 파일 보기


BIN
src/main/webapp/content/images/faceofbooks3.jpg 파일 보기


BIN
src/main/webapp/content/images/faceofbooks4.jpg 파일 보기


+ 3
- 3
src/main/webapp/i18n/en/home.json 파일 보기

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