Merge branch 'main' of https://github.com/htl-leo-itp-2325-4-5BHITM/P…

…artytiga

app/backend/pom.xml

@@ -74,6 +74,15 @@
       <artifactId>rest-assured</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-multipart</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

app/backend/src/main/java/at/htl/feature/event/Event.java

@@ -1,11 +1,12 @@
 package at.htl.feature.event;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import io.vertx.codegen.doc.Text;
+import jakarta.persistence.*;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.core.MediaType;
+import org.jboss.resteasy.annotations.providers.multipart.PartType;
+
+import java.io.InputStream;
 
 @Table(name = "tb_event")
 @Entity
@@ -15,23 +16,24 @@ public class Event {
     Long id;
 
     String name;
-    String organization;
+    /*String organization;
     String date;
     String address;
     String location;
     String age;
     String tickets;
     String contact;
-    String img;
 
-    // Neu hinzugefügte Variablen
+    @FormParam("file")
+    @PartType(MediaType.APPLICATION_OCTET_STREAM)
+    public InputStream file;
+
     @Column(name = "x_koordinate")
     Double xKoordinate;
 
     @Column(name = "y_koordinate")
     Double yKoordinate;
 
-    // Getter und Setter für xKoordinate
     public Double getXKoordinate() {
         return xKoordinate;
     }
@@ -40,14 +42,15 @@ public void setXKoordinate(Double xKoordinate) {
         this.xKoordinate = xKoordinate;
     }
 
-    // Getter und Setter für yKoordinate
     public Double getYKoordinate() {
         return yKoordinate;
     }
 
     public void setYKoordinate(Double yKoordinate) {
         this.yKoordinate = yKoordinate;
-    }
+    }*/
+
+
 
     public Long getId() {
         return id;
@@ -65,7 +68,7 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public String getOrganization() {
+    /*public String getOrganization() {
         return organization;
     }
 
@@ -121,11 +124,11 @@ public void setContact(String contact) {
         this.contact = contact;
     }
 
-    public String getImg() {
+    public byte[] getImg() {
         return img;
     }
 
-    public void setImg(String img) {
+    public void setImg(byte[] img) {
         this.img = img;
-    }
+    }*/
 }

app/backend/src/main/java/at/htl/feature/event/EventDao.java

@@ -32,16 +32,16 @@ public void updateEvent(Event event) {
         System.out.println(findEvent);
         if (findEvent != null) {
             findEvent.setName(event.name);
-            findEvent.setDate(event.date);
+            /*findEvent.setDate(event.date);
             findEvent.setOrganization(event.organization);
             findEvent.setAddress(event.address);
             findEvent.setLocation(event.location);
             findEvent.setAge(event.age);
             findEvent.setTickets(event.tickets);
             findEvent.setContact(event.contact);
-            findEvent.setImg(event.img);
+            //findEvent.setImg(event.img);
             findEvent.setXKoordinate(event.xKoordinate);
-            findEvent.setYKoordinate(event.yKoordinate);
+            findEvent.setYKoordinate(event.yKoordinate);*/
         }
     }
 

app/backend/src/main/java/at/htl/feature/event/EventDto.java

@@ -1,17 +1,19 @@
 package at.htl.feature.event;
 
+import java.io.InputStream;
+
 public record EventDto(
         Long id,
-        String name,
-        String organization,
+        String name
+        /*String organization,
         String date,
         String address,
         String location,
         String age,
         String tickets,
         String contact,
-        String img,
+        InputStream file,
         double xKoordinate, // Neue Felder
-        double yKoordinate  // Neue Felder
+        double yKoordinate  // Neue Felder*/
 ) {
 }

app/backend/src/main/java/at/htl/feature/event/EventMapper.java

@@ -7,8 +7,8 @@ public class EventMapper {
     public EventDto toResource(Event event) {
         return new EventDto(
                 event.id,
-                event.name,
-                event.organization,
+                event.name
+                /*event.organization,
                 event.date,
                 event.address,
                 event.location,
@@ -17,7 +17,7 @@ public EventDto toResource(Event event) {
                 event.contact,
                 event.img,
                 event.xKoordinate, // Neue Felder
-                event.yKoordinate  // Neue Felder
+                event.yKoordinate  // Neue Felder*/
         );
     }
 }

app/backend/src/main/java/at/htl/feature/event/EventResource.java

@@ -12,6 +12,7 @@
 import org.eclipse.microprofile.jwt.Claims;
 import org.eclipse.microprofile.jwt.JsonWebToken;
 import org.jboss.logging.Logger;
+import org.jboss.resteasy.annotations.providers.multipart.MultipartForm;
 import org.keycloak.authorization.client.AuthzClient;
 
 import java.util.List;
@@ -51,9 +52,9 @@ public void removeEvent (@PathParam("id") String id){
     @POST
     @Path("/addEvent")
     @Transactional
-    @Produces(MediaType.APPLICATION_JSON)
-    public void addEvent(Event event){
-        eventDao.addEvent(event);
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    public void addEvent(@MultipartForm Event data){
+        eventDao.addEvent(data);
     }
 
     @POST

app/backend/src/main/resources/db/import.sql

@@ -1,4 +1,4 @@
-INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
+/*INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
 VALUES('2023-11-16', 'HTL-Leonding', 'Birthday', 'Krenn', 'Limestraße 12', '16', 'siehe Instagram', 'siehe Instagram', 48.28705, 14.27256);
 
 INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
@@ -13,9 +13,6 @@ VALUES('2024-03-03', 'Tourismusschule BALE', 'Tourismusball', 'BALEonTour', 'Sch
 INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
 VALUES('2024-05-01', 'Lichtenberg', 'Maifest', 'LJ', 'Lichtenbergstraße 9', '16', 'Abendkasse', 'kontakt@ljlichtenberg.at', 48.33845, 14.24879);
 
-INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
-
-
 INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
 VALUES('2024-05-05', 'Palais', 'Hornball 5', 'Tanzschule Horn', 'Palaisstraße 1', '16', 'Online', 'info@tanzschulehorn.at', 48.30694, 14.28642);
 
@@ -27,4 +24,4 @@ VALUES('2024-11-01', 'Lichtenberg', 'Maifest', 'LJ', 'Lichtenbergstraße 9', '16
 
 INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
 VALUES('2024-08-24', 'Palais', 'Hornball 4', 'Tanzschule Horn', 'Palaisstraße 1', '16', 'Online', 'info@tanzschulehorn.at', 48.30694, 14.28642);
-
+*/

app/backend/target/classes/db/import.sql

@@ -0,0 +1,27 @@
+/*INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
+VALUES('2023-11-16', 'HTL-Leonding', 'Birthday', 'Krenn', 'Limestraße 12', '16', 'siehe Instagram', 'siehe Instagram', 48.28705, 14.27256);
+
+INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
+VALUES('2024-03-11', 'Kürnberghalle', 'HTL-Ball', 'Kümmerer', 'Hauptstraße 23', '18', 'Vorverkauf', 'kuemmerer@example.com', 48.30694, 14.30416);
+
+INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
+VALUES('2024-05-06', 'Palais', 'Hornball 1', 'Tanzschule Horn', 'Palaisstraße 1', '16', 'Online', 'info@tanzschulehorn.at', 48.30694, 14.28642);
+
+INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
+VALUES('2024-03-03', 'Tourismusschule BALE', 'Tourismusball', 'BALEonTour', 'Schulstraße 45', '17', 'siehe Webseite', 'info@baleontour.at', 48.29068, 14.28616);
+
+INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
+VALUES('2024-05-01', 'Lichtenberg', 'Maifest', 'LJ', 'Lichtenbergstraße 9', '16', 'Abendkasse', 'kontakt@ljlichtenberg.at', 48.33845, 14.24879);
+
+INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
+VALUES('2024-05-05', 'Palais', 'Hornball 5', 'Tanzschule Horn', 'Palaisstraße 1', '16', 'Online', 'info@tanzschulehorn.at', 48.30694, 14.28642);
+
+INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
+VALUES('2024-09-03', 'Tourismusschule', 'Tourismusball', 'HBLA', 'Schulstraße 45', '17', 'siehe Webseite', 'info@hbla.at', 48.29068, 14.28616);
+
+INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
+VALUES('2024-11-01', 'Lichtenberg', 'Maifest', 'LJ', 'Lichtenbergstraße 9', '16', 'Abendkasse', 'kontakt@ljlichtenberg.at', 48.33845, 14.24879);
+
+INSERT INTO public.tb_event ("date", "location", "name", "organization", "address", "age", "tickets", "contact", "x_koordinate", "y_koordinate")
+VALUES('2024-08-24', 'Palais', 'Hornball 4', 'Tanzschule Horn', 'Palaisstraße 1', '16', 'Online', 'info@tanzschulehorn.at', 48.30694, 14.28642);
+*/

app/backend/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst

@@ -0,0 +1,5 @@
+C:\Users\seker\OneDrive\Dokumente\GitHub\Partytiga\app\backend\src\main\java\at\htl\feature\event\EventDao.java
+C:\Users\seker\OneDrive\Dokumente\GitHub\Partytiga\app\backend\src\main\java\at\htl\feature\event\EventResource.java
+C:\Users\seker\OneDrive\Dokumente\GitHub\Partytiga\app\backend\src\main\java\at\htl\feature\event\EventMapper.java
+C:\Users\seker\OneDrive\Dokumente\GitHub\Partytiga\app\backend\src\main\java\at\htl\feature\event\Event.java
+C:\Users\seker\OneDrive\Dokumente\GitHub\Partytiga\app\backend\src\main\java\at\htl\feature\event\EventDto.java

app/backend/target/maven-status/maven-compiler-plugin/testCompile/null/inputFiles.lst

@@ -0,0 +1,2 @@
+C:\Users\seker\OneDrive\Dokumente\GitHub\Partytiga\app\backend\src\test\java\org\acme\GreetingResourceIT.java
+C:\Users\seker\OneDrive\Dokumente\GitHub\Partytiga\app\backend\src\test\java\org\acme\GreetingResourceTest.java

app/frontend/package.json

@@ -23,7 +23,7 @@
     "tailwindcss": "^3.4.1",
     "ts-loader": "^9.5.0",
     "typescript": "^5.2.2",
-    "webpack": "^5.89.0",
+    "webpack": "^5.92.1",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   },

app/frontend/src/components/event-table-component.ts

@@ -17,15 +17,15 @@ export class EventTableComponent extends HTMLElement {
     store.subscribe((model) => {
       this.render(model.events, model.currentEvent);
     });
-    this.addStyles();
+    //this.addStyles();
   }
 
   render(events: Event[], currentEvent?: Event) {
     console.log("table component loaded");
-    render(this.template(events, currentEvent), this.shadowRoot);
+    //render(this.template(events, currentEvent), this.shadowRoot);
   }
 
-  nameTemplate = (event: Event) => html`
+  /*nameTemplate = (event: Event) => html`
     <div class="rowName">
       <!--<p class="label">Name:</p>-->
       <p class="output">${event.name}</p>
@@ -361,6 +361,7 @@ export class EventTableComponent extends HTMLElement {
     leafletScript.setAttribute("crossorigin", "");
     this.shadowRoot.appendChild(leafletScript);
   }
+}*/
 }
 
 customElements.define("event-table", EventTableComponent);