From 6536389eb8b127952567dabdd0fabdbf70ae3500 Mon Sep 17 00:00:00 2001
From: Max <s_ehrlicherschmid18@stud.hwr-berlin.de>
Date: Thu, 17 Oct 2019 13:15:33 +0200
Subject: [PATCH] added user variables to AppComonent & login functionality

---
 src/app/app.component.html                    |  1 +
 src/app/app.component.sass                    |  7 +++++++
 src/app/app.component.ts                      | 14 ++++++++++++++
 .../app-scaffold/app-scaffold.component.html  |  8 ++++----
 .../app-scaffold/app-scaffold.component.ts    |  4 +++-
 src/app/components/login/login.component.html |  1 -
 src/app/components/login/login.component.sass |  9 +--------
 src/app/components/login/login.component.ts   |  4 +++-
 .../register/register.component.html          |  1 -
 .../register/register.component.sass          |  6 ------
 src/app/models/user.ts                        | 15 +++++++++++++++
 src/app/services/login/login.service.ts       | 19 +++++++++++++++----
 12 files changed, 63 insertions(+), 26 deletions(-)
 create mode 100644 src/app/models/user.ts

diff --git a/src/app/app.component.html b/src/app/app.component.html
index 90c6b64..4e1306a 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1 +1,2 @@
+<app-scaffold id="headerbar"></app-scaffold>
 <router-outlet></router-outlet>
\ No newline at end of file
diff --git a/src/app/app.component.sass b/src/app/app.component.sass
index f00d56b..2a73a26 100644
--- a/src/app/app.component.sass
+++ b/src/app/app.component.sass
@@ -34,3 +34,10 @@
   display: grid
   min-height: 100vh
   max-height: 100vh
+
+#headerbar
+  @include gridPosition(1, 1, 1, 4)
+  display: grid
+  grid-template: 100% /30% 10% 10% 10% 10% 10% 15% 5%
+  background-color: $cHeadPrimaryBackground
+  color: $cHeadFontColor
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 73203c5..ec18c39 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -8,5 +8,19 @@ import { Component, OnInit } from '@angular/core';
 export class AppComponent implements OnInit {
   constructor() { }
 
+  loggedIn : boolean = false;
+  userID : number;
+  username : string;
+  handle : string;
+  email : string;
+  points : number;
+  level : number;
+
+  friendIDs : number[];
+  groupIDs : number[];
+  chatIDs : number[];
+
+  requestIDs : number[];
+
   ngOnInit() { }
 }
diff --git a/src/app/components/app-scaffold/app-scaffold.component.html b/src/app/components/app-scaffold/app-scaffold.component.html
index cfd5a41..ea1e121 100644
--- a/src/app/components/app-scaffold/app-scaffold.component.html
+++ b/src/app/components/app-scaffold/app-scaffold.component.html
@@ -1,10 +1,10 @@
 <h1>Greenvironment</h1>
   <button id="tab-home" routerLink="">Home</button>
-  <button id="tab-profile" routerLink="/profile">Profile</button>
-  <button id="tab-rank">Rank</button>
+  <button id="tab-profile" routerLink="/profile" *ngIf="loggedIn">Profile</button>
+  <button id="tab-rank" *ngIf="loggedIn">Rank</button>
   <button id="tab-about" routerLink="/about">About</button>
   <button id="tab-imprint" routerLink="/imprint">Imprint</button>
-  <div id="dropdown">
+  <div id="dropdown" *ngIf="loggedIn">
     <div>
       <span><i class="fa fa-caret-down" aria-hidden="true"></i></span>
       <span> Niklas Lampe</span>
@@ -13,4 +13,4 @@
       Hallo
     </div>
   </div>
-  <button id="logoutbutton"><span><i class="fa fa-sign-out-alt fa-2x" aria-hidden="true"></i></span></button>
+  <button id="logoutbutton" *ngIf="loggedIn"><span><i class="fa fa-sign-out-alt fa-2x" aria-hidden="true"></i></span></button>
diff --git a/src/app/components/app-scaffold/app-scaffold.component.ts b/src/app/components/app-scaffold/app-scaffold.component.ts
index 75a2283..e173656 100644
--- a/src/app/components/app-scaffold/app-scaffold.component.ts
+++ b/src/app/components/app-scaffold/app-scaffold.component.ts
@@ -1,12 +1,14 @@
 import { Component, OnInit } from '@angular/core';
+import { LoginComponent } from '../login/login.component';
 
 @Component({
   selector: 'app-scaffold',
   templateUrl: './app-scaffold.component.html',
   styleUrls: ['./app-scaffold.component.sass']
 })
