소스 검색

updated homepage

Elliott Stansbury 5 년 전
부모
커밋
59f1cdf9f8

+ 1
- 0
src/main/java/rocks/zipcode/io/service/UserService.java 파일 보기

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

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

63
         }
63
         }
64
         User user = userService.registerUser(managedUserVM, managedUserVM.getPassword());
64
         User user = userService.registerUser(managedUserVM, managedUserVM.getPassword());
65
         mailService.sendActivationEmail(user);
65
         mailService.sendActivationEmail(user);
66
+        System.out.println("1");
66
     }
67
     }
67
 
68
 
68
     /**
69
     /**
78
         if (!user.isPresent()) {
79
         if (!user.isPresent()) {
79
             throw new InternalServerErrorException("No user was found for this activation key");
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
     @Timed
92
     @Timed
91
     public String isAuthenticated(HttpServletRequest request) {
93
     public String isAuthenticated(HttpServletRequest request) {
92
         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");
93
         return request.getRemoteUser();
96
         return request.getRemoteUser();
94
     }
97
     }
95
 
98
 
102
     @GetMapping("/account")
105
     @GetMapping("/account")
103
     @Timed
106
     @Timed
104
     public UserDTO getAccount() {
107
     public UserDTO getAccount() {
108
+        System.out.println("4");
105
         return userService.getUserWithAuthorities()
109
         return userService.getUserWithAuthorities()
106
             .map(UserDTO::new)
110
             .map(UserDTO::new)
107
             .orElseThrow(() -> new InternalServerErrorException("User could not be found"));
111
             .orElseThrow(() -> new InternalServerErrorException("User could not be found"));
128
         }
132
         }
129
         userService.updateUser(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(),
133
         userService.updateUser(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(),
130
             userDTO.getLangKey(), userDTO.getImageUrl());
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 파일 보기

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()))

+ 9
- 4
src/main/resources/config/application-dev.yml 파일 보기

69
     liquibase:
69
     liquibase:
70
         contexts: dev
70
         contexts: dev
71
     mail:
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
     messages:
81
     messages:
77
         cache-duration: PT1S # 1 second, see the ISO 8601 standard
82
         cache-duration: PT1S # 1 second, see the ISO 8601 standard
78
     thymeleaf:
83
     thymeleaf:

+ 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": {