#51

htl-leo-itp-2325-4-5BHITM · May 8, 2024 · def54df · def54df
1 parent 053acdd
commit def54df
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 33 deletions.
diff --git a/app/backend/.idea/misc.xml b/app/backend/.idea/misc.xml
diff --git a/app/backend/src/main/resources/db/import.sql b/app/backend/src/main/resources/db/import.sql
@@ -4,3 +4,7 @@ INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2
 INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-03-03', 'Tourismusschule BALE', 'Tourismusball', 'BALEonTour');
 INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-05-01', 'Lichtenberg', 'Maifest', 'LJ');
 INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-08-24', 'Palais', 'Hornball 2', 'Tanzschule Horn');
+INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-05-05', 'Palais', 'Hornball 5', 'Tanzschule Horn');
+INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-09-03', 'Tourismusschule ', 'Tourismusball', 'HBLA');
+INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-11-01', 'Lichtenberg', 'Maifest', 'LJ');
+INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-08-24', 'Palais', 'Hornball 4', 'Tanzschule Horn');
diff --git a/app/backend/target/build-metrics.json b/app/backend/target/build-metrics.json
diff --git a/app/backend/target/classes/db/import.sql b/app/backend/target/classes/db/import.sql
@@ -4,3 +4,7 @@ INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2
 INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-03-03', 'Tourismusschule BALE', 'Tourismusball', 'BALEonTour');
 INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-05-01', 'Lichtenberg', 'Maifest', 'LJ');
 INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-08-24', 'Palais', 'Hornball 2', 'Tanzschule Horn');
+INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-05-05', 'Palais', 'Hornball 5', 'Tanzschule Horn');
+INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-09-03', 'Tourismusschule ', 'Tourismusball', 'HBLA');
+INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-11-01', 'Lichtenberg', 'Maifest', 'LJ');
+INSERT INTO public.tb_event ("date", "location", "name", organization) VALUES('2024-08-24', 'Palais', 'Hornball 4', 'Tanzschule Horn');
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:\DATA\SCHULE\HTL_Leonding\4Klasse\ITP\Eventplaner_Projekt\Partytiga\app\backend\src\main\java\at\htl\feature\event\EventMapper.java
-C:\DATA\SCHULE\HTL_Leonding\4Klasse\ITP\Eventplaner_Projekt\Partytiga\app\backend\src\main\java\at\htl\feature\event\EventDao.java
-C:\DATA\SCHULE\HTL_Leonding\4Klasse\ITP\Eventplaner_Projekt\Partytiga\app\backend\src\main\java\at\htl\feature\event\EventDto.java
-C:\DATA\SCHULE\HTL_Leonding\4Klasse\ITP\Eventplaner_Projekt\Partytiga\app\backend\src\main\java\at\htl\feature\event\EventResource.java
-C:\DATA\SCHULE\HTL_Leonding\4Klasse\ITP\Eventplaner_Projekt\Partytiga\app\backend\src\main\java\at\htl\feature\event\Event.java
+C:\Users\Leonie\Desktop\HTL-LEONDING\Partytiga\app\backend\src\main\java\at\htl\feature\event\Event.java
+C:\Users\Leonie\Desktop\HTL-LEONDING\Partytiga\app\backend\src\main\java\at\htl\feature\event\EventResource.java
+C:\Users\Leonie\Desktop\HTL-LEONDING\Partytiga\app\backend\src\main\java\at\htl\feature\event\EventDao.java
+C:\Users\Leonie\Desktop\HTL-LEONDING\Partytiga\app\backend\src\main\java\at\htl\feature\event\EventDto.java
+C:\Users\Leonie\Desktop\HTL-LEONDING\Partytiga\app\backend\src\main\java\at\htl\feature\event\EventMapper.java
diff --git a/app/backend/target/maven-status/maven-compiler-plugin/testCompile/null/inputFiles.lst b/app/backend/target/maven-status/maven-compiler-plugin/testCompile/null/inputFiles.lst
@@ -1,2 +1,2 @@
-C:\DATA\SCHULE\HTL_Leonding\4Klasse\ITP\Eventplaner_Projekt\Partytiga\app\backend\src\test\java\org\acme\GreetingResourceTest.java
-C:\DATA\SCHULE\HTL_Leonding\4Klasse\ITP\Eventplaner_Projekt\Partytiga\app\backend\src\test\java\org\acme\GreetingResourceIT.java
+C:\Users\Leonie\Desktop\HTL-LEONDING\Partytiga\app\backend\src\test\java\org\acme\GreetingResourceIT.java
+C:\Users\Leonie\Desktop\HTL-LEONDING\Partytiga\app\backend\src\test\java\org\acme\GreetingResourceTest.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/index.html b/app/frontend/index.html
@@ -4,7 +4,6 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <link rel="stylesheet" href="./styles/style.css" />
   <link href='https://unpkg.com/css.gg@2.0.0/icons/css/profile.css' rel='stylesheet'>  <script src="https://kit.fontawesome.com/c77a38666b.js" crossorigin="anonymous"></script>
   <title>Partytiga</title>
   <style>
