Selaa lähdekoodia

updated homepage

Elliott Stansbury 5 vuotta sitten
vanhempi
commit
59f1cdf9f8

+ 1
- 0
src/main/java/rocks/zipcode/io/service/UserService.java Näytä tiedosto

@@ -2,6 +2,7 @@ package rocks.zipcode.io.service;
2 2
 
3 3
 import rocks.zipcode.io.config.Constants;
4 4
 import rocks.zipcode.io.domain.Authority;
5
+import rocks.zipcode.io.domain.Profile;
5 6
 import rocks.zipcode.io.domain.User;
6 7
 import rocks.zipcode.io.repository.AuthorityRepository;
7 8
 import rocks.zipcode.io.repository.UserRepository;

+ 5
- 0
src/main/java/rocks/zipcode/io/web/rest/AccountResource.java Näytä tiedosto

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

+ 3
- 0
src/main/java/rocks/zipcode/io/web/rest/UserResource.java Näytä tiedosto

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

+ 9
- 4
src/main/resources/config/application-dev.yml Näytä tiedosto

@@ -69,10 +69,15 @@ spring:
69 69
     liquibase:
70 70
         contexts: dev
71 71
     mail:
72
-        host: localhost
73
-        port: 25
74
-        username:
75
-        password:
72
+        host: smtp.gmail.com
73
+        port: 587
74
+        username: faebooreg@gmail.com
75
+        password: FaeBooBuzzK1ll!
76
+        protocol: smtp
77
+        properties.mail.smtp:
78
+            auth: true
79
+            starttls.enable: true
80
+            ssl.trust: smtp.gmail.com
76 81
     messages:
77 82
         cache-duration: PT1S # 1 second, see the ISO 8601 standard
78 83
     thymeleaf:

+ 2
- 8
src/main/webapp/app/home/home.component.html Näytä tiedosto

@@ -3,7 +3,8 @@
3 3
         <span class="hipster img-fluid rounded"></span>
4 4
     </div>
5 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 8
         <p class="lead" jhiTranslate="home.subtitle">This is your homepage</p>
8 9
 
9 10
         <div [ngSwitch]="isAuthenticated()">
@@ -26,13 +27,6 @@
26 27
             If you have any question on JHipster:
27 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 31
         <p>
38 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 Näytä tiedosto

@@ -6,7 +6,7 @@ Main page styles
6 6
     display: inline-block;
7 7
     width: 347px;
8 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 10
     background-size: contain;
11 11
 }
12 12
 
@@ -17,7 +17,7 @@ Main page styles
17 17
     only screen and (min-resolution: 192dpi),
18 18
     only screen and (min-resolution: 2dppx) {
19 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 21
         background-size: contain;
22 22
     }
23 23
 }

+ 1
- 1
src/main/webapp/app/layouts/navbar/navbar.scss Näytä tiedosto

@@ -71,7 +71,7 @@ Logo styles
71 71
             width: 70px;
72 72
             display: inline-block;
73 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 75
             background-size: contain;
76 76
         }
77 77
     }

BIN
src/main/webapp/content/images/faceofbooks1.jpg Näytä tiedosto


BIN
src/main/webapp/content/images/faceofbooks2.jpg Näytä tiedosto


BIN
src/main/webapp/content/images/faceofbooks3.jpg Näytä tiedosto


BIN
src/main/webapp/content/images/faceofbooks4.jpg Näytä tiedosto


+ 3
- 3
src/main/webapp/i18n/en/home.json Näytä tiedosto

@@ -1,9 +1,9 @@
1 1
 {
2 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 5
         "logged": {
6
-            "message": "You are logged in as user \"{{username}}\"."
6
+            "message": "\"{{username}}\" is currently logged in."
7 7
         },
8 8
         "question": "If you have any question on JHipster:",
9 9
         "link": {