From 8438b73542070af3ab2b7ef8f9ef646f3f809543 Mon Sep 17 00:00:00 2001 From: Felix Eriksson Date: Tue, 28 Apr 2026 11:44:05 +0200 Subject: [PATCH 1/4] updated files to show in a li format. Added favicon.ico --- .../untitled/config/SecurityConfig.java | 2 +- .../example/untitled/s3/S3RestController.java | 6 +++- .../org/example/untitled/s3/S3Service.java | 1 + .../usercase/controller/CaseController.java | 1 + .../repository/UploadedFileRepository.java | 2 ++ src/main/resources/static/favicon.ico | Bin 0 -> 2806 bytes src/main/resources/static/style.css | 4 +++ src/main/resources/templates/ticket.html | 26 ++++++------------ src/main/resources/templates/upload.html | 26 +++++------------- 9 files changed, 29 insertions(+), 39 deletions(-) create mode 100644 src/main/resources/static/favicon.ico diff --git a/src/main/java/org/example/untitled/config/SecurityConfig.java b/src/main/java/org/example/untitled/config/SecurityConfig.java index 19065f3..8a00f6d 100644 --- a/src/main/java/org/example/untitled/config/SecurityConfig.java +++ b/src/main/java/org/example/untitled/config/SecurityConfig.java @@ -34,7 +34,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti http.authorizeHttpRequests( auth -> auth .requestMatchers("/auth/**", "/", "/home", "/images/**", "/style.css", - "/upload/**", "/login", "/register", "/favicon.ico", "/access-denied") + "/upload/**", "/login", "/register", "/static/favicon.ico", "/access-denied") .permitAll() .requestMatchers("/admin/**").hasRole("ADMIN") .requestMatchers("/handler/**").hasAnyRole("HANDLER", "SUPERVISOR", "ADMIN") diff --git a/src/main/java/org/example/untitled/s3/S3RestController.java b/src/main/java/org/example/untitled/s3/S3RestController.java index 8b6cec6..89045a4 100644 --- a/src/main/java/org/example/untitled/s3/S3RestController.java +++ b/src/main/java/org/example/untitled/s3/S3RestController.java @@ -1,5 +1,6 @@ package org.example.untitled.s3; +import org.example.untitled.usercase.service.CaseService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; @@ -13,9 +14,11 @@ public class S3RestController { private final Logger log = LoggerFactory.getLogger(S3RestController.class); private final S3Service s3Service; + private final CaseService caseService; - public S3RestController(S3Service s3Service){ + public S3RestController(S3Service s3Service, CaseService caseService){ this.s3Service = s3Service; + this.caseService = caseService; } @GetMapping() @@ -44,6 +47,7 @@ public Map downloadFile(@RequestParam String fileName){ public void deleteFile(@RequestParam String fileName){ log.info("Deleting file " + fileName); s3Service.deleteFile(fileName); + caseService.deleteFile(fileName); } @PostMapping("/callback") diff --git a/src/main/java/org/example/untitled/s3/S3Service.java b/src/main/java/org/example/untitled/s3/S3Service.java index 8cb6009..1484ad7 100644 --- a/src/main/java/org/example/untitled/s3/S3Service.java +++ b/src/main/java/org/example/untitled/s3/S3Service.java @@ -97,6 +97,7 @@ public void deleteFile(String filename){ s3Client.deleteObject(req -> req .bucket(BUCKET_NAME) .key(filename)); + } public UploadedFile createFile(CaseEntity caseEntity, String s3Key) { diff --git a/src/main/java/org/example/untitled/usercase/controller/CaseController.java b/src/main/java/org/example/untitled/usercase/controller/CaseController.java index f12ec3b..b833036 100644 --- a/src/main/java/org/example/untitled/usercase/controller/CaseController.java +++ b/src/main/java/org/example/untitled/usercase/controller/CaseController.java @@ -28,6 +28,7 @@ import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import java.net.URI; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/src/main/java/org/example/untitled/usercase/repository/UploadedFileRepository.java b/src/main/java/org/example/untitled/usercase/repository/UploadedFileRepository.java index adfdb63..d084d5f 100644 --- a/src/main/java/org/example/untitled/usercase/repository/UploadedFileRepository.java +++ b/src/main/java/org/example/untitled/usercase/repository/UploadedFileRepository.java @@ -15,4 +15,6 @@ public interface UploadedFileRepository extends ListCrudRepository getUploadedFilesByUploadedBy(User uploadedBy); + + void deleteUploadedFileByS3Key(String s3Key); } diff --git a/src/main/resources/static/favicon.ico b/src/main/resources/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c4923ddfc9843530014c7b68c06e3c76e96eb009 GIT binary patch literal 2806 zcmbtUd010d7Jq>vi-HTXDA0+Y+Mp612?R(?VgdmTCde+7B4&9Zfsllk7YHgYhzlwe zEs9VTR8WMXfZ|xdVi8LRK^74dp}2rns0$Hs!?7<3gV32j=9|g)-JEmo{hi-C=iYNp zdVv2*bF=wo005Y?SFwUn>7rdG2I&8t^|Dq}m?~C9C;`BtUb`@dmRZ;VfRUFZBpeCn zawr0MyfaTI=R?lwcm;|E0O|_0f+vWB5G)^xk;rJc7uB^mtVBq|ttD|?xC(DbELpVy zhJrWvhX^*r3CKd+3c49pO+g9bA%urj$4g~OikgPg@lsG-yA9${5G)i?f>^%e5Y(dK z#0a9GfM8Nml5>))vmA~A31l)EbRmL7A|6HHmB})Mr^d^a3sD9$td4^PDFv`Zfk@;s ztd^6`hMDiry-AE!b-c3k!#e2F6 z(cB=2??U1UTzCS)1dHBfDvd86Wg!tsM0XOI;70HulRRA}9CU|M@gZ`RK&-uII&lK_ zc~6I>g4(B-O7t(LGsd56!bAU_df=p*`S0sUD43`rg$kDH>Qg8HAt@9O$q;P?5ymS> zD4-w`L<)VbAEp$UT0dxGP^3Ir3=OBo3n39tB}H)bP%IvcUfsW?GVVz9n)SJMBOh(0%TOrZk{oEU4UF)c9eeADoji18`a|Jt5tj=rMRgP43(S1L z2-Ps?qGRkPbYF}kV5r+ir?Y|OxUNO%f9p}9wRAGcsP73nrvWyL8KOSgoD;=~glrq~ z-fXHw@E_;<^m|)hJB(?&yQ7(FWAM;6pFmhAc8lFNyu4b|ID`93(;Q2%<4CV9Xzc+e zT?pS<_WP`F>a8lSUbhu7x)@#U?V|x3=+R*J&riv_Mq4ohTV9WnTRzm(9)C4b)AC{N zm8f|;dl#MT0Ad4uTK4U|l`t&(+TzT>V$*hjk$RVNxtX=&SZrDFha>|N!P9Lo*K8e{ zsrab?0r#KD=vf;#SWG&mXGAFd|eJRVa>e$f5=o^or_n_UwGT zp&9JGdGs63(Vn?`f@Fi4U5TgnNK!(u^Y(gJ=Cu@nRv9Nd{#lW<|ISTI$LQnz)xX?G zw;O(A^KSN>oI{DGO5pN+jfsf?!S6=XU}1qh#$HN+0{8oqCzVfL~DLJ}S>gl_vn*PvPwpk>?lb7AtQ@AGu1-cX07hnXG-Z0$LF?@L z^f|)}*2^;m*X{F*JSD=~9`^^oUmIyQC~Z8^-Ua{#15zs%b_6_4Y`gd7ko)+Z7Tbt72z-PB#KQ6C&TRAJ#ck9KZlv9+dR2jkY zoIMsO60Pfa?ayW&x_-@`WYB-&wrp7iB_vT2+|aFdDDvfnE-gOGj^##u)qiu1VDV7N z5zD2gDw+a{ceWYAZOw5rgU zE{(ZpdAL5kph$*vjBn3c9lOR^oKi#a z2<>RzX*?Fb<%dX;Ip+2=&5uvLyLV5kyxRAcHkv!i?HCw5pFeXMe(*}uwTo^M^x%1f z-CLY$vkzMDImO=d1}zqeB-bggSd451uEsqp6?N2Jwj$r(JIdN|@B2d2VULvZ?9Rqx zq)=B-T^b$x@%0Dqnxk*=-8q?}j^7v#Wi_|N@9O0W5@pJIa zk}7VFxm_4rGWuQ(gwHuk;~mDcOyVdKDDTm9U2WChEvFL6V4Ln=BK0k)4n>zvp6 G)IR~|z))fU literal 0 HcmV?d00001 diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css index b32c1c8..baa853b 100644 --- a/src/main/resources/static/style.css +++ b/src/main/resources/static/style.css @@ -461,3 +461,7 @@ main { padding-bottom: 8px; border-bottom: 1px solid #1e3a5f; } + +li{ + list-style-type: none; +} diff --git a/src/main/resources/templates/ticket.html b/src/main/resources/templates/ticket.html index 3184f5a..8767fa8 100644 --- a/src/main/resources/templates/ticket.html +++ b/src/main/resources/templates/ticket.html @@ -28,6 +28,12 @@

Ticket Details

Handler:

+

Files

+
    +
  • +
    • +
@@ -52,7 +58,7 @@

Comments

Add Comment

+ method="POST">
@@ -60,14 +66,9 @@

Add Comment

th:errors="*{text}" class="field-error">
-
- - -

-
- +
@@ -85,17 +86,6 @@

Activity Log

-
- - - - - - - -