Team-Greenvironment
/
greenvironment-frontend
mirror of https://github.com/Team-Greenvironment/greenvironment-frontend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

events and members are displayed on group page now

Browse Source
master
Max 5 years ago
parent c9c6a9b836
commit 284f8995e0
7 changed files with 146 additions and 46 deletions
Show Stats Download Patch File Download Diff File

4
src/app/components/group/dialog.html
Unescape Escape View File

@ -1,7 +1,7 @@
<h1 mat-dialog-title>Create a new event!</h1> <h1 mat-dialog-title>Create a new event!</h1>
<div mat-dialog-content> <div mat-dialog-content>
<mat-form-field style="display:contents;"> <mat-form-field style="display:contents;">
<input matInput placeholder="Enter groupname" #name> <input matInput placeholder="Enter eventname" #name>
</mat-form-field> </mat-form-field>
<mat-form-field style="display:contents;"> <mat-form-field style="display:contents;">
<input matInput [matDatepicker]="picker" placeholder="Choose a date" #date disabled> <input matInput [matDatepicker]="picker" placeholder="Choose a date" #date disabled>
@ -11,5 +11,5 @@
</div> </div>
<div mat-dialog-actions> <div mat-dialog-actions>
<button mat-button (click)="onNoClick()">Cancel</button> <button mat-button (click)="onNoClick()">Cancel</button>
<button mat-button cdkFocusInitial (click)="createEvent(name.value, date.value)">Create Group</button> <button mat-button cdkFocusInitial (click)="createEvent(name.value, date.value)">Create Event</button>
</div> </div>

67
src/app/components/group/group.component.html
Unescape Escape View File

