diff --git a/build.gradle b/build.gradle index 0f2b055d1..db021837f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '2.2.1.RELEASE' + id 'org.springframework.boot' version '2.4.4' id 'io.spring.dependency-management' version '1.0.8.RELEASE' id 'java' } @@ -22,6 +22,9 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'mysql:mysql-connector-java' + implementation 'org.springframework.boot:spring-boot-starter-validation' developmentOnly 'org.springframework.boot:spring-boot-devtools' testImplementation('org.springframework.boot:spring-boot-starter-test') { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6ce793f21..a4b442974 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/org/launchcode/codingevents/controllers/EventCategoryController.java b/src/main/java/org/launchcode/codingevents/controllers/EventCategoryController.java new file mode 100644 index 000000000..9c521f433 --- /dev/null +++ b/src/main/java/org/launchcode/codingevents/controllers/EventCategoryController.java @@ -0,0 +1,54 @@ +package org.launchcode.codingevents.controllers; + +import org.launchcode.codingevents.data.EventCategoryRepository; +import org.launchcode.codingevents.models.EventCategory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.Errors; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.validation.Valid; + +/** + * Created by Chris Bay + */ +@Controller +@RequestMapping("eventCategories") +public class EventCategoryController { + + @Autowired + private EventCategoryRepository eventCategoryRepository; + + @GetMapping + public String displayAllCategories(Model model) { + model.addAttribute("title", "All Categories"); + model.addAttribute("categories", eventCategoryRepository.findAll()); + return "eventCategories/index"; + } + + @GetMapping("create") + public String renderCreateEventCategoryForm(Model model) { + model.addAttribute("title", "Create Category"); + model.addAttribute(new EventCategory()); + return "eventCategories/create"; + } + + @PostMapping("create") + public String processCreateEventCategoryForm(@Valid @ModelAttribute EventCategory eventCategory, + Errors errors, Model model) { + + if (errors.hasErrors()) { + model.addAttribute("title", "Create Category"); + model.addAttribute(new EventCategory()); + return "eventCategories/create"; + } + + eventCategoryRepository.save(eventCategory); + return "redirect:"; + } + +} diff --git a/src/main/java/org/launchcode/codingevents/controllers/EventController.java b/src/main/java/org/launchcode/codingevents/controllers/EventController.java index 2e837d2b0..15c0a2550 100644 --- a/src/main/java/org/launchcode/codingevents/controllers/EventController.java +++ b/src/main/java/org/launchcode/codingevents/controllers/EventController.java @@ -1,14 +1,15 @@ package org.launchcode.codingevents.controllers; +import org.launchcode.codingevents.data.EventRepository; +import org.launchcode.codingevents.models.Event; +import org.launchcode.codingevents.models.EventType; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.validation.Errors; +import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; +import javax.validation.Valid; /** * Created by Chris Bay @@ -17,24 +18,52 @@ @RequestMapping("events") public class EventController { - private static List events = new ArrayList<>(); + @Autowired + private EventRepository eventRepository; @GetMapping public String displayAllEvents(Model model) { model.addAttribute("title", "All Events"); - model.addAttribute("events", events); + model.addAttribute("events", eventRepository.findAll()); return "events/index"; } @GetMapping("create") public String displayCreateEventForm(Model model) { model.addAttribute("title", "Create Event"); + model.addAttribute(new Event()); + model.addAttribute("types", EventType.values()); return "events/create"; } @PostMapping("create") - public String processCreateEventForm(@RequestParam String eventName) { - events.add(eventName); + public String processCreateEventForm(@ModelAttribute @Valid Event newEvent, + Errors errors, Model model) { + if(errors.hasErrors()) { + model.addAttribute("title", "Create Event"); + return "events/create"; + } + + eventRepository.save(newEvent); + return "redirect:"; + } + + @GetMapping("delete") + public String displayDeleteEventForm(Model model) { + model.addAttribute("title", "Delete Events"); + model.addAttribute("events", eventRepository.findAll()); + return "events/delete"; + } + + @PostMapping("delete") + public String processDeleteEventsForm(@RequestParam(required = false) int[] eventIds) { + + if (eventIds != null) { + for (int id : eventIds) { + eventRepository.deleteById(id); + } + } + return "redirect:"; } diff --git a/src/main/java/org/launchcode/codingevents/data/EventCategoryRepository.java b/src/main/java/org/launchcode/codingevents/data/EventCategoryRepository.java new file mode 100644 index 000000000..b819c1a5b --- /dev/null +++ b/src/main/java/org/launchcode/codingevents/data/EventCategoryRepository.java @@ -0,0 +1,13 @@ +package org.launchcode.codingevents.data; + +import org.launchcode.codingevents.models.EventCategory; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +/** + * Created by Chris Bay + */ +@Repository +public interface EventCategoryRepository extends CrudRepository { + +} diff --git a/src/main/java/org/launchcode/codingevents/data/EventRepository.java b/src/main/java/org/launchcode/codingevents/data/EventRepository.java new file mode 100644 index 000000000..6072b8fbf --- /dev/null +++ b/src/main/java/org/launchcode/codingevents/data/EventRepository.java @@ -0,0 +1,12 @@ +package org.launchcode.codingevents.data; + +import org.launchcode.codingevents.models.Event; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +/** + * Created by Chris Bay + */ +@Repository +public interface EventRepository extends CrudRepository { +} diff --git a/src/main/java/org/launchcode/codingevents/models/AbstractEntity.java b/src/main/java/org/launchcode/codingevents/models/AbstractEntity.java new file mode 100644 index 000000000..a179f73ee --- /dev/null +++ b/src/main/java/org/launchcode/codingevents/models/AbstractEntity.java @@ -0,0 +1,40 @@ +package org.launchcode.codingevents.models; + +import org.springframework.data.annotation.Id; + +import javax.persistence.GeneratedValue; +import javax.persistence.MappedSuperclass; +import java.util.Objects; + +@MappedSuperclass +public abstract class AbstractEntity { + + @Id + @GeneratedValue + public int id; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + @Override + public boolean equals(Object o) { + // Check if both references point to the same object in memory + if (this == o) return true; + // Check if the object being compared is null or is not of the same class + if (o == null || getClass() != o.getClass()) return false; + // Cast the object to AbstractEntity since we're comparing ids + AbstractEntity entity = (AbstractEntity) o; + // Compare the id of the current object with the id of the object being compared + return id == entity.id; + } + + @Override + public int hashCode() { + return Objects.hash(id); + } +} diff --git a/src/main/java/org/launchcode/codingevents/models/Event.java b/src/main/java/org/launchcode/codingevents/models/Event.java new file mode 100644 index 000000000..bb47b0dd3 --- /dev/null +++ b/src/main/java/org/launchcode/codingevents/models/Event.java @@ -0,0 +1,97 @@ +package org.launchcode.codingevents.models; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.Objects; + +/** + * Created by Chris Bay + */ +@Entity +public class Event extends AbstractEntity { + + @Override + public String toString() { + return name; + } + +// @Id +// @GeneratedValue +// private int id; + + @NotBlank(message = "Name is required") + @Size(min = 3, max = 50, message = "Name must be between 3 and 50 characters") + private String name; + + @Size(max = 500, message = "Description too long!") + private String description; + + @NotBlank(message = "Email is required") + @Email(message = "Invalid email. Try again.") + private String contactEmail; + + private EventType type; + + public Event(String name, String description, String contactEmail, EventType type) { + this.name = name; + this.description = description; + this.contactEmail = contactEmail; + this.type = type; + } + + public Event() {} + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getContactEmail() { + return contactEmail; + } + + public void setContactEmail(String contactEmail) { + this.contactEmail = contactEmail; + } + + public EventType getType() { + return type; + } + + public void setType(EventType type) { + this.type = type; + } + +// public int getId() { +// return id; + } + + + +// @Override +// public boolean equals(Object o) { +// if (this == o) return true; +// if (o == null || getClass() != o.getClass()) return false; +// Event event = (Event) o; +// return id == event.id; +// } + +// @Override +// public int hashCode() { +// return Objects.hash(id); + diff --git a/src/main/java/org/launchcode/codingevents/models/EventCategory.java b/src/main/java/org/launchcode/codingevents/models/EventCategory.java new file mode 100644 index 000000000..13d651abf --- /dev/null +++ b/src/main/java/org/launchcode/codingevents/models/EventCategory.java @@ -0,0 +1,58 @@ +package org.launchcode.codingevents.models; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.validation.constraints.Size; +import java.util.Objects; + +/** + * Created by Chris Bay + */ + +@Entity +public class EventCategory extends AbstractEntity { + +// @Id +// @GeneratedValue +// private int id; + + @Size(min=3, message="Name must be at least 3 characters long") + private String name; + + public EventCategory(@Size(min = 3, message = "Name must be at least 3 characters long") String name) { + this.name = name; + } + + public EventCategory() {} + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +// public int getId() { +// return id; +// } + + @Override + public String toString() { + return name; + } + +// @Override +// public boolean equals(Object o) { +// if (this == o) return true; +// if (o == null || getClass() != o.getClass()) return false; +// EventCategory that = (EventCategory) o; +// return id == that.id; +// } +// +// @Override +// public int hashCode() { +// return Objects.hash(id); +// } +} diff --git a/src/main/java/org/launchcode/codingevents/models/EventType.java b/src/main/java/org/launchcode/codingevents/models/EventType.java new file mode 100644 index 000000000..027e089b5 --- /dev/null +++ b/src/main/java/org/launchcode/codingevents/models/EventType.java @@ -0,0 +1,22 @@ +package org.launchcode.codingevents.models; + +/** + * Created by Chris Bay + */ +public enum EventType { + + CONFERENCE("Conference"), + MEETUP("Meetup"), + WORKSHOP("Workshop"), + SOCIAL("Social"); + + private final String displayName; + + EventType(String displayName) { + this.displayName = displayName; + } + + public String getDisplayName() { + return displayName; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8b1378917..38084f5f5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,17 @@ +spring.datasource.url=jdbc:mysql://localhost:3306/coding_events_demo +spring.datasource.username=coding_events_demo +spring.datasource.password=Learn2code! + +# Specify the DBMS +spring.jpa.database = MYSQL + +# Show or not log for each sql query +spring.jpa.show-sql = true + +# Hibernate ddl auto (create, create-drop, update) +spring.jpa.hibernate.ddl-auto = update + +# Use spring.jpa.properties.* for Hibernate native properties (the prefix is +# stripped before adding them to the entity manager) +spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL8Dialect diff --git a/src/main/resources/static/styles.css b/src/main/resources/static/styles.css index 654f3c43a..5369ff798 100644 --- a/src/main/resources/static/styles.css +++ b/src/main/resources/static/styles.css @@ -1,3 +1,6 @@ body { - font-size: 18px; + font-size: 14px; +} +.error { + color: red; } \ No newline at end of file diff --git a/src/main/resources/templates/eventCategories/create.html b/src/main/resources/templates/eventCategories/create.html new file mode 100644 index 000000000..20a307c64 --- /dev/null +++ b/src/main/resources/templates/eventCategories/create.html @@ -0,0 +1,19 @@ + + + + + +
+ +
+
+ + +
+ +
+ + + diff --git a/src/main/resources/templates/eventCategories/index.html b/src/main/resources/templates/eventCategories/index.html new file mode 100644 index 000000000..1b6cfb64e --- /dev/null +++ b/src/main/resources/templates/eventCategories/index.html @@ -0,0 +1,21 @@ + + + + + +
+ + + + + + + + + + + +
Category Name
+ + + diff --git a/src/main/resources/templates/events/create.html b/src/main/resources/templates/events/create.html index bac9ddef0..04b1bbd1d 100644 --- a/src/main/resources/templates/events/create.html +++ b/src/main/resources/templates/events/create.html @@ -1,13 +1,42 @@ - +
- - +
+ +

+
+
+ +

+
+
+ +

+
+
+ +
+
+ +
diff --git a/src/main/resources/templates/events/delete.html b/src/main/resources/templates/events/delete.html new file mode 100644 index 000000000..97a1d7f46 --- /dev/null +++ b/src/main/resources/templates/events/delete.html @@ -0,0 +1,23 @@ + + + + + +
+ +
+ + +
+ +
+ + + +
+ + + \ No newline at end of file diff --git a/src/main/resources/templates/events/index.html b/src/main/resources/templates/events/index.html index 561ce87e2..132980499 100644 --- a/src/main/resources/templates/events/index.html +++ b/src/main/resources/templates/events/index.html @@ -1,15 +1,28 @@ - +
-
    - -
  • -     -
+ + + + + + + + + + + + + + + + + +
IDNameDescriptionContact EmailType
\ No newline at end of file diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html index 66b59a0f6..5539c6a92 100644 --- a/src/main/resources/templates/fragments.html +++ b/src/main/resources/templates/fragments.html @@ -3,18 +3,25 @@ Coding Events + + + + - + - + - \ No newline at end of file + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index b8aaaaaeb..8315be5dc 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -1,7 +1,7 @@ - +

Coding Events