From c95b07b4395897c56fcd75a7d96b7be1ed2f910a Mon Sep 17 00:00:00 2001 From: Sophia Deckhut Date: Tue, 30 Apr 2024 12:55:48 +0200 Subject: [PATCH 1/6] FE-#118: created component eventsite --- .../app/eventsite/eventsite.component.html | 2 ++ .../app/eventsite/eventsite.component.scss | 0 .../app/eventsite/eventsite.component.spec.ts | 23 +++++++++++++++++++ .../src/app/eventsite/eventsite.component.ts | 10 ++++++++ 4 files changed, 35 insertions(+) create mode 100644 frontend/src/app/eventsite/eventsite.component.html create mode 100644 frontend/src/app/eventsite/eventsite.component.scss create mode 100644 frontend/src/app/eventsite/eventsite.component.spec.ts create mode 100644 frontend/src/app/eventsite/eventsite.component.ts diff --git a/frontend/src/app/eventsite/eventsite.component.html b/frontend/src/app/eventsite/eventsite.component.html new file mode 100644 index 0000000..b3182d1 --- /dev/null +++ b/frontend/src/app/eventsite/eventsite.component.html @@ -0,0 +1,2 @@ +

eventsite works!

+
diff --git a/frontend/src/app/eventsite/eventsite.component.scss b/frontend/src/app/eventsite/eventsite.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/app/eventsite/eventsite.component.spec.ts b/frontend/src/app/eventsite/eventsite.component.spec.ts new file mode 100644 index 0000000..6274089 --- /dev/null +++ b/frontend/src/app/eventsite/eventsite.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EventsiteComponent } from './eventsite.component'; + +describe('EventsiteComponent', () => { + let component: EventsiteComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [EventsiteComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(EventsiteComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/eventsite/eventsite.component.ts b/frontend/src/app/eventsite/eventsite.component.ts new file mode 100644 index 0000000..0b3cdba --- /dev/null +++ b/frontend/src/app/eventsite/eventsite.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-eventsite', + templateUrl: './eventsite.component.html', + styleUrl: './eventsite.component.scss' +}) +export class EventsiteComponent { + +} From 2c7dc0d331f8af02203ccd77439e6d83a9a5270e Mon Sep 17 00:00:00 2001 From: Sophia Deckhut Date: Tue, 30 Apr 2024 13:04:43 +0200 Subject: [PATCH 2/6] FE-#118: created component defaultEventPage --- .../default-event-page.component.html | 1 + .../default-event-page.component.scss | 0 .../default-event-page.component.spec.ts | 23 +++++++++++++++++++ .../default-event-page.component.ts | 10 ++++++++ 4 files changed, 34 insertions(+) create mode 100644 frontend/src/app/default-event-page/default-event-page.component.html create mode 100644 frontend/src/app/default-event-page/default-event-page.component.scss create mode 100644 frontend/src/app/default-event-page/default-event-page.component.spec.ts create mode 100644 frontend/src/app/default-event-page/default-event-page.component.ts diff --git a/frontend/src/app/default-event-page/default-event-page.component.html b/frontend/src/app/default-event-page/default-event-page.component.html new file mode 100644 index 0000000..0db918e --- /dev/null +++ b/frontend/src/app/default-event-page/default-event-page.component.html @@ -0,0 +1 @@ +

default-event-page works!

diff --git a/frontend/src/app/default-event-page/default-event-page.component.scss b/frontend/src/app/default-event-page/default-event-page.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/app/default-event-page/default-event-page.component.spec.ts b/frontend/src/app/default-event-page/default-event-page.component.spec.ts new file mode 100644 index 0000000..026072d --- /dev/null +++ b/frontend/src/app/default-event-page/default-event-page.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DefaultEventPageComponent } from './default-event-page.component'; + +describe('DefaultEventPageComponent', () => { + let component: DefaultEventPageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [DefaultEventPageComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(DefaultEventPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/default-event-page/default-event-page.component.ts b/frontend/src/app/default-event-page/default-event-page.component.ts new file mode 100644 index 0000000..39ca95a --- /dev/null +++ b/frontend/src/app/default-event-page/default-event-page.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-default-event-page', + templateUrl: './default-event-page.component.html', + styleUrl: './default-event-page.component.scss' +}) +export class DefaultEventPageComponent { + +} From 85f9721d66440456abe986c31da660e9ea06ef4c Mon Sep 17 00:00:00 2001 From: Sophia Deckhut Date: Tue, 30 Apr 2024 14:07:15 +0200 Subject: [PATCH 3/6] FE-#118: added Picture and text --- .../default-event-page.component.scss | 0 .../default-event-page.component.html | 11 ++++++++ .../default-event-page.component.scss | 25 +++++++++++++++++++ .../app/eventsite/eventsite.component.html | 2 +- 4 files changed, 37 insertions(+), 1 deletion(-) delete mode 100644 frontend/src/app/default-event-page/default-event-page.component.scss create mode 100644 frontend/src/app/eventsite/default-event-page/default-event-page.component.html create mode 100644 frontend/src/app/eventsite/default-event-page/default-event-page.component.scss diff --git a/frontend/src/app/default-event-page/default-event-page.component.scss b/frontend/src/app/default-event-page/default-event-page.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/src/app/eventsite/default-event-page/default-event-page.component.html b/frontend/src/app/eventsite/default-event-page/default-event-page.component.html new file mode 100644 index 0000000..95a5419 --- /dev/null +++ b/frontend/src/app/eventsite/default-event-page/default-event-page.component.html @@ -0,0 +1,11 @@ +
+ +
+
+

+ Kein Event ausgewählt +
+
+ Füge Links ein Event aus oder füge ein neues über das     Icon hinzu +

+
diff --git a/frontend/src/app/eventsite/default-event-page/default-event-page.component.scss b/frontend/src/app/eventsite/default-event-page/default-event-page.component.scss new file mode 100644 index 0000000..6c3f78c --- /dev/null +++ b/frontend/src/app/eventsite/default-event-page/default-event-page.component.scss @@ -0,0 +1,25 @@ + +#noEventPictureDiv{ + display: flex; + align-items: center; + justify-content: center; + height: 100vh; + object-fit: cover; +} +#noEventTextDiv{ + display: flex; + align-items: center; + justify-content: center; + text-align: center; +} +#addEventPicture{ + position: relative; + top: 3px; +} +#noEventPicture{ + max-width:100%; + height:auto; + width: auto; +} + + diff --git a/frontend/src/app/eventsite/eventsite.component.html b/frontend/src/app/eventsite/eventsite.component.html index b3182d1..7bcd249 100644 --- a/frontend/src/app/eventsite/eventsite.component.html +++ b/frontend/src/app/eventsite/eventsite.component.html @@ -1,2 +1,2 @@

eventsite works!

-
+ From 230183a1a51c04529846c3799610ea244cd99577 Mon Sep 17 00:00:00 2001 From: Sophia Deckhut Date: Tue, 30 Apr 2024 16:48:37 +0200 Subject: [PATCH 4/6] FE-#118: upload noEventPicture.svg --- frontend/src/assets/noEventPicture.svg | 48 ++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 frontend/src/assets/noEventPicture.svg diff --git a/frontend/src/assets/noEventPicture.svg b/frontend/src/assets/noEventPicture.svg new file mode 100644 index 0000000..3c2a26d --- /dev/null +++ b/frontend/src/assets/noEventPicture.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 04468818accd1ed1c4014eb39b7711080a41f310 Mon Sep 17 00:00:00 2001 From: Sophia Deckhut Date: Wed, 1 May 2024 12:01:13 +0200 Subject: [PATCH 5/6] FE-#118: rename component eventsite to eventpage --- .../src/app/eventpage/eventpage.component.html | 2 ++ .../eventpage.component.scss} | 0 .../eventpage.component.spec.ts} | 14 +++++++------- frontend/src/app/eventpage/eventpage.component.ts | 10 ++++++++++ .../src/app/eventsite/eventsite.component.html | 2 -- frontend/src/app/eventsite/eventsite.component.ts | 10 ---------- 6 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 frontend/src/app/eventpage/eventpage.component.html rename frontend/src/app/{eventsite/eventsite.component.scss => eventpage/eventpage.component.scss} (100%) rename frontend/src/app/{eventsite/eventsite.component.spec.ts => eventpage/eventpage.component.spec.ts} (52%) create mode 100644 frontend/src/app/eventpage/eventpage.component.ts delete mode 100644 frontend/src/app/eventsite/eventsite.component.html delete mode 100644 frontend/src/app/eventsite/eventsite.component.ts diff --git a/frontend/src/app/eventpage/eventpage.component.html b/frontend/src/app/eventpage/eventpage.component.html new file mode 100644 index 0000000..090b2bd --- /dev/null +++ b/frontend/src/app/eventpage/eventpage.component.html @@ -0,0 +1,2 @@ +

eventpage works!

+ diff --git a/frontend/src/app/eventsite/eventsite.component.scss b/frontend/src/app/eventpage/eventpage.component.scss similarity index 100% rename from frontend/src/app/eventsite/eventsite.component.scss rename to frontend/src/app/eventpage/eventpage.component.scss diff --git a/frontend/src/app/eventsite/eventsite.component.spec.ts b/frontend/src/app/eventpage/eventpage.component.spec.ts similarity index 52% rename from frontend/src/app/eventsite/eventsite.component.spec.ts rename to frontend/src/app/eventpage/eventpage.component.spec.ts index 6274089..936c31c 100644 --- a/frontend/src/app/eventsite/eventsite.component.spec.ts +++ b/frontend/src/app/eventpage/eventpage.component.spec.ts @@ -1,18 +1,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { EventsiteComponent } from './eventsite.component'; +import { EventpageComponent } from './eventpage.component'; -describe('EventsiteComponent', () => { - let component: EventsiteComponent; - let fixture: ComponentFixture; +describe('EventpageComponent', () => { + let component: EventpageComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [EventsiteComponent] + declarations: [EventpageComponent] }) .compileComponents(); - - fixture = TestBed.createComponent(EventsiteComponent); + + fixture = TestBed.createComponent(EventpageComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/frontend/src/app/eventpage/eventpage.component.ts b/frontend/src/app/eventpage/eventpage.component.ts new file mode 100644 index 0000000..05ff6f9 --- /dev/null +++ b/frontend/src/app/eventpage/eventpage.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-eventpage', + templateUrl: './eventpage.component.html', + styleUrl: './eventpage.component.scss' +}) +export class EventpageComponent { + +} diff --git a/frontend/src/app/eventsite/eventsite.component.html b/frontend/src/app/eventsite/eventsite.component.html deleted file mode 100644 index 7bcd249..0000000 --- a/frontend/src/app/eventsite/eventsite.component.html +++ /dev/null @@ -1,2 +0,0 @@ -

eventsite works!

- diff --git a/frontend/src/app/eventsite/eventsite.component.ts b/frontend/src/app/eventsite/eventsite.component.ts deleted file mode 100644 index 0b3cdba..0000000 --- a/frontend/src/app/eventsite/eventsite.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-eventsite', - templateUrl: './eventsite.component.html', - styleUrl: './eventsite.component.scss' -}) -export class EventsiteComponent { - -} From ca17351bae8f8e3c3792c2aa2ff70fd3600677f6 Mon Sep 17 00:00:00 2001 From: Sophia Deckhut Date: Wed, 1 May 2024 12:02:30 +0200 Subject: [PATCH 6/6] FE-#118: added component default-event-page to dashboard and refactor heigh of noEventPicture --- .../dashboard-content/dashboard-content.component.html | 3 +++ .../default-event-page/default-event-page.component.scss | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) rename frontend/src/app/{eventsite => eventpage}/default-event-page/default-event-page.component.scss (95%) diff --git a/frontend/src/app/dashboard/dashboard-content/dashboard-content.component.html b/frontend/src/app/dashboard/dashboard-content/dashboard-content.component.html index e6d548d..963ada0 100644 --- a/frontend/src/app/dashboard/dashboard-content/dashboard-content.component.html +++ b/frontend/src/app/dashboard/dashboard-content/dashboard-content.component.html @@ -6,6 +6,9 @@

Ist Gast: {{ user.guest ? 'Ja' : 'Nein' }}

+ + + diff --git a/frontend/src/app/eventsite/default-event-page/default-event-page.component.scss b/frontend/src/app/eventpage/default-event-page/default-event-page.component.scss similarity index 95% rename from frontend/src/app/eventsite/default-event-page/default-event-page.component.scss rename to frontend/src/app/eventpage/default-event-page/default-event-page.component.scss index 6c3f78c..75d9d72 100644 --- a/frontend/src/app/eventsite/default-event-page/default-event-page.component.scss +++ b/frontend/src/app/eventpage/default-event-page/default-event-page.component.scss @@ -3,7 +3,6 @@ display: flex; align-items: center; justify-content: center; - height: 100vh; object-fit: cover; } #noEventTextDiv{