@ -38,13 +38,23 @@
<mat-toolbar-row> <mat-toolbar-row>
<div class="profile-picture"></div> <div class="profile-picture"></div>
<span id="username">{{groupProfile.name}}</span> <span id="username">{{groupProfile.name}}</span>
<span id="handle">created by {{groupProfile.creator.username}} @{{groupProfile.creator.handle}}</span> <span id="handle" class="pointer" (click)="showUserProfile(groupProfile.creator)">created by {{groupProfile.creator.username}} @{{groupProfile.creator.handle}}</span>
<button mat-icon-button <div class="button-box">
class="request-button" <button mat-icon-button
(click)="joinGroup(groupProfile)" class="request-button"
[disabled]="!groupProfile.allowedToJoinGroup"> matTooltip="join group" matTooltipShowDelay="500"
<mat-icon>group_add</mat-icon> (click)="joinGroup(groupProfile)"
</button> [disabled]="!groupProfile.allowedToJoinGroup">
<mat-icon>group_add</mat-icon>
</button>
<button mat-icon-button
class="request-button"
matTooltip="create event" matTooltipShowDelay="500"
(click)="openDialog()"
[disabled]="!isAdmin">
<mat-icon>event</mat-icon>
</button>
</div>
</mat-toolbar-row> </mat-toolbar-row>
<mat-toolbar-row> <mat-toolbar-row>
<div class="info-box"> <div class="info-box">
@ -52,6 +62,49 @@
</div> </div>
</mat-toolbar-row> </mat-toolbar-row>
</mat-toolbar> </mat-toolbar>
<mat-accordion>
<mat-expansion-panel *ngIf="groupProfile.events.length > 0" expanded>
<mat-expansion-panel-header>
<mat-panel-title>
Events
</mat-panel-title>
</mat-expansion-panel-header>
<div class="list">
<mat-card class="card" *ngFor="let event of groupProfile.events"
[class.selected]="event === selectedEvent"
tabindex="0">
<mat-card-header>
<mat-card-title>{{event.name}}</mat-card-title>
<mat-card-subtitle >{{event.date}}</mat-card-subtitle>
<!--<div class="icon-box">
<button mat-icon-button class="request-button" (click)="sendFriendRequest(user)" [disabled]="!user.allowedToSendRequest"><mat-icon>person_add</mat-icon></button>
</div>-->
</mat-card-header>
</mat-card>
</div>
</mat-expansion-panel>
<mat-expansion-panel [expanded]="groupProfile.events.length < 1">
<mat-expansion-panel-header>
<mat-panel-title>
Members
</mat-panel-title>
</mat-expansion-panel-header>
<div class="list">
<mat-card class="card" *ngFor="let user of groupProfile.members"
[class.selected]="user === selectedUser"
tabindex="0">
<mat-card-header>
<div mat-card-avatar class="profile-picture" (click)="showUserProfile(user)"></div>
<mat-card-title class="pointer" (click)="showUserProfile(user)">{{user.username}}</mat-card-title>
<mat-card-subtitle class="pointer" (click)="showUserProfile(user)">{{user.handle}}</mat-card-subtitle>
<div class="icon-box">
<button mat-icon-button class="request-button" (click)="sendFriendRequest(user)" [disabled]="!user.allowedToSendRequest"><mat-icon>person_add</mat-icon></button>
</div>
</mat-card-header>
</mat-card>
</div>
</mat-expansion-panel>
</mat-accordion>
</div> </div>
<div id="profilecontainer" *ngIf="groupNotFound"> <div id="profilecontainer" *ngIf="groupNotFound">
<h1>Group not found :(</h1> <h1>Group not found :(</h1>

66
src/app/components/group/group.component.sass
Unescape Escape View File

@ -13,6 +13,7 @@
max-width: 1200px max-width: 1200px
margin: 0 auto margin: 0 auto
$mat-card-header-size: 100px !default
#profile-card-container #profile-card-container
margin: 0 auto margin: 0 auto
width: 100% width: 100%
@ -38,30 +39,45 @@
margin: 0 0.5em margin: 0 0.5em
#handle #handle
font-size: 14px font-size: 14px
.profile-picture
background-image: url(https://material.angular.io/assets/img/examples/shiba1.jpg)
height: $mat-card-header-size
width: $mat-card-header-size
border-radius: 50%
flex-shrink: 0
background-size: cover
// Makes `<img>` tags behave like `background-size: cover`. Not supported
// in IE, but we're using it as a progressive enhancement.
object-fit: cover
.card
.mat-table box-sizing: border-box
width: 100% width: 100%
max-width: 690px margin-top: 0.5em
margin: 0 auto outline: none
.mat-header-cell user-select: none
padding-right: 0.5em /deep/ .mat-card-header-text
width: 1000%
$mat-card-header-size: 100px !default margin: 0
.profile-picture margin-left: 16px
background-image: url(https://material.angular.io/assets/img/examples/shiba1.jpg) .mat-card-subtitle
height: $mat-card-header-size margin: 0
width: $mat-card-header-size word-break: break-all
border-radius: 50% .mat-card-title
flex-shrink: 0 margin: 0
background-size: cover word-break: break-all
// Makes `<img>` tags behave like `background-size: cover`. Not supported .request-button
// in IE, but we're using it as a progressive enhancement. margin-top: 0.5em
object-fit: cover margin-bottom: 0.5em
.profile-picture
background-image: url(https://material.angular.io/assets/img/examples/shiba1.jpg)
background-size: cover
#postlist .profile-picture:hover
margin: 0.5em auto cursor: pointer
padding: 0 .pointer
max-width: 690px cursor: pointer
/deep/ .mat-expansion-panel
background: #e6e6e6
/deep/.dark-theme .mat-expansion-panel
background: #121212

16
src/app/components/group/group.component.ts
Unescape Escape View File

@ -30,9 +30,7 @@ export class DialogCreateEventComponent {
createEvent(name: string, date: string) { createEvent(name: string, date: string) {
name = name.trim(); name = name.trim();
if (name && date) { if (name && date) {
this.group.createEvent(name, (new Date(date)).getTime().toString(), this.groupId).subscribe(response => { this.group.createEvent(name, (new Date(date)).getTime().toString(), this.groupId);
console.log(response);
});
this.dialogRef.close(); this.dialogRef.close();
} }
} }
@ -93,6 +91,9 @@ export class GroupComponent implements OnInit {
this.isAdmin = true; this.isAdmin = true;
} }
} }
for (const member of this.groupProfile.members) {
member.allowedToSendRequest = this.requestService.isAllowedToSendRequest(member.userID, this.self);
}
} else { this.groupNotFound = true; } } else { this.groupNotFound = true; }
this.loading = false; this.loading = false;
}); });
@ -108,4 +109,13 @@ export class GroupComponent implements OnInit {
group.allowedToJoinGroup = false; group.allowedToJoinGroup = false;
this.requestService.joinGroup(group); this.requestService.joinGroup(group);
} }
public showUserProfile(user: User) {
this.router.navigate(['profile/' + user.userID]);
}
public sendFriendRequest(user: User) {
user.allowedToSendRequest = false;
this.requestService.sendFriendRequest(user);
}
} }