@@ -37,11 +36,12 @@
   </div>
     <div id="content">
       <!--<event-table></event-table>-->
+      <!--<addevent></addevent>-->
       <div id="dynamic-content"></div>
     </div>
   </div>
 
-  <i class="gg-profile" id="profile"></i>
+  <i id="profile"></i>
 
   <script>
     // Laden der Komponente basierend auf dem Pfad
@@ -62,6 +62,7 @@
       } else {
         // Standardfall: Startseite oder Fehlerseite
         dynamicContent.innerHTML = '<event-table></event-table>';
+
       }
     }
 

diff --git a/app/frontend/src/components/event-table-component.ts b/app/frontend/src/components/event-table-component.ts
@@ -64,7 +64,7 @@ export class EventTableComponent extends HTMLElement {
           id="eventBox"
           @click=${() => {
             this.eventClick(event);
-            // alterEvent(event);
+            //alterEvent(event);
           }}
         >
           <p>${rowName}</p>
@@ -76,7 +76,7 @@ export class EventTableComponent extends HTMLElement {
     });
     return html`
     <div id="addNewEvent" @click=${() => this.eventClick(null)}>
-      <i class="fa-solid fa-plus"></i>
+      <i class="fa-solid"></i>
       <h2>Event hinzufügen</h2>
     </div>
 

diff --git a/app/frontend/src/components/navigation-component.ts b/app/frontend/src/components/navigation-component.ts
@@ -62,6 +62,8 @@ export class AppNavigationComponent extends HTMLElement {
     this.addStyles();
     this.setupNavigation();
     this.highlightCurrentPage();
+
+
   }
 
   render() {
@@ -79,8 +81,9 @@ 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>
         </div>
-        <a href="#" id="settings" class="settings-link">Einloggen</a>
+        <a href="#" id="settings" class="settings-link">Einstellungen</a>
       </div>
     `;
   }

diff --git a/app/frontend/styles/entdecken-style.css b/app/frontend/styles/entdecken-style.css
@@ -8,16 +8,22 @@
 #searchbar[type="text"] {
     /* Vorherige Stile hier */
     box-shadow: 0 0 5px rgba(0,0,0,0.1); /* Schatten */
+    position: sticky;
+    top: 0;
   }
 
   #searchbar[type="text"]:hover {
     border-color: #aaa; /* Randfarbe beim Überfahren */
+
+
   }
 
   #searchBox{
     display: flex;
     flex-direction: row;
     margin-top: 5%;
+    position: sticky;
+    top: 0;
   }
 
   #lupe{

diff --git a/app/frontend/styles/event-table-style.css b/app/frontend/styles/event-table-style.css
@@ -3,30 +3,31 @@
 /* add button*/
 #addNewEvent {
     cursor: pointer;
-    position: absolute;
-    display: grid;
+    position: fixed;
+    /*display: grid;*/
     text-align: center;
     grid-template-columns: 20% 80%;
     width: 10vw;
-    background: black;
-    border-radius: 1vh;
-    color: white;
-    padding: 1vw 2vh;
-    box-shadow: 0px 0px 12px -2px rgba(0, 0, 0, 0.5);
-    transition: background-color 0.6s ease;
+    /*background: black;*/
+    /*border-radius: 1vh;*/
+    color: black;
+    /*padding: 1vw 2vh;*/
+    /*box-shadow: 0px 0px 12px -2px rgba(0, 0, 0, 0.5);*/
+    /*transition: background-color 0.6s ease;*/
     overflow: hidden;
-    border-color: none;
-    margin-left: -28%;
-    margin-top: 18%;
+    /*border-color: none;*/
+    margin-left: -29.5%;
+    margin-top: 20%;
+
   }
 
-  #addNewEvent:hover {
+  /*#addNewEvent:hover {
     background: gray;
-  }
+  }*/
 
   #addNewEvent > h2 {
     margin: 0;
-    font-size: medium;
+    font-size: 1.1em;
   }
 
   h3 {
@@ -42,13 +43,15 @@
   }
   #eventBox {
     width: 30%;
-    height: 18vw;
+   /* height: 18vw;*/
     padding: 2%;
     margin-left: 5%;
     margin-right: 5%;
     margin-top: 5%;
-    background-color: #D9D9D9;
+    /*background-color: #D9D9D9;*/
+    border: #000 ;;
     cursor: pointer;
+    box-shadow: 5px 3px 10px grey;
   }
   .rowName,
   .rowOrganizer,
@@ -67,6 +70,7 @@
   }
 
 
+
   input,
       button {
         border-radius: 5px;
@@ -105,8 +109,8 @@
         background-color: #fefefe;
         margin-left: 23%;
         padding: 5vh 3vw;
-        width: 70vw;
-        height: 45vw;
+        width: 65vw;
+        height: 50vw;
         overflow: hidden;
       }
 
@@ -221,4 +225,6 @@
         color: #000;
         text-decoration: none;
         cursor: pointer;
-      }
+      }
+
+