Skip to content

Merge master into developer (image solved!) #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 1, 2023
Merged

Merge master into developer (image solved!) #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76a0199
Merge pull request #7 from Csaba79-coder/developer
Csaba79-coder Jun 1, 2023
910feed
Merge pull request #9 from Csaba79-coder/developer
Csaba79-coder Jun 1, 2023
8b8cb7e
import
Csaba79-coder Jun 1, 2023
c03fd29
Merge pull request #10 from Csaba79-coder/developer
Csaba79-coder Jun 1, 2023
3a1fb19
render photo from database on thymeleaf
Csaba79-coder Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/main/java/com/csaba79coder/littersnap/view/LitterViewController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@
import com.csaba79coder.littersnap.util.Mapper;
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.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;

import java.util.Base64;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.UUID;
Expand Down Expand Up @@ -40,7 +46,6 @@ public String getAllLitters(Model model) {

@GetMapping("/{id}")
public String getLitterById(@PathVariable("id") UUID id, Model model) {

try {
LitterModel litter = litterService.getLitterById(id);
model.addAttribute("id", litter.getId());
Expand All @@ -51,7 +56,11 @@ public String getLitterById(@PathVariable("id") UUID id, Model model) {
model.addAttribute("country", litter.getAddress().getCountry());
model.addAttribute("postcode", litter.getAddress().getPostCode());
model.addAttribute("description", litter.getDescription());
model.addAttribute("image", litter.getImage());

// Convert the byte array to a base64 encoded string
String base64Image = Base64.getEncoder().encodeToString(litter.getImage());
model.addAttribute("image", base64Image);

model.addAttribute("status", litter.getStatus());
model.addAttribute("view", "litter_details");
return "welcome";
Expand All @@ -64,7 +73,11 @@ public String getLitterById(@PathVariable("id") UUID id, Model model) {
@GetMapping("/create")
public String showAddLitterForm(Model model) {
try {
model.addAttribute("litter", new LitterCreateOrModifyModel());
LitterCreateOrModifyModel litterModel = new LitterCreateOrModifyModel();

// Set any other necessary properties in the litterModel object

model.addAttribute("litter", litterModel);
return "litter_add_form";
} catch (NoSuchElementException e) {
model.addAttribute("errorMessage", e.getMessage());
Expand All @@ -75,7 +88,8 @@ public String showAddLitterForm(Model model) {
@PostMapping("/create")
public String addNewLitter(@ModelAttribute("litter") LitterCreateOrModifyModel litterModel,
@ModelAttribute("address") Address address,
@RequestParam("file") MultipartFile file,Model model) {
@RequestParam("file") MultipartFile file,
Model model) {
try {
litterService.addNewLitter(litterModel, address, file);
return "redirect:/thy/litter";
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/litter_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h4><span class="text-muted">Description:</span></h4>
<p><span th:text="${description}"></span></p>

<h4><span class="text-muted">Image:</span></h4>
<p><span th:text="${image}"></span></p>
<img th:src="@{'data:image/png;base64,' + ${image}}" alt="Litter Image" />

<h4><span class="text-muted">Status:</span></h4>
<p><span th:text="${status}"></span></p>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<div th:if="~{${view}}" class="row m-4">
<div class="col">
<!-- Dynamic Content Placeholder -->
<div th:include="~{${view}}"></div>
<div th:insert="~{${view}}"></div>

</div>
</div>
Expand Down