We believe, that together we can do amazing things to protect our environment and keep it
clean and green.
-
You aren't part of greenvironment yet? - join us now!
-
Register
-
-
Login
+
+
You aren't part of greenvironment yet? - join us now!
+
Register
+
+
Login
+
-
+
\ No newline at end of file
diff --git a/src/app/components/about/about.component.ts b/src/app/components/about/about.component.ts
index 2fdf072..e586858 100644
--- a/src/app/components/about/about.component.ts
+++ b/src/app/components/about/about.component.ts
@@ -1,9 +1,10 @@
-import {Component, OnInit, ViewChild} from '@angular/core';
-import {Activitylist} from 'src/app/models/activity';
-import {LevelList} from 'src/app/models/levellist';
-import {MatSort} from '@angular/material/sort';
-import {MatTableDataSource} from '@angular/material/table';
-import {ActivityService} from 'src/app/services/activity/activity.service';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { Activitylist } from 'src/app/models/activity';
+import { LevelList } from 'src/app/models/levellist';
+import { MatSort } from '@angular/material/sort';
+import { MatTableDataSource } from '@angular/material/table';
+import { ActivityService } from 'src/app/services/activity/activity.service';
+import { DatasharingService } from '../../services/datasharing.service';
@Component({
selector: 'app-about',
@@ -11,6 +12,7 @@ import {ActivityService} from 'src/app/services/activity/activity.service';
styleUrls: ['./about.component.sass']
})
export class AboutComponent implements OnInit {
+ loggedIn = false;
actionlist: Activitylist = new Activitylist();
levellist: LevelList = new LevelList();
@@ -19,12 +21,15 @@ export class AboutComponent implements OnInit {
displayedLevelColumns = ['level', 'name'];
levelSource = new MatTableDataSource(this.levellist.levels);
- constructor(private activityService: ActivityService) {
+ constructor(private activityService: ActivityService, private data: DatasharingService) {
}
- @ViewChild(MatSort, {static: true}) sort: MatSort;
+ @ViewChild(MatSort, { static: true }) sort: MatSort;
ngOnInit() {
+ this.data.currentUser.subscribe(user => {
+ this.loggedIn = user.loggedIn;
+ });
this.activityService.getActivities();
this.activityService.activitylist.subscribe(response => {
this.actionlist = response;
diff --git a/src/app/components/register/register.component.ts b/src/app/components/register/register.component.ts
index ca5f1b9..7522922 100644
--- a/src/app/components/register/register.component.ts
+++ b/src/app/components/register/register.component.ts
@@ -1,6 +1,6 @@
-import {Component, OnInit} from '@angular/core';
-import {RegisterService} from '../../services/register/register.service';
-import {Registration} from '../../models/registration';
+import { Component, OnInit } from '@angular/core';
+import { RegisterService } from '../../services/register/register.service';
+import { Registration } from '../../models/registration';
import * as sha512 from 'js-sha512';
@Component({
@@ -18,7 +18,7 @@ export class RegisterComponent implements OnInit {
imprintCheck = false;
constructor(private registerService: RegisterService) {
- this.registration = {username: null, passwordHash: null, email: null};
+ this.registration = { username: null, passwordHash: null, email: null };
}
public registerError(error: any) {
@@ -39,6 +39,11 @@ export class RegisterComponent implements OnInit {
}
passwordSame(pwd: string, pwd2: string) {
+ if (!pwd) {
+ this.errorOccurred = true;
+ this.errorMessage = 'please enter a password';
+ return false;
+ }
if (pwd === pwd2) {
return true;
} else {