diff --git a/src/app/components/app-scaffold/app-scaffold.component.sass b/src/app/components/app-scaffold/app-scaffold.component.sass
index fd527fc..17fdf9e 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 cc28c79..f535395 100644
--- a/src/app/components/app-scaffold/app-scaffold.component.ts
+++ b/src/app/components/app-scaffold/app-scaffold.component.ts
@@ -14,20 +14,14 @@ export class AppScaffoldComponent implements OnInit {
userId: number;
profileUrl: string;
- constructor(private data: DatasharingService,private selfservice: SelfService) { }
+ constructor(private data: DatasharingService) { }
ngOnInit() {
this.data.currentUserInfo.subscribe(user => {
this.loggedIn = user.loggedIn;
this.userId = user.userID;
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)
+ })
}
}
diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html
index b7a3663..837e839 100644
--- a/src/app/components/login/login.component.html
+++ b/src/app/components/login/login.component.html
@@ -1,7 +1,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..5f5bfff 100644
--- a/src/app/components/login/login.component.sass
+++ b/src/app/components/login/login.component.sass
@@ -9,9 +9,14 @@
max-height: 100vh
#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
+
input
- margin: 0.25em
\ No newline at end of file
+ margin: 0.25em
+
+a
+ color: $cHeadPrimaryBackground
+
+
diff --git a/src/app/components/register/register.component.html b/src/app/components/register/register.component.html
index a737235..d81b877 100644
--- a/src/app/components/register/register.component.html
+++ b/src/app/components/register/register.component.html
@@ -1,6 +1,6 @@
-
+
username: |
|
@@ -21,6 +21,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..2b67572 100644
--- a/src/app/components/register/register.component.sass
+++ b/src/app/components/register/register.component.sass
@@ -16,3 +16,5 @@
input
margin: 0.25em
+a
+ color: $cHeadPrimaryBackground
\ No newline at end of file
diff --git a/src/app/services/login/login.service.ts b/src/app/services/login/login.service.ts
index 8924676..549e16c 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..282a11b 100644
--- a/src/app/services/selfservice/self.service.ts
+++ b/src/app/services/selfservice/self.service.ts
@@ -39,7 +39,7 @@ 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){
@@ -60,8 +60,8 @@ export class SelfService {
}
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;