diff --git a/ISD-conference-web-app-frontend/angular.json b/ISD-conference-web-app-frontend/angular.json
index 6c2e4da..bcc02ac 100644
--- a/ISD-conference-web-app-frontend/angular.json
+++ b/ISD-conference-web-app-frontend/angular.json
@@ -37,13 +37,13 @@
"budgets": [
{
"type": "initial",
- "maximumWarning": "500kb",
- "maximumError": "1mb"
+ "maximumWarning": "1mb",
+ "maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "4kb",
- "maximumError": "10kb"
+ "maximumError": "20kb"
}
],
"fileReplacements": [
diff --git a/ISD-conference-web-app-frontend/src/app/app.component.html b/ISD-conference-web-app-frontend/src/app/app.component.html
index fed8ecb..411c2d8 100644
--- a/ISD-conference-web-app-frontend/src/app/app.component.html
+++ b/ISD-conference-web-app-frontend/src/app/app.component.html
@@ -1,8 +1,8 @@
+
-
diff --git a/ISD-conference-web-app-frontend/src/app/app.component.scss b/ISD-conference-web-app-frontend/src/app/app.component.scss
index d283b90..c752cbe 100644
--- a/ISD-conference-web-app-frontend/src/app/app.component.scss
+++ b/ISD-conference-web-app-frontend/src/app/app.component.scss
@@ -12,6 +12,7 @@
}
.router-content {
background-color: $white-darker;
+ padding-top: 50px;
flex: 1;
}
}
diff --git a/ISD-conference-web-app-frontend/src/app/components/isd-ui/burger/burger.component.html b/ISD-conference-web-app-frontend/src/app/components/isd-ui/burger/burger.component.html
index 7395ded..3bd5ae1 100644
--- a/ISD-conference-web-app-frontend/src/app/components/isd-ui/burger/burger.component.html
+++ b/ISD-conference-web-app-frontend/src/app/components/isd-ui/burger/burger.component.html
@@ -1,5 +1,17 @@
-
-
-
-
+
+
+
+
+
+
+
diff --git a/ISD-conference-web-app-frontend/src/app/components/isd-ui/burger/burger.component.ts b/ISD-conference-web-app-frontend/src/app/components/isd-ui/burger/burger.component.ts
index 65f55fa..7d4fd1f 100644
--- a/ISD-conference-web-app-frontend/src/app/components/isd-ui/burger/burger.component.ts
+++ b/ISD-conference-web-app-frontend/src/app/components/isd-ui/burger/burger.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { get } from 'lodash-es';
import { NavService } from 'src/app/services/nav/nav.service';
@Component({
@@ -9,25 +10,21 @@ import { NavService } from 'src/app/services/nav/nav.service';
export class BurgerComponent implements OnInit {
readonly CLOSED = 'closed';
readonly OPENED = 'opened';
- animationClass!: string;
+ @Input() barsColor: string = 'white';
+ @Input() animationClass!: string;
+ @Output() onBurgerClick = new EventEmitter
();
constructor(private navService: NavService) { }
ngOnInit(): void {
+ this.navService.animationClass$.subscribe(animationClass => {
+ this.animationClass = animationClass;
+ });
}
- toggleNav() {
- this.navService.toggleBurgerNav();
- this.setAnimationClass();
- }
+ getAnimationClass = (className: string) => `${className}-${this.animationClass}`;
- setAnimationClass = () => {
- if(typeof this.animationClass === 'undefined'){
- this.animationClass = this.CLOSED;
- return;
- }
- this.animationClass = this.animationClass === this.OPENED ? this.CLOSED : this.OPENED;
+ onBurgerClickHandler = () => {
+ this.onBurgerClick.emit();
}
-
- getAnimationClass = (className: string) => `${className}-${this.animationClass}`;
}
diff --git a/ISD-conference-web-app-frontend/src/app/components/isd-ui/footer/footer.component.html b/ISD-conference-web-app-frontend/src/app/components/isd-ui/footer/footer.component.html
index b592bbb..314486b 100644
--- a/ISD-conference-web-app-frontend/src/app/components/isd-ui/footer/footer.component.html
+++ b/ISD-conference-web-app-frontend/src/app/components/isd-ui/footer/footer.component.html
@@ -33,7 +33,7 @@
\ No newline at end of file
diff --git a/ISD-conference-web-app-frontend/src/app/components/isd-ui/footer/footer.component.scss b/ISD-conference-web-app-frontend/src/app/components/isd-ui/footer/footer.component.scss
index ead9e41..86e4f71 100644
--- a/ISD-conference-web-app-frontend/src/app/components/isd-ui/footer/footer.component.scss
+++ b/ISD-conference-web-app-frontend/src/app/components/isd-ui/footer/footer.component.scss
@@ -79,6 +79,7 @@
@include simpleFlexLayout($direction: row, $align-items: center, $gap: 0.5*$default-gap);
&:hover {
color: white;
+ cursor: pointer;
}
}
}
diff --git a/ISD-conference-web-app-frontend/src/app/components/isd-ui/footer/footer.component.ts b/ISD-conference-web-app-frontend/src/app/components/isd-ui/footer/footer.component.ts
index 5c671ae..e075919 100644
--- a/ISD-conference-web-app-frontend/src/app/components/isd-ui/footer/footer.component.ts
+++ b/ISD-conference-web-app-frontend/src/app/components/isd-ui/footer/footer.component.ts
@@ -17,4 +17,13 @@ export class FooterComponent implements OnInit {
ngOnInit(): void {
}
+ scrollToElement(event: Event, elementId: string): void {
+ event.preventDefault();
+ const element = document.getElementById(elementId);
+ console.log(element)
+ if (element) {
+ element.scrollIntoView({ behavior: 'smooth' });
+ }
+ }
+
}
diff --git a/ISD-conference-web-app-frontend/src/app/components/isd-ui/header/header.component.html b/ISD-conference-web-app-frontend/src/app/components/isd-ui/header/header.component.html
index 06c493b..495d5a1 100644
--- a/ISD-conference-web-app-frontend/src/app/components/isd-ui/header/header.component.html
+++ b/ISD-conference-web-app-frontend/src/app/components/isd-ui/header/header.component.html
@@ -1,4 +1,5 @@
-