Up and running.

.dockerignore

@@ -0,0 +1,11 @@
+# Exclude the target directory, which contains the build output
+target/
+
+# Exclude git configuration and repository data
+.git
+.gitignore
+
+# Exclude local configuration files (IDE settings, etc.)
+.idea
+*.iml
+*.log

.gitignore

@@ -9,3 +9,6 @@ dependency-reduced-pom.xml
 .factorypath
 .project
 .settings/
+.env
+
+.DS_STORE

Dockerfile

@@ -0,0 +1,11 @@
+# Use Maven to build the JAR file
+FROM maven:3.8.1-openjdk-17 AS build
+WORKDIR /app
+COPY . .
+RUN mvn clean package
+
+# Use the JAR file from the build stage
+FROM openjdk:17
+COPY --from=build /app/target/acebook-template-1.0-SNAPSHOT.jar app.jar
+ENTRYPOINT ["java", "-jar", "/app.jar"]
+EXPOSE 8080

docker-compose.yml

@@ -0,0 +1,29 @@
+version: '3.8'
+
+services:
+  database:
+    image: postgres:latest
+    environment:
+      POSTGRES_DB: acebook_springboot_development
+      POSTGRES_USER: postgres
+      POSTGRES_HOST_AUTH_METHOD: trust
+    ports:
+      - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+
+  app:
+    build: .
+    ports:
+      - "8080:8080"
+    depends_on:
+      - database
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:postgresql://database:5432/acebook_springboot_development
+      SPRING_DATASOURCE_USERNAME:
+      SPRING_DATASOURCE_PASSWORD:
+      SPRING_JPA_HIBERNATE_DDL_AUTO: update
+      SPRING_JPA_DATABASE_PLATFORM: org.hibernate.dialect.PostgreSQL9Dialect
+
+volumes:
+  postgres_data:

pom.xml

@@ -19,6 +19,26 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M5</version>
+                <configuration>
+                    <includes>
+                        <include>**/*Test.java</include>
+                        <include>**/*Tests.java</include>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -30,8 +50,8 @@
 
     <repositories>
         <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
+            <id>central</id>
+            <url>https://repo.maven.apache.org/maven2</url>
         </repository>
     </repositories>
 
@@ -40,14 +60,21 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
-		<dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version> <!-- Might not be necessary -->
+        </dependency>
+
         <dependency>
             <groupId>org.thymeleaf.extras</groupId>
             <artifactId>thymeleaf-extras-springsecurity5</artifactId>
@@ -56,6 +83,17 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+            <version>2.20.25</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>netty-nio-client</artifactId>
+            <version>2.20.25</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-rest</artifactId>
@@ -67,7 +105,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-	    <version>1.18.30</version>
+            <version>1.18.30</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -99,12 +137,17 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
+            <version>42.2.5</version>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
-
-
-</project>
+</project>

render.yml

@@ -0,0 +1,30 @@
+services:
+  - type: web
+    name: acebook-api
+    env: docker
+    plan: free
+    dockerfilePath: Dockerfile
+    envVars:
+      - key: DATABASE_URL
+        fromService:
+          name: acebook-db
+          type: database
+          property: connectionString
+      - key: DB_HOST
+        value: dpg-cpm5nc2ju9rs738kt4ng-a
+      - key: DB_NAME
+        value: acebook_springboot_development_fpol
+      - key: DB_USER
+        value: acebook_springboot_development_fpol_user
+      - key: DB_PASS
+        value: wiXc8BpegUV52sdrqykindpYNTIFiNDH
+    buildCommand: "./mvnw clean package"  # Ensure this matches your build command
+    startCommand: "java -jar app.jar"
+
+  - type: postgresql
+    name: acebook-db
+    plan: free
+    properties:
+      databaseName: acebook_springboot_development_fpol
+      user: acebook_springboot_development_fpol_user
+      password: wiXc8BpegUV52sdrqykindpYNTIFiNDH

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

