diff --git a/.gitignore b/.gitignore index 549e00a2..e7934e8e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ target/ !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ - +LiveTerm ### STS ### .apt_generated .classpath @@ -18,7 +18,6 @@ target/ *.iws *.iml *.ipr - ### NetBeans ### /nbproject/private/ /nbbuild/ diff --git a/Jenkinsfile123 b/Jenkinsfile123 deleted file mode 100644 index 48de8b34..00000000 --- a/Jenkinsfile123 +++ /dev/null @@ -1,28 +0,0 @@ -pipeline { - agent {label 'slave-1'} - - tools { - jdk 'jdk17' - maven 'maven3' - } - - stages { - stage('Compile') { - steps { - sh 'mvn compile' - } - } - - stage('Test') { - steps { - sh 'mvn test' - } - } - - stage('Build') { - steps { - sh 'mvn package' - } - } - } -} diff --git a/LiveTerm b/LiveTerm new file mode 160000 index 00000000..1f2e543b --- /dev/null +++ b/LiveTerm @@ -0,0 +1 @@ +Subproject commit 1f2e543bdbfacaff0585a3f338d4fec215553250 diff --git a/README.md b/README.md index f695021d..b5a66ad8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# BoardgameListingWebApp +# Boardgame Listing Web Application ## Description @@ -6,7 +6,6 @@ This web application displays lists of board games and their reviews. While anyone can view the board game lists and reviews, they are required to log in to add/ edit the board games and their reviews. The 'users' have the authority to add board games to the list and add reviews, and the 'managers' have the authority to edit/ delete the reviews on top of the authorities of users. ## Technologies - - Java - Spring Boot - Amazon Web Services(AWS) EC2 @@ -20,15 +19,15 @@ This web application displays lists of board games and their reviews. While anyo - H2 Database Engine (In-memory) - JUnit test framework - Spring Security -- Twitter Bootstrap -- Maven +- Bootstrap +- Apache Maven ## Features - Full-Stack Application - UI components created with Thymeleaf and styled with Twitter Bootstrap - Authentication and authorization using Spring Security - - Authentication by allowing the users to authenticate with a username and password + - Authentication by allowing the users to authenticate with a valid username and password. - Authorization by granting different permissions based on the roles (non-members, users, and managers) - Different roles (non-members, users, and managers) with varying levels of permissions - Non-members only can see the boardgame lists and reviews @@ -39,7 +38,7 @@ This web application displays lists of board games and their reviews. While anyo - Spring MVC best practices to segregate views, controllers, and database packages - JDBC for database connectivity and interaction - CRUD (Create, Read, Update, Delete) operations for managing data in the database -- Schema.sql file to customize the schema and input initial data +- a SQL file named "schema.sql" to customize the schema and input initial data - Thymeleaf Fragments to reduce redundancy of repeating HTML elements (head, footer, navigation) ## How to Run @@ -47,7 +46,7 @@ This web application displays lists of board games and their reviews. While anyo 1. Clone the repository 2. Open the project in your IDE of choice 3. Run the application -4. To use initial user data, use the following credentials. +4. To use initial user data, please use the following credentials. - username: bugs | password: bunny (user role) - username: daffy | password: duck (manager role) 5. You can also sign-up as a new user and customize your role to play with the application! 😊 diff --git a/pom.xml b/pom.xml index 44a8c70f..1c521f1c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ Project for Spring Boot jar - 11 + 17 0.8.7 jacoco reuseReports @@ -74,7 +74,7 @@ org.jacoco jacoco-maven-plugin - 0.8.7 + 0.8.9 diff --git a/src/main/java/com/javaproject/DatabaseServiceProjectApplication.java b/src/main/java/com/javaproject/DatabaseServiceProjectApplication.java index e5307a7f..a22fdfa1 100644 --- a/src/main/java/com/javaproject/DatabaseServiceProjectApplication.java +++ b/src/main/java/com/javaproject/DatabaseServiceProjectApplication.java @@ -1,10 +1,8 @@ package com.javaproject; - import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication -public class DatabaseServiceProjectApplication { +class DatabaseServiceProjectApplication { public static void main(String[] args) { SpringApplication.run(DatabaseServiceProjectApplication.class, args);