merging with Jaes register branch

.yo-rc.json

@@ -13,7 +13,7 @@
     "authenticationType": "jwt",
     "cacheProvider": "hazelcast",
     "enableHibernateCache": true,
-    "websocket": false,
+    "websocket": "spring-websocket",
     "databaseType": "sql",
     "devDatabaseType": "h2Memory",
     "prodDatabaseType": "postgresql",
@@ -35,4 +35,4 @@
       "en"
     ]
   }
-}
+}

src/main/java/rocks/zipcode/io/repository/UserRepository.java

@@ -1,5 +1,6 @@
 package rocks.zipcode.io.repository;
 
+import org.springframework.data.jpa.repository.Query;
 import rocks.zipcode.io.domain.User;
 
 import org.springframework.cache.annotation.Cacheable;
@@ -32,6 +33,9 @@ public interface UserRepository extends JpaRepository<User, Long> {
 
     Optional<User> findOneByLogin(String login);
 
+    @Query("select user from User user where user.login = ?#{principal.username}")
+    Optional<User> findOneByCurrentUser();
+
     @EntityGraph(attributePaths = "authorities")
     Optional<User> findOneWithAuthoritiesById(Long id);
 

src/main/java/rocks/zipcode/io/service/UserService.java

@@ -1,10 +1,13 @@
 package rocks.zipcode.io.service;
 
 import rocks.zipcode.io.config.Constants;
+import rocks.zipcode.io.domain.AccountDetails;
 import rocks.zipcode.io.domain.Authority;
 import rocks.zipcode.io.domain.Profile;
 import rocks.zipcode.io.domain.User;
+import rocks.zipcode.io.repository.AccountDetailsRepository;
 import rocks.zipcode.io.repository.AuthorityRepository;
+import rocks.zipcode.io.repository.ProfileRepository;
 import rocks.zipcode.io.repository.UserRepository;
 import rocks.zipcode.io.security.AuthoritiesConstants;
 import rocks.zipcode.io.security.SecurityUtils;
@@ -38,17 +41,23 @@ public class UserService {
 
     private final UserRepository userRepository;
 
+    private final ProfileRepository profileRepository;
+
+    private final AccountDetailsRepository accountDetailsRepository;
+
     private final PasswordEncoder passwordEncoder;
 
     private final AuthorityRepository authorityRepository;
 
     private final CacheManager cacheManager;
 
-    public UserService(UserRepository userRepository, PasswordEncoder passwordEncoder, AuthorityRepository authorityRepository, CacheManager cacheManager) {
+    public UserService(UserRepository userRepository, AccountDetailsRepository accountDetailsRepository, ProfileRepository profileRepository, PasswordEncoder passwordEncoder, AuthorityRepository authorityRepository, CacheManager cacheManager) {
         this.userRepository = userRepository;
         this.passwordEncoder = passwordEncoder;
         this.authorityRepository = authorityRepository;
         this.cacheManager = cacheManager;
+        this.profileRepository = profileRepository;
+        this.accountDetailsRepository = accountDetailsRepository;
     }
 
     public Optional<User> activateRegistration(String key) {
@@ -140,6 +149,18 @@ public class UserService {
         user.setLastName(userDTO.getLastName());
         user.setEmail(userDTO.getEmail().toLowerCase());
         user.setImageUrl(userDTO.getImageUrl());
+
+        //create default profile
+        Profile profile = new Profile();
+        profile.setBio("");
+        profile.setUserProfile(user);
+        profile.setAccessible(true);
+
+        //create default account details
+        AccountDetails accountDetails = new AccountDetails();
+        accountDetails.setSecurityQuestion("");
+        accountDetails.setSecurityAnswer("");
+
         if (userDTO.getLangKey() == null) {
             user.setLangKey(Constants.DEFAULT_LANGUAGE); // default language
         } else {
@@ -158,7 +179,15 @@ public class UserService {
                 .collect(Collectors.toSet());
             user.setAuthorities(authorities);
         }
+
         userRepository.save(user);
+
+        //save the default profile
+        profileRepository.save(profile);
+
+        //save the default account details
+        accountDetailsRepository.save(accountDetails);
+
         this.clearUserCaches(user);
         log.debug("Created Information for User: {}", user);
         return user;

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

@@ -3,6 +3,7 @@ package rocks.zipcode.io.web.rest;
 import com.codahale.metrics.annotation.Timed;
 
 import rocks.zipcode.io.domain.User;
+import rocks.zipcode.io.repository.ProfileRepository;
 import rocks.zipcode.io.repository.UserRepository;
 import rocks.zipcode.io.security.SecurityUtils;
 import rocks.zipcode.io.service.MailService;
@@ -79,7 +80,6 @@ public class AccountResource {
         if (!user.isPresent()) {
             throw new InternalServerErrorException("No user was found for this activation key");
         }
-        System.out.println("2");
     }
 
     /**
@@ -130,9 +130,7 @@ 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());
-        System.out.println("5");
+        userService.updateUser(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(), userDTO.getLangKey(), userDTO.getImageUrl());
     }
 
     /**

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

@@ -3,6 +3,7 @@ package rocks.zipcode.io.web.rest;
 import com.codahale.metrics.annotation.Timed;
 import rocks.zipcode.io.domain.Post;
 import rocks.zipcode.io.repository.PostRepository;
+import rocks.zipcode.io.repository.UserRepository;
 import rocks.zipcode.io.web.rest.errors.BadRequestAlertException;
 import rocks.zipcode.io.web.rest.util.HeaderUtil;
 import io.github.jhipster.web.util.ResponseUtil;
@@ -30,8 +31,11 @@ public class PostResource {
 
     private final PostRepository postRepository;
 
-    public PostResource(PostRepository postRepository) {
+    private final UserRepository userRepository;
+
+    public PostResource(PostRepository postRepository, UserRepository userRepository) {
         this.postRepository = postRepository;
+        this.userRepository = userRepository;
     }
 
     /**
@@ -44,6 +48,7 @@ public class PostResource {
     @PostMapping("/posts")
     @Timed
     public ResponseEntity<Post> createPost(@RequestBody Post post) throws URISyntaxException {
+        post.setOwner(userRepository.findOneByCurrentUser().get());
         log.debug("REST request to save Post : {}", post);
         if (post.getId() != null) {
             throw new BadRequestAlertException("A new post cannot already have an ID", ENTITY_NAME, "idexists");
@@ -85,7 +90,7 @@ public class PostResource {
     @Timed
     public List<Post> getAllPosts() {
         log.debug("REST request to get all Posts");
-        return postRepository.findAll();
+        return postRepository.findByOwnerIsCurrentUser();
     }
 
     /**

src/main/resources/.h2.server.properties

@@ -1,4 +1,5 @@
 #H2 Server Properties
+#Wed Jan 09 09:38:54 EST 2019
 0=JHipster H2 (Memory)|org.h2.Driver|jdbc\:h2\:mem\:faeboo|FaeBoo
 webAllowOthers=true
 webPort=8082

src/main/webapp/app/FaeBoo/Profile-head/profile-head.component.html

@@ -0,0 +1,79 @@
+<div class="main-cont">
+
+    <div class = "friend-cont">
+
+        <div class="friend-pic friend4" id = "friend7">
+            <img class ="friend-photo friend4" src = "../../../content/images/defaultphoto.png">
+        </div>
+
+        <div class="friend-pic friend3" id = "friend5">
+            <img class ="friend-photo friend3" src = "../../../content/images/defaultphoto.png">
+        </div>
+
+        <div class="friend-pic friend2" id = "friend3">
+            <img class ="friend-photo" src = "../../../content/images/defaultphoto.png">
+        </div>
+
+        <div class="friend-pic friend1" id = "friend1">
+            <img class ="friend-photo" src = "../../../content/images/defaultphoto.png">
+        </div>
+
+        <div class = "profile-pic">
+            <img class ="friend-photo" src = "../../../content/images/defaultphoto.png">
+        </div>
+
+        <div class="friend-pic friend1" id = "friend2">
+            <img class ="friend-photo" src = "../../../content/images/defaultphoto.png">
+        </div>
+
+        <div class="friend-pic friend2" id = "friend4">
+            <img class ="friend-photo" src = "../../../content/images/defaultphoto.png">
+        </div>
+
+        <div class="friend-pic friend3" id = "friend6">
+            <img class ="friend-photo" src = "../../../content/images/defaultphoto.png">
+        </div>
+
+        <div class="friend-pic friend4" id = friend8>
+            <img class ="friend-photo" src = "../../../content/images/defaultphoto.png">
+        </div>
+
+    </div>
+
+
+    <div class = "settings-container">
+
+        <button>Settings</button>
+        <button>Change Profile</button>
+        <button>Change Bio</button>
+        <button>Friends</button>
+
+    </div>
+
+    <hr>
+
+    <div id = "bio-cont"></div>
+
+    <hr>
+
+    <div id = "feed">
+
+        <div class = "post">
+            <div>
+                <textarea id = "post-area" [(ngModel)]="str"></textarea>
+            </div>
+
+            <div id = "postButton-container">
+                <div class = "button-holder"><button class = "postBtn">Schedule</button></div>
+                <div class = "button-holder"><button class = "postBtn">Memo</button></div>
+                <div class = "button-holder"><button class = "postBtn">Photo</button></div>
+                <div class = "button-holder"><button class = "postBtn" (click)="submitPost();">Submit</button></div>
+            </div>
+
+            <p id = "msg">Create a post...</p>
+        </div>
+
+
+    </div>
+
+</div>

src/main/webapp/app/FaeBoo/Profile-head/profile-head.component.ts

@@ -1,8 +1,57 @@
 import { Component } from '@angular/core';
+import { PostService } from 'app/entities/post';
+import { IPost } from 'app/shared/model/post.model';
+import { IUser } from 'app/core';
+import { Observable } from 'rxjs';
+import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 
 @Component({
     selector: 'jhi-profile-head',
     templateUrl: './profile-head.component.html',
-    styleUrls: ['profile-head.scss']
+    styleUrls: ['profile-head.css']
 })
-export class ProfileHeadComponent {}
+export class ProfileHeadComponent {
+    str: string;
+    post: IPost;
+    user: IUser;
+    isSaving: boolean;
+    testPost: IPost;
+
+    constructor(private postService: PostService) {}
+
+    submitPost(): void {
+        this.post = new class implements IPost {
+            content: string;
+            dislikes: number;
+            id: number;
+            likes: number;
+            numberOfComments: number;
+            owner: IUser;
+        }();
+        this.post.content = this.str;
+        this.post.dislikes = 0;
+        this.post.likes = 0;
+        this.post.numberOfComments = 0;
+        if (this.post.content.length > 1) {
+            this.save(this.post);
+        }
+    }
+
+    save(post: IPost) {
+        this.isSaving = true;
+        this.subscribeToSaveResponse(this.postService.create(post));
+        console.log('post created');
+    }
+
+    private subscribeToSaveResponse(result: Observable<HttpResponse<IPost>>) {
+        result.subscribe((res: HttpResponse<IPost>) => this.onSaveSuccess(), (res: HttpErrorResponse) => this.onSaveError());
+    }
+
+    private onSaveSuccess() {
+        this.isSaving = false;
+    }
+
+    private onSaveError() {
+        this.isSaving = false;
+    }
+}

src/main/webapp/app/FaeBoo/Profile-head/profile-head.css

@@ -0,0 +1,160 @@
+.main-cont {
+    width: 100%;
+    height: 1fr;
+    box-sizing: border-box;
+    padding: 8px;
+    position: relative;
+}
+
+.friend-cont {
+    display: grid;
+    justify-items: center;
+    grid-template-columns: calc(10%) calc(10%) calc(10%) calc(10%) calc(20%) calc(10%) calc(10%) calc(10%) calc(10%);
+    /*grid-column-gap: 5px;*/
+    grid-template-rows: auto;
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    position: relative;
+    overflow-y: auto;
+    overflow-x: scroll;
+    margin: auto;
+}
+
+#bio-cont {
+    width: 100%;
+    height: 75px;
+    box-sizing: border-box;
+    padding: 8px;
+    margin-top: 8px;
+}
+
+.friend-pic {
+    width: 100px;
+    height: 100px;
+    position: relative;
+    border-radius: 50%;
+    margin: auto;
+    overflow-x: hidden;
+}
+
+.friend-photo {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+.profile-pic {
+    width: 200px;
+    height: 200px;
+    position: relative;
+    overflow: hidden;
+    border-radius: 50%;
+    grid-column-start: 5;
+    grid-row-start: 1;
+    margin: auto;
+    z-index: 5;
+}
+
+.friend1 {
+    z-index: 1;
+}
+
+.friend2 {
+    z-index: 2;
+}
+
+.friend3 {
+    z-index: 3;
+}
+
+.friend4 {
+    z-index: 4;
+}
+
+.settings-container {
+    width: 100%;
+    text-align: center;
+    padding: 10px;
+}
+
+.settings-container button {
+    display: inline-block;
+    width: 20%;
+    text-align: center;
+    border: none;
+    background-color: #e2e6eb;
+    padding: 5px;
+    color: #969a9f;
+    margin-right: 10px;
+    margin-top: 10px;
+}
+
+hr {
+    border: 1px solid #d1d5da;
+}
+
+#feed {
+    width: 65%;
+    min-height: 250px;
+    margin: auto;
+    padding: 10px;
+    box-sizing: border-box;
+}
+
+.post {
+    width: 100%;
+    height: 245px;
+    padding: 15px;
+    box-sizing: border-box;
+    display: grid;
+    grid-template-columns: calc(85% - 5px) 15%;
+    grid-template-rows: 195px 20px;
+    grid-column-gap: 5px;
+    color: #969a9f;
+    border-radius: 5px;
+    background-color: #e2e6eb;
+}
+
+#post-area {
+    resize: none;
+    width: 100%;
+    height: 100%;
+    grid-row-start: 1;
+    grid-column-start: 1;
+    border: none;
+    border-radius: 5px;
+    padding: 10px;
+}
+
+#postButton-container {
+    width: 100%;
+    height: 100%;
+    display: grid;
+    grid-template-rows: 25% 25% 25% 25%;
+    grid-template-columns: 100%;
+    box-sizing: border-box;
+    grid-row-start: 1;
+    grid-column-start: 2;
+}
+
+.postBtn {
+    width: 100%;
+    height: 100%;
+    font-size: 10px;
+    border: none;
+    background-color: white;
+    color: #969a9f;
+}
+
+.button-holder {
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    padding: 5px;
+}
+
+#msg {
+    grid-column-start: 1;
+    grid-row-start: 2;
+}

src/main/webapp/app/FaeBoo/Profile-temp/profile-temp.component.html

@@ -0,0 +1 @@
+<jhi-profile-head></jhi-profile-head>

src/main/webapp/app/FaeBoo/Profile-temp/profile-temp.component.ts

@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import { ProfileHeadComponent } from 'app/FaeBoo/Profile-head/profile-head.component';
 
 @Component({
     selector: 'jhi-profile-temp',

src/main/webapp/app/FaeBoo/Profile-temp/profile-temp.module.ts

@@ -4,10 +4,11 @@ import { RouterModule } from '@angular/router';
 import { FaeBooSharedModule } from 'app/shared';
 import { PROFILE_ROUTE } from 'app/FaeBoo/Profile-temp/profile-temp.route';
 import { ProfileTempComponent } from 'app/FaeBoo/Profile-temp/profile-temp.component';
+import { ProfileHeadComponent } from 'app/FaeBoo/Profile-head/profile-head.component';
 
 @NgModule({
     imports: [FaeBooSharedModule, RouterModule.forChild([PROFILE_ROUTE])],
-    declarations: [ProfileTempComponent],
+    declarations: [ProfileTempComponent, ProfileHeadComponent],
     schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
 export class ProfileTempModule {}

src/main/webapp/app/FaeBoo/Services/post.service.ts

@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpResponse } from '@angular/common/http';
+import { Observable } from 'rxjs';
+
+import { SERVER_API_URL } from 'app/app.constants';
+import { createRequestOption } from 'app/shared/util/request-util';
+import { IPost } from 'app/shared/model/post.model';
+
+@Injectable({ providedIn: 'root' })
+export class PostService {
+    public resourceUrl = SERVER_API_URL + 'api/users';
+
+    constructor(private http: HttpClient) {}
+
+    create(post: IPost): Observable<HttpResponse<IPost>> {
+        return this.http.post<IPost>(this.resourceUrl, post, { observe: 'response' });
+    }
+
+    update(post: IPost): Observable<HttpResponse<IPost>> {
+        return this.http.put<IPost>(this.resourceUrl, post, { observe: 'response' });
+    }
+
+    find(login: string): Observable<HttpResponse<IPost>> {
+        return this.http.get<IPost>(`${this.resourceUrl}/${login}`, { observe: 'response' });
+    }
+
+    query(req?: any): Observable<HttpResponse<IPost[]>> {
+        const options = createRequestOption(req);
+        return this.http.get<IPost[]>(this.resourceUrl, { params: options, observe: 'response' });
+    }
+
+    delete(login: string): Observable<HttpResponse<any>> {
+        return this.http.delete(`${this.resourceUrl}/${login}`, { observe: 'response' });
+    }
+
+    authorities(): Observable<string[]> {
+        return this.http.get<string[]>(SERVER_API_URL + 'api/users/authorities');
+    }
+}

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

@@ -39,6 +39,7 @@ export class RegisterComponent implements OnInit, AfterViewInit {
     }
 
     register() {
+        console.log('Register');
         if (this.registerAccount.password !== this.confirmPassword) {
             this.doNotMatch = 'ERROR';
         } else {

src/main/webapp/app/app.module.ts

@@ -7,7 +7,7 @@ import { NgbDatepickerConfig } from '@ng-bootstrap/ng-bootstrap';
 import { Ng2Webstorage } from 'ngx-webstorage';
 import { NgJhipsterModule } from 'ng-jhipster';
 
-import { ProfileHeadComponent } from 'app/FaeBoo/Profile-head/profile-head.component';
+// import { ProfileHeadComponent } from 'app/FaeBoo/Profile-head/profile-head.component';
 import { ProfileTempComponent } from 'app/FaeBoo/Profile-temp/profile-temp.component';
 import { ProfileTempModule } from 'app/FaeBoo/Profile-temp/profile-temp.module';
 
@@ -51,8 +51,8 @@ import { JhiMainComponent, NavbarComponent, FooterComponent, PageRibbonComponent
         ErrorComponent,
         PageRibbonComponent,
         ActiveMenuDirective,
-        FooterComponent,
-        ProfileHeadComponent
+        FooterComponent
+        // ProfileHeadComponent,
     ],
     providers: [
         {

src/main/webapp/app/layouts/navbar/navbar.component.ts

@@ -79,5 +79,4 @@ export class NavbarComponent implements OnInit {
     getImageUrl() {
         return this.isAuthenticated() ? this.principal.getImageUrl() : null;
     }
-    /*some change*/
 }

src/test/java/rocks/zipcode/io/web/rest/PostResourceIntTest.java

@@ -4,6 +4,7 @@ import rocks.zipcode.io.FaeBooApp;
 
 import rocks.zipcode.io.domain.Post;
 import rocks.zipcode.io.repository.PostRepository;
+import rocks.zipcode.io.repository.UserRepository;
 import rocks.zipcode.io.web.rest.errors.ExceptionTranslator;
 
 import org.junit.Before;
@@ -55,6 +56,9 @@ public class PostResourceIntTest {
     private PostRepository postRepository;
 
     @Autowired
+    UserRepository userRepository;
+
+    @Autowired
     private MappingJackson2HttpMessageConverter jacksonMessageConverter;
 
     @Autowired
@@ -73,7 +77,7 @@ public class PostResourceIntTest {
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
-        final PostResource postResource = new PostResource(postRepository);
+        final PostResource postResource = new PostResource(postRepository, userRepository);
         this.restPostMockMvc = MockMvcBuilders.standaloneSetup(postResource)
             .setCustomArgumentResolvers(pageableArgumentResolver)
             .setControllerAdvice(exceptionTranslator)