@@ -26,13 +26,25 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception {
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
-                .antMatchers("/posts").hasRole("USER")
-                .antMatchers("/users").permitAll()
-                .and().formLogin();
+                .antMatchers("/posts", "/profile", "/profile/**").hasRole("USER")
+                .antMatchers("/users", "/profile-pictures/**", "/login", "/users/new", "/css/**", "/js/**", "/images/**").permitAll()
+                .anyRequest().authenticated()
+                .and()
+                .formLogin()
+                .loginPage("/login")
+                .defaultSuccessUrl("/posts", true)
+                .permitAll()
+                .and()
+                .logout()
+                .logoutUrl("/logout")
+                .logoutSuccessUrl("/login?logout")
+                .permitAll()
+                .and()
+                .csrf();
     }
 
     @Bean
     public PasswordEncoder getPasswordEncoder() {
         return NoOpPasswordEncoder.getInstance();
     }
-}
+}

src/main/java/com/makersacademy/acebook/auth/AuthService.java

@@ -0,0 +1,14 @@
+package com.makersacademy.acebook.auth;
+
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AuthService {
+
+    public Boolean isLoggedIn() {
+        String username = SecurityContextHolder.getContext().getAuthentication().getName();
+        return !username.equals("anonymousUser");
+    }
+
+}

src/main/java/com/makersacademy/acebook/config/S3Config.java

@@ -0,0 +1,19 @@
+package com.makersacademy.acebook.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+
+@Configuration
+public class S3Config {
+
+    @Bean
+    public S3Client s3Client() {
+        return S3Client.builder()
+                .region(Region.US_EAST_1)
+                .credentialsProvider(EnvironmentVariableCredentialsProvider.create())
+                .build();
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.makersacademy.acebook.controller;
+
+import com.makersacademy.acebook.auth.AuthService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+@RestController
+@RequestMapping("/auth")
+public class AuthController {
+
+    @Autowired
+    private AuthService authService;
+
+    @GetMapping("/userLoggedIn")
+    public Map<String, Boolean> userLoggedIn() {
+        Map<String, Boolean> response = new HashMap<>();
+        response.put("loggedIn", authService.isLoggedIn());
+        return response;
+    }
+}
+

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

@@ -0,0 +1,14 @@
+package com.makersacademy.acebook.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class LoginController {
+
+    @GetMapping("/login")
+    public String login(){
+        return "login";
+    }
+
+}

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

@@ -1,32 +1,70 @@
 package com.makersacademy.acebook.controller;
 
+import com.makersacademy.acebook.model.Comment;
 import com.makersacademy.acebook.model.Post;
-import com.makersacademy.acebook.repository.PostRepository;
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.UserRepository;
+import com.makersacademy.acebook.service.PostService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.view.RedirectView;
+import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import java.io.IOException;
 
 @Controller
 public class PostsController {
 
     @Autowired
-    PostRepository repository;
+    private UserRepository userRepository;
+
+    @Autowired
+    private PostService postService;
 
     @GetMapping("/posts")
     public String index(Model model) {
-        Iterable<Post> posts = repository.findAll();
+        Iterable<Post> posts = postService.getAllPostsFromNewestToOldest();
         model.addAttribute("posts", posts);
         model.addAttribute("post", new Post());
+        model.addAttribute("newComment", new Comment());
         return "posts/index";
     }
 
     @PostMapping("/posts")
-    public RedirectView create(@ModelAttribute Post post) {
-        repository.save(post);
-        return new RedirectView("/posts");
+    public RedirectView create(Post post, @RequestParam("image") MultipartFile image, @RequestParam(required = false) String redirectUrl, Authentication authentication) {
+        String username = authentication.getName();
+        User user = userRepository.findByUsername(username);
+        post.setUser(user);
+
+        try {
+            postService.savePost(post, image);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return new RedirectView(redirectUrl != null ? redirectUrl + "?error" : "/posts?error");
+        }
+
+        return new RedirectView(redirectUrl != null ? redirectUrl : "/posts");
+    }
+    @PostMapping("/posts/{postId}/comments")
+    public String addComment(@PathVariable Long postId, @RequestParam String content, Authentication authentication) {
+        String username = authentication.getName();
+        User user = userRepository.findByUsername(username);
+        postService.addComment(postId, content, user);
+        return "redirect:/posts";
     }
-}
+
+    @PostMapping("/posts/{postId}/toggleLike")
+    public String toggleLikePost(@PathVariable Long postId, Authentication authentication) {
+        String username = authentication.getName();
+        User user = userRepository.findByUsername(username);
+        postService.toggleLike(postId, user);
+        return "redirect:/posts";
+    }
+
+}