-export class AppScaffoldComponent implements OnInit {
 
+export class AppScaffoldComponent implements OnInit {
+  
   constructor() { }
 
   ngOnInit() {
diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html
index a29a884..00341e7 100644
--- a/src/app/components/login/login.component.html
+++ b/src/app/components/login/login.component.html
@@ -1,6 +1,5 @@
 
 <div id="login">
-  <app-scaffold id="headerbar"></app-scaffold>
   <div id="logincontainer">
     <table style="width:100%">
       <tr>
diff --git a/src/app/components/login/login.component.sass b/src/app/components/login/login.component.sass
index a1809fb..8e687e2 100644
--- a/src/app/components/login/login.component.sass
+++ b/src/app/components/login/login.component.sass
@@ -13,11 +13,4 @@
     grid-template: 15% 15% 15% 15% 15% 15% / 100%
     background-color: $cPrimaryBackground
 input
-    margin: 0.25em
-
-#headerbar
-  @include gridPosition(1, 1, 1, 4)
-  display: grid
-  grid-template: 100% /30% 10% 10% 10% 10% 10% 15% 5%
-  background-color: $cHeadPrimaryBackground
-  color: $cHeadFontColor
+    margin: 0.25em
\ No newline at end of file
diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts
index 23c6c80..8a2c5b0 100644
--- a/src/app/components/login/login.component.ts
+++ b/src/app/components/login/login.component.ts
@@ -9,7 +9,8 @@ import { LoginService } from 'src/app/services/login/login.service';
 })
 export class LoginComponent implements OnInit {
   login: Login 
- 
+  user: User
+
   constructor(private loginService: LoginService) {
     this.login = {passwordHash: null, email: null};
   }
@@ -21,6 +22,7 @@ export class LoginComponent implements OnInit {
 
     this.loginService.login(this.login)
   }
+
   ngOnInit() {}
 }
 
diff --git a/src/app/components/register/register.component.html b/src/app/components/register/register.component.html
index 172d4cc..4683ee6 100644
--- a/src/app/components/register/register.component.html
+++ b/src/app/components/register/register.component.html
@@ -1,5 +1,4 @@
 <div id="register">
-    <app-scaffold id="headerbar"></app-scaffold>
   <div id="registercontainer">
       <table style="width:100%">
           <tr>
diff --git a/src/app/components/register/register.component.sass b/src/app/components/register/register.component.sass
index 54ae275..639703f 100644
--- a/src/app/components/register/register.component.sass
+++ b/src/app/components/register/register.component.sass
@@ -16,9 +16,3 @@
 input
     margin: 0.25em
 
-#headerbar
-  @include gridPosition(1, 1, 1, 4)
-  display: grid
-  grid-template: 100% /30% 10% 10% 10% 10% 10% 15% 5%
-  background-color: $cHeadPrimaryBackground
-  color: $cHeadFontColor
diff --git a/src/app/models/user.ts b/src/app/models/user.ts
new file mode 100644
index 0000000..785b099
--- /dev/null
+++ b/src/app/models/user.ts
@@ -0,0 +1,15 @@
+export interface User {
+  loggedIn : boolean;
+  userID : number;
+  username : string;
+  handle : string;
+  email : string;
+  points : number;
+  level : number;
+
+  friendIDs : number[];
+  groupIDs : number[];
+  chatIDs : number[];
+
+  requestIDs : number[];
+  }
\ 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 ee3e5c0..bf3ebe5 100644
--- a/src/app/services/login/login.service.ts
+++ b/src/app/services/login/login.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, EventEmitter, Output } from '@angular/core';
 import {Http, URLSearchParams, Headers} from '@angular/http';
 import { Login } from '../../models/login';
 
@@ -9,6 +9,8 @@ export class LoginService {
 
   constructor(private http: Http) { }
 
+  @Output() showChatEvent = new EventEmitter<Chatinfo>();
+
   public login(login : Login) {
  
     //let url = './graphql'
@@ -17,16 +19,25 @@ export class LoginService {
     let headers = new Headers();
     headers.set('Content-Type', 'application/json');
  
-    return this.http.post(url, this.buildJson(login)).subscribe(response => console.log(response.text()));
+    return this.http.post(url, this.buildJson(login))
+      .subscribe(response => {
+        console.log(response.text());
+        this.saveUserData(response.json())
+      });
+  }
+
+  public saveUserData(text : any){
+    app = text.name;
+    
   }
 
   public buildJson(login: Login): any {
     const body =  {query: `mutation($email: String, $pwHash: String) {
-      login(email: $email, passwordHash: $pwHash) {id}
+      login(email: $email, passwordHash: $pwHash) {id, name, handle, points, level, friends{id}, groups{id},chats{id}} 
     }`, variables: {
         email: login.email,
         pwHash: login.passwordHash,
       }};
     return body;
   }
-}
+}//add ,receivedRequests{id} later