Feature/create ticket view

src/main/java/org/example/alfs/config/SecurityConfig.java

@@ -43,6 +43,10 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                         .requestMatchers("/auth/signup").permitAll()
                         .requestMatchers("/auth/hash").permitAll()
                         .requestMatchers("/h2-console/**").permitAll()
+
+                        //allow access to endpoints during development
+                        .requestMatchers("/create", "/tickets/**", "/view/**").permitAll()
+                        .requestMatchers("/css/**", "/js/**", "/images/**", "/static/**").permitAll()
                         .requestMatchers("/login", "/login-form").permitAll()
                         .requestMatchers("/signup", "/signup-form").permitAll()
                         .anyRequest().authenticated()

src/main/java/org/example/alfs/controllers/TicketController.java

@@ -15,7 +15,7 @@
 //TODO: Decide final routes and redirects
 
 @Controller
-@RequestMapping
+@RequestMapping("/tickets")
 public class TicketController {
 
     private final TicketService ticketService;
@@ -34,23 +34,23 @@ public String createNewTicketForm(Model model) {
         return "create";
     }
 
-    //TODO REDIRECT, WHERE??
     @PreAuthorize("hasRole('REPORTER')") // should change later for anonymous access
     @PostMapping("/create")
-    public String createNewTicket(@ModelAttribute("ticket") @Valid TicketCreateDTO ticketCreateDTO,  BindingResult bindingResult) {
+    public String createNewTicket(@ModelAttribute("ticket") @Valid TicketCreateDTO ticketCreateDTO,  BindingResult bindingResult, Model model) {
         if (bindingResult.hasErrors()) {
+            model.addAttribute("ticket", ticketCreateDTO);
             return "create";
         }
 
-        ticketService.createNewTicket(ticketCreateDTO);
+        TicketViewDTO ticket = ticketService.createNewTicket(ticketCreateDTO);
 
-        return "redirect:/home";
+        return "redirect:/tickets/" + ticket.getId();
 
     }
 
     //view ticket by token
-    //TODO, FIX SO ANONYMOUS USERS CAN USE
-    @GetMapping("/view/token/{token}")
+
+    @GetMapping("/token/{token}")
     public String viewTicketByToken(@PathVariable String token, Model model) {
 
         TicketViewDTO ticket = ticketService.getTicketByToken(token);
@@ -61,7 +61,7 @@ public String viewTicketByToken(@PathVariable String token, Model model) {
 
     //view ticket by id
     @PreAuthorize("hasAnyRole('ADMIN','INVESTIGATOR','REPORTER')")
-    @GetMapping("/view/id/{id}")
+    @GetMapping("/{id}")
     public String viewTicketById(@PathVariable Long id, Model model) {
 
         TicketViewDTO ticket = ticketService.getTicketById(id);
@@ -78,7 +78,7 @@ public String assignTicket(@PathVariable Long id, @Valid @ModelAttribute TicketA
 
         ticketService.assignInvestigator(id, dto.getInvestigatorId());
 
-        return "redirect:/view/id/" + id;
+        return "redirect:/tickets/" + id;
     }
 
     //update status
@@ -88,7 +88,7 @@ public String updateStatus(@PathVariable Long id, @Valid @ModelAttribute TicketS
 
         ticketService.updateTicketStatus(id, dto.getStatus());
 
-        return "redirect:/view/id/" + id;
+        return "redirect:/tickets/" + id;
     }
 
 

src/main/jte/create.jte

@@ -0,0 +1,24 @@
+@param org.example.alfs.dto.ticket.TicketCreateDTO ticket
+
+@template.layout(title = "Create Ticket", content = @`
+    <h1 class="text-2xl font-bold mb-6">Create Ticket</h1>
+
+    <form method="post" action="/tickets/create" class="space-y-4">
+        <input type="text"
+               name="title"
+               value="${ticket.getTitle()}"
+               placeholder="Title"
+               class="w-full border p-2 rounded"/>
+
+        <textarea
+                name="description"
+                placeholder="Description"
+                  class="w-full border p-2 rounded h-32">${ticket.getDescription()}</textarea>
+
+        <button
+                type="submit"
+                class="bg-[#1a2b49] text-white px-4 py-2 rounded">
+            Create
+        </button>
+    </form>
+`)

src/main/jte/layout.jte

@@ -0,0 +1,52 @@
+@param String title
+@param gg.jte.Content content
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <title>${title}</title>
+
+    <!-- Tailwind -->
+    <script src="https://cdn.tailwindcss.com"></script>
+
+    <!-- Custom CSS -->
+    <link rel="stylesheet" href="/css/style.css">
+</head>
+
+<body class="min-h-screen flex flex-col">
+
+<!-- HEADER -->
+<header class="bg-[#1a2b49] text-white py-6 px-4 header-border">
+    <div class="max-w-5xl mx-auto flex justify-between items-center">
+        <h1 class="text-xl font-bold uppercase">
+            ALFS
+            whistleblower system
+        </h1>
+
+        <nav class="space-x-6 text-sm">
+            <a href="/" class="hover:text-[#b39359]">Home</a>
+            <a href="/tickets/create" class="hover:text-[#b39359]">Report</a>
+            <a href="/auth/login" class="hover:text-[#b39359]">Sign in</a>
+        </nav>
+    </div>
+</header>
+
+<!-- CONTENT -->
+<main class="flex-grow max-w-5xl mx-auto w-full p-4 md:p-10">
+
+    ${content}
+
+</main>
+
+<!-- FOOTER -->
+<footer class="bg-white border-t py-6 px-4">
+    <div class="max-w-5xl mx-auto text-sm text-gray-600">
+        © ALFS
+    </div>
+</footer>
+
+</body>
+</html>

src/main/jte/view.jte

@@ -0,0 +1,23 @@
+@param org.example.alfs.dto.ticket.TicketViewDTO ticket
+
+@template.layout(title = "View Ticket", content = @`
+    <h1 class="text-2xl font-bold mb-6">Ticket</h1>
+
+    <div class="card p-6 space-y-4">
+        <div>
+            <strong>ID:</strong> ${ticket.getId()}
+        </div>
+
+        <div>
+            <strong>Title:</strong> ${ticket.getTitle()}
+        </div>
+
+        <div>
+            <strong>Description:</strong> ${ticket.getDescription()}
+        </div>
+
+        <div>
+            <strong>Status:</strong> ${ticket.getStatus()}
+        </div>
+    </div>
+`)

src/main/resources/static/css/style.css

@@ -0,0 +1,27 @@
+
+:root {
+    --state-blue: #1a2b49;
+    --state-gold: #b39359;
+    --state-gray: #f4f4f4;
+}
+body {
+    font-family: Georgia, serif;
+    background-color: var(--state-gray);
+    color: #333;
+}
+.header-border {
+    border-bottom: 4px solid var(--state-gold);
+}
+.btn-primary {
+    background-color: var(--state-blue);
+    color: white;
+    transition: all 0.3s ease;
+}
+.btn-primary:hover {
+    background-color: #2c4471;
+}
+.card {
+    background: white;
+    border: 1px solid #ddd;
+    box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);
+}