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

Cleanup code

Browse Source
master
trivernis 5 years ago
parent d99310c9b6
commit 5a19cc0dc4
134 changed files with 1723 additions and 1568 deletions
Show Stats Download Patch File Download Diff File

4
src/app/app.component.spec.ts
Unescape Escape View File

@ -1,5 +1,5 @@
import { TestBed, async } from '@angular/core/testing'; import {async, TestBed} from '@angular/core/testing';
import { AppComponent } from './app.component'; import {AppComponent} from './app.component';
describe('AppComponent', () => { describe('AppComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {

10
src/app/app.component.ts
Unescape Escape View File

@ -1,7 +1,6 @@
import { Component, OnInit } from '@angular/core'; import {Component, OnInit} from '@angular/core';
import { User } from './models/user'; import {DatasharingService} from './services/datasharing.service';
import { DatasharingService } from './services/datasharing.service'; import {SelfService} from './services/selfservice/self.service';
import { SelfService } from './services/selfservice/self.service';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
@ -10,7 +9,8 @@ import { SelfService } from './services/selfservice/self.service';
}) })
export class AppComponent implements OnInit { export class AppComponent implements OnInit {
constructor(private data: DatasharingService, private selfservice: SelfService) { } constructor(private data: DatasharingService, private selfservice: SelfService) {
}
ngOnInit() { ngOnInit() {
this.data.currentUserInfo.subscribe(user => { this.data.currentUserInfo.subscribe(user => {

101
src/app/app.module.ts
Unescape Escape View File

@ -1,43 +1,40 @@
import { BrowserModule } from '@angular/platform-browser'; import {BrowserModule, DomSanitizer} from '@angular/platform-browser';
import { NgModule } from '@angular/core'; import {NgModule} from '@angular/core';
import { FormsModule } from '@angular/forms'; import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import { RouterModule, Routes } from '@angular/router'; import {RouterModule, Routes} from '@angular/router';
import { SocketIoModule, SocketIoConfig } from 'ngx-socket-io'; import {SocketIoConfig, SocketIoModule} from 'ngx-socket-io';
import { HttpModule } from '@angular/http'; import {HttpModule} from '@angular/http';
import { AppComponent } from './app.component'; import {AppComponent} from './app.component';
import { DocumentListComponent } from './components/document-list/document-list.component'; import {DocumentListComponent} from './components/document-list/document-list.component';
import { DocumentComponent } from './components/document/document.component'; import {DocumentComponent} from './components/document/document.component';
import { RegisterComponent } from './components/register/register.component'; import {RegisterComponent} from './components/register/register.component';
import { LoginComponent } from './components/login/login.component'; import {LoginComponent} from './components/login/login.component';
import { ChatComponent } from './components/chat/chat.component'; import {ChatComponent} from './components/chat/chat.component';
import { FriendsComponent } from './components/social/friends/friends.component'; import {FriendsComponent} from './components/social/friends/friends.component';
import { FeedComponent } from './components/feed/feed.component'; import {FeedComponent} from './components/feed/feed.component';
import { HomeComponent } from './components/home/home.component'; import {HomeComponent} from './components/home/home.component';
import { SocialComponent } from './components/social/social.component'; import {SocialComponent} from './components/social/social.component';
import { GroupsComponent } from './components/social/groups/groups.component'; import {DialogCreateGroupComponent, GroupsComponent} from './components/social/groups/groups.component';
import { DialogCreateGroupComponent } from './components/social/groups/groups.component'; import {DialogCreateEventComponent, GroupComponent} from './components/group/group.component';
import { DialogCreateEventComponent } from './components/group/group.component'; import {ChatmanagerComponent} from './components/chatmanager/chatmanager.component';
import { ChatmanagerComponent } from './components/chatmanager/chatmanager.component'; import {ChatlistComponent} from './components/chatlist/chatlist.component';
import { ChatlistComponent } from './components/chatlist/chatlist.component'; import {PostlistComponent} from './components/feed/postlist/postlist.component';
import { PostlistComponent } from './components/feed/postlist/postlist.component'; import {GraphQLModule} from './graphql.module';
import { GraphQLModule } from './graphql.module'; import {HttpClientModule} from '@angular/common/http';
import { HttpClientModule } from '@angular/common/http'; import {ProfileComponent} from './components/profile/profile.component';
import { ProfileComponent } from './components/profile/profile.component'; import {ImprintComponent} from './components/imprint/imprint.component';
import { GroupComponent } from './components/group/group.component'; import {AboutComponent} from './components/about/about.component';
import { ImprintComponent } from './components/imprint/imprint.component'; import {ChatcontactsComponent} from './components/chatmanager/chatcontacts/chatcontacts.component';
import { AboutComponent } from './components/about/about.component'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import { ChatcontactsComponent } from './components/chatmanager/chatcontacts/chatcontacts.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import {MatTableModule} from '@angular/material/table'; import {MatTableModule} from '@angular/material/table';
import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import {InfiniteScrollModule} from 'ngx-infinite-scroll';
import {UserlistComponent} from './components/userlist/userlist.component'; import {UserlistComponent} from './components/userlist/userlist.component';
import { MatSliderModule } from '@angular/material/slider'; import {MatSliderModule} from '@angular/material/slider';
import { MatFormFieldModule } from '@angular/material/form-field'; import {MatFormFieldModule} from '@angular/material/form-field';
import {MatInputModule} from '@angular/material/input'; import {MatInputModule} from '@angular/material/input';
import { ReactiveFormsModule} from '@angular/forms'; import {MatIconModule, MatIconRegistry} from '@angular/material/icon';
import {MatIconModule} from '@angular/material/icon';
import {MatToolbarModule} from '@angular/material/toolbar'; import {MatToolbarModule} from '@angular/material/toolbar';
import {MatSidenavModule} from '@angular/material/sidenav'; import {MatSidenavModule} from '@angular/material/sidenav';
import {MatTabsModule} from '@angular/material/tabs'; import {MatTabsModule} from '@angular/material/tabs';
@ -45,22 +42,20 @@ import {MatCardModule} from '@angular/material/card';
import {MatButtonToggleModule} from '@angular/material/button-toggle'; import {MatButtonToggleModule} from '@angular/material/button-toggle';
import {MatSelectModule} from '@angular/material/select'; import {MatSelectModule} from '@angular/material/select';
import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatCheckboxModule} from '@angular/material/checkbox';
import { OverlayModule} from '@angular/cdk/overlay'; import {OverlayModule} from '@angular/cdk/overlay';
import {MatSlideToggleModule} from '@angular/material/slide-toggle'; import {MatSlideToggleModule} from '@angular/material/slide-toggle';
import {MatMenuModule} from '@angular/material/menu'; import {MatMenuModule} from '@angular/material/menu';
import {MatRippleModule} from '@angular/material/core'; import {MatRippleModule} from '@angular/material/core';
import {MatBadgeModule} from '@angular/material/badge'; import {MatBadgeModule} from '@angular/material/badge';
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
import { FlexLayoutModule } from '@angular/flex-layout'; import {FlexLayoutModule} from '@angular/flex-layout';
import { MainNavigationComponent } from './components/main-navigation/main-navigation.component'; import {MainNavigationComponent} from './components/main-navigation/main-navigation.component';
import { LayoutModule } from '@angular/cdk/layout'; import {LayoutModule} from '@angular/cdk/layout';
import { MatButtonModule } from '@angular/material/button'; import {MatButtonModule} from '@angular/material/button';
import { MatListModule } from '@angular/material/list'; import {MatListModule} from '@angular/material/list';
import {MatSortModule} from '@angular/material/sort'; import {MatSortModule} from '@angular/material/sort';
import { SearchComponent } from './components/search/search.component'; import {SearchComponent} from './components/search/search.component';
import {DomSanitizer} from '@angular/platform-browser';
import {MatIconRegistry} from '@angular/material/icon';
import {MatDialogModule} from '@angular/material/dialog'; import {MatDialogModule} from '@angular/material/dialog';
import {MatTooltipModule} from '@angular/material/tooltip'; import {MatTooltipModule} from '@angular/material/tooltip';
import {MatExpansionModule} from '@angular/material/expansion'; import {MatExpansionModule} from '@angular/material/expansion';
@ -70,16 +65,16 @@ import {MatSnackBarModule} from '@angular/material/snack-bar';
import {DialogFileUploadComponent} from './components/profile/fileUpload/fileUpload.component'; import {DialogFileUploadComponent} from './components/profile/fileUpload/fileUpload.component';
const config: SocketIoConfig = { url: 'http://localhost:4444', options: {} }; const config: SocketIoConfig = {url: 'http://localhost:4444', options: {}};
const appRoutes: Routes = [ const appRoutes: Routes = [
{ path: '', component: HomeComponent }, {path: '', component: HomeComponent},
{ path: 'profile/:id', component: ProfileComponent }, {path: 'profile/:id', component: ProfileComponent},
{ path: 'group/:id', component: GroupComponent }, {path: 'group/:id', component: GroupComponent},
{ path: 'login', component: LoginComponent }, {path: 'login', component: LoginComponent},
{ path: 'register', component: RegisterComponent }, {path: 'register', component: RegisterComponent},
{ path: 'about', component: AboutComponent }, {path: 'about', component: AboutComponent},
{ path: 'imprint', component: ImprintComponent }, {path: 'imprint', component: ImprintComponent},
]; ];
@NgModule({ @NgModule({
@ -170,4 +165,4 @@ export class AppModule {
iconRegistry.addSvgIcon( iconRegistry.addSvgIcon(
'logo_green', sanitizer.bypassSecurityTrustResourceUrl('assets/images/gv-logo-flat.svg')); 'logo_green', sanitizer.bypassSecurityTrustResourceUrl('assets/images/gv-logo-flat.svg'));
} }
} }

30
src/app/components/about/about.component.html
Unescape Escape View File

@ -1,5 +1,5 @@
<div id="about"> <div id="about">
<div id="text0" style="text-align: center;"> <div id="text0" style="text-align: center;">
<h1>Greenvironment</h1> <h1>Greenvironment</h1>
<br> <br> <br> <br> <br> <br> <br> <br> <br> <br>
@ -7,10 +7,11 @@
<button mat-icon-button> <button mat-icon-button>
<mat-icon class="big-icon" color="primary">keyboard_arrow_down</mat-icon> <mat-icon class="big-icon" color="primary">keyboard_arrow_down</mat-icon>
</button> </button>
</div> </div>
<div id="text1" style="text-align: center;"> <div id="text1" style="text-align: center;">
<h1>What's Greenvironment?</h1> <h1>What's Greenvironment?</h1>
<p>We, the greenviroment team want to create a network for environmentalists who care for our nature and our planet as much as we do.</p> <p>We, the greenviroment team want to create a network for environmentalists who care for our nature and our planet
as much as we do.</p>
<br> <br>
<h1>What does the level mean?</h1> <h1>What does the level mean?</h1>
<p>There are different levels you can reach through green behaviour. <p>There are different levels you can reach through green behaviour.
@ -18,11 +19,11 @@
</p> </p>
<table mat-table [dataSource]="levelSource" class="mat-elevation-z8"> <table mat-table [dataSource]="levelSource" class="mat-elevation-z8">
<ng-container matColumnDef="level"> <ng-container matColumnDef="level">
<th mat-header-cell *matHeaderCellDef> level </th> <th mat-header-cell *matHeaderCellDef> level</th>
<td mat-cell *matCellDef="let level"> {{level.level}} </td> <td mat-cell *matCellDef="let level"> {{level.level}} </td>
</ng-container> </ng-container>
<ng-container matColumnDef="name"> <ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef> level name </th> <th mat-header-cell *matHeaderCellDef> level name</th>
<td mat-cell *matCellDef="let level"> {{level.name}} </td> <td mat-cell *matCellDef="let level"> {{level.name}} </td>
</ng-container> </ng-container>
<tr mat-header-row *matHeaderRowDef="displayedLevelColumns"></tr> <tr mat-header-row *matHeaderRowDef="displayedLevelColumns"></tr>
@ -42,31 +43,32 @@
<!-- Position Column --> <!-- Position Column -->
<ng-container matColumnDef="points"> <ng-container matColumnDef="points">
<th mat-header-cell *matHeaderCellDef mat-sort-header> points </th> <th mat-header-cell *matHeaderCellDef mat-sort-header> points</th>
<td mat-cell *matCellDef="let action"> {{action.points}} </td> <td mat-cell *matCellDef="let action"> {{action.points}} </td>
</ng-container> </ng-container>
<!-- Name Column --> <!-- Name Column -->
<ng-container matColumnDef="name"> <ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef mat-sort-header> action </th> <th mat-header-cell *matHeaderCellDef mat-sort-header> action</th>
<td mat-cell *matCellDef="let action"> {{action.name}} </td> <td mat-cell *matCellDef="let action"> {{action.name}} </td>
</ng-container> </ng-container>
<!-- decriotion Column --> <!-- decriotion Column -->
<ng-container matColumnDef="description"> <ng-container matColumnDef="description">
<th mat-header-cell *matHeaderCellDef mat-sort-header> description </th> <th mat-header-cell *matHeaderCellDef mat-sort-header> description</th>
<td mat-cell *matCellDef="let action"> {{action.description}} </td> <td mat-cell *matCellDef="let action"> {{action.description}} </td>
</ng-container> </ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr> <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table> </table>
</div> </div>
<div id="text2" style="text-align: center;"> <div id="text2" style="text-align: center;">
<p class="mat-display-1">We believe, that together we can do amazing things to protect our environment and keep it clean and green.</p> <p class="mat-display-1">We believe, that together we can do amazing things to protect our environment and keep it
clean and green.</p>
<p class="mat-display-1">You aren't part of greenvironment yet? - join us now!</p> <p class="mat-display-1">You aren't part of greenvironment yet? - join us now!</p>
<a mat-stroked-button color="primary" class="link-button" routerLink="/register" >Register</a> <a mat-stroked-button color="primary" class="link-button" routerLink="/register">Register</a>
<br> <br>
<a mat-stroked-button color="primary" class="link-button" routerLink="/login">Login</a> <a mat-stroked-button color="primary" class="link-button" routerLink="/login">Login</a>
</div> </div>
</div> </div>

1
src/app/components/about/about.component.sass
Unescape Escape View File

@ -31,5 +31,6 @@
max-width: 690px max-width: 690px
margin: 0 auto margin: 0 auto
text-align: left text-align: left
.mat-header-cell .mat-header-cell
padding-right: 0.5em padding-right: 0.5em

6
src/app/components/about/about.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { AboutComponent } from './about.component'; import {AboutComponent} from './about.component';
describe('AboutComponent', () => { describe('AboutComponent', () => {
let component: AboutComponent; let component: AboutComponent;
@ -8,7 +8,7 @@ describe('AboutComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ AboutComponent ] declarations: [AboutComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

12
src/app/components/about/about.component.ts
Unescape Escape View File

@ -1,9 +1,9 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import {Component, OnInit, ViewChild} from '@angular/core';
import { Activitylist } from 'src/app/models/activity'; import {Activitylist} from 'src/app/models/activity';
import { Levellist } from 'src/app/models/levellist'; import {Levellist} from 'src/app/models/levellist';
import {MatSort} from '@angular/material/sort'; import {MatSort} from '@angular/material/sort';
import {MatTableDataSource} from '@angular/material/table'; import {MatTableDataSource} from '@angular/material/table';
import { ActivityService } from 'src/app/services/activity/activity.service'; import {ActivityService} from 'src/app/services/activity/activity.service';
@Component({ @Component({
selector: 'app-about', selector: 'app-about',
@ -19,9 +19,11 @@ export class AboutComponent implements OnInit {
displayedLevelColumns = ['level', 'name']; displayedLevelColumns = ['level', 'name'];
levelSource = this.levellist.levels; levelSource = this.levellist.levels;
constructor(private activityService: ActivityService) { } constructor(private activityService: ActivityService) {
}
@ViewChild(MatSort, {static: true}) sort: MatSort; @ViewChild(MatSort, {static: true}) sort: MatSort;
ngOnInit() { ngOnInit() {
this.activityService.getActivities(); this.activityService.getActivities();
this.activityService.activitylist.subscribe(response => { this.activityService.activitylist.subscribe(response => {

6
src/app/components/chat/chat.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { ChatComponent } from './chat.component'; import {ChatComponent} from './chat.component';
describe('ChatComponent', () => { describe('ChatComponent', () => {
let component: ChatComponent; let component: ChatComponent;
@ -8,7 +8,7 @@ describe('ChatComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ ChatComponent ] declarations: [ChatComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

12
src/app/components/chat/chat.component.ts
Unescape Escape View File

@ -1,8 +1,7 @@
import { Component, OnInit, EventEmitter, Output, Input } from '@angular/core'; import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
import { Chatmessage } from 'src/app/models/chatmessage'; import {Chatmessage} from 'src/app/models/chatmessage';
import { Chatinfo } from 'src/app/models/chatinfo'; import {ChatService} from 'src/app/services/chat/chat.service';
import { ChatService } from 'src/app/services/chat/chat.service'; import {Chat} from 'src/app/models/chat';
import { Chat } from 'src/app/models/chat';
@Component({ @Component({
selector: 'chatmanager-chat', selector: 'chatmanager-chat',
@ -16,7 +15,8 @@ export class ChatComponent implements OnInit {
@Output() goBackEvent = new EventEmitter<boolean>(); @Output() goBackEvent = new EventEmitter<boolean>();
@Input() childChat: Chat; @Input() childChat: Chat;
constructor(private chatService: ChatService) { } constructor(private chatService: ChatService) {
}
ngOnInit() { ngOnInit() {
this.refresh(); this.refresh();

2
src/app/components/chatlist/chatlist.component.html
Unescape Escape View File

@ -9,7 +9,7 @@
[class.selected]="chat === selectedChat" (click)="showChat(chat)"> [class.selected]="chat === selectedChat" (click)="showChat(chat)">
<div class="picture">Pic</div> <div class="picture">Pic</div>
<div class="name"><span>{{chat.memberName}}</span></div> <div class="name"><span>{{chat.memberName}}</span></div>
<div class="date"> <a>Date of last message</a></div> <div class="date"><a>Date of last message</a></div>
</div> </div>
</div> </div>
</div> </div>

6
src/app/components/chatlist/chatlist.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { ChatlistComponent } from './chatlist.component'; import {ChatlistComponent} from './chatlist.component';
describe('ChatlistComponent', () => { describe('ChatlistComponent', () => {
let component: ChatlistComponent; let component: ChatlistComponent;
@ -8,7 +8,7 @@ describe('ChatlistComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ ChatlistComponent ] declarations: [ChatlistComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

10
src/app/components/chatlist/chatlist.component.ts
Unescape Escape View File

@ -1,7 +1,6 @@
import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core'; import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
import { Chatinfo } from 'src/app/models/chatinfo'; import {Chat} from 'src/app/models/chat';
import { Chat } from 'src/app/models/chat'; import {ChatService} from 'src/app/services/chat/chat.service';
import { ChatService } from 'src/app/services/chat/chat.service';
@Component({ @Component({
selector: 'chatmanager-chatlist', selector: 'chatmanager-chatlist',
@ -15,7 +14,8 @@ export class ChatlistComponent implements OnInit {
@Output() showCreateChatEvent = new EventEmitter<boolean>(); @Output() showCreateChatEvent = new EventEmitter<boolean>();
selectedChat: Chat; selectedChat: Chat;
constructor(private chatService: ChatService) { } constructor(private chatService: ChatService) {
}
ngOnInit() { ngOnInit() {

3
src/app/components/chatmanager/chatcontacts/chatcontacts.component.html
Unescape Escape View File

@ -1,6 +1,7 @@
<div id="contacts"> <div id="contacts">
<div id='header'> <div id='header'>
<button id="goback" (click)="goBack()"><span><i class="fa fa-arrow-left fa-3x" aria-hidden="true"></i></span></button> <button id="goback" (click)="goBack()"><span><i class="fa fa-arrow-left fa-3x" aria-hidden="true"></i></span>
</button>
<span class='title'>Contacts</span> <span class='title'>Contacts</span>
</div> </div>
<div class="search-container"> <div class="search-container">

6
src/app/components/chatmanager/chatcontacts/chatcontacts.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { ChatcontactsComponent } from './chatcontacts.component'; import {ChatcontactsComponent} from './chatcontacts.component';
describe('ChatcontactsComponent', () => { describe('ChatcontactsComponent', () => {
let component: ChatcontactsComponent; let component: ChatcontactsComponent;
@ -8,7 +8,7 @@ describe('ChatcontactsComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ ChatcontactsComponent ] declarations: [ChatcontactsComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

9
src/app/components/chatmanager/chatcontacts/chatcontacts.component.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { Component, OnInit, Output, EventEmitter } from '@angular/core'; import {Component, EventEmitter, OnInit, Output} from '@angular/core';
import { FriendInfo } from 'src/app/models/friendinfo'; import {FriendInfo} from 'src/app/models/friendinfo';
import { ChatService } from 'src/app/services/chat/chat.service'; import {ChatService} from 'src/app/services/chat/chat.service';
@Component({ @Component({
selector: 'chatmanager-chatcontacts', selector: 'chatmanager-chatcontacts',
@ -12,7 +12,8 @@ export class ChatcontactsComponent implements OnInit {
@Output() goBackEvent = new EventEmitter<boolean>(); @Output() goBackEvent = new EventEmitter<boolean>();
selectedContact: FriendInfo; selectedContact: FriendInfo;
constructor(private chatService: ChatService) { } constructor(private chatService: ChatService) {
}
ngOnInit() { ngOnInit() {
} }

6
src/app/components/chatmanager/chatmanager.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { ChatmanagerComponent } from './chatmanager.component'; import {ChatmanagerComponent} from './chatmanager.component';
describe('ChatmanagerComponent', () => { describe('ChatmanagerComponent', () => {
let component: ChatmanagerComponent; let component: ChatmanagerComponent;
@ -8,7 +8,7 @@ describe('ChatmanagerComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ ChatmanagerComponent ] declarations: [ChatmanagerComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

13
src/app/components/chatmanager/chatmanager.component.ts
Unescape Escape View File

@ -1,9 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import {Component, OnInit} from '@angular/core';
import { ChatService } from '../../services/chat/chat.service'; import {ChatService} from '../../services/chat/chat.service';
import { ChatComponent } from '../chat/chat.component'; import {DatasharingService} from 'src/app/services/datasharing.service';
import { Chatinfo } from 'src/app/models/chatinfo'; import {Chat} from 'src/app/models/chat';
import { DatasharingService } from 'src/app/services/datasharing.service';
import { Chat } from 'src/app/models/chat';
@Component({ @Component({
selector: 'home-chatmanager', selector: 'home-chatmanager',
@ -19,7 +17,8 @@ export class ChatmanagerComponent implements OnInit {
parentSelectedChat: Chat; parentSelectedChat: Chat;
parentChats: Array<Chat>; parentChats: Array<Chat>;
constructor(private data: DatasharingService, private chatService: ChatService) { } constructor(private data: DatasharingService, private chatService: ChatService) {
}
ngOnInit() { ngOnInit() {
/*this.data.currentChatIDs.subscribe(chatIDs => { /*this.data.currentChatIDs.subscribe(chatIDs => {

3
src/app/components/document-list/document-list.component.html
Unescape Escape View File

@ -1,4 +1,5 @@
<div class='sidenav'> <div class='sidenav'>
<span (click)='newDoc()'>New Document</span> <span (click)='newDoc()'>New Document</span>
<span [class.selected]='docId === currentDoc' (click)='loadDoc(docId)' *ngFor='let docId of documents | async'>{{ docId }}</span> <span [class.selected]='docId === currentDoc' (click)='loadDoc(docId)'
*ngFor='let docId of documents | async'>{{ docId }}</span>
</div> </div>

8
src/app/components/document-list/document-list.component.scss
Unescape Escape View File

@ -15,9 +15,13 @@
font-family: 'Roboto', Tahoma, Geneva, Verdana, sans-serif; font-family: 'Roboto', Tahoma, Geneva, Verdana, sans-serif;
color: #818181; color: #818181;
display: block; display: block;
}.selected { }
.selected {
color: #e1e1e1; color: #e1e1e1;
}:hover { }
:hover {
color: #f1f1f1; color: #f1f1f1;
cursor: pointer; cursor: pointer;
} }

6
src/app/components/document-list/document-list.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { DocumentListComponent } from './document-list.component'; import {DocumentListComponent} from './document-list.component';
describe('DocumentListComponent', () => { describe('DocumentListComponent', () => {
let component: DocumentListComponent; let component: DocumentListComponent;
@ -8,7 +8,7 @@ describe('DocumentListComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ DocumentListComponent ] declarations: [DocumentListComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

9
src/app/components/document-list/document-list.component.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { Component, OnInit, OnDestroy } from '@angular/core'; import {Component, OnDestroy, OnInit} from '@angular/core';
import { Observable, Subscription } from 'rxjs'; import {Observable, Subscription} from 'rxjs';
import { DocumentService } from 'src/app/services/document.service'; import {DocumentService} from 'src/app/services/document.service';
@Component({ @Component({
selector: 'app-document-list', selector: 'app-document-list',
@ -13,7 +13,8 @@ export class DocumentListComponent implements OnInit, OnDestroy {
currentDoc: string; currentDoc: string;
private _docSub: Subscription; private _docSub: Subscription;
constructor(private documentService: DocumentService) { } constructor(private documentService: DocumentService) {
}
ngOnInit() { ngOnInit() {
this.documents = this.documentService.documents; this.documents = this.documentService.documents;

6
src/app/components/document/document.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { DocumentComponent } from './document.component'; import {DocumentComponent} from './document.component';
describe('DocumentComponent', () => { describe('DocumentComponent', () => {
let component: DocumentComponent; let component: DocumentComponent;
@ -8,7 +8,7 @@ describe('DocumentComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ DocumentComponent ] declarations: [DocumentComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

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

@ -1,8 +1,8 @@
import { Component, OnInit, OnDestroy } from '@angular/core'; import {Component, OnDestroy, OnInit} from '@angular/core';
import { DocumentService } from 'src/app/services/document.service'; import {DocumentService} from 'src/app/services/document.service';
import { Subscription } from 'rxjs'; import {Subscription} from 'rxjs';
import { Document } from 'src/app/models/document'; import {Document} from 'src/app/models/document';
import { startWith } from 'rxjs/operators'; import {startWith} from 'rxjs/operators';
@Component({ @Component({
selector: 'app-document', selector: 'app-document',
@ -12,11 +12,13 @@ import { startWith } from 'rxjs/operators';
export class DocumentComponent implements OnInit, OnDestroy { export class DocumentComponent implements OnInit, OnDestroy {
document: Document; document: Document;
private _docSub: Subscription; private _docSub: Subscription;
constructor(private documentService: DocumentService) { }
constructor(private documentService: DocumentService) {
}
ngOnInit() { ngOnInit() {
this._docSub = this.documentService.currentDocument.pipe( this._docSub = this.documentService.currentDocument.pipe(
startWith({ id: '', doc: 'Select an existing document or create a new one to get started'}) startWith({id: '', doc: 'Select an existing document or create a new one to get started'})
).subscribe(document => this.document = document); ).subscribe(document => this.document = document);
} }

35
src/app/components/feed/feed.component.html
Unescape Escape View File

@ -1,31 +1,35 @@
<div id="home" <div id="home"
infinite-scroll infinite-scroll
[infiniteScrollDistance]="0.5" [infiniteScrollDistance]="0.5"
[scrollWindow]="false" [scrollWindow]="false"
(scrolled)="onScroll()"> (scrolled)="onScroll()">
<div [hidden]="!loggedIn"> <div [hidden]="!loggedIn">
<mat-card > <mat-card>
<mat-card-content> <mat-card-content>
<mat-form-field id="input"> <mat-form-field id="input">
<textarea matInput #content type="text" (input)="onTextInputChange()" [(ngModel)]="textInputValue" mat-autosize="true" matAutosizeMaxRows="3" placeholder="post something"></textarea> <textarea matInput #content type="text" (input)="onTextInputChange()" [(ngModel)]="textInputValue"
mat-autosize="true" matAutosizeMaxRows="3" placeholder="post something"></textarea>
<button mat-button matSuffix mat-icon-button> <button mat-button matSuffix mat-icon-button>
<mat-icon>add</mat-icon> <mat-icon>add</mat-icon>
</button> </button>
</mat-form-field> </mat-form-field>
<p id="check"> <p id="check">
<mat-checkbox color="primary" [(ngModel)]="checked" checked="checked">I protected the environment.</mat-checkbox> <mat-checkbox color="primary" [(ngModel)]="checked" checked="checked">I protected the environment.
</mat-checkbox>
</p> </p>
<mat-form-field id="action-chooser" *ngIf="checked"> <mat-form-field id="action-chooser" *ngIf="checked">
<mat-label>What did you do?</mat-label> <mat-label>What did you do?</mat-label>
<mat-select [(ngModel)]="activityId" name="action"> <mat-select [(ngModel)]="activityId" name="action">
<mat-option>nothing ;)</mat-option> <mat-option>nothing ;)</mat-option>
<mat-option *ngFor="let action of actionlist.Actions" [value]="action.id" [matTooltip]="action.description" matTooltipShowDelay="200"> <mat-option *ngFor="let action of actionlist.Actions" [value]="action.id" [matTooltip]="action.description"
matTooltipShowDelay="200">
{{action.name}} ({{action.description}}) {{action.name}} ({{action.description}})
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-error *ngIf="errorOccurred && textInputValue">{{getErrorMessage()}}</mat-error> <mat-error *ngIf="errorOccurred && textInputValue">{{getErrorMessage()}}</mat-error>
<button mat-raised-button *ngIf="textInputValue" color="primary" id="post-button" (click)=createPost(content,activityId)> <button mat-raised-button *ngIf="textInputValue" color="primary" id="post-button"
(click)=createPost(content,activityId)>
POST POST
</button> </button>
</mat-card-content> </mat-card-content>
@ -34,26 +38,27 @@ infinite-scroll
<div [hidden]="loggedIn"> <div [hidden]="loggedIn">
<mat-card id="info"> <mat-card id="info">
<mat-card-header> <mat-card-header>
<mat-card-title > <mat-card-title>
You need to <a routerLink="/login" class="primary-color">login</a> to post something. You need to <a routerLink="/login" class="primary-color">login</a> to post something.
</mat-card-title> </mat-card-title>
</mat-card-header> </mat-card-header>
</mat-card> </mat-card>
</div> </div>
<div id="chooser-div" style="text-align: center; margin-top: 1em;"> <div id="chooser-div" style="text-align: center; margin-top: 1em;">
<mat-button-toggle-group id="feedchooser" [(ngModel)]="view" value="view"> <mat-button-toggle-group id="feedchooser" [(ngModel)]="view" value="view">
<mat-button-toggle (click)="showNew()" value="new">New</mat-button-toggle> <mat-button-toggle (click)="showNew()" value="new">New</mat-button-toggle>
<mat-button-toggle (click)="showMostLiked()" value="mostliked">Most Liked</mat-button-toggle> <mat-button-toggle (click)="showMostLiked()" value="mostliked">Most Liked</mat-button-toggle>
</mat-button-toggle-group> </mat-button-toggle-group>
</div> </div>
<div id="complete-feed"> <div id="complete-feed">
<div id="feedlist"> <div id="feedlist">
<feed-postlist [childPostList]="parentSelectedPostList"></feed-postlist> <feed-postlist [childPostList]="parentSelectedPostList"></feed-postlist>
<div style="height: 60px;" [hidden]='(!loadingNew && view === "new") || (!loadingMostLiked && view === "mostliked") '> <div style="height: 60px;"
[hidden]='(!loadingNew && view === "new") || (!loadingMostLiked && view === "mostliked") '>
<!--<mat-spinner *ngIf='loadingNew && view === "mostLiked"' style="margin:0 auto; margin-top: 2em;" diameter="50"></mat-spinner>--> <!--<mat-spinner *ngIf='loadingNew && view === "mostLiked"' style="margin:0 auto; margin-top: 2em;" diameter="50"></mat-spinner>-->
<mat-spinner style="margin:0 auto; margin-top: 2em;" diameter="50"></mat-spinner> <mat-spinner style="margin:0 auto; margin-top: 2em;" diameter="50"></mat-spinner>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

1
src/app/components/feed/feed.component.sass
Unescape Escape View File

@ -15,6 +15,7 @@
display: flex display: flex
width: 100% width: 100%
padding: 0.5em padding: 0.5em
#info #info
::ng-deep .mat-card-header-text ::ng-deep .mat-card-header-text
margin: 0px margin: 0px

6
src/app/components/feed/feed.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { FeedComponent } from './feed.component'; import {FeedComponent} from './feed.component';
describe('FeedComponent', () => { describe('FeedComponent', () => {
let component: FeedComponent; let component: FeedComponent;
@ -8,7 +8,7 @@ describe('FeedComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ FeedComponent ] declarations: [FeedComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

2
src/app/components/feed/postlist/postlist.component.html
Unescape Escape View File

@ -19,7 +19,7 @@
</div> </div>
</div>--> </div>-->
<mat-card class="post" *ngFor = "let post of childPostList" [class.selected]="post === selectedPost" tabindex="0"> <mat-card class="post" *ngFor="let post of childPostList" [class.selected]="post === selectedPost" tabindex="0">
<mat-card-header> <mat-card-header>
<div mat-card-avatar> <div mat-card-avatar>
<img class="profile-picture" [src]="post.author.profilePicture"/> <img class="profile-picture" [src]="post.author.profilePicture"/>

9
src/app/components/feed/postlist/postlist.component.sass
Unescape Escape View File

@ -8,26 +8,34 @@ $mat-card-header-size: 40px !default
margin-top: 0.5em margin-top: 0.5em
outline: none outline: none
user-select: none user-select: none
::ng-deep .mat-card-header-text ::ng-deep .mat-card-header-text
margin-top: 10px margin-top: 10px
.mat-card-subtitle .mat-card-subtitle
display: contents display: contents
.mat-card-content .mat-card-content
overflow: auto overflow: auto
a:hover a:hover
cursor: pointer cursor: pointer
#button-box #button-box
text-align: right text-align: right
margin-left: auto margin-left: auto
::ng-deep img ::ng-deep img
max-width: 100% max-width: 100%
height: auto height: auto
border-radius: 4px border-radius: 4px
.mat-button .mat-button
min-width: 32px !important min-width: 32px !important
padding: 0 padding: 0
margin: 0 margin: 0
margin-left: 8px margin-left: 8px
.profile-picture .profile-picture
border-radius: 50% border-radius: 50%
width: $mat-card-header-size width: $mat-card-header-size
@ -35,6 +43,7 @@ $mat-card-header-size: 40px !default
.activity-info .activity-info
display: contents display: contents
.span .span
margin-left: 32px margin-left: 32px

6
src/app/components/feed/postlist/postlist.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { PostlistComponent } from './postlist.component'; import {PostlistComponent} from './postlist.component';
describe('PostlistComponent', () => { describe('PostlistComponent', () => {
let component: PostlistComponent; let component: PostlistComponent;
@ -8,7 +8,7 @@ describe('PostlistComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ PostlistComponent ] declarations: [PostlistComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

11
src/app/components/feed/postlist/postlist.component.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
import { Post } from 'src/app/models/post'; import {Post} from 'src/app/models/post';
import { FeedService } from 'src/app/services/feed/feed.service'; import {FeedService} from 'src/app/services/feed/feed.service';
import { Router } from '@angular/router'; import {Router} from '@angular/router';
@Component({ @Component({
selector: 'feed-postlist', selector: 'feed-postlist',
@ -14,7 +14,8 @@ export class PostlistComponent implements OnInit {
@Output() voteEvent = new EventEmitter<boolean>(); @Output() voteEvent = new EventEmitter<boolean>();
selectedPost: Post; selectedPost: Post;
constructor(private feedService: FeedService, private router: Router) { } constructor(private feedService: FeedService, private router: Router) {
}
ngOnInit() { ngOnInit() {
} }

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

@ -24,7 +24,9 @@
</mat-toolbar-row> </mat-toolbar-row>
<mat-toolbar-row> <mat-toolbar-row>
<div class="info-box"> <div class="info-box">
<span id="handle" class="pointer" (click)="showUserProfile(groupProfile.creator)">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>
</div> </div>
</mat-toolbar-row> </mat-toolbar-row>
<mat-toolbar-row> <mat-toolbar-row>
@ -38,7 +40,9 @@
<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" class="pointer" (click)="showUserProfile(groupProfile.creator)">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>
<div class="button-box"> <div class="button-box">
<button mat-icon-button <button mat-icon-button
class="request-button" class="request-button"
@ -76,7 +80,7 @@
tabindex="0"> tabindex="0">
<mat-card-header> <mat-card-header>
<mat-card-title>{{event.name}}</mat-card-title> <mat-card-title>{{event.name}}</mat-card-title>
<mat-card-subtitle >{{event.date}}</mat-card-subtitle> <mat-card-subtitle>{{event.date}}</mat-card-subtitle>
<div class="button-box"> <div class="button-box">
<button mat-icon-button class="request-button" <button mat-icon-button class="request-button"
matTooltip="join event" matTooltipShowDelay="500" matTooltip="join event" matTooltipShowDelay="500"
@ -115,4 +119,3 @@
<mat-spinner *ngIf="loading" style="margin:0 auto; margin-top: 10em;" diameter="100"></mat-spinner> <mat-spinner *ngIf="loading" style="margin:0 auto; margin-top: 10em;" diameter="100"></mat-spinner>
</div> </div>

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

@ -26,22 +26,30 @@ $mat-card-header-size: 100px !default
.button-box .button-box
text-align: right text-align: right
margin-left: auto margin-left: auto
.request-button .request-button
margin: auto 0 margin: auto 0
#toolbar #toolbar
margin-top: 32px margin-top: 32px
.mat-toolbar-row .mat-toolbar-row
max-height: 40px max-height: 40px
.info-box .info-box
font-size: 14px font-size: 14px
margin-left: calc(100px + 0.5em) margin-left: calc(100px + 0.5em)
.info .info
margin-right: 3em margin-right: 3em
#username #username
margin: 0 0.5em margin: 0 0.5em
overflow: auto overflow: auto
#handle #handle
font-size: 14px font-size: 14px
.profile-picture .profile-picture
background-image: url(https://material.angular.io/assets/img/examples/shiba1.jpg) background-image: url(https://material.angular.io/assets/img/examples/shiba1.jpg)
height: $mat-card-header-size height: $mat-card-header-size
@ -49,6 +57,7 @@ $mat-card-header-size: 100px !default
border-radius: 50% border-radius: 50%
flex-shrink: 0 flex-shrink: 0
background-size: cover background-size: cover
&:hover &:hover
height: 200 height: 200
// Makes `<img>` tags behave like `background-size: cover`. Not supported // Makes `<img>` tags behave like `background-size: cover`. Not supported
@ -61,27 +70,35 @@ $mat-card-header-size: 100px !default
margin-top: 0.5em margin-top: 0.5em
outline: none outline: none
user-select: none user-select: none
::ng-deep .mat-card-header-text ::ng-deep .mat-card-header-text
margin: 0 margin: 0
margin-left: 16px margin-left: 16px
.mat-card-subtitle .mat-card-subtitle
margin: 0 margin: 0
word-break: break-all word-break: break-all
.mat-card-title .mat-card-title
margin: 0 margin: 0
word-break: break-all word-break: break-all
.request-button .request-button
margin-top: 0.5em margin-top: 0.5em
margin-bottom: 0.5em margin-bottom: 0.5em
.profile-picture .profile-picture
background-image: url(https://material.angular.io/assets/img/examples/shiba1.jpg) background-image: url(https://material.angular.io/assets/img/examples/shiba1.jpg)
background-size: cover background-size: cover
.profile-picture:hover .profile-picture:hover
cursor: pointer cursor: pointer
.pointer .pointer
cursor: pointer cursor: pointer
::ng-deep .mat-expansion-panel ::ng-deep .mat-expansion-panel
background: #e6e6e6 background: #e6e6e6
::ng-deep.dark-theme .mat-expansion-panel ::ng-deep.dark-theme .mat-expansion-panel
background: #121212 background: #121212

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

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { GroupComponent } from './group.component'; import {GroupComponent} from './group.component';
describe('GroupComponent', () => { describe('GroupComponent', () => {
let component: GroupComponent; let component: GroupComponent;
@ -8,7 +8,7 @@ describe('GroupComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ GroupComponent ] declarations: [GroupComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

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

@ -1,12 +1,12 @@
import { Component, OnInit, ViewChild} from '@angular/core'; import {Component, OnInit, ViewChild} from '@angular/core';
import {Router, NavigationEnd} from '@angular/router'; import {NavigationEnd, Router} from '@angular/router';
import { User } from 'src/app/models/user'; import {User} from 'src/app/models/user';
import {MatSort} from '@angular/material/sort'; import {MatSort} from '@angular/material/sort';
import { RequestService } from 'src/app/services/request/request.service'; import {RequestService} from 'src/app/services/request/request.service';
import { DatasharingService } from '../../services/datasharing.service'; import {DatasharingService} from '../../services/datasharing.service';
import { GroupService } from 'src/app/services/group/group.service'; import {GroupService} from 'src/app/services/group/group.service';
import { Group } from 'src/app/models/group'; import {Group} from 'src/app/models/group';
import { Event } from 'src/app/models/event'; import {Event} from 'src/app/models/event';
import {MatDialog, MatDialogRef} from '@angular/material/dialog'; import {MatDialog, MatDialogRef} from '@angular/material/dialog';
// DIALOG COMPONENT to create events // DIALOG COMPONENT to create events
@ -77,6 +77,7 @@ export class GroupComponent implements OnInit {
} }
@ViewChild(MatSort, {static: true}) sort: MatSort; @ViewChild(MatSort, {static: true}) sort: MatSort;
ngOnInit() { ngOnInit() {
this.loading = true; this.loading = true;
this.id = this.router.url.substr(this.router.url.lastIndexOf('/') + 1); this.id = this.router.url.substr(this.router.url.lastIndexOf('/') + 1);
@ -98,7 +99,9 @@ export class GroupComponent implements OnInit {
for (const member of this.groupProfile.members) { for (const member of this.groupProfile.members) {
member.allowedToSendRequest = this.requestService.isAllowedToSendRequest(member.userID, this.self); member.allowedToSendRequest = this.requestService.isAllowedToSendRequest(member.userID, this.self);
} }
} else { this.groupNotFound = true; } } else {
this.groupNotFound = true;
}
this.loading = false; this.loading = false;
}); });
} }

18
src/app/components/home/home.component.html
Unescape Escape View File

@ -1,8 +1,16 @@
<div id="content" fxShow="true" fxHide.lt-md="true"> <div id="content" fxShow="true" fxHide.lt-md="true">
<div id="chat"><home-chatmanager [hidden]="!loggedIn"></home-chatmanager></div> <div id="chat">
<div id="feed"><home-feed></home-feed></div> <home-chatmanager [hidden]="!loggedIn"></home-chatmanager>
<div class="social" [hidden]="!loggedIn"><home-social></home-social></div> </div>
<div class="social" [hidden]="loggedIn"><home-search></home-search></div> <div id="feed">
<home-feed></home-feed>
</div>
<div class="social" [hidden]="!loggedIn">
<home-social></home-social>
</div>
<div class="social" [hidden]="loggedIn">
<home-search></home-search>
</div>
</div> </div>
<!-- <!--
<mat-tab-group headerPosition="below" position="0" id="bottom-menu" fxShow="true" fxHide.gt-sm="true"> <mat-tab-group headerPosition="below" position="0" id="bottom-menu" fxShow="true" fxHide.gt-sm="true">
@ -31,7 +39,7 @@
</ng-template> </ng-template>
<home-social class="tab-content"></home-social> <home-social class="tab-content"></home-social>
</mat-tab> </mat-tab>
<mat-tab > <mat-tab>
<ng-template mat-tab-label> <ng-template mat-tab-label>
<mat-icon>search</mat-icon> <mat-icon>search</mat-icon>
</ng-template> </ng-template>

6
src/app/components/home/home.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { HomeComponent } from './home.component'; import {HomeComponent} from './home.component';
describe('HomeComponent', () => { describe('HomeComponent', () => {
let component: HomeComponent; let component: HomeComponent;
@ -8,7 +8,7 @@ describe('HomeComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ HomeComponent ] declarations: [HomeComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

9
src/app/components/home/home.component.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import {Component, OnInit} from '@angular/core';
import { DatasharingService } from 'src/app/services/datasharing.service'; import {DatasharingService} from 'src/app/services/datasharing.service';
import { FeedService } from 'src/app/services/feed/feed.service'; import {FeedService} from 'src/app/services/feed/feed.service';
@Component({ @Component({
selector: 'app-home', selector: 'app-home',
@ -11,7 +11,8 @@ export class HomeComponent implements OnInit {
loggedIn: boolean; loggedIn: boolean;
constructor(private data: DatasharingService, private feedService: FeedService) { } constructor(private data: DatasharingService, private feedService: FeedService) {
}
ngOnInit() { ngOnInit() {
this.data.currentUserInfo.subscribe(user => { this.data.currentUserInfo.subscribe(user => {

6
src/app/components/imprint/imprint.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { ImprintComponent } from './imprint.component'; import {ImprintComponent} from './imprint.component';
describe('ImprintComponent', () => { describe('ImprintComponent', () => {
let component: ImprintComponent; let component: ImprintComponent;
@ -8,7 +8,7 @@ describe('ImprintComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ ImprintComponent ] declarations: [ImprintComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

5
src/app/components/imprint/imprint.component.ts
Unescape Escape View File

@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core'; import {Component, OnInit} from '@angular/core';
@Component({ @Component({
selector: 'app-imprint', selector: 'app-imprint',
@ -7,7 +7,8 @@ import { Component, OnInit } from '@angular/core';
}) })
export class ImprintComponent implements OnInit { export class ImprintComponent implements OnInit {
constructor() { } constructor() {
}
ngOnInit() { ngOnInit() {
} }

9
src/app/components/login/login.component.html
Unescape Escape View File

@ -1,5 +1,5 @@
<div id="login"> <div id="login">
<mat-card style="text-align: center;" > <mat-card style="text-align: center;">
<mat-card-title> <mat-card-title>
Login Login
</mat-card-title> </mat-card-title>
@ -7,11 +7,12 @@
<div class="example-container" (keyup.enter)="onClickSubmit(email.value,password.value)"> <div class="example-container" (keyup.enter)="onClickSubmit(email.value,password.value)">
<mat-error *ngIf="errorOccurred">{{getErrorMessage()}}</mat-error> <mat-error *ngIf="errorOccurred">{{getErrorMessage()}}</mat-error>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Enter your email" #email > <input matInput placeholder="Enter your email" #email>
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Enter your password" [type]="hide ? 'password' : 'text'" #password> <input matInput placeholder="Enter your password" [type]="hide ? 'password' : 'text'" #password>
<button mat-icon-button matSuffix (click)="hide = !hide" [attr.aria-label]="'Hide password'" [attr.aria-pressed]="hide"> <button mat-icon-button matSuffix (click)="hide = !hide" [attr.aria-label]="'Hide password'"
[attr.aria-pressed]="hide">
<mat-icon>{{hide ? 'visibility_off' : 'visibility'}}</mat-icon> <mat-icon>{{hide ? 'visibility_off' : 'visibility'}}</mat-icon>
</button> </button>
</mat-form-field> </mat-form-field>
@ -20,5 +21,5 @@
<p>You aren't part of greenvironment yet?</p> <p>You aren't part of greenvironment yet?</p>
<a mat-stroked-button color="primary" routerLink="/register">Register</a> <a mat-stroked-button color="primary" routerLink="/register">Register</a>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
</div> </div>

6
src/app/components/login/login.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { LoginComponent } from './login.component'; import {LoginComponent} from './login.component';
describe('LoginComponent', () => { describe('LoginComponent', () => {
let component: LoginComponent; let component: LoginComponent;
@ -8,7 +8,7 @@ describe('LoginComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ LoginComponent ] declarations: [LoginComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

12
src/app/components/login/login.component.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {FormControl, Validators} from '@angular/forms'; import {FormControl, Validators} from '@angular/forms';
import { Login } from 'src/app/models/login'; import {Login} from 'src/app/models/login';
import { LoginService } from 'src/app/services/login/login.service'; import {LoginService} from 'src/app/services/login/login.service';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import * as sha512 from 'js-sha512'; import * as sha512 from 'js-sha512';
import {IErrorResponse} from '../../models/interfaces/IErrorResponse'; import {IErrorResponse} from '../../models/interfaces/IErrorResponse';
@ -16,6 +16,7 @@ export class LoginComponent implements OnInit {
constructor(private loginService: LoginService, private router: Router) { constructor(private loginService: LoginService, private router: Router) {
this.login = {passwordHash: null, email: null}; this.login = {passwordHash: null, email: null};
} }
login: Login; login: Login;
hide = true; hide = true;
errorOccurred = false; errorOccurred = false;
@ -43,7 +44,7 @@ export class LoginComponent implements OnInit {
this.errorMessage = ' '; this.errorMessage = ' ';
this.login.email = pEmail.trim().toLowerCase(); this.login.email = pEmail.trim().toLowerCase();
this.login.passwordHash = sha512.sha512(pPasswordHash); this.login.passwordHash = sha512.sha512(pPasswordHash);
this.loginService.login(this.login).subscribe( () => { this.loginService.login(this.login).subscribe(() => {
this.router.navigateByUrl('').catch((error) => { this.router.navigateByUrl('').catch((error) => {
this.errorMessage = error.message; this.errorMessage = error.message;
this.errorOccurred = true; this.errorOccurred = true;
@ -55,6 +56,7 @@ export class LoginComponent implements OnInit {
}); });
} }
ngOnInit() {} ngOnInit() {
}
} }

27
src/app/components/main-navigation/main-navigation.component.html
Unescape Escape View File

@ -1,5 +1,7 @@
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"> <!-- getting the google material fonts --> <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500"
<meta name="viewport" content="width=device-width,height=device-height,user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0"> <!-- diables zoom --> rel="stylesheet"> <!-- getting the google material fonts -->
<meta name="viewport"
content="width=device-width,height=device-height,user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0"> <!-- diables zoom -->
<mat-sidenav-container class="mat-typography"> <mat-sidenav-container class="mat-typography">
<!-- SIDENAV --> <!-- SIDENAV -->
@ -24,8 +26,10 @@
<mat-divider></mat-divider> <mat-divider></mat-divider>
<div id="link-box"> <div id="link-box">
<a mat-stroked-button *ngIf="!loggedIn" class="link-button" routerLink="/register" (click)="drawer.close()">Register</a> <a mat-stroked-button *ngIf="!loggedIn" class="link-button" routerLink="/register" (click)="drawer.close()">Register</a>
<a mat-stroked-button *ngIf="!loggedIn" class="link-button" routerLink="/login" (click)="drawer.toggle()">Login</a> <a mat-stroked-button *ngIf="!loggedIn" class="link-button" routerLink="/login"
<a mat-stroked-button *ngIf="loggedIn" class="link-button" (click)="logout()" (click)="drawer.toggle()">log out</a> (click)="drawer.toggle()">Login</a>
<a mat-stroked-button *ngIf="loggedIn" class="link-button" (click)="logout()" (click)="drawer.toggle()">log
out</a>
</div> </div>
</mat-nav-list> </mat-nav-list>
</mat-sidenav> </mat-sidenav>
@ -46,7 +50,8 @@
<mat-icon *ngIf="lighttheme" svgIcon="logo" style="min-width: 35px;" routerLink="" class="link"></mat-icon> <mat-icon *ngIf="lighttheme" svgIcon="logo" style="min-width: 35px;" routerLink="" class="link"></mat-icon>
<mat-icon *ngIf="!lighttheme" svgIcon="logo_green" style="min-width: 35px;" routerLink="" class="link"></mat-icon> <mat-icon *ngIf="!lighttheme" svgIcon="logo_green" style="min-width: 35px;" routerLink="" class="link"></mat-icon>
<span routerLink="" class="link">Greenvironment</span> <span routerLink="" class="link">Greenvironment</span>
<nav mat-tab-nav-bar backgroundColor="accent" color="accent" fxShow="true" fxHide.lt-md="true" routerLinkActive #rla=""> <nav mat-tab-nav-bar backgroundColor="accent" color="accent" fxShow="true" fxHide.lt-md="true" routerLinkActive
#rla="">
<div *ngIf="loggedIn"> <div *ngIf="loggedIn">
<a mat-tab-link class="link" <a mat-tab-link class="link"
*ngFor="let link of navLinksLoggedIn" *ngFor="let link of navLinksLoggedIn"
@ -73,10 +78,13 @@
<!--content on BIG SCREEN--> <!--content on BIG SCREEN-->
<div id="menu-button-box"> <div id="menu-button-box">
<span class="mat-button" *ngIf="loggedIn" fxShow="true" fxHide.lt-md="true" routerLink={{profileUrl}}>Hello, {{user.username}}</span> <span class="mat-button" *ngIf="loggedIn" fxShow="true" fxHide.lt-md="true"
routerLink={{profileUrl}}>Hello, {{user.username}}</span>
<span class="mat-button" *ngIf="!loggedIn" fxShow="true" fxHide.lt-md="true" routerLink="/login"><span>Hello, Sign in</span></span> <span class="mat-button" *ngIf="!loggedIn" fxShow="true" fxHide.lt-md="true" routerLink="/login"><span>Hello, Sign in</span></span>
<button mat-icon-button [matMenuTriggerFor]="requestMenu" [disabled]="!loggedIn" id="menu-button"> <button mat-icon-button [matMenuTriggerFor]="requestMenu" [disabled]="!loggedIn" id="menu-button">
<mat-icon [matBadge]="user.receivedRequests.length" [matBadgeHidden]="!(user.receivedRequests.length > 0)" matBadgeColor="accent">notifications</mat-icon> <mat-icon [matBadge]="user.receivedRequests.length" [matBadgeHidden]="!(user.receivedRequests.length > 0)"
matBadgeColor="accent">notifications
</mat-icon>
</button> </button>
<button mat-icon-button [matMenuTriggerFor]="menu" id="menu-button"> <button mat-icon-button [matMenuTriggerFor]="menu" id="menu-button">
@ -86,7 +94,8 @@
<mat-menu #requestMenu="matMenu"> <mat-menu #requestMenu="matMenu">
<span mat-menu-item disableRipple="true" disabled="true">friend requests:</span> <span mat-menu-item disableRipple="true" disabled="true">friend requests:</span>
<button mat-menu-item *ngFor = "let request of user.receivedRequests" [class.selected]="request === selectedRequest" (click)="$event.stopPropagation();" disableRipple="true"> <button mat-menu-item *ngFor="let request of user.receivedRequests"
[class.selected]="request === selectedRequest" (click)="$event.stopPropagation();" disableRipple="true">
<button mat-icon-button (click)=acceptRequest(request.senderUserID) (click)="$event.stopPropagation();"> <button mat-icon-button (click)=acceptRequest(request.senderUserID) (click)="$event.stopPropagation();">
<mat-icon>check</mat-icon> <mat-icon>check</mat-icon>
</button> </button>
@ -108,7 +117,7 @@
</mat-slide-toggle> </mat-slide-toggle>
</button> </button>
<div [hidden]="!loggedIn"> <div [hidden]="!loggedIn">
<button mat-menu-item (click)="logout()" > <button mat-menu-item (click)="logout()">
<mat-icon>exit_to_app</mat-icon> <mat-icon>exit_to_app</mat-icon>
<span>log out</span> <span>log out</span>
</button> </button>

11
src/app/components/main-navigation/main-navigation.component.sass
Unescape Escape View File

@ -6,15 +6,19 @@
.menu-bar .menu-bar
position: inherit !important position: inherit !important
.mat-card-avatar .mat-card-avatar
display: contents display: contents
.profile-picture .profile-picture
width: 52px width: 52px
height: 52px height: 52px
border-radius: 50% border-radius: 50%
flex-shrink: 0 flex-shrink: 0
.hello-text-box .hello-text-box
margin-left: 8px margin-left: 8px
.hello-text .hello-text
white-space: normal white-space: normal
font-size: initial font-size: initial
@ -26,7 +30,7 @@
.sidenav .mat-toolbar .sidenav .mat-toolbar
//background: inherit //background: inherit
.mat-toolbar .mat-toolbar
height: 56px height: 56px
@ -34,10 +38,13 @@
//position: sticky //position: sticky
top: 0 top: 0
z-index: 999 z-index: 999
.mat-tab-nav-bar .mat-tab-nav-bar
height: 56px height: 56px
.mat-tab-links .mat-tab-links
height: 56px height: 56px
.mat-tab-link .mat-tab-link
height: 56px height: 56px
@ -53,7 +60,7 @@
margin-bottom: 0.5em margin-bottom: 0.5em
::ng-deep .mat-tab-link ::ng-deep .mat-tab-link
min-width: 5em!important min-width: 5em !important
#menu-button-box #menu-button-box
text-align: right text-align: right

18
src/app/components/main-navigation/main-navigation.component.spec.ts
Unescape Escape View File

@ -1,13 +1,13 @@
import { LayoutModule } from '@angular/cdk/layout'; import {LayoutModule} from '@angular/cdk/layout';
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import {NoopAnimationsModule} from '@angular/platform-browser/animations';
import { MatButtonModule } from '@angular/material/button'; import {MatButtonModule} from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon'; import {MatIconModule} from '@angular/material/icon';
import { MatListModule } from '@angular/material/list'; import {MatListModule} from '@angular/material/list';
import { MatSidenavModule } from '@angular/material/sidenav'; import {MatSidenavModule} from '@angular/material/sidenav';
import { MatToolbarModule } from '@angular/material/toolbar'; import {MatToolbarModule} from '@angular/material/toolbar';
import { MainNavigationComponent } from './main-navigation.component'; import {MainNavigationComponent} from './main-navigation.component';
describe('MainNavigationComponent', () => { describe('MainNavigationComponent', () => {
let component: MainNavigationComponent; let component: MainNavigationComponent;

57
src/app/components/main-navigation/main-navigation.component.ts
Unescape Escape View File

@ -1,14 +1,14 @@
import { Component, OnInit, HostBinding } from '@angular/core'; import {Component, HostBinding, OnInit} from '@angular/core';
import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; import {BreakpointObserver} from '@angular/cdk/layout';
import { DatasharingService } from '../../services/datasharing.service'; import {DatasharingService} from '../../services/datasharing.service';
import { RequestService } from '../../services/request/request.service'; import {RequestService} from '../../services/request/request.service';
import { SettingsService } from '../../services/settings/settings.service'; import {SettingsService} from '../../services/settings/settings.service';
import { environment } from 'src/environments/environment'; import {environment} from 'src/environments/environment';
import { Levellist } from 'src/app/models/levellist'; import {Levellist} from 'src/app/models/levellist';
import { Http } from '@angular/http'; import {Http} from '@angular/http';
import { Router } from '@angular/router'; import {Router} from '@angular/router';
import { User } from 'src/app/models/user'; import {User} from 'src/app/models/user';
import { OverlayContainer} from '@angular/cdk/overlay'; import {OverlayContainer} from '@angular/cdk/overlay';
@Component({ @Component({
selector: 'app-main-navigation', selector: 'app-main-navigation',
@ -27,6 +27,7 @@ export class MainNavigationComponent implements OnInit {
) { ) {
this.overlay = overlayContainer.getContainerElement(); this.overlay = overlayContainer.getContainerElement();
} }
loggedIn = false; loggedIn = false;
userId: number; userId: number;
username: string; username: string;
@ -41,18 +42,19 @@ export class MainNavigationComponent implements OnInit {
overlay; overlay;
navLinksLoggedIn = [ navLinksLoggedIn = [
{ path: '', label: 'Home' }, {path: '', label: 'Home'},
{ path: this.profileUrl, label: 'Profile' }, {path: this.profileUrl, label: 'Profile'},
{ path: '/about', label: 'About' }, {path: '/about', label: 'About'},
{ path: '/imprint', label: 'Imprint' }, {path: '/imprint', label: 'Imprint'},
]; ];
navLinks = [ navLinks = [
{ path: '', label: 'Home' }, {path: '', label: 'Home'},
{ path: '/about', label: 'About' }, {path: '/about', label: 'About'},
{ path: '/imprint', label: 'Imprint' }, {path: '/imprint', label: 'Imprint'},
]; ];
@HostBinding('class') componentCssClass; @HostBinding('class') componentCssClass;
ngOnInit() { ngOnInit() {
this.data.currentUserInfo.subscribe(user => { this.data.currentUserInfo.subscribe(user => {
this.user = user; this.user = user;
@ -96,26 +98,31 @@ export class MainNavigationComponent implements OnInit {
updateLinks() { updateLinks() {
this.navLinksLoggedIn = [ this.navLinksLoggedIn = [
{ path: '', label: 'Home' }, {path: '', label: 'Home'},
{ path: this.profileUrl, label: 'Profile' }, {path: this.profileUrl, label: 'Profile'},
{ path: '/about', label: 'About' }, {path: '/about', label: 'About'},
{ path: '/imprint', label: 'Imprint' }, {path: '/imprint', label: 'Imprint'},
]; ];
} }
onSetTheme(theme) { onSetTheme(theme) {
this.overlayContainer.getContainerElement().classList.add(theme); this.overlayContainer.getContainerElement().classList.add(theme);
this.componentCssClass = theme; this.componentCssClass = theme;
} }
logout() { logout() {
const url = environment.graphQLUrl; const url = environment.graphQLUrl;
const headers = new Headers(); const headers = new Headers();
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
const body = {query: `mutation { const body = {
query: `mutation {
logout logout
}`}; }`
};
this.http.post(url, body).subscribe(response => { this.http.post(url, body).subscribe(response => {
console.log(response.text()); }); console.log(response.text());
});
this.loggedIn = false; this.loggedIn = false;
const user = new User(); const user = new User();
user.loggedIn = false; user.loggedIn = false;

6
src/app/components/profile/fileUpload/fileUpload.component.ts
Unescape Escape View File

@ -1,4 +1,4 @@
import {Component, EventEmitter} from '@angular/core'; import {Component} from '@angular/core';
import {MatDialogRef} from '@angular/material/dialog'; import {MatDialogRef} from '@angular/material/dialog';
import {SelfService} from '../../../services/selfservice/self.service'; import {SelfService} from '../../../services/selfservice/self.service';
import {environment} from '../../../../environments/environment'; import {environment} from '../../../../environments/environment';
@ -13,12 +13,12 @@ export class DialogFileUploadComponent {
public errorOccurred = false; public errorOccurred = false;
public uploading = false; public uploading = false;
private errorMessage: string; private errorMessage: string;
public profilePictureUrl: BehaviorSubject<string|null>; public profilePictureUrl: BehaviorSubject<string | null>;
private file; private file;
public localFileUrl; public localFileUrl;
constructor(public dialogRef: MatDialogRef<DialogFileUploadComponent>, private selfService: SelfService) { constructor(public dialogRef: MatDialogRef<DialogFileUploadComponent>, private selfService: SelfService) {
this.profilePictureUrl = new BehaviorSubject<string|null>(null); this.profilePictureUrl = new BehaviorSubject<string | null>(null);
} }
/** /**

14
src/app/components/profile/profile.component.sass
Unescape Escape View File

@ -17,25 +17,33 @@
margin: 0 auto margin: 0 auto
width: 100% width: 100%
max-width: 690px max-width: 690px
.icon-box .icon-box
text-align: right text-align: right
width: 100% width: 100%
.request-button .request-button
margin-top: 0.5em margin-top: 0.5em
margin-bottom: 0.5em margin-bottom: 0.5em
margin-left: auto margin-left: auto
#toolbar #toolbar
margin-top: 32px margin-top: 32px
.mat-toolbar-row .mat-toolbar-row
max-height: 40px max-height: 40px
.info-box .info-box
font-size: 14px font-size: 14px
margin-left: calc(100px + 0.5em) margin-left: calc(100px + 0.5em)
.info .info
margin-right: 1em margin-right: 1em
font-size: 14px font-size: 14px
#username #username
margin: 0 0.5em margin: 0 0.5em
#handle #handle
font-size: 14px font-size: 14px
@ -52,14 +60,16 @@ $mat-card-header-size: 100px !default
display: flex display: flex
justify-content: center justify-content: center
align-items: center align-items: center
&:hover &:hover
.profile-picture .profile-picture
filter: brightness(70%) filter: brightness(70%)
#icon #icon
display: block display: block
filter: none filter: none
// Makes `<img>` tags behave like `background-size: cover`. Not supported // Makes `<img>` tags behave like `background-size: cover`. Not supported
// in IE, but we're using it as a progressive enhancement. // in IE, but we're using it as a progressive enhancement.
.profile-picture .profile-picture
height: $mat-card-header-size height: $mat-card-header-size

6
src/app/components/profile/profile.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { ProfileComponent } from './profile.component'; import {ProfileComponent} from './profile.component';
describe('ProfileComponent', () => { describe('ProfileComponent', () => {
let component: ProfileComponent; let component: ProfileComponent;
@ -8,7 +8,7 @@ describe('ProfileComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ ProfileComponent ] declarations: [ProfileComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

21
src/app/components/profile/profile.component.ts
Unescape Escape View File

@ -1,12 +1,11 @@
import { Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {Router, NavigationEnd} from '@angular/router'; import {NavigationEnd, Router} from '@angular/router';
import { User } from 'src/app/models/user'; import {User} from 'src/app/models/user';
import { Levellist } from 'src/app/models/levellist'; import {Levellist} from 'src/app/models/levellist';
import { RequestService } from 'src/app/services/request/request.service'; import {RequestService} from 'src/app/services/request/request.service';
import { DatasharingService } from '../../services/datasharing.service'; import {DatasharingService} from '../../services/datasharing.service';
import { ProfileService } from 'src/app/services/profile/profile.service'; import {ProfileService} from 'src/app/services/profile/profile.service';
import { HttpClient } from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import { environment } from 'src/environments/environment';
import {MatSnackBar} from '@angular/material/snack-bar'; import {MatSnackBar} from '@angular/material/snack-bar';
import {SelfService} from '../../services/selfservice/self.service'; import {SelfService} from '../../services/selfservice/self.service';
import {MatDialog} from '@angular/material'; import {MatDialog} from '@angular/material';
@ -63,7 +62,9 @@ export class ProfileComponent implements OnInit {
this.userProfile.allowedToSendRequest = this.requestService.isAllowedToSendRequest(this.userProfile.userID, this.self); this.userProfile.allowedToSendRequest = this.requestService.isAllowedToSendRequest(this.userProfile.userID, this.self);
this.ownProfile = this.userProfile.userID === this.self.userID; this.ownProfile = this.userProfile.userID === this.self.userID;
this.rankname = this.levellist.getLevelName(this.userProfile.level); this.rankname = this.levellist.getLevelName(this.userProfile.level);
} else { this.profileNotFound = true; } } else {
this.profileNotFound = true;
}
this.loading = false; this.loading = false;
}); });
} }

21
src/app/components/register/register.component.html
Unescape Escape View File

@ -1,33 +1,38 @@
<div id="register"> <div id="register">
<mat-card style="text-align: center;" > <mat-card style="text-align: center;">
<mat-card-title> <mat-card-title>
Register Register
</mat-card-title> </mat-card-title>
<mat-card-content> <mat-card-content>
<div class="example-container" (keyup.enter)="onClickSubmit(username.value,email.value,password.value, repeatpassword.value)"> <div class="example-container"
(keyup.enter)="onClickSubmit(username.value,email.value,password.value, repeatpassword.value)">
<mat-error *ngIf="errorOccurred">{{errorMessage}}</mat-error> <mat-error *ngIf="errorOccurred">{{errorMessage}}</mat-error>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Enter your email" #email > <input matInput placeholder="Enter your email" #email>
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Enter your username" #username > <input matInput placeholder="Enter your username" #username>
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Enter your password" [type]="hide1 ? 'password' : 'text'" #password> <input matInput placeholder="Enter your password" [type]="hide1 ? 'password' : 'text'" #password>
<button mat-icon-button matSuffix (click)="hide1 = !hide1" [attr.aria-label]="'Hide password'" [attr.aria-pressed]="hide1"> <button mat-icon-button matSuffix (click)="hide1 = !hide1" [attr.aria-label]="'Hide password'"
[attr.aria-pressed]="hide1">
<mat-icon>{{hide1 ? 'visibility_off' : 'visibility'}}</mat-icon> <mat-icon>{{hide1 ? 'visibility_off' : 'visibility'}}</mat-icon>
</button> </button>
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Repeat your password" [type]="hide2 ? 'password' : 'text'" #repeatpassword> <input matInput placeholder="Repeat your password" [type]="hide2 ? 'password' : 'text'" #repeatpassword>
<button mat-icon-button matSuffix (click)="hide2 = !hide2" [attr.aria-label]="'Hide password'" [attr.aria-pressed]="hide2"> <button mat-icon-button matSuffix (click)="hide2 = !hide2" [attr.aria-label]="'Hide password'"
[attr.aria-pressed]="hide2">
<mat-icon>{{hide2 ? 'visibility_off' : 'visibility'}}</mat-icon> <mat-icon>{{hide2 ? 'visibility_off' : 'visibility'}}</mat-icon>
</button> </button>
</mat-form-field> </mat-form-field>
</div> </div>
<button mat-raised-button color="primary" (click)="onClickSubmit(username.value,email.value,password.value, repeatpassword.value)">Register</button> <button mat-raised-button color="primary"
(click)="onClickSubmit(username.value,email.value,password.value, repeatpassword.value)">Register
</button>
<p>You are already part of greenvironment?</p> <p>You are already part of greenvironment?</p>
<a mat-stroked-button color="primary" routerLink="/login">Login</a> <a mat-stroked-button color="primary" routerLink="/login">Login</a>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
</div> </div>

6
src/app/components/register/register.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { RegisterComponent } from './register.component'; import {RegisterComponent} from './register.component';
describe('RegisterComponent', () => { describe('RegisterComponent', () => {
let component: RegisterComponent; let component: RegisterComponent;
@ -8,7 +8,7 @@ describe('RegisterComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ RegisterComponent ] declarations: [RegisterComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

10
src/app/components/register/register.component.ts
Unescape Escape View File

@ -1,9 +1,6 @@
import { Component, OnInit } from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {RegisterService} from '../../services/register/register.service'; import {RegisterService} from '../../services/register/register.service';
import {Registration} from '../../models/registration'; import {Registration} from '../../models/registration';
import {Router} from '@angular/router';
import {Md5} from 'ts-md5/dist/md5';
import { parseWebDriverCommand } from 'blocking-proxy/built/lib/webdriver_commands';
import * as sha512 from 'js-sha512'; import * as sha512 from 'js-sha512';
@Component({ @Component({
@ -28,7 +25,7 @@ export class RegisterComponent implements OnInit {
this.errorMessage = error.errors[0].message; this.errorMessage = error.errors[0].message;
} }
onClickSubmit(pUsername: string, pEmail: string, pPasswordHash: string, pPasswordHashRepeat: string ) { onClickSubmit(pUsername: string, pEmail: string, pPasswordHash: string, pPasswordHashRepeat: string) {
this.errorOccurred = false; this.errorOccurred = false;
this.errorMessage = ' '; this.errorMessage = ' ';
if (this.passwordSame(pPasswordHash, pPasswordHashRepeat)) { if (this.passwordSame(pPasswordHash, pPasswordHashRepeat)) {
@ -50,7 +47,8 @@ export class RegisterComponent implements OnInit {
} }
} }
ngOnInit() {} ngOnInit() {
}
} }

9
src/app/components/search/search.component.html
Unescape Escape View File

@ -1,13 +1,13 @@
<div id="search"> <div id="search">
<mat-toolbar> <mat-toolbar>
<mat-form-field id="input" <mat-form-field id="input"
floatLabel="never" > floatLabel="never">
<input matInput #searchWord <input matInput #searchWord
placeholder="search" placeholder="search"
[ngModel]="searchWord.value" [ngModel]="searchWord.value"
(ngModelChange)="search(searchWord.value)"> (ngModelChange)="search(searchWord.value)">
<button mat-button matSuffix mat-icon-button> <button mat-button matSuffix mat-icon-button>
<mat-icon>search </mat-icon> <mat-icon>search</mat-icon>
</button> </button>
</mat-form-field> </mat-form-field>
</mat-toolbar> </mat-toolbar>
@ -34,7 +34,10 @@
<div mat-card-avatar class="profile-picture" (click)="showGroupProfile(group)"></div> <div mat-card-avatar class="profile-picture" (click)="showGroupProfile(group)"></div>
<mat-card-title class="pointer" (click)="showGroupProfile(group)">{{group.name}}</mat-card-title> <mat-card-title class="pointer" (click)="showGroupProfile(group)">{{group.name}}</mat-card-title>
<div class="icon-box"> <div class="icon-box">
<button mat-icon-button class="request-button" (click)="joinGroup(group)" [disabled]="!group.allowedToJoinGroup"><mat-icon>group_add</mat-icon></button> <button mat-icon-button class="request-button" (click)="joinGroup(group)"
[disabled]="!group.allowedToJoinGroup">
<mat-icon>group_add</mat-icon>
</button>
</div> </div>
</mat-card-header> </mat-card-header>
</mat-card> </mat-card>

6
src/app/components/search/search.component.sass
Unescape Escape View File

@ -22,16 +22,20 @@
margin-top: 0.5em margin-top: 0.5em
outline: none outline: none
user-select: none user-select: none
::ng-deep .mat-card-header-text ::ng-deep .mat-card-header-text
width: 1000% width: 1000%
margin: 0 margin: 0
margin-left: 16px margin-left: 16px
.mat-card-subtitle .mat-card-subtitle
margin: 0 margin: 0
word-break: break-all word-break: break-all
.mat-card-title .mat-card-title
margin: 0 margin: 0
word-break: break-all word-break: break-all
.request-button .request-button
margin-top: 0.5em margin-top: 0.5em
margin-bottom: 0.5em margin-bottom: 0.5em
@ -39,6 +43,7 @@
.profile-picture .profile-picture
background-image: url(https://material.angular.io/assets/img/examples/shiba1.jpg) background-image: url(https://material.angular.io/assets/img/examples/shiba1.jpg)
background-size: cover background-size: cover
.profile-picture:hover .profile-picture:hover
cursor: pointer cursor: pointer
@ -51,6 +56,7 @@
::ng-deep .mat-expansion-panel ::ng-deep .mat-expansion-panel
background: #e6e6e6 background: #e6e6e6
::ng-deep.dark-theme .mat-expansion-panel ::ng-deep.dark-theme .mat-expansion-panel
background: #121212 background: #121212

6
src/app/components/search/search.component.spec.ts
Unescape Escape View File

@ -1,5 +1,5 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { SearchComponent } from './search.component'; import {SearchComponent} from './search.component';
describe('ChatComponent', () => { describe('ChatComponent', () => {
let component: SearchComponent; let component: SearchComponent;
@ -7,7 +7,7 @@ describe('ChatComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ SearchComponent ] declarations: [SearchComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

20
src/app/components/search/search.component.ts
Unescape Escape View File

@ -1,12 +1,10 @@
import { Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import { SearchService } from 'src/app/services/search/search.service'; import {SearchService} from 'src/app/services/search/search.service';
import { RequestService } from 'src/app/services/request/request.service'; import {RequestService} from 'src/app/services/request/request.service';
import {Headers, Http} from '@angular/http'; import {User} from 'src/app/models/user';
import { User } from 'src/app/models/user'; import {Router} from '@angular/router';
import {environment} from 'src/environments/environment'; import {DatasharingService} from '../../services/datasharing.service';
import { Router } from '@angular/router'; import {GroupInfo} from 'src/app/models/groupinfo';
import { DatasharingService } from '../../services/datasharing.service';
import { GroupInfo } from 'src/app/models/groupinfo';
@Component({ @Component({
selector: 'home-search', selector: 'home-search',
@ -25,7 +23,9 @@ export class SearchComponent implements OnInit {
private searchService: SearchService, private searchService: SearchService,
private requestService: RequestService, private requestService: RequestService,
private router: Router, private router: Router,
private data: DatasharingService) { } private data: DatasharingService) {
}
ngOnInit() { ngOnInit() {
this.data.currentUserInfo.subscribe(user => { this.data.currentUserInfo.subscribe(user => {
this.user = user; this.user = user;

2
src/app/components/social/friends/friends.component.sass
Unescape Escape View File

@ -10,8 +10,10 @@
width: 100% width: 100%
margin-top: 0.5em margin-top: 0.5em
cursor: pointer cursor: pointer
::ng-deep .mat-card-header-text ::ng-deep .mat-card-header-text
margin: 0 24px margin: 0 24px
.mat-card-subtitle .mat-card-subtitle
margin: 0 margin: 0

6
src/app/components/social/friends/friends.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { FriendsComponent } from './friends.component'; import {FriendsComponent} from './friends.component';
describe('FriendsComponent', () => { describe('FriendsComponent', () => {
let component: FriendsComponent; let component: FriendsComponent;
@ -8,7 +8,7 @@ describe('FriendsComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ FriendsComponent ] declarations: [FriendsComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

17
src/app/components/social/friends/friends.component.ts
Unescape Escape View File

@ -1,8 +1,8 @@
import { Component, OnInit } from '@angular/core'; import {Component, OnInit} from '@angular/core';
import { DatasharingService } from 'src/app/services/datasharing.service'; import {DatasharingService} from 'src/app/services/datasharing.service';
import { FriendInfo } from 'src/app/models/friendinfo'; import {FriendInfo} from 'src/app/models/friendinfo';
import { Router } from '@angular/router'; import {Router} from '@angular/router';
import { User } from 'src/app/models/user'; import {User} from 'src/app/models/user';
@Component({ @Component({
selector: 'social-friends', selector: 'social-friends',
@ -11,11 +11,14 @@ import { User } from 'src/app/models/user';
}) })
export class FriendsComponent implements OnInit { export class FriendsComponent implements OnInit {
user: User; user: User;
constructor(private data: DatasharingService, private router: Router) { }
constructor(private data: DatasharingService, private router: Router) {
}
ngOnInit() { ngOnInit() {
this.data.currentUserInfo.subscribe(user => { this.data.currentUserInfo.subscribe(user => {
this.user = user; }); this.user = user;
});
} }
public showFriendProfile(pFriend: FriendInfo) { public showFriendProfile(pFriend: FriendInfo) {

5
src/app/components/social/groups/groups.component.html
Unescape Escape View File

@ -1,7 +1,10 @@
<mat-toolbar> <mat-toolbar>
<span>Groups</span> <span>Groups</span>
<div id="button-box"> <div id="button-box">
<button mat-icon-button (click)="openDialog()" matTooltip="create group" matTooltipPosition="left" matTooltipShowDelay="500"><mat-icon>group_add</mat-icon></button> <button mat-icon-button (click)="openDialog()" matTooltip="create group" matTooltipPosition="left"
matTooltipShowDelay="500">
<mat-icon>group_add</mat-icon>
</button>
</div> </div>
</mat-toolbar> </mat-toolbar>

1
src/app/components/social/groups/groups.component.sass
Unescape Escape View File

@ -10,6 +10,7 @@
width: 100% width: 100%
margin-top: 0.5em margin-top: 0.5em
cursor: pointer cursor: pointer
.mat-card-subtitle .mat-card-subtitle
margin: 0 margin: 0

6
src/app/components/social/groups/groups.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { GroupsComponent } from './groups.component'; import {GroupsComponent} from './groups.component';
describe('GroupsComponent', () => { describe('GroupsComponent', () => {
let component: GroupsComponent; let component: GroupsComponent;
@ -8,7 +8,7 @@ describe('GroupsComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ GroupsComponent ] declarations: [GroupsComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

2
src/app/components/social/groups/groups.component.ts
Unescape Escape View File

@ -5,8 +5,6 @@ import {SocialService} from 'src/app/services/social/social.service';
import {User} from 'src/app/models/user'; import {User} from 'src/app/models/user';
import {DatasharingService} from 'src/app/services/datasharing.service'; import {DatasharingService} from 'src/app/services/datasharing.service';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {GraphQLError} from 'graphql';
import {IGraphqlError} from '../../../models/interfaces/IGraphqlError';
import {IErrorResponse} from '../../../models/interfaces/IErrorResponse'; import {IErrorResponse} from '../../../models/interfaces/IErrorResponse';
// DIALOG COMPONENT to create groups // DIALOG COMPONENT to create groups

6
src/app/components/social/social.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { SocialComponent } from './social.component'; import {SocialComponent} from './social.component';
describe('SocialComponent', () => { describe('SocialComponent', () => {
let component: SocialComponent; let component: SocialComponent;
@ -8,7 +8,7 @@ describe('SocialComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ SocialComponent ] declarations: [SocialComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

5
src/app/components/social/social.component.ts
Unescape Escape View File

@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core'; import {Component, OnInit} from '@angular/core';
@Component({ @Component({
selector: 'home-social', selector: 'home-social',
@ -7,7 +7,8 @@ import { Component, OnInit } from '@angular/core';
}) })
export class SocialComponent implements OnInit { export class SocialComponent implements OnInit {
constructor() { } constructor() {
}
ngOnInit() { ngOnInit() {
} }

9
src/app/components/userlist/userlist.component.html
Unescape Escape View File

@ -1,4 +1,4 @@
<mat-card class="card" *ngFor = "let user of userList" [class.selected]="user === selectedUser" tabindex="0"> <mat-card class="card" *ngFor="let user of userList" [class.selected]="user === selectedUser" tabindex="0">
<mat-card-header> <mat-card-header>
<div mat-card-avatar> <div mat-card-avatar>
<img class="profile-picture" [src]="user.profilePicture"/> <img class="profile-picture" [src]="user.profilePicture"/>
@ -6,7 +6,10 @@
<mat-card-title class="pointer" (click)="showUserProfile(user)">{{user.username}}</mat-card-title> <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> <mat-card-subtitle class="pointer" (click)="showUserProfile(user)">{{user.handle}}</mat-card-subtitle>
<div class="icon-box"> <div class="icon-box">
<button mat-icon-button class="request-button" (click)="sendFriendRequest(user)" [disabled]="!user.allowedToSendRequest"><mat-icon>person_add</mat-icon></button> <button mat-icon-button class="request-button" (click)="sendFriendRequest(user)"
[disabled]="!user.allowedToSendRequest">
<mat-icon>person_add</mat-icon>
</button>
</div> </div>
</mat-card-header> </mat-card-header>
</mat-card> </mat-card>

4
src/app/components/userlist/userlist.component.sass
Unescape Escape View File

@ -7,15 +7,19 @@
margin-top: 0.5em margin-top: 0.5em
outline: none outline: none
user-select: none user-select: none
::ng-deep .mat-card-header-text ::ng-deep .mat-card-header-text
width: 1000% width: 1000%
margin: auto 0 auto 24px margin: auto 0 auto 24px
.mat-card-subtitle .mat-card-subtitle
margin: 0 margin: 0
word-break: break-all word-break: break-all
.mat-card-title .mat-card-title
margin: 0 margin: 0
word-break: break-all word-break: break-all
.request-button .request-button
margin-top: 0.5em margin-top: 0.5em
margin-bottom: 0.5em margin-bottom: 0.5em

6
src/app/components/userlist/userlist.component.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { UserlistComponent } from './userlist.component'; import {UserlistComponent} from './userlist.component';
describe('UserlistComponent', () => { describe('UserlistComponent', () => {
let component: UserlistComponent; let component: UserlistComponent;
@ -8,7 +8,7 @@ describe('UserlistComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ UserlistComponent ] declarations: [UserlistComponent]
}) })
.compileComponents(); .compileComponents();
})); }));

11
src/app/components/userlist/userlist.component.ts
Unescape Escape View File

@ -1,7 +1,7 @@
import { Component, OnInit, Input } from '@angular/core'; import {Component, Input, OnInit} from '@angular/core';
import { User } from 'src/app/models/user'; import {User} from 'src/app/models/user';
import { RequestService } from 'src/app/services/request/request.service'; import {RequestService} from 'src/app/services/request/request.service';
import { Router } from '@angular/router'; import {Router} from '@angular/router';
@Component({ @Component({
selector: 'user-list', selector: 'user-list',
@ -13,7 +13,8 @@ export class UserlistComponent implements OnInit {
@Input() userList: Array<User>; @Input() userList: Array<User>;
selectedUser: User; selectedUser: User;
constructor(private requestService: RequestService, private router: Router) { } constructor(private requestService: RequestService, private router: Router) {
}
ngOnInit() { ngOnInit() {
} }

8
src/app/graphql.module.ts
Unescape Escape View File

@ -1,9 +1,10 @@
import {NgModule} from '@angular/core'; import {NgModule} from '@angular/core';
import {ApolloModule, APOLLO_OPTIONS} from 'apollo-angular'; import {APOLLO_OPTIONS, ApolloModule} from 'apollo-angular';
import {HttpLinkModule, HttpLink} from 'apollo-angular-link-http'; import {HttpLink, HttpLinkModule} from 'apollo-angular-link-http';
import {InMemoryCache} from 'apollo-cache-inmemory'; import {InMemoryCache} from 'apollo-cache-inmemory';
const uri = 'https://o5x5jzoo7z.sse.codesandbox.io/graphql'; const uri = 'https://o5x5jzoo7z.sse.codesandbox.io/graphql';
// 'https://greenvironment.net/graphql:443'; // <-- add the URL of the GraphQL server here // 'https://greenvironment.net/graphql:443'; // <-- add the URL of the GraphQL server here
export function createApollo(httpLink: HttpLink) { export function createApollo(httpLink: HttpLink) {
return { return {
@ -22,4 +23,5 @@ export function createApollo(httpLink: HttpLink) {
}, },
], ],
}) })
export class GraphQLModule {} export class GraphQLModule {
}

3
src/app/models/activity.ts
Unescape Escape View File

@ -1,4 +1,3 @@
export class Activity { export class Activity {
id: number; id: number;
name: string; name: string;
@ -14,5 +13,5 @@ export class Activity {
} }
export class Activitylist { export class Activitylist {
Actions: Activity[] = new Array(); Actions: Activity[] = [];
} }

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

@ -1,4 +1,4 @@
import { Chatmessage } from './chatmessage'; import {Chatmessage} from './chatmessage';
export class Chat { export class Chat {
id: number; id: number;

4
src/app/models/friendRequest.ts
Unescape Escape View File

@ -1,5 +1,3 @@
import { User } from 'src/app/models/user';
export class FriendRequest { export class FriendRequest {
id: number; id: number;
senderUserID: number; senderUserID: number;
@ -12,4 +10,4 @@ export class FriendRequest {
this.senderHandle = senderHandle; this.senderHandle = senderHandle;
this.senderUsername = senderName; this.senderUsername = senderName;
} }
} }

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

@ -1,4 +1,4 @@
import { Levellist } from 'src/app/models/levellist'; import {Levellist} from 'src/app/models/levellist';
export class FriendInfo { export class FriendInfo {
levellist: Levellist = new Levellist(); levellist: Levellist = new Levellist();

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

@ -1,14 +1,14 @@
import { User } from 'src/app/models/user'; import {User} from 'src/app/models/user';
import { Event } from 'src/app/models/event'; import {Event} from 'src/app/models/event';
export class Group { export class Group {
id: number; id: number;
name: string; name: string;
handle: string; handle: string;
creator: User = new User(); creator: User = new User();
members: User[] = new Array(); members: User[] = [];
admins: User[] = new Array(); admins: User[] = [];
events: Event[] = new Array(); events: Event[] = [];
joined: boolean; joined: boolean;
allowedToJoinGroup = false; allowedToJoinGroup = false;
} }

2
src/app/models/interfaces/IGraphqlError.ts
Unescape Escape View File

@ -4,5 +4,5 @@ export interface IGraphqlError {
path: string[]; path: string[];
location: {line: number; column: number}[]; location: { line: number; column: number }[];
} }

1
src/app/models/interfaces/IUser.ts
Unescape Escape View File

@ -1,5 +1,4 @@
import {IGroup} from './IGroup'; import {IGroup} from './IGroup';
import {ISettings} from './ISettings';
import {IChat} from './IChat'; import {IChat} from './IChat';
import {IRequest} from './IRequest'; import {IRequest} from './IRequest';

14
src/app/models/levellist.ts
Unescape Escape View File

@ -1,12 +1,12 @@
export class Levellist { export class Levellist {
levels: {level: number, name: string, points: number}[] = [ levels: { level: number, name: string, points: number }[] = [
{level: 0, name: 'Green Horn', points: 0}, {level: 0, name: 'Green Horn', points: 0},
{level: 1, name: 'Good Willed', points: 100 }, {level: 1, name: 'Good Willed', points: 100},
{level: 2, name: 'Helper', points: 200 }, {level: 2, name: 'Helper', points: 200},
{level: 3, name: 'World Saver', points: 300 }, {level: 3, name: 'World Saver', points: 300},
{level: 4, name: 'Hero of the Green Country', points: 400 }, {level: 4, name: 'Hero of the Green Country', points: 400},
{level: 5, name: 'Champion of the Earth', points: 500 }, {level: 5, name: 'Champion of the Earth', points: 500},
{level: 6, name: 'Intergallactic Superhero', points: 600 }, {level: 6, name: 'Intergallactic Superhero', points: 600},
]; ];
getLevelName(level: number): any { getLevelName(level: number): any {

4
src/app/models/login.ts
Unescape Escape View File

@ -1,6 +1,4 @@
import { Hash } from 'crypto';
export interface Login { export interface Login {
email: string; email: string;
passwordHash: string; passwordHash: string;
} }

4
src/app/models/post.ts
Unescape Escape View File

@ -1,5 +1,5 @@
import { Author } from './author'; import {Author} from './author';
import { Activity } from './activity'; import {Activity} from './activity';
export class Post { export class Post {
id: number; id: number;

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

@ -2,4 +2,4 @@ export interface Registration {
username: string; username: string;
email: string; email: string;
passwordHash: string; passwordHash: string;
} }

10
src/app/models/user.ts
Unescape Escape View File

@ -1,9 +1,9 @@
import { FriendRequest } from 'src/app/models/friendRequest'; import {FriendRequest} from 'src/app/models/friendRequest';
import { FriendInfo } from 'src/app/models/friendinfo'; import {FriendInfo} from 'src/app/models/friendinfo';
import { GroupInfo } from 'src/app/models/groupinfo'; import {GroupInfo} from 'src/app/models/groupinfo';
import { Post } from 'src/app/models/post'; import {Post} from 'src/app/models/post';
import {IUser} from './interfaces/IUser'; import {IUser} from './interfaces/IUser';
import { environment } from 'src/environments/environment'; import {environment} from 'src/environments/environment';
export class User { export class User {
loggedIn = false; loggedIn = false;

4
src/app/services/activity/activity.service.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { TestBed } from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import { ActivityService } from './activity.service'; import {ActivityService} from './activity.service';
describe('ActivityService', () => { describe('ActivityService', () => {
beforeEach(() => TestBed.configureTestingModule({})); beforeEach(() => TestBed.configureTestingModule({}));

21
src/app/services/activity/activity.service.ts
Unescape Escape View File

@ -1,8 +1,8 @@
import { Injectable } from '@angular/core'; import {Injectable} from '@angular/core';
import { BehaviorSubject } from 'rxjs'; import {BehaviorSubject} from 'rxjs';
import { Activitylist, Activity } from 'src/app/models/activity'; import {Activity, Activitylist} from 'src/app/models/activity';
import { environment } from 'src/environments/environment'; import {environment} from 'src/environments/environment';
import { Http } from '@angular/http'; import {Http} from '@angular/http';
@Injectable({ @Injectable({
@ -12,7 +12,8 @@ export class ActivityService {
public activitylist = new BehaviorSubject<Activitylist>(new Activitylist()); public activitylist = new BehaviorSubject<Activitylist>(new Activitylist());
constructor(private http: Http) { } constructor(private http: Http) {
}
changeUserInfo(pActivitylist: Activitylist) { changeUserInfo(pActivitylist: Activitylist) {
this.activitylist.next(pActivitylist); this.activitylist.next(pActivitylist);
@ -30,11 +31,11 @@ export class ActivityService {
} }
public buildJson(): any { public buildJson(): any {
const body = {query: `query{getActivities{ const body = {
query: `query{getActivities{
id name description points id name description points
}}`, variables: { }}`, variables: {}
};
}};
return body; return body;
} }

4
src/app/services/chat/chat.service.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { TestBed } from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import { ChatService } from './chat.service'; import {ChatService} from './chat.service';
describe('ChatService', () => { describe('ChatService', () => {
beforeEach(() => TestBed.configureTestingModule({})); beforeEach(() => TestBed.configureTestingModule({}));

47
src/app/services/chat/chat.service.ts
Unescape Escape View File

@ -1,10 +1,10 @@
import { Injectable } from '@angular/core'; import {Injectable} from '@angular/core';
import {Http, URLSearchParams, Headers} from '@angular/http'; import {Headers, Http} from '@angular/http';
import { Chat } from 'src/app/models/chat'; import {Chat} from 'src/app/models/chat';
import { Chatmessage } from 'src/app/models/chatmessage'; import {Chatmessage} from 'src/app/models/chatmessage';
import { FriendInfo } from 'src/app/models/friendinfo'; import {FriendInfo} from 'src/app/models/friendinfo';
import { DatasharingService } from '../datasharing.service'; import {DatasharingService} from '../datasharing.service';
import { environment } from 'src/environments/environment'; import {environment} from 'src/environments/environment';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@ -17,7 +17,8 @@ export class ChatService {
constructor(private http: Http, private data: DatasharingService) { constructor(private http: Http, private data: DatasharingService) {
this.data.currentUserInfo.subscribe(user => { this.data.currentUserInfo.subscribe(user => {
this.ownID = user.userID; }); this.ownID = user.userID;
});
} }
public getAllChats(): Array<Chat> { public getAllChats(): Array<Chat> {
@ -210,17 +211,20 @@ export class ChatService {
getBodyForNewChat(pUserID: number) { getBodyForNewChat(pUserID: number) {
this.arr = [pUserID]; this.arr = [pUserID];
const body = {query: `mutation($userID: number[]) { const body = {
query: `mutation($userID: number[]) {
createChat(members: $userID) {id} createChat(members: $userID) {id}
}`, variables: { }`, variables: {
members: this.arr members: this.arr
}}; }
};
return body; return body;
} }
getBodyForRequestOfAllChatPartners() { getBodyForRequestOfAllChatPartners() {
const body = {query: `query { const body = {
query: `query {
getSelf { getSelf {
chats(first: 1000, offset: 0) {members{name, id, level}} chats(first: 1000, offset: 0) {members{name, id, level}}
}}` }}`
@ -230,18 +234,21 @@ export class ChatService {
} }
getBodyForSendMessage(pchatID: number, pContent: string) { getBodyForSendMessage(pchatID: number, pContent: string) {
const body = {query: `mutation($chatId: ID!, $content: String!) { const body = {
query: `mutation($chatId: ID!, $content: String!) {
sendMessage(chatId: $chatId, content: $content) {id} sendMessage(chatId: $chatId, content: $content) {id}
}`, variables: { }`, variables: {
chatId: pchatID, chatId: pchatID,
content: pContent content: pContent
}}; }
};
return body; return body;
} }
getBodyForGetAllChats() { getBodyForGetAllChats() {
const body = {query: `query { const body = {
query: `query {
getSelf { getSelf {
chats(first: 10, offset: 0) { chats(first: 10, offset: 0) {
id, members{name, id, level}, id, members{name, id, level},
@ -256,24 +263,28 @@ export class ChatService {
} }
getBodyForGetChatsByID(pChatID: number) { getBodyForGetChatsByID(pChatID: number) {
const body = {query: `query($chatID: ID!) { const body = {
query: `query($chatID: ID!) {
getChat(chatId: $chatID) {id, members{name, id, level}, getChat(chatId: $chatID) {id, members{name, id, level},
messages(first: 1000, offset: 0) {author {id}, createdAt, content}} messages(first: 1000, offset: 0) {author {id}, createdAt, content}}
} }
}`, variables: { }`, variables: {
chatId: pChatID chatId: pChatID
}}; }
};
return body; return body;
} }
getBodyForGetMessagesInChat(pChatID: number) { getBodyForGetMessagesInChat(pChatID: number) {
const body = {query: `query($chatId: ID!) { const body = {
query: `query($chatId: ID!) {
getChat(chatId: $chatId) { getChat(chatId: $chatId) {
messages(first: 1000, offset: 0) {author {id}, createdAt, content} messages(first: 1000, offset: 0) {author {id}, createdAt, content}
} }
}`, variables: { }`, variables: {
chatId: pChatID chatId: pChatID
}}; }
};
return body; return body;
} }
} }

4
src/app/services/datasharing.service.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { TestBed } from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import { DatasharingService } from './datasharing.service'; import {DatasharingService} from './datasharing.service';
describe('DatasharingService', () => { describe('DatasharingService', () => {
beforeEach(() => TestBed.configureTestingModule({})); beforeEach(() => TestBed.configureTestingModule({}));

9
src/app/services/datasharing.service.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { Injectable } from '@angular/core'; import {Injectable} from '@angular/core';
import { BehaviorSubject } from 'rxjs'; import {BehaviorSubject} from 'rxjs';
import { User } from '../models/user'; import {User} from '../models/user';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@ -12,7 +12,8 @@ export class DatasharingService {
currentUserInfo = this.userInfoSource.asObservable(); currentUserInfo = this.userInfoSource.asObservable();
currentChatIDs = this.chatIDsSource.asObservable(); currentChatIDs = this.chatIDsSource.asObservable();
constructor() { } constructor() {
}
changeUserInfo(pUserInfo: User) { changeUserInfo(pUserInfo: User) {
this.userInfoSource.next(pUserInfo); this.userInfoSource.next(pUserInfo);

4
src/app/services/document.service.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { TestBed } from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import { DocumentService } from './document.service'; import {DocumentService} from './document.service';
describe('DocumentService', () => { describe('DocumentService', () => {
beforeEach(() => TestBed.configureTestingModule({})); beforeEach(() => TestBed.configureTestingModule({}));

11
src/app/services/document.service.ts
Unescape Escape View File

@ -1,8 +1,8 @@
import { Injectable } from '@angular/core'; import {Injectable} from '@angular/core';
import { Socket } from 'ngx-socket-io'; import {Socket} from 'ngx-socket-io';
import { Document } from '../models/document'; import {Document} from '../models/document';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@ -11,14 +11,15 @@ export class DocumentService {
currentDocument = this.socket.fromEvent<Document>('document'); currentDocument = this.socket.fromEvent<Document>('document');
documents = this.socket.fromEvent<string[]>('documents'); documents = this.socket.fromEvent<string[]>('documents');
constructor(private socket: Socket) { } constructor(private socket: Socket) {
}
getDocument(id: string) { getDocument(id: string) {
this.socket.emit('getDoc', id); this.socket.emit('getDoc', id);
} }
newDocument() { newDocument() {
this.socket.emit('addDoc', { id: this.docId(), doc: '' }); this.socket.emit('addDoc', {id: this.docId(), doc: ''});
} }
editDocument(document: Document) { editDocument(document: Document) {

4
src/app/services/feed/feed.service.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { TestBed } from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import { FeedService } from './feed.service'; import {FeedService} from './feed.service';
describe('FeedService', () => { describe('FeedService', () => {
beforeEach(() => TestBed.configureTestingModule({})); beforeEach(() => TestBed.configureTestingModule({}));

64
src/app/services/feed/feed.service.ts
Unescape Escape View File

@ -1,10 +1,10 @@
import { Injectable } from '@angular/core'; import {Injectable} from '@angular/core';
import { HttpClient } from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import { Post } from 'src/app/models/post'; import {Post} from 'src/app/models/post';
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 { Activity } from 'src/app/models/activity'; import {Activity} from 'src/app/models/activity';
import { BehaviorSubject } from 'rxjs'; import {BehaviorSubject} from 'rxjs';
import {tap} from 'rxjs/operators'; import {tap} from 'rxjs/operators';
@Injectable({ @Injectable({
@ -21,13 +21,15 @@ export class FeedService {
private mostLikedOffset = 0; private mostLikedOffset = 0;
private newOffset = 0; private newOffset = 0;
constructor(private http: HttpClient) { } constructor(private http: HttpClient) {
}
public createPost(pContent: String) { public createPost(pContent: String) {
const headers = new Headers(); const headers = new Headers();
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
const body = {query: `mutation($content: String!) { const body = {
query: `mutation($content: String!) {
createPost(content: $content) { createPost(content: $content) {
id, id,
content, content,
@ -50,7 +52,8 @@ export class FeedService {
createdAt} createdAt}
}`, variables: { }`, variables: {
content: pContent content: pContent
}}; }
};
return this.http.post(environment.graphQLUrl, body).pipe(tap(response => { return this.http.post(environment.graphQLUrl, body).pipe(tap(response => {
const updatedposts = this.newPosts.getValue(); const updatedposts = this.newPosts.getValue();
updatedposts.unshift(this.renderPost(response)); updatedposts.unshift(this.renderPost(response));
@ -63,7 +66,8 @@ export class FeedService {
const headers = new Headers(); const headers = new Headers();
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
const body = {query: `mutation($content: String!, $id: ID) { const body = {
query: `mutation($content: String!, $id: ID) {
createPost(content: $content activityId: $id) { createPost(content: $content activityId: $id) {
id, id,
content, content,
@ -87,7 +91,8 @@ export class FeedService {
}`, variables: { }`, variables: {
content: pContent, content: pContent,
id: activityId id: activityId
}}; }
};
return this.http.post(environment.graphQLUrl, body).pipe(tap(response => { return this.http.post(environment.graphQLUrl, body).pipe(tap(response => {
const updatedposts = this.newPosts.getValue(); const updatedposts = this.newPosts.getValue();
updatedposts.unshift(this.renderPost(response)); updatedposts.unshift(this.renderPost(response));
@ -100,13 +105,15 @@ export class FeedService {
const headers = new Headers(); const headers = new Headers();
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
const body = {query: `mutation($postId: ID!) { const body = {
query: `mutation($postId: ID!) {
vote(postId: $postId, type: UPVOTE) { vote(postId: $postId, type: UPVOTE) {
post{userVote upvotes downvotes} post{userVote upvotes downvotes}
} }
}`, variables: { }`, variables: {
postId postId
}}; }
};
return this.http.post(environment.graphQLUrl, body); return this.http.post(environment.graphQLUrl, body);
} }
@ -115,13 +122,15 @@ export class FeedService {
const headers = new Headers(); const headers = new Headers();
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
const body = {query: `mutation($postId: ID!) { const body = {
query: `mutation($postId: ID!) {
vote(postId: $postId, type: DOWNVOTE) { vote(postId: $postId, type: DOWNVOTE) {
post{userVote upvotes downvotes} post{userVote upvotes downvotes}
} }
}`, variables: { }`, variables: {
postId: pPostID postId: pPostID
}}; }
};
return this.http.post(environment.graphQLUrl, body); return this.http.post(environment.graphQLUrl, body);
} }
@ -130,11 +139,13 @@ export class FeedService {
const headers = new Headers(); const headers = new Headers();
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
const body = {query: `mutation($postId: ID!) { const body = {
query: `mutation($postId: ID!) {
deletePost(postId: $postId) deletePost(postId: $postId)
}`, variables: { }`, variables: {
postId: pPostID postId: pPostID
}}; }
};
return this.http.post(environment.graphQLUrl, body); return this.http.post(environment.graphQLUrl, body);
} }
@ -153,7 +164,8 @@ export class FeedService {
} }
this.setPost(sort); this.setPost(sort);
}); });
} this.setPost(sort); }
this.setPost(sort);
} }
public getNextPosts() { public getNextPosts() {
@ -198,7 +210,8 @@ export class FeedService {
} }
buildJson(sort: string, offset: number) { buildJson(sort: string, offset: number) {
const body = {query: `query($offset: Int, $sort: SortType){ const body = {
query: `query($offset: Int, $sort: SortType){
getPosts (first: 10, offset: $offset, sort: $sort) { getPosts (first: 10, offset: $offset, sort: $sort) {
id, id,
content, content,
@ -222,7 +235,8 @@ export class FeedService {
}`, variables: { }`, variables: {
offset, offset,
sort sort
}}; }
};
return body; return body;
} }
@ -251,7 +265,9 @@ export class FeedService {
post.activity.name, post.activity.name,
post.activity.description, post.activity.description,
post.activity.points); post.activity.points);
} else { activity = null; } } else {
activity = null;
}
return new Post(id, content, htmlContent, upvotes, downvotes, userVote, deletable, date, author, activity); return new Post(id, content, htmlContent, upvotes, downvotes, userVote, deletable, date, author, activity);
} }
@ -283,7 +299,9 @@ export class FeedService {
post.activity.name, post.activity.name,
post.activity.description, post.activity.description,
post.activity.points); post.activity.points);
} else { activity = null; } } else {
activity = null;
}
posts.push(new Post(id, content, htmlContent, upvotes, downvotes, userVote, deletable, date, author, activity)); posts.push(new Post(id, content, htmlContent, upvotes, downvotes, userVote, deletable, date, author, activity));
} }
return posts; return posts;

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

@ -1,6 +1,6 @@
import { TestBed } from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import { GroupService } from './group.service'; import {GroupService} from './group.service';
describe('GroupService', () => { describe('GroupService', () => {
beforeEach(() => TestBed.configureTestingModule({})); beforeEach(() => TestBed.configureTestingModule({}));

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

@ -1,11 +1,10 @@
import { Injectable } from '@angular/core'; import {Injectable} from '@angular/core';
import { Http } from '@angular/http'; import {Http} from '@angular/http';
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 {Event} from 'src/app/models/event';
import { Event } from 'src/app/models/event'; import {BehaviorSubject} from 'rxjs';
import { Observable, BehaviorSubject } from 'rxjs'; import {Group} from 'src/app/models/group';
import { Group } from 'src/app/models/group';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@ -14,7 +13,8 @@ export class GroupService {
public group: BehaviorSubject<Group> = new BehaviorSubject(new Group()); public group: BehaviorSubject<Group> = new BehaviorSubject(new Group());
constructor(private http: Http) { } constructor(private http: Http) {
}
public getGroupData(groupId: string) { public getGroupData(groupId: string) {
const headers = new Headers(); const headers = new Headers();
@ -83,7 +83,8 @@ export class GroupService {
public createEvent(name: string, date: string, groupId: string) { public createEvent(name: string, date: string, groupId: string) {
const headers = new Headers(); const headers = new Headers();
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
const body = {query: `mutation($groupId: ID!, $name: String, $date: String) { const body = {
query: `mutation($groupId: ID!, $name: String, $date: String) {
createEvent(name: $name, dueDate: $date, groupId: $groupId) { createEvent(name: $name, dueDate: $date, groupId: $groupId) {
id id
name name
@ -94,7 +95,8 @@ export class GroupService {
name: name, name: name,
date: date, date: date,
groupId: groupId groupId: groupId
}}; }
};
this.http.post(environment.graphQLUrl, body).subscribe(response => { this.http.post(environment.graphQLUrl, body).subscribe(response => {
const event = response.json().data.createEvent; const event = response.json().data.createEvent;
@ -109,26 +111,30 @@ export class GroupService {
public joinEvent(eventId: string) { public joinEvent(eventId: string) {
const headers = new Headers(); const headers = new Headers();
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
const body = {query: `mutation($eventId: ID!) { const body = {
query: `mutation($eventId: ID!) {
joinEvent(eventId: $eventId) { joinEvent(eventId: $eventId) {
joined joined
} }
}`, variables: { }`, variables: {
eventId: eventId eventId: eventId
}}; }
};
return this.http.post(environment.graphQLUrl, body); return this.http.post(environment.graphQLUrl, body);
} }
public leaveEvent(eventId: string) { public leaveEvent(eventId: string) {
const headers = new Headers(); const headers = new Headers();
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
const body = {query: `mutation($eventId: ID!) { const body = {
query: `mutation($eventId: ID!) {
leaveEvent(eventId: $eventId) { leaveEvent(eventId: $eventId) {
joined joined
} }
}`, variables: { }`, variables: {
eventId: eventId eventId: eventId
}}; }
};
return this.http.post(environment.graphQLUrl, body); return this.http.post(environment.graphQLUrl, body);
} }

4
src/app/services/login/login.service.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { TestBed } from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import { LoginService } from './login.service'; import {LoginService} from './login.service';
describe('LoginService', () => { describe('LoginService', () => {
beforeEach(() => TestBed.configureTestingModule({})); beforeEach(() => TestBed.configureTestingModule({}));

4
src/app/services/profile/profile.service.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { TestBed } from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import { ProfileService } from './profile.service'; import {ProfileService} from './profile.service';
describe('ProfileService', () => { describe('ProfileService', () => {
beforeEach(() => TestBed.configureTestingModule({})); beforeEach(() => TestBed.configureTestingModule({}));

4
src/app/services/profile/profile.service.ts
Unescape Escape View File

@ -119,7 +119,9 @@ export class ProfileService extends BaseService {
post.activity.name, post.activity.name,
post.activity.description, post.activity.description,
post.activity.points); post.activity.points);
} else { activity = null; } } else {
activity = null;
}
// tslint:disable-next-line: max-line-length // tslint:disable-next-line: max-line-length
posts.push(new Post(id, content, htmlContent, upvotes, downvotes, userVote, deletable, pdate, author, activity)); posts.push(new Post(id, content, htmlContent, upvotes, downvotes, userVote, deletable, pdate, author, activity));

4
src/app/services/register/register.service.spec.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { TestBed } from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import { RegisterService } from './register.service'; import {RegisterService} from './register.service';
describe('RegisterService', () => { describe('RegisterService', () => {
beforeEach(() => TestBed.configureTestingModule({})); beforeEach(() => TestBed.configureTestingModule({}));

25
src/app/services/register/register.service.ts
Unescape Escape View File

@ -1,19 +1,20 @@
import { Injectable } from '@angular/core'; import {Injectable} from '@angular/core';
import {Http, URLSearchParams, Headers} from '@angular/http'; import {Headers, Http} from '@angular/http';
import { Registration } from '../../models/registration'; import {Registration} from '../../models/registration';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import { DatasharingService } from '../datasharing.service'; import {DatasharingService} from '../datasharing.service';
import { User } from 'src/app/models/user'; import {User} from 'src/app/models/user';
import { environment } from 'src/environments/environment'; import {environment} from 'src/environments/environment';
import { FriendRequest } from 'src/app/models/friendRequest'; import {FriendRequest} from 'src/app/models/friendRequest';
import { FriendInfo } from 'src/app/models/friendinfo'; import {FriendInfo} from 'src/app/models/friendinfo';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class RegisterService { export class RegisterService {
constructor(private http: Http, private data: DatasharingService, private router: Router) { } constructor(private http: Http, private data: DatasharingService, private router: Router) {
}
public register(registration: Registration, errorCb: any) { public register(registration: Registration, errorCb: any) {
@ -72,7 +73,8 @@ export class RegisterService {
} }
public buildJson(registration: Registration): any { public buildJson(registration: Registration): any {
const body = {query: `mutation($username: String, $email: String, $pwHash: String) { const body = {
query: `mutation($username: String, $email: String, $pwHash: String) {
register(username: $username, email: $email, passwordHash: $pwHash) { register(username: $username, email: $email, passwordHash: $pwHash) {
id, id,
name, name,
@ -95,7 +97,8 @@ export class RegisterService {
email: registration.email, email: registration.email,
pwHash: registration.passwordHash, pwHash: registration.passwordHash,
username: registration.username, username: registration.username,
}}; }
};
return body; return body;
} }
} }

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save