diff --git a/src/app/components/app-scaffold/app-scaffold.component.sass b/src/app/components/app-scaffold/app-scaffold.component.sass
index d9c67b2..d2dd041 100644
--- a/src/app/components/app-scaffold/app-scaffold.component.sass
+++ b/src/app/components/app-scaffold/app-scaffold.component.sass
@@ -30,13 +30,13 @@ h1
#tab-profile
@include gridPosition(1, 2, 3, 4)
-#tab-rank
+#tab-about
@include gridPosition(1, 2, 4, 5)
-#tab-about
+#tab-imprint
@include gridPosition(1, 2, 5, 6)
-#tab-about
+#tab-login
@include gridPosition(1, 2, 6, 7)
#dropdown
diff --git a/src/app/components/app-scaffold/app-scaffold.component.ts b/src/app/components/app-scaffold/app-scaffold.component.ts
index 2ec09b7..ba2ed9e 100644
--- a/src/app/components/app-scaffold/app-scaffold.component.ts
+++ b/src/app/components/app-scaffold/app-scaffold.component.ts
@@ -24,6 +24,7 @@ export class AppScaffoldComponent implements OnInit {
profileUrl: string;
dropdownShown: boolean = false
+ constructor(private data: DatasharingService) { }
constructor(private data: DatasharingService,private selfservice: SelfService, private http: Http, private router: Router) { }
@@ -36,13 +37,7 @@ export class AppScaffoldComponent implements OnInit {
this.level = this.levellist.getLevelName(user.level)
this.points = user.points
this.profileUrl = '/profile/' + this.userId;
- console.log(user.loggedIn);
- })
- if(this.loggedIn != true){
- console.log('user is not logged in');
- this.selfservice.checkIfLoggedIn;
- };
- console.log('loggedIn is ' + this.loggedIn)
+ })
}
showDropdown() {
diff --git a/src/app/components/chatlist/chatlist.component.ts b/src/app/components/chatlist/chatlist.component.ts
index 1cbbf44..c108945 100644
--- a/src/app/components/chatlist/chatlist.component.ts
+++ b/src/app/components/chatlist/chatlist.component.ts
@@ -29,4 +29,8 @@ export class ChatlistComponent implements OnInit {
this.showChatEvent.emit(this.selectedChat)
}
+
+ newChat() {
+ console.error("not implemented")
+ }
}
diff --git a/src/app/components/chatmanager/chatcontacts/chatcontacts.component.ts b/src/app/components/chatmanager/chatcontacts/chatcontacts.component.ts
index 6f2d3c3..481f7b1 100644
--- a/src/app/components/chatmanager/chatcontacts/chatcontacts.component.ts
+++ b/src/app/components/chatmanager/chatcontacts/chatcontacts.component.ts
@@ -27,4 +27,8 @@ export class ChatcontactsComponent implements OnInit {
this.goBack()
}
+ contactList() {
+ console.error("Not Imlemented!")
+ }
+
}
diff --git a/src/app/components/feed/feed.component.sass b/src/app/components/feed/feed.component.sass
index 02fe803..591631c 100644
--- a/src/app/components/feed/feed.component.sass
+++ b/src/app/components/feed/feed.component.sass
@@ -28,6 +28,7 @@
@include gridPosition(2, 3, 1, 2)
display: grid
grid-template: 5% 95% /100%
+ overflow: auto
background-color: $cFontWhite
#feedchooser
diff --git a/src/app/components/home/home.component.sass b/src/app/components/home/home.component.sass
index 62e1983..727440f 100644
--- a/src/app/components/home/home.component.sass
+++ b/src/app/components/home/home.component.sass
@@ -4,22 +4,25 @@
#content
grid-template: 100%/ 25% 50% 25%
display: grid
- min-height: 100vh
- max-height: 100vh
+ min-height: 90vh
+ max-height: 90vh
background-color: $cFontWhite
#chatcontainer
@include gridPosition(1, 3, 1, 2)
background-color: $cBoxBodyBackground
+ overflow: auto
#feedcontainer
@include gridPosition(1, 3, 2, 3)
display: grid
grid-template: 10% 90% /100%
background-color: $cFontWhite
+ overflow: auto
#socialcontainer
@include gridPosition(1, 3, 3, 4)
display: grid
grid-template: 50% 50% /100%
- background-color: $cBoxBodyBackground
\ No newline at end of file
+ background-color: $cBoxBodyBackground
+ overflow: auto
\ No newline at end of file
diff --git a/src/app/components/imprint/imprint.component.html b/src/app/components/imprint/imprint.component.html
index 38c4af9..71a25aa 100644
--- a/src/app/components/imprint/imprint.component.html
+++ b/src/app/components/imprint/imprint.component.html
@@ -1,8 +1,8 @@
Imprint
-
The greenvironment network is being developed by Bliblablub
+
The greenvironment network is being developed by the greenvironment team
Contact
-
Email: mailadress
+
Email: nick.derkoenig@greenvironment.net
\ No newline at end of file
diff --git a/src/app/components/imprint/imprint.component.sass b/src/app/components/imprint/imprint.component.sass
index ee3a6be..7f25657 100644
--- a/src/app/components/imprint/imprint.component.sass
+++ b/src/app/components/imprint/imprint.component.sass
@@ -5,12 +5,14 @@
background-color: $cSecondaryBackground
grid-template: 15% 70% 15% / 15% 70% 15%
display: grid
- min-height: 100vh
- max-height: 100vh
+ height: 90vh
#imprintcontainer
@include gridPosition(2, 2,2,2)
background-color: $cPrimaryBackground
+ padding: 1em
+ overflow: auto
+
input
margin: 0.25em
#header
diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html
index b7a3663..7d5f2b6 100644
--- a/src/app/components/login/login.component.html
+++ b/src/app/components/login/login.component.html
@@ -1,7 +1,8 @@
-
+ Login
+
email: |
|
@@ -14,6 +15,7 @@
{{errorMessage}}
+
You arenĀ“t part of greenvironment yet? - join us here
diff --git a/src/app/components/login/login.component.sass b/src/app/components/login/login.component.sass
index 067cd7b..cc8aa9a 100644
--- a/src/app/components/login/login.component.sass
+++ b/src/app/components/login/login.component.sass
@@ -5,13 +5,18 @@
background-color: $cSecondaryBackground
grid-template: 8% 77% 15% / 15% 70% 15%
display: grid
- min-height: 100vh
- max-height: 100vh
+ height: 90vh
#logincontainer
- @include gridPosition(2, 2,2,2)
- grid-template: 15% 15% 15% 15% 15% 15% / 100%
- background-color: $cPrimaryBackground
- padding: 1em
+ @include gridPosition(2, 2,2,2)
+ background-color: $cPrimaryBackground
+ padding: 1em
+ overflow: auto
+
input
- margin: 0.25em
\ No newline at end of file
+ margin: 0.25em
+
+a
+ color: $cHeadPrimaryBackground
+
+
diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts
index cc49235..dfd8423 100644
--- a/src/app/components/login/login.component.ts
+++ b/src/app/components/login/login.component.ts
@@ -1,9 +1,8 @@
import { Component, OnInit } from '@angular/core';
import { Login } from 'src/app/models/login';
import { LoginService } from 'src/app/services/login/login.service';
-import { RouterLink } from '@angular/router';
import {Router} from '@angular/router';
-import {Md5} from 'ts-md5/dist/md5';
+import * as sha512 from 'js-sha512';
@Component({
selector: 'app-login',
@@ -30,8 +29,8 @@ export class LoginComponent implements OnInit {
this.errorOccurred = false;
this.errorMessage = " ";
this.login.email = pEmail
- const md5 = new Md5();
- this.login.passwordHash = md5.appendStr(pPasswordHash).end() as string
+ this.login.passwordHash = sha512.sha512(pPasswordHash);
+ console.log(this.login.passwordHash);
console.log(this.login.passwordHash)
diff --git a/src/app/components/profile/profile.component.sass b/src/app/components/profile/profile.component.sass
index f3c16e2..5150b88 100644
--- a/src/app/components/profile/profile.component.sass
+++ b/src/app/components/profile/profile.component.sass
@@ -5,14 +5,16 @@
background-color: $cSecondaryBackground
grid-template: 3% 94% 3% / 10% 80% 10%
display: grid
- min-height: 100vh
- max-height: 100vh
+ min-height: 90vh
+ max-height: 90vh
+
#profilecontainer
@include gridPosition(2, 2,2,2)
//grid-template: 15% 15% 15% 15% 15% 15% / 100%
background-color: $cPrimaryBackground
padding: 1em
+ overflow: auto
th
text-align: left
\ No newline at end of file
diff --git a/src/app/components/register/register.component.html b/src/app/components/register/register.component.html
index a737235..a030ae9 100644
--- a/src/app/components/register/register.component.html
+++ b/src/app/components/register/register.component.html
@@ -1,6 +1,7 @@
-
+ Register
+
username: |
|
@@ -21,6 +22,7 @@
{{errorMessage}}
+
You are already part of greenvironment? - login
\ No newline at end of file
diff --git a/src/app/components/register/register.component.sass b/src/app/components/register/register.component.sass
index 639703f..56a5862 100644
--- a/src/app/components/register/register.component.sass
+++ b/src/app/components/register/register.component.sass
@@ -5,14 +5,17 @@
background-color: $cSecondaryBackground
grid-template: 8% 77% 15% / 15% 70% 15%
display: grid
- min-height: 100vh
- max-height: 100vh
+ min-height: 90vh
+ max-height: 90vh
#registercontainer
@include gridPosition(2, 2,2,2)
grid-template: 15% 15% 15% 15% 15% 15% / 100%
background-color: $cPrimaryBackground
padding: 1em
+ overflow: auto
input
margin: 0.25em
+a
+ color: $cHeadPrimaryBackground
\ No newline at end of file
diff --git a/src/app/components/register/register.component.ts b/src/app/components/register/register.component.ts
index b659e5a..90c6945 100644
--- a/src/app/components/register/register.component.ts
+++ b/src/app/components/register/register.component.ts
@@ -4,6 +4,7 @@ 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';
@Component({
selector: 'registration',
@@ -31,8 +32,7 @@ export class RegisterComponent implements OnInit {
if(this.passwordSame(pPasswordHash,pPasswordHashRepeat)){
this.registration.username = pUsername
this.registration.email = pEmail
- const md5 = new Md5();
- this.registration.passwordHash = md5.appendStr(pPasswordHash).end() as string
+ this.registration.passwordHash = sha512.sha512(pPasswordHash);
this.registerService.register(this.registration, error => this.registerError(error.json()));
}
}
diff --git a/src/app/services/login/login.service.ts b/src/app/services/login/login.service.ts
index a03fd8e..ab2c5db 100644
--- a/src/app/services/login/login.service.ts
+++ b/src/app/services/login/login.service.ts
@@ -55,7 +55,7 @@ export class LoginService {
public buildJson(login: Login): any {
const body = {query: `mutation($email: String, $pwHash: String) {
- login(email: $email, passwordHash: $pwHash) {id, name, handle, points, level, friends{id}, groups{id},chats{id}}
+ login(email: $email, passwordHash: $pwHash) {id, name,email, handle, points, level, friends{id}, groups{id},chats{id}}
}`, variables: {
email: login.email,
pwHash: login.passwordHash,
diff --git a/src/app/services/selfservice/self.service.ts b/src/app/services/selfservice/self.service.ts
index e6623b6..9eb582b 100644
--- a/src/app/services/selfservice/self.service.ts
+++ b/src/app/services/selfservice/self.service.ts
@@ -39,29 +39,29 @@ export class SelfService {
public notLoggedIn(){
console.log('user was not logged in');
//do routing
- this.router.navigateByUrl('/login');
+ //this.router.navigateByUrl('/login');
}
public updateUserInfo(response : any){
const user: User = new User();
user.loggedIn = true;
- user.userID = response.data.login.id;
- user.username = response.data.login.name;
- user.handle = response.data.login.handle;
- user.email = response.data.login.email;
- user.points = response.data.login.points;
- user.level = response.data.login.level;
- user.friendIDs = response.data.login.friends;
- user.groupIDs = response.data.login.groups;
- user.chatIDs = response.data.login.chats;
- user.requestIDs = response.data.login.requests;
+ user.userID = response.data.getSelf.id;
+ user.username = response.data.getSelf.name;
+ user.handle = response.data.getSelf.handle;
+ user.email = response.data.getSelf.email;
+ user.points = response.data.getSelf.points;
+ user.level = response.data.getSelf.level;
+ user.friendIDs = response.data.getSelf.friends;
+ user.groupIDs = response.data.getSelf.groups;
+ user.chatIDs = response.data.getSelf.chats;
+ user.requestIDs = response.data.getSelf.requests;
this.data.changeUserInfo(user)
}
public buildJson(): any {
- const body = {query: `query() {
- getSelf(){id, name, handle, points, level, friends{id}, groups{id},chats{id}}
+ const body = {query: `{
+ getSelf{id, name,email, handle, points, level, friends{id}, groups{id},chats{id}}
}`, variables: {
}};
return body;