Selaa lähdekoodia

home merged with register

Jonathan Hinds 5 vuotta sitten
vanhempi
commit
c32006b648

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

@@ -133,7 +133,6 @@ public class AccountResource {
133 133
         }
134 134
         userService.updateUser(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(),
135 135
             userDTO.getLangKey(), userDTO.getImageUrl());
136
-        System.out.println("5");
137 136
     }
138 137
 
139 138
     /**

+ 6
- 4
src/main/webapp/app/FaeBoo/Profile-head/profile-head.component.html Näytä tiedosto

@@ -3,19 +3,19 @@
3 3
     <div class = "friend-cont">
4 4
 
5 5
         <div class="friend-pic friend4" id = "friend7">
6
-            <img class ="friend-photo friend4" src = "../../../content/images/defaultphoto.png">
6
+            <img class ="friend-photo friend4" src = "../../../content/images/faceofbooks3.jpg">
7 7
         </div>
8 8
 
9 9
         <div class="friend-pic friend3" id = "friend5">
10
-            <img class ="friend-photo friend3" src = "../../../content/images/defaultphoto.png">
10
+            <img class ="friend-photo friend3" src = "../../../content/images/faceofbooks4.jpg">
11 11
         </div>
12 12
 
13 13
         <div class="friend-pic friend2" id = "friend3">
14
-            <img class ="friend-photo" src = "../../../content/images/defaultphoto.png">
14
+            <img class ="friend-photo" src = "../../../content/images/faceofbooks2.jpg">
15 15
         </div>
16 16
 
17 17
         <div class="friend-pic friend1" id = "friend1">
18
-            <img class ="friend-photo" src = "../../../content/images/defaultphoto.png">
18
+            <img class ="friend-photo" src = "../../../content/images/faceofbooks1.png">
19 19
         </div>
20 20
 
21 21
         <div class = "profile-pic">
@@ -50,6 +50,8 @@
50 50
 
51 51
     </div>
52 52
 
53
+    <div [innerHTML] = bioinput></div>
54
+
53 55
     <hr>
54 56
 
55 57
     <div id = "bio-cont"></div>

+ 2
- 0
src/main/webapp/app/FaeBoo/Profile-head/profile-head.component.ts Näytä tiedosto

@@ -18,11 +18,13 @@ export class ProfileHeadComponent implements OnInit {
18 18
     isSaving: boolean;
19 19
     testPost: IPost;
20 20
     posts: IPost[];
21
+    bioinput: string;
21 22
 
22 23
     constructor(private postService: PostService, private jhiAlertService: JhiAlertService) {}
23 24
 
24 25
     ngOnInit() {
25 26
         this.loadAll();
27
+        this.bioinput = `<input>`;
26 28
     }
27 29
 
28 30
     trackId(index: number, item: IPost) {