11
src/app/models/event.ts
Unescape Escape View File

@ -0,0 +1,11 @@
export class Event {
id: number;
name: string;
date: string;
constructor(pId: number, pName: string, pdate: string) {
this.id = pId;
this.name = pName;
this.date = pdate;
}
}

2
src/app/models/group.ts
Unescape Escape View File

@ -1,4 +1,5 @@
import { User } from 'src/app/models/user'; import { User } from 'src/app/models/user';
import { Event } from 'src/app/models/event';
export class Group { export class Group {
id: number; id: number;
@ -7,5 +8,6 @@ export class Group {
creator: User = new User(); creator: User = new User();
members: User[] = new Array(); members: User[] = new Array();
admins: User[] = new Array(); admins: User[] = new Array();
events: Event[] = new Array();
allowedToJoinGroup = false; allowedToJoinGroup = false;
} }

26
src/app/services/group/group.service.ts
Unescape Escape View File

@ -3,7 +3,8 @@ import { Http } from '@angular/http';
import { Author } from 'src/app/models/author'; import { Author } from 'src/app/models/author';
import { environment } from 'src/environments/environment'; import { environment } from 'src/environments/environment';
import { User } from 'src/app/models/user'; import { User } from 'src/app/models/user';
import { Observable, Subject } from 'rxjs'; import { Event } from 'src/app/models/event';
import { Observable, BehaviorSubject } from 'rxjs';
import { Group } from 'src/app/models/group'; import { Group } from 'src/app/models/group';
@Injectable({ @Injectable({
@ -11,7 +12,7 @@ import { Group } from 'src/app/models/group';
}) })
export class GroupService { export class GroupService {
public group: Subject<any> = new Subject(); public group: BehaviorSubject<Group> = new BehaviorSubject(new Group());
constructor(private http: Http) { } constructor(private http: Http) { }
@ -34,6 +35,7 @@ export class GroupService {
creator{id name handle} creator{id name handle}
admins{id name handle} admins{id name handle}
members{id name handle} members{id name handle}
events{id name dueDate}
} }
}`, variables: { }`, variables: {
groupId: id groupId: id
@ -44,8 +46,6 @@ export class GroupService {
public renderGroup(response: any): Group { public renderGroup(response: any): Group {
const group = new Group(); const group = new Group();
const members: User[] = new Array();
const admins: User[] = new Array();
if (response.data.getGroup != null) { if (response.data.getGroup != null) {
group.id = response.data.getGroup.id; group.id = response.data.getGroup.id;
group.name = response.data.getGroup.name; group.name = response.data.getGroup.name;
@ -57,17 +57,20 @@ export class GroupService {
user.userID = member.id; user.userID = member.id;
user.username = member.name; user.username = member.name;
user.handle = member.handle; user.handle = member.handle;
members.push(user); group.members.push(user);
} }
group.members = members;
for (const admin of response.data.getGroup.admins) { for (const admin of response.data.getGroup.admins) {
const user = new User(); const user = new User();
user.userID = admin.id; user.userID = admin.id;
user.username = admin.name; user.username = admin.name;
user.handle = admin.handle; user.handle = admin.handle;
admins.push(user); group.admins.push(user);
}
for (const event of response.data.getGroup.events) {
const temp = new Date(Number(event.dueDate));
const date = temp.toLocaleString('en-GB');
group.events.push(new Event(event.id, event.name, date));
} }
group.admins = admins;
return group; return group;
} }
return null; return null;
@ -88,6 +91,11 @@ export class GroupService {
groupId: groupId groupId: groupId
}}; }};
return this.http.post(environment.graphQLUrl, body); this.http.post(environment.graphQLUrl, body).subscribe(response => {
const event = response.json().data.createEvent;
const temp = new Date(Number(event.dueDate));
const pdate = temp.toLocaleString('en-GB');
this.group.next(this.renderGroup(this.group.getValue().events.push(new Event(event.id, event.name, pdate))));
});
} }
} }

Write Preview
Loading…
Cancel
Save