Greenvironment
@@ -8,7 +9,7 @@
What's Greenvironment?
-
We, the greenviroment team want to create a netwok for environmentalists who care for our nature and our planet as much as we do.
+
We, the greenviroment team want to create a network for environmentalists who care for our nature and our planet as much as we do.
We believe, that together we can do amazing things to protect our environment and keep it clean and green.
@@ -17,3 +18,4 @@
Login
+
\ No newline at end of file
diff --git a/src/app/components/about/about.component.sass b/src/app/components/about/about.component.sass
index 5011064..90e88b1 100644
--- a/src/app/components/about/about.component.sass
+++ b/src/app/components/about/about.component.sass
@@ -3,6 +3,12 @@
@import '~@angular/material/theming'
@import '../../../styles/greenvironment-material-theme.scss'
+#about
+ position: fixed
+ width: 100%
+ height: calc(100% - 56px)
+ overflow: scroll
+
#text0, #text2
padding: 2em
max-width: 100%
diff --git a/src/app/components/app-scaffold/app-scaffold.component.html b/src/app/components/app-scaffold/app-scaffold.component.html
deleted file mode 100644
index c154507..0000000
--- a/src/app/components/app-scaffold/app-scaffold.component.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
+
\ No newline at end of file
diff --git a/src/app/components/chat/chat.component.sass b/src/app/components/chat/chat.component.sass
index 5ae8d7e..e69de29 100644
--- a/src/app/components/chat/chat.component.sass
+++ b/src/app/components/chat/chat.component.sass
@@ -1,91 +0,0 @@
-@import '../../../styles/mixins.sass'
-@import '../../../styles/vars.sass'
-
-#chat
- display: grid
- grid-template: 7.5% 82.5% 10%/100%
- width: 100%
- height: 100%
-
-#header
- @include gridPosition(1, 2, 1, 2)
- background-color: $cBoxHeaderBackground
- display: grid
- grid-template: 100% /20% 80%
-
- span
- color: $cFontWhite
- span.title
- @include gridPosition(1, 2, 2, 3)
- margin-top: 0.25em
- margin-left: 0.25em
- line-height: 100%
- font-size: 2em
-
- button
- background-color: $cBoxHeaderBackground
- border: none
-
- button:hover
- background-color: lighten($cBoxHeaderBackground, 10%)
- cursor: pointer
-
- button:active
- background-color: darken($cBoxHeaderBackground, 5%)
-
- #goback
- @include gridPosition(1, 2, 1, 2)
-
-#chatheader
- @include gridPosition(1, 2, 1, 2)
- display: grid
- grid-template: 100% /10% 90%
- #goback
- @include gridPosition(1, 2, 1, 2)
- #name
- @include gridPosition(1, 2, 2, 3)
-
-#messagecontainer
- @include gridPosition(2, 3, 1, 2)
- overflow: auto
-.chatmessage
- width: 100%
- #ownmessage
- text-align: right
- margin: 0.5em
- span
- background-color: $cMessageOwn
- border: solid
- border-color: $cMessageOwn
- border-radius: 0.25em
- #foreignmessage
- text-align: left
- margin: 0.5em
- span
- background-color: $cMessageForeign
- border: solid
- border-color: $cMessageForeign
- border-radius: 0.25em
-
-
-#newmessage
- @include gridPosition(3, 4, 1, 2)
- margin: 0.5em
- display: grid
- grid-template: 100% /80% 20%
- #input
- @include gridPosition(1, 2, 1, 2)
- border-radius: 0.25em
- border: 1px solid $cFeedInputBorder
- padding: 0.125em
- resize: none
- #send
- @include gridPosition(1, 2, 2, 3)
- button
- background-color: $cFeedChooserBackground
- color: $cFontWhite
- border: none
- border-radius: 0.5em
- button:hover
- background-color: lighten($cFeedChooserBackground, 10%)
- cursor: pointer
\ No newline at end of file
diff --git a/src/app/components/chatlist/chatlist.component.sass b/src/app/components/chatlist/chatlist.component.sass
index 1fb59d4..e69de29 100644
--- a/src/app/components/chatlist/chatlist.component.sass
+++ b/src/app/components/chatlist/chatlist.component.sass
@@ -1,71 +0,0 @@
-@import '../../../styles/mixins.sass'
-@import '../../../styles/vars.sass'
-
-#chatlist
- display: grid
- grid-template: 7.5% 92.5%/100%
- width: 100%
- height: 100%
-
-#header
- @include gridPosition(1, 2, 1, 2)
- background-color: $cBoxHeaderBackground
- display: grid
- grid-template: 100% /80% 20%
-
- span
- color: $cFontWhite
- span.title
- @include gridPosition(1, 2, 1, 2)
- margin-top: 0.25em
- margin-left: 0.25em
- line-height: 100%
- font-size: 2em
-
- button
- background-color: $cBoxHeaderBackground
- border: none
-
- button:hover
- background-color: lighten($cBoxHeaderBackground, 10%)
- cursor: pointer
-
- button:active
- background-color: darken($cBoxHeaderBackground, 5%)
-
- #newchat
- @include gridPosition(1, 2, 2, 3)
-
-#chats
- overflow: auto
- @include gridPosition(2, 3, 1, 2)
-
- div:hover
- background-color: darken($cPrimaryBackground, 10%)
- cursor: pointer
- .chatitem
- background-color: $cPrimaryBackground
- height: 3em
- margin: 0.2em
- padding: 0.25em
- border-radius: 0.25em
- display: grid
- grid-template: 100% / 20% 60% 20%
- .picture
- @include gridPosition(1, 2, 1, 2)
- border: solid
- .name, .date
- margin-top: auto
- margin-bottom: auto
- .name
- @include gridPosition(1, 2, 2, 3)
- font-weight: bold
- text-align: left
- padding-left: 0.5em
- span
- font-size: 125%
- .date
- @include gridPosition(1, 2, 3, 4)
- color: $cInactiveText
- text-align: right
- padding-right: 0.5em
\ No newline at end of file
diff --git a/src/app/components/chatmanager/chatmanager.component.html b/src/app/components/chatmanager/chatmanager.component.html
index 2d57601..75035de 100644
--- a/src/app/components/chatmanager/chatmanager.component.html
+++ b/src/app/components/chatmanager/chatmanager.component.html
@@ -1,4 +1,4 @@
-
+
diff --git a/src/app/components/feed/feed.component.html b/src/app/components/feed/feed.component.html
index 1fbc9f5..c51821b 100644
--- a/src/app/components/feed/feed.component.html
+++ b/src/app/components/feed/feed.component.html
@@ -1,34 +1,41 @@
-
-
-
-
-
-
-
-
- I protected the environment.
-
-
- What did you do?
-
- nothing ;)
-
- {{action.name}}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ I protected the environment.
+
+
+ What did you do?
+
+ nothing ;)
+
+ {{action.name}}
+
+
+
+
+
+
+
+
+
+
+
+ You need to login to post something.
+
+
+
+
+
New
@@ -36,10 +43,6 @@
\ No newline at end of file
diff --git a/src/app/components/feed/feed.component.sass b/src/app/components/feed/feed.component.sass
index cbedf1a..2780ae2 100644
--- a/src/app/components/feed/feed.component.sass
+++ b/src/app/components/feed/feed.component.sass
@@ -1,6 +1,10 @@
@import '../../../styles/mixins.sass'
@import '../../../styles/vars.sass'
+
+.primary-color
+ color: $primary-color
+
#home
width: 100%
height: 100%
@@ -10,6 +14,9 @@
display: flex
width: 100%
padding: 0.5em
+#info
+ ::ng-deep .mat-card-header-text
+ margin: 0px
#feedlist
width: 100%
diff --git a/src/app/components/feed/feed.component.ts b/src/app/components/feed/feed.component.ts
index fd38752..73094f0 100644
--- a/src/app/components/feed/feed.component.ts
+++ b/src/app/components/feed/feed.component.ts
@@ -11,7 +11,9 @@ import { User } from 'src/app/models/user';
styleUrls: ['./feed.component.sass']
})
export class FeedComponent implements OnInit {
+ loading = true;
checked: boolean; // if the "I protected the environment."-box is checked
+ empty: boolean;
// points value of the green action
value: any;
viewNew = true;
@@ -34,15 +36,14 @@ export class FeedComponent implements OnInit {
this.data.currentUserInfo.subscribe(user => {
this.user = user;
this.loggedIn = user.loggedIn;
- if (this.loggedIn) { this.userId = user.userID; }
- console.log('the userId is ' + this.userId);
- });
- this.feedService.getAllPostsRawByUserId(this.userId).subscribe(response => {
- this.feedNew = this.feedService.renderAllPosts(response.json());
- this.parentSelectedPostList = this.feedNew;
- this.feedMostLiked = this.feedNew;
- console.log(this.feedNew);
+ this.feedService.getAllPostsRaw().subscribe(response => {
+ this.loading = false;
+ this.feedNew = this.feedService.renderAllPosts(response.json());
+ this.parentSelectedPostList = this.feedNew;
+ this.feedMostLiked = this.feedNew;
+ });
});
+
}
createPost(pElement) {
@@ -55,8 +56,7 @@ export class FeedComponent implements OnInit {
}
showNew() {
- console.log('showNew()');
- this.feedService.getAllPostsRawByUserId(this.userId).subscribe(response => {
+ this.feedService.getAllPostsRaw().subscribe(response => {
this.feedNew = this.feedService.renderAllPosts(response.json());
this.parentSelectedPostList = this.feedNew; });
this.viewNew = true;
@@ -64,8 +64,7 @@ export class FeedComponent implements OnInit {
}
showMostLiked() {
- console.log('showMostLiked()');
- this.feedService.getAllPostsRawByUserId(this.userId).subscribe(response => {
+ this.feedService.getAllPostsRaw().subscribe(response => {
this.feedMostLiked = this.feedService.renderAllPosts(response.json());
this.parentSelectedPostList = this.feedMostLiked; });
this.viewNew = false;
@@ -74,9 +73,8 @@ export class FeedComponent implements OnInit {
refresh($event) {
- this.feedService.getAllPostsRawByUserId(this.userId).subscribe(response => {
+ this.feedService.getAllPostsRaw().subscribe(response => {
this.parentSelectedPostList = this.feedService.renderAllPosts(response.json());
- console.log('Refresh');
});
}
diff --git a/src/app/components/feed/postlist/postlist.component.html b/src/app/components/feed/postlist/postlist.component.html
index 03d0101..6d6d510 100644
--- a/src/app/components/feed/postlist/postlist.component.html
+++ b/src/app/components/feed/postlist/postlist.component.html
@@ -21,10 +21,21 @@
+
+
+
+
+
+
{{post.author.name}}
- @{{post.author.handle}}
+
+ @{{post.author.handle}}
{{post.date}}
@@ -35,15 +46,16 @@
-
-
\ No newline at end of file
+
+
diff --git a/src/app/components/feed/postlist/postlist.component.sass b/src/app/components/feed/postlist/postlist.component.sass
index cf022b7..12f3e95 100644
--- a/src/app/components/feed/postlist/postlist.component.sass
+++ b/src/app/components/feed/postlist/postlist.component.sass
@@ -5,11 +5,20 @@
box-sizing: border-box
width: 100%
margin-top: 0.5em
+ outline: none
+ user-select: none
::ng-deep .mat-card-header-text
margin: 0px
- .mat-card-header
-
.mat-card-subtitle
display: contents
+ a:hover
+ cursor: pointer
+ #button-box
+ text-align: right
+ margin-left: auto
+ ::ng-deep img
+ max-width: 100%
+ height: auto
+ border-radius: 4px
diff --git a/src/app/components/feed/postlist/postlist.component.ts b/src/app/components/feed/postlist/postlist.component.ts
index 3d35997..ec2e5f1 100644
--- a/src/app/components/feed/postlist/postlist.component.ts
+++ b/src/app/components/feed/postlist/postlist.component.ts
@@ -1,6 +1,7 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { Post } from 'src/app/models/post';
import { FeedService } from 'src/app/services/feed/feed.service';
+import { Router } from '@angular/router';
@Component({
selector: 'feed-postlist',
@@ -13,19 +14,41 @@ export class PostlistComponent implements OnInit {
@Output() voteEvent = new EventEmitter
();
selectedPost: Post;
- constructor(private feedService: FeedService) { }
+ constructor(private feedService: FeedService, private router: Router) { }
ngOnInit() {
}
voteUp(pPost: Post) {
this.feedService.upvote(pPost.id).subscribe(response => {
- this.voteEvent.emit(true); });
+ // this.voteEvent.emit(true);
+ pPost.userVote = response.json().data.vote.post.userVote;
+ pPost.upvotes = response.json().data.vote.post.upvotes;
+ pPost.downvotes = response.json().data.vote.post.downvotes;
+ });
}
voteDown(pPost: Post) {
this.feedService.downvote(pPost.id).subscribe(response => {
- this.voteEvent.emit(true); });
+ // this.voteEvent.emit(true);
+ pPost.userVote = response.json().data.vote.post.userVote;
+ pPost.upvotes = response.json().data.vote.post.upvotes;
+ pPost.downvotes = response.json().data.vote.post.downvotes;
+ });
}
+ deletePost(pPost: Post) {
+ this.feedService.deletePost(pPost.id).subscribe(response => {
+ for (let i = 0; i < this.childPostList.length; i++) {
+ if (this.childPostList[i].id === pPost.id) {
+ this.childPostList.splice(i, 1);
+ return;
+ }
+ }
+ });
+ }
+
+ public showUserProfile(post: any) {
+ this.router.navigate(['profile/' + post.author.id]);
+ }
}
diff --git a/src/app/components/group/dialog.html b/src/app/components/group/dialog.html
new file mode 100644
index 0000000..719cdd4
--- /dev/null
+++ b/src/app/components/group/dialog.html
@@ -0,0 +1,18 @@
+Create a new event!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/components/group/group.component.html b/src/app/components/group/group.component.html
new file mode 100644
index 0000000..52f9d46
--- /dev/null
+++ b/src/app/components/group/group.component.html
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+ {{groupProfile.name}}
+
+
+
+
+
+
+
+ created by {{groupProfile.creator.username}} @{{groupProfile.creator.handle}}
+
+
+
+
+ {{groupProfile.members.length}} member(s)
+
+
+
+
+
+
+
+ {{groupProfile.name}}
+ created by {{groupProfile.creator.username}} @{{groupProfile.creator.handle}}
+
+
+
+
+
+
+
+ {{groupProfile.members.length}} member(s)
+
+
+
+
+
+
+
+
+ Events
+
+
+
+
+
+ {{event.name}}
+ {{event.date}}
+
+
+
+
+
+
+
+
+
+
+ {{user.username}}
+ {{user.handle}}
+
+
+
+
+
+
+
+
+
+
Group not found :(
+
+
+
![]()
` tags behave like `background-size: cover`. Not supported
+ // in IE, but we're using it as a progressive enhancement.
+ object-fit: cover
+
+.card
+ box-sizing: border-box
+ width: 100%
+ margin-top: 0.5em
+ outline: none
+ user-select: none
+ /deep/ .mat-card-header-text
+ margin: 0
+ margin-left: 16px
+ .mat-card-subtitle
+ margin: 0
+ word-break: break-all
+ .mat-card-title
+ margin: 0
+ word-break: break-all
+ .request-button
+ margin-top: 0.5em
+ margin-bottom: 0.5em
+ .profile-picture
+ background-image: url(https://material.angular.io/assets/img/examples/shiba1.jpg)
+ background-size: cover
+ .profile-picture:hover
+ cursor: pointer
+.pointer
+ cursor: pointer
+
+/deep/ .mat-expansion-panel
+ background: #e6e6e6
+/deep/.dark-theme .mat-expansion-panel
+ background: #121212
\ No newline at end of file
diff --git a/src/app/components/app-scaffold/app-scaffold.component.spec.ts b/src/app/components/group/group.component.spec.ts
similarity index 53%
rename from src/app/components/app-scaffold/app-scaffold.component.spec.ts
rename to src/app/components/group/group.component.spec.ts
index 7ba9186..50601d0 100644
--- a/src/app/components/app-scaffold/app-scaffold.component.spec.ts
+++ b/src/app/components/group/group.component.spec.ts
@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { AppScaffoldComponent } from './app-scaffold.component';
+import { GroupComponent } from './group.component';
-describe('AppScaffoldComponent', () => {
- let component: AppScaffoldComponent;
- let fixture: ComponentFixture;
+describe('GroupComponent', () => {
+ let component: GroupComponent;
+ let fixture: ComponentFixture;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ AppScaffoldComponent ]
+ declarations: [ GroupComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(AppScaffoldComponent);
+ fixture = TestBed.createComponent(GroupComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/components/group/group.component.ts b/src/app/components/group/group.component.ts
new file mode 100644
index 0000000..6e5af39
--- /dev/null
+++ b/src/app/components/group/group.component.ts
@@ -0,0 +1,139 @@
+import { Component, OnInit, ViewChild} from '@angular/core';
+import {Router, NavigationEnd} from '@angular/router';
+import { User } from 'src/app/models/user';
+import {MatSort} from '@angular/material/sort';
+import { RequestService } from 'src/app/services/request/request.service';
+import { DatasharingService } from '../../services/datasharing.service';
+import { GroupService } from 'src/app/services/group/group.service';
+import { Group } from 'src/app/models/group';
+import { Event } from 'src/app/models/event';
+import {MatDialog, MatDialogRef} from '@angular/material/dialog';
+
+// DIALOG COMPONENT to create events
+@Component({
+ selector: 'dialog-overview-example-dialog',
+ templateUrl: 'dialog.html',
+})
+export class DialogCreateEventComponent {
+ groupId: string;
+
+ constructor(
+ public dialogRef: MatDialogRef,
+ private group: GroupService,
+ private router: Router) {
+ this.groupId = this.router.url.substr(this.router.url.lastIndexOf('/') + 1);
+ }
+
+ onNoClick(): void {
+ this.dialogRef.close();
+ }
+
+ createEvent(name: string, date: string, time: string) {
+ name = name.trim();
+ if (name && date && time) {
+ date = date + ' ' + time;
+ console.log(date);
+ console.log(new Date(date).getTime().toString());
+ this.group.createEvent(name, (new Date(date)).getTime().toString(), this.groupId);
+ this.dialogRef.close();
+ }
+ }
+
+}
+
+// GROUP COMPONENT
+@Component({
+ selector: 'app-profile',
+ templateUrl: './group.component.html',
+ styleUrls: ['./group.component.sass']
+})
+
+export class GroupComponent implements OnInit {
+ groupProfile: Group = new Group();
+ self: User;
+ id: string;
+ isAdmin = false;
+ groupNotFound = false;
+
+ loading = false;
+
+ constructor(
+ private router: Router,
+ public dialog: MatDialog,
+ private requestService: RequestService,
+ private data: DatasharingService,
+ private groupService: GroupService) {
+ router.events.forEach((event) => {
+ // check if url changes
+ if (event instanceof NavigationEnd) {
+ const possibleID = this.router.url.substr(this.router.url.lastIndexOf('/') + 1);
+ if (this.id !== possibleID && this.id && this.router.url.includes('group/')) {
+ // reload the group
+ console.log('search for group id: ' + this.router.url.substr(this.router.url.lastIndexOf('/') + 1));
+ this.ngOnInit();
+ }
+ }
+ });
+ }
+
+ @ViewChild(MatSort, {static: true}) sort: MatSort;
+ ngOnInit() {
+ this.loading = true;
+ this.id = this.router.url.substr(this.router.url.lastIndexOf('/') + 1);
+ this.data.currentUserInfo.subscribe(user => {
+ this.self = user;
+ });
+ this.groupService.getGroupData(this.id);
+ this.groupService.group.subscribe(response => {
+ this.isAdmin = false;
+ if (response) {
+ this.groupProfile = response;
+ // tslint:disable-next-line:max-line-length
+ this.groupProfile.allowedToJoinGroup = this.requestService.isAllowedToJoinGroup(this.groupProfile.id, this.self);
+ for (const admin of this.groupProfile.admins) {
+ if (admin.userID === this.self.userID) {
+ this.isAdmin = true;
+ }
+ }
+ for (const member of this.groupProfile.members) {
+ member.allowedToSendRequest = this.requestService.isAllowedToSendRequest(member.userID, this.self);
+ }
+ } else { this.groupNotFound = true; }
+ this.loading = false;
+ });
+ }
+
+ openDialog(): void {
+ const dialogRef = this.dialog.open(DialogCreateEventComponent, {
+ width: '250px'
+ });
+ }
+
+ public joinGroup(group: Group) {
+ group.allowedToJoinGroup = false;
+ this.requestService.joinGroup(group);
+ }
+
+ public joinEvent(event: Event) {
+ this.groupService.joinEvent(event.id).subscribe(response => {
+ const pEvent = response.json().data.joinEvent;
+ event.joined = pEvent.joined;
+ });
+ }
+
+ public leaveEvent(event: Event) {
+ this.groupService.leaveEvent(event.id).subscribe(response => {
+ const pEvent = response.json().data.leaveEvent;
+ event.joined = pEvent.joined;
+ });
+ }
+
+ public showUserProfile(user: User) {
+ this.router.navigate(['profile/' + user.userID]);
+ }
+
+ public sendFriendRequest(user: User) {
+ user.allowedToSendRequest = false;
+ this.requestService.sendFriendRequest(user);
+ }
+}
diff --git a/src/app/components/home/home.component.html b/src/app/components/home/home.component.html
index 73af9aa..e274fc6 100644
--- a/src/app/components/home/home.component.html
+++ b/src/app/components/home/home.component.html
@@ -1,7 +1,8 @@
diff --git a/src/app/components/home/home.component.sass b/src/app/components/home/home.component.sass
index 2ae2205..3a1098c 100644
--- a/src/app/components/home/home.component.sass
+++ b/src/app/components/home/home.component.sass
@@ -1,38 +1,32 @@
@import '../../../styles/mixins.sass'
@import '../../../styles/vars.sass'
-#content
- position: fixed
- width: 100%
- height: calc(100% - 56px)
-
-#chat
- box-sizing: content-box
- height: 100%
- width: 25%
- float: left
- overflow-y: auto
-
-#feed
- box-sizing: content-box
- height: 100%
- width: 50%
- float: left
+#content
+ position: fixed
+ width: 100%
+ height: calc(100% - 56px)
+
+#chat
+ box-sizing: content-box
+ height: 100%
+ width: 25%
+ float: left
+ overflow-y: auto
+
+#feed
+ box-sizing: content-box
+ height: 100%
+ width: 50%
+ float: left
+ overflow-y: auto
+
+.social
+ box-sizing: content-box
+ height: 100%
+ width: 25%
+ float: left
overflow-y: auto
-#social
- box-sizing: content-box
- height: 100%
- width: 25%
- float: left
- overflow-y: auto
-
-.mat-toolbar.mat-primary
- width: 100%
- position: sticky
- top: 0
- z-index: 1
-
/deep/ .mat-tab-body-wrapper
height: 100%
@@ -45,8 +39,9 @@
height: 100%
.tab-content
- height: 50%
+ box-sizing: content-box
width: 100%
+
diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts
index 8ece19b..f7545d1 100644
--- a/src/app/components/login/login.component.ts
+++ b/src/app/components/login/login.component.ts
@@ -26,20 +26,15 @@ export class LoginComponent implements OnInit {
}
public loginError(error: any) {
- console.log(error.errors[0].message);
this.errorOccurred = true;
this.errorMessage = error.errors[0].message;
}
onClickSubmit(pEmail: string, pPasswordHash: string) {
- console.log('try to login with mail adress:' + pEmail);
this.errorOccurred = false;
this.errorMessage = ' ';
- this.login.email = pEmail.trim();
+ this.login.email = pEmail.trim().toLowerCase();
this.login.passwordHash = sha512.sha512(pPasswordHash);
- console.log(this.login.passwordHash);
-
- console.log(this.login.passwordHash);
this.loginService.login(this.login, error => this.loginError(error.json()));
}
diff --git a/src/app/components/main-navigation/main-navigation.component.html b/src/app/components/main-navigation/main-navigation.component.html
index 4ad7044..1936530 100644
--- a/src/app/components/main-navigation/main-navigation.component.html
+++ b/src/app/components/main-navigation/main-navigation.component.html
@@ -1,11 +1,16 @@
-
-
+
+
+
+
+
- Menu
+ autoFocus="false">
+ Menu
+
+ Hello, {{user.username}}
+
Home
Profile
@@ -19,8 +24,12 @@
+
+
+
+
- Greenvironment
-
-