main-commit

htl-leo-itp-2325-4-5BHITM · Oct 1, 2024 · c21e956 · c21e956
1 parent c60c028
commit c21e956
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 162 deletions.
diff --git a/app/backend/.idea/misc.xml b/app/backend/.idea/misc.xml
diff --git a/app/backend/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst b/app/backend/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst
@@ -1,5 +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
+/Users/lana/Desktop/Schule/5BHITM/ITP/Partytiga/app/backend/src/main/java/at/htl/feature/event/Event.java
+/Users/lana/Desktop/Schule/5BHITM/ITP/Partytiga/app/backend/src/main/java/at/htl/feature/event/EventDto.java
+/Users/lana/Desktop/Schule/5BHITM/ITP/Partytiga/app/backend/src/main/java/at/htl/feature/event/EventResource.java
+/Users/lana/Desktop/Schule/5BHITM/ITP/Partytiga/app/backend/src/main/java/at/htl/feature/event/EventDao.java
+/Users/lana/Desktop/Schule/5BHITM/ITP/Partytiga/app/backend/src/main/java/at/htl/feature/event/EventMapper.java
diff --git a/app/backend/target/quarkus/bootstrap/dev-app-model.dat b/app/backend/target/quarkus/bootstrap/dev-app-model.dat
diff --git a/app/frontend/.idea/.gitignore b/app/frontend/.idea/.gitignore
diff --git a/app/frontend/.idea/frontend.iml b/app/frontend/.idea/frontend.iml
diff --git a/app/frontend/.idea/modules.xml b/app/frontend/.idea/modules.xml
diff --git a/app/frontend/.idea/vcs.xml b/app/frontend/.idea/vcs.xml
diff --git a/app/frontend/src/components/hinzufuegen-component.ts b/app/frontend/src/components/hinzufuegen-component.ts
@@ -1,176 +1,92 @@
-<<<<<<< Updated upstream
-import { Event, store } from "../model/model";
-import { html, render } from "lit-html";
-import { produce } from "immer";
-import L from 'leaflet';
-
-import { EventTableComponent } from "./event-table-component";
-import { loadEvents, loadEventsByList } from "../service/event-service";
-=======
 import { loadEvents, loadEventsByList } from "../service/event-service";
 import { Event, store } from "../model/model";
 import { html, render } from "lit-html";
 import { produce } from "immer";
 
 import { EventTableComponent } from "./event-table-component";
 
->>>>>>> Stashed changes
 export class HinzufuegenComponent extends HTMLElement {
   constructor() {
     super();
     this.attachShadow({ mode: "open" });
   }
-<<<<<<< Updated upstream
-=======
 
->>>>>>> Stashed changes
   connectedCallback(): void {
     console.log("hinzufuegen connected");
     this.render();
   }
-<<<<<<< Updated upstream
-=======
 
->>>>>>> Stashed changes
   render() {
     console.log("hinzufuegen component loaded");
     render(this.displayContent(), this.shadowRoot);
   }
-<<<<<<< Updated upstream
+
   displayContent() {
     return html`
       <h2>Event hinzufügen</h2>
       <form id="eventForm">
         <label for="eventName">Name des Events:</label>
-        <input type="text" id="eventName" required @input=${this.updateSaveButtonState.bind(this)} />
-        <br /><br />
+        <input type="text" id="eventName" required @input=${this.updateSaveButtonState.bind(this)}/>
+        <br/><br/>
         <label for="organizerName">Veranstalter:</label>
-        <input type="text" id="organizerName" required @input=${this.updateSaveButtonState.bind(this)} />
-        <br /><br />
+        <input type="text" id="organizerName" required @input=${this.updateSaveButtonState.bind(this)}/>
+        <br/><br/>
         <label for="eventDate">Datum:</label>
-        <input type="date" id="eventDate" required @input=${this.updateSaveButtonState.bind(this)} />
-        <br /><br />
+        <input type="date" id="eventDate" required @input=${this.updateSaveButtonState.bind(this)}/>
+        <br/><br/>
         <label for="eventAddress">Adresse:</label>
-        <input type="text" id="eventAddress" required @input=${this.updateSaveButtonState.bind(this)} />
-        <br /><br />
+        <input type="text" id="eventAddress" required @input=${this.updateSaveButtonState.bind(this)}/>
+        <br/><br/>
         <label for="eventLocation">Ort:</label>
-        <input type="text" id="eventLocation" required @input=${this.updateSaveButtonState.bind(this)} />
-        <br /><br />
+        <input type="text" id="eventLocation" required @input=${this.updateSaveButtonState.bind(this)}/>
+        <br/><br/>
         <label for="eventEinlassalter">Einlassalter:</label>
-        <input type="number" id="eventEinlassalter" required @input=${this.updateSaveButtonState.bind(this)} />
-        <br /><br />
+        <input type="number" id="eventEinlassalter" required @input=${this.updateSaveButtonState.bind(this)}/>
+        <br/><br/>
         <label for="eventEintrittskarten">Eintrittskarten:</label>
-        <input type="text" id="eventEintrittskarten" required @input=${this.updateSaveButtonState.bind(this)} />
-        <br /><br />
+        <input type="text" id="eventEintrittskarten" required @input=${this.updateSaveButtonState.bind(this)}/>
+        <br/><br/>
         <label for="eventKontaktdaten">Kontaktdaten:</label>
-        <input type="text" id="eventKontaktdaten" required @input=${this.updateSaveButtonState.bind(this)} />
-        <br /><br />
+        <input type="text" id="eventKontaktdaten" required @input=${this.updateSaveButtonState.bind(this)}/>
+        <br/><br/>
         <label for="eventImage">Bild hochladen:</label>
-        <input type="file" id="eventImage" @change=${this.previewImage.bind(this)} />
-        <br /><br />
+        <input type="file" id="eventImage" /> <!--@change={this.previewImage.bind(this)}-->
+        <br/><br/>
         <label for="eventXCoordinate">X-Koordinate:</label>
-        <input type="number" id="eventXCoordinate" required @input=${this.updateSaveButtonState.bind(this)} step="any" />
-        <br /><br />
+        <input type="number" id="eventXCoordinate" required @input=${this.updateSaveButtonState.bind(this)} step="any"/>
+        <br/><br/>
         <label for="eventYCoordinate">Y-Koordinate:</label>
-        <input type="number" id="eventYCoordinate" required @input=${this.updateSaveButtonState.bind(this)} step="any" />
-        <br /><br />
-        <img id="imagePreview" src="" alt="Image Preview" style="display:none; max-width: 200px;" />
-        <br /><br />
-        <button type="button" id="addEvent" @click=${this.saveEvent.bind(this)}>Speichern</button>
-=======
-
-  displayContent() {
-    return html`
-      <h2>Event hinzufügen</h2>
-
-      <form id="eventForm">
-        <label for="eventName">Name des Events:</label>
-        <input type="text" id="eventName" required @input=${this.updateSaveButtonState.bind(this)} />
-
-        <br /><br />
-
-        <label for="organizerName">Veranstalter:</label>
-        <input type="text" id="organizerName" required @input=${this.updateSaveButtonState.bind(this)} />
-
-        <br /><br />
-
-        <label for="eventDate">Datum:</label>
-        <input type="date" id="eventDate" required @input=${this.updateSaveButtonState.bind(this)} />
-
-        <br /><br />
-
-        <label for="eventLocation">Adresse:</label>
-        <input type="text" id="eventLocation" required @input=${this.updateSaveButtonState.bind(this)} />
-
-        <br /><br />
-
-        <label for="eventOrt">Ort:</label>
-        <input type="text" id="eventOrt" required @input=${this.updateSaveButtonState.bind(this)} />
-
-        <br /><br />
-
-        <label for="eventEinlassalter">Einlassalter:</label>
-        <input type="text" id="eventEinlassalter" required @input=${this.updateSaveButtonState.bind(this)} />
-
-        <br /><br />
-
-        <label for="eventEintrittskarten">Eintrittskarten:</label>
-        <input type="text" id="eventEintrittskarten" required @input=${this.updateSaveButtonState.bind(this)} />
-
-        <br /><br />
-
-        <label for="eventKontaktdaten">Kontaktdaten:</label>
-        <input type="text" id="eventKontaktdaten" required @input=${this.updateSaveButtonState.bind(this)} />
-
-        <br /><br />
-
-        <label for="eventImage">Bild hochladen:</label>
-        <input type="file" id="eventImage" @change=${this.previewImage.bind(this)} />
-
-        <br /><br />
-
-        <img id="imagePreview" src="" alt="Image Preview" style="display:none; max-width: 200px;" />
-
-        <br /><br />
-
-        <button type="button" id="addEvent" @click=${this.saveEvent.bind(this)} disabled>Speichern</button>
->>>>>>> Stashed changes
-      </form>
-    `;
+        <input type="number" id="eventYCoordinate" required @input=${this.updateSaveButtonState.bind(this)} step="any"/>
+        <br/><br/>
+        <img id="imagePreview" src="" alt="Image Preview" style="display:none; max-width: 200px;"/>
+        <br/><br/>
+      </form>`;
   }
+//<button type="button" id="addEvent" @click=${this.saveEvent.bind(this)}>Speichern</button>
 
-  previewImage(event) {
+ /* previewImage(event) {
     const input = event.target;
     if (input.files && input.files[0]) {
       const reader = new FileReader();
       reader.onload = (e) => {
         const img = this.shadowRoot.getElementById('imagePreview');
         if (img instanceof HTMLImageElement && typeof e.target.result === 'string') {
           img.src = e.target.result;
-<<<<<<< Updated upstream
           console.log(img.src)
-=======
->>>>>>> Stashed changes
-          img.style.display = 'block';
         }
       };
       reader.readAsDataURL(input.files[0]);
     }
-  }
+  }*/
 
   updateSaveButtonState() {
-<<<<<<< Updated upstream
-    /*const saveButton = this.shadowRoot.getElementById("addEvent") as HTMLButtonElement | null;
-=======
-    const saveButton = this.shadowRoot.getElementById("addEvent");
+    const saveButton = this.shadowRoot.getElementById("addEvent") as HTMLButtonElement | null;
 
->>>>>>> Stashed changes
     if (saveButton) {
       const eventName = (this.shadowRoot.getElementById("eventName") as HTMLInputElement).value;
       const organizerName = (this.shadowRoot.getElementById("organizerName") as HTMLInputElement).value;
       const eventDate = (this.shadowRoot.getElementById("eventDate") as HTMLInputElement).value;
       const eventLocation = (this.shadowRoot.getElementById("eventLocation") as HTMLInputElement).value;
-<<<<<<< Updated upstream
       const eventAddress = (this.shadowRoot.getElementById("eventAddress") as HTMLInputElement).value;
       const eventEinlassalter = (this.shadowRoot.getElementById("eventEinlassalter") as HTMLInputElement).value;
       const eventEintrittskarten = (this.shadowRoot.getElementById("eventEintrittskarten") as HTMLInputElement).value;
@@ -182,10 +98,10 @@ export class HinzufuegenComponent extends HTMLElement {
       saveButton.disabled = !(eventName && organizerName && eventDate && eventLocation && eventAddress && eventEinlassalter && eventEintrittskarten && eventKontaktdaten && eventXCoordinate && eventYCoordinate);
     } else {
       console.log("Button nicht gefunden.");
-    }*/
+    }
   }
 
-  saveEvent() {
+  /*saveEvent() {
     const formData = new FormData();
 
     const eventName = (this.shadowRoot.getElementById("eventName") as HTMLInputElement).value;
@@ -199,21 +115,10 @@ export class HinzufuegenComponent extends HTMLElement {
       .then(response => response.json())
             .then(data => console.log(data))
             .catch(error => console.error('Error:', error));
-    }
-
-=======
-      const eventOrt = (this.shadowRoot.getElementById("eventOrt") as HTMLInputElement).value;
-      const eventEinlassalter = (this.shadowRoot.getElementById("eventEinlassalter") as HTMLInputElement).value;
-      const eventEintrittskarten = (this.shadowRoot.getElementById("eventEintrittskarten") as HTMLInputElement).value;
-      const eventKontaktdaten = (this.shadowRoot.getElementById("eventKontaktdaten") as HTMLInputElement).value;
+    }*/
 
-      saveButton.disabled = !(eventName && organizerName && eventDate && eventLocation && eventOrt && eventEinlassalter && eventEintrittskarten && eventKontaktdaten);
-    } else {
-      console.log("Button nicht gefunden.");
-    }
-  }
 
-  saveEvent() {
+  /*saveEvent() {
     const eventName = (this.shadowRoot.getElementById("eventName") as HTMLInputElement).value;
     const organizerName = (this.shadowRoot.getElementById("organizerName") as HTMLInputElement).value;
     const eventDate = (this.shadowRoot.getElementById("eventDate") as HTMLInputElement).value;
@@ -231,8 +136,8 @@ export class HinzufuegenComponent extends HTMLElement {
         organization: organizerName,
         date: eventDate,
         location: eventLocation,
-        ort: eventOrt,
-        einlassalter: eventEinlassalter,
+        address: eventOrt,
+        age: eventEinlassalter,
         eintrittskarten: eventEintrittskarten,
         kontaktdaten: eventKontaktdaten,
         image: eventImage,
@@ -258,42 +163,29 @@ export class HinzufuegenComponent extends HTMLElement {
           console.error("Fehler beim Speichern der Daten:", error);
         });
     }
-  }
->>>>>>> Stashed changes
+  }*/
 
   clearForm() {
     (this.shadowRoot.getElementById("eventName") as HTMLInputElement).value = '';
     (this.shadowRoot.getElementById("organizerName") as HTMLInputElement).value = '';
     (this.shadowRoot.getElementById("eventDate") as HTMLInputElement).value = '';
     (this.shadowRoot.getElementById("eventLocation") as HTMLInputElement).value = '';
-<<<<<<< Updated upstream
     (this.shadowRoot.getElementById("eventAddress") as HTMLInputElement).value = '';
     (this.shadowRoot.getElementById("eventEinlassalter") as HTMLInputElement).value = '';
     (this.shadowRoot.getElementById("eventEintrittskarten") as HTMLInputElement).value = '';
     (this.shadowRoot.getElementById("eventKontaktdaten") as HTMLInputElement).value = '';
     (this.shadowRoot.getElementById("eventXCoordinate") as HTMLInputElement).value = '';
     (this.shadowRoot.getElementById("eventYCoordinate") as HTMLInputElement).value = '';
-=======
     (this.shadowRoot.getElementById("eventOrt") as HTMLInputElement).value = '';
-    (this.shadowRoot.getElementById("eventEinlassalter") as HTMLInputElement).value = '';
-    (this.shadowRoot.getElementById("eventEintrittskarten") as HTMLInputElement).value = '';
-    (this.shadowRoot.getElementById("eventKontaktdaten") as HTMLInputElement).value = '';
->>>>>>> Stashed changes
     const imgPreview = this.shadowRoot.getElementById("imagePreview") as HTMLImageElement;
     if (imgPreview) {
       imgPreview.src = '';
       imgPreview.style.display = 'none';
     }
-<<<<<<< Updated upstream
-=======
 
->>>>>>> Stashed changes
     this.updateSaveButtonState();
   }
 }
 
-<<<<<<< Updated upstream
-customElements.define("event-hinzufuegen", HinzufuegenComponent);
-=======
 customElements.define("event-hinzufuegen", HinzufuegenComponent);
->>>>>>> Stashed changes
+
diff --git a/app/frontend/src/components/navigation-component.ts b/app/frontend/src/components/navigation-component.ts
@@ -80,11 +80,7 @@ export class AppNavigationComponent extends HTMLElement {
           <a href="#" id="startseite">Startseite</a>
           <a href="#" id="entdecken">Entdecken</a>
           <a href="#" id="favoriten">Favoriten</a>
-          <a href="#" id="profil">Profil</a>
-<<<<<<< Updated upstream
-=======
-          <!--<a href="#"><add-new-event></add-new-event></a>-->
->>>>>>> Stashed changes
+          <a href="#" id="profil">Profil</a
           <a href="#" id="hinzufuegen">Hinzufügen</a>
         </div>
         <a href="#" id="settings" class="settings-link">Einstellungen</a>