Navbar links

pom.xml

@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-	    <version>1.18.24</version>
+	    <version>1.18.30</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -104,6 +104,11 @@
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>font-awesome</artifactId>
+            <version>4.7.0</version>
+        </dependency>
     </dependencies>
 
 

src/main/java/com/makersacademy/acebook/SecurityConfiguration.java

@@ -28,11 +28,11 @@ protected void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
                 .antMatchers("/posts").hasRole("USER")
                 .antMatchers("/users").permitAll()
-                .and().formLogin();
+                .and().formLogin().loginPage("/login");
     }
 
     @Bean
     public PasswordEncoder getPasswordEncoder() {
         return NoOpPasswordEncoder.getInstance();
     }
-}
+}

src/main/java/com/makersacademy/acebook/controller/CommentController.java

@@ -0,0 +1,89 @@
+package com.makersacademy.acebook.controller;
+
+import com.makersacademy.acebook.model.Comment;
+import com.makersacademy.acebook.model.Post;
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.CommentRepository;
+import com.makersacademy.acebook.repository.PostRepository;
+import com.makersacademy.acebook.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Optional;
+
+@Controller
+public class CommentController {
+
+
+    @Autowired
+    PostRepository postRepository;
+
+    @Autowired
+    CommentRepository commentRepository;
+
+    @Autowired
+    UserRepository userRepository;
+
+    @GetMapping("/post/{id}")
+    public String show(@PathVariable Long id, Model model, Principal principal) {
+
+//        get post to display at the top of page
+        Optional<Post> post = postRepository.findById(id);
+        Post currentPost = post.orElse(null);
+        model.addAttribute("currentPost", currentPost);
+
+
+        Optional<User> postUser = userRepository.findById(currentPost.getUserId());
+        User postOwner = postUser.orElse(null);
+        model.addAttribute("postOwner", postOwner);
+
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+
+
+//        create new comment object to make a new comment using the form
+        Comment commentObj = new Comment();
+        model.addAttribute("newComment", commentObj);
+
+//          Create a LinkedHashMap to store sorted data
+        LinkedHashMap<Comment, User> commentsAndOwners = new LinkedHashMap<>();
+
+//        get an ordered list of comments associated with the post we are visiting
+        List<Comment> comments = commentRepository.findAllByPostIdOrderById(id);
+        model.addAttribute("comments", comments);
+
+//        for each comment, find the associated user/owner and add both to LinkedHaspMap
+        for (Comment comment : comments) {
+            Optional<User> commentOwner = userRepository.findById(comment.getUserId());
+            User user = commentOwner.orElse(null);
+            commentsAndOwners.put(comment, user);
+        }
+//        System.out.println(commentsAndOwners);
+        model.addAttribute("commentsAndOwners", commentsAndOwners);
+        model.addAttribute("currentUser", principalUser);
+        model.addAttribute("profilePicture", principalUser.getImageUrl());
+
+        return "posts/show";
+    }
+
+    @PostMapping("/post/addComment")
+    public String createComment(@RequestParam String comment, @RequestParam Long postId, Principal principal) {
+
+//        Get userID
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+
+        Comment newComment = new Comment(comment, postId, principalUser.getId());
+
+        commentRepository.save(newComment);
+
+        return "redirect:/post/" + postId;
+
+    }
+}

src/main/java/com/makersacademy/acebook/controller/FriendController.java

@@ -0,0 +1,98 @@
+package com.makersacademy.acebook.controller;
+
+import com.makersacademy.acebook.model.Friend;
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.FriendRepository;
+import com.makersacademy.acebook.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
+
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+@Controller
+public class FriendController {
+
+    @Autowired
+    FriendRepository friendRepository;
+    @Autowired
+    UserRepository userRepository;
+
+    @GetMapping("/users/friend")
+    public ModelAndView showFriends(Model model) {
+        ModelAndView modelAndView = new ModelAndView("/users/friend");
+        modelAndView.addObject("friend", new Friend());
+        return modelAndView;
+    }
+
+    @GetMapping("/friends")
+    public ModelAndView showRequests(Principal principal) {
+        ModelAndView modelAndView = new ModelAndView("/users/friends");
+
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+
+        assert principalUser != null;
+        List<Friend> pendingRequests = friendRepository.findByStatusAndReceiverId(principalUser.getId(), "PENDING");
+        List<Friend> acceptedRequests = friendRepository.findByStatusAndReceiverId(principalUser.getId(), "ACCEPTED");
+
+        ArrayList<User> friendRequests = new ArrayList<>();
+        for (Friend friend : pendingRequests) {
+            Optional<User> optionalUser = userRepository.findById(friend.getRequesterId());
+            User friendRequest = optionalUser.orElse(null);
+            friendRequests.add(friendRequest);
+        }
+
+        ArrayList<User> friends = new ArrayList<>();
+        for (Friend friend : acceptedRequests) {
+            Optional<User> optionalUser = userRepository.findById(friend.getRequesterId());
+            User acceptedRequest = optionalUser.orElse(null);
+            friends.add(acceptedRequest);
+        }
+
+        modelAndView.addObject("friendRequests", friendRequests);
+        modelAndView.addObject("friends", friends);
+        modelAndView.addObject("currentUser", principalUser);
+        modelAndView.addObject("profilePicture", principalUser.getImageUrl());
+        return modelAndView;
+    }
+
+    @PostMapping("/handleFriendRequest")
+    public RedirectView handleFriendRequest(@RequestParam("requester_id") Long requesterId,
+                                            @RequestParam("receiver_id") Long receiverId, Principal principal) {
+
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        assert principalUser != null;
+
+        Friend friendRequest = new Friend(requesterId, receiverId, "PENDING");
+        friendRepository.save(friendRequest);
+
+        return new RedirectView("/users/" + receiverId);
+    }
+
+    @PostMapping("/handleFriendConfirmation")
+    public String handleConfirmation(@RequestParam("action") String action,
+                                 @RequestParam("requesterId") Long requesterId, Principal principal) {
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User receiverId = currentUser.orElse(null);
+        assert receiverId != null;
+
+        if ("accept".equals(action)) {
+            friendRepository.updateStatusByRequesterIdAndReceiverId(requesterId, receiverId.getId(), "ACCEPTED");
+        } else if ("deny".equals(action)) {
+            friendRepository.updateStatusByRequesterIdAndReceiverId(requesterId, receiverId.getId(), "DENIED");
+        }
+
+        return "redirect:/friends";
+    }
+}

src/main/java/com/makersacademy/acebook/controller/HomeController.java

@@ -4,10 +4,24 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.view.RedirectView;
 
+import javax.servlet.http.HttpSession;
+
 @Controller
 public class HomeController {
 	@RequestMapping(value = "/")
 	public RedirectView index() {
 		return new RedirectView("/posts");
 	}
+
+	@RequestMapping("/login")
+	public String login() {
+		return "login";
+	}
+	@RequestMapping("/logout")
+	public String logout(HttpSession session) {
+		session.removeAttribute("user_id");
+		return "logout";
+	}
+
 }
+

src/main/java/com/makersacademy/acebook/controller/PostsController.java

@@ -1,32 +1,77 @@
 package com.makersacademy.acebook.controller;
 
+import com.makersacademy.acebook.model.Comment;
+import com.makersacademy.acebook.model.Friend;
 import com.makersacademy.acebook.model.Post;
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.CommentRepository;
 import com.makersacademy.acebook.repository.PostRepository;
+import com.makersacademy.acebook.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
-import java.util.List;
+import java.security.Principal;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Controller
 public class PostsController {
 
     @Autowired
-    PostRepository repository;
+    PostRepository postRepository;
+    @Autowired
+    UserRepository userRepository;
 
     @GetMapping("/posts")
-    public String index(Model model) {
-        Iterable<Post> posts = repository.findAll();
-        model.addAttribute("posts", posts);
-        model.addAttribute("post", new Post());
+    public String index(Model model, Principal principal) {
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        assert principalUser != null;
+
+        Iterable<Post> posts = postRepository.findAllByOrderByTimestampDesc();
+        ArrayList<HashMap<Post, User>> postsAndPosters = new ArrayList<>();
+
+        for (Post post : posts) {
+            HashMap<Post, User> entry = new HashMap<>();
+
+            Optional<User> optionalUser = userRepository.findById(post.getUserId());
+            User poster = optionalUser.orElse(null);
+
+            entry.put(post, poster);
+            postsAndPosters.add(entry);
+        }
+
+//        System.out.println(postsAndPosters);
+
+        model.addAttribute("postsAndPosters", postsAndPosters);
+        model.addAttribute("newPost", new Post());
+        model.addAttribute("profilePicture", principalUser.getImageUrl());
+        model.addAttribute("currentUser", principalUser);
+
         return "posts/index";
     }
 
     @PostMapping("/posts")
-    public RedirectView create(@ModelAttribute Post post) {
-        repository.save(post);
+    public RedirectView create(@ModelAttribute Post post, Principal principal) {
+
+//        get and set timestamp of post
+        String timeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new java.util.Date());
+        post.setTimestamp(Timestamp.valueOf(timeStamp));
+
+//        get user and set userid of post
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        post.setUserId(principalUser.getId());
+
+//        save post
+        postRepository.save(post);
+
         return new RedirectView("/posts");
     }
+
 }