Merge branch 'master' into max_dev

Jenkinsfile

@@ -0,0 +1,33 @@
+pipeline {
+    agent any
+
+    stages {
+        stage('Dependencies') {
+            steps {
+                echo 'Installing Dependencies...'
+                nodejs(nodeJSInstallationName: 'Node 12.x') {
+                    sh 'npm i @angular/cli'
+                    sh 'npm i'
+                }
+            }
+        }
+        stage('Stylecheck') {
+            steps {
+                echo 'Checking Style...'
+                nodejs(nodeJSInstallationName: 'Node 12.x') {
+                    sh 'tslint "src/**/*.ts"'
+                }
+            }
+        }
+        stage('Build') {
+            steps {
+                echo 'Building...'
+                nodejs(nodeJSInstallationName: 'Node 12.x') {
+                    sh 'ng build --prod'
+                }
+                sh '/bin/tar -zcvf greenvironment-frontend.tar.gz dist'
+                archiveArtifacts artifacts: 'greenvironment-frontend.tar.gz', fingerprint: true
+            }
+        }
+    }
+}

package-lock.json

@@ -4521,9 +4521,9 @@
       }
     },
     "commander": {
-      "version": "2.17.1",
+      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
     "commondir": {
@@ -12844,12 +12844,12 @@
       },
       "dependencies": {
         "resolve": {
-          "version": "1.8.1",
+          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz",
-          "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
+          "integrity": "sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==",
           "dev": true,
           "requires": {
-            "path-parse": "^1.0.5"
+            "path-parse": "^1.0.6"
           }
         }
       }

package.json

@@ -57,7 +57,7 @@
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~5.4.0",
     "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
+    "tslint": "^5.11.0",
     "typescript": "~3.5.0"
   }
 }

src/app/app.component.ts

@@ -34,7 +34,7 @@ export class AppComponent implements OnInit {
       console.log(this.userInfo);
       this.data.changeChatIDs(user.chatIDs);
     });
-    if (this.loggedIn != true) {
+    if (this.loggedIn !== true) {
       this.selfservice.checkIfLoggedIn();
     }
   }

src/app/components/app-scaffold/app-scaffold.component.ts

@@ -26,7 +26,11 @@ export class AppScaffoldComponent implements OnInit {
 
   dropdownShown = false;
 
-  constructor(private data: DatasharingService, private selfservice: SelfService, private http: Http, private router: Router) { }
+  constructor(
+    private data: DatasharingService,
+    private selfservice: SelfService,
+    private http: Http,
+    private router: Router) { }
 
   ngOnInit() {
     this.data.currentUserInfo.subscribe(user => {

src/app/components/feed/feed.component.ts

@@ -28,7 +28,7 @@ export class FeedComponent implements OnInit {
   userId: number;
   user: User;
 
-  constructor(private feedService: FeedService,private data: DatasharingService) { }
+  constructor(private feedService: FeedService, private data: DatasharingService) { }
 
   ngOnInit() {
     this.data.currentUserInfo.subscribe(user => {

src/app/components/login/login.component.ts

@@ -11,20 +11,21 @@ import * as sha512 from 'js-sha512';
   styleUrls: ['./login.component.sass']
 })
 export class LoginComponent implements OnInit {
-  login: Login;
-  hide = true;
-  errorOccurred: boolean = false;
-  errorMessage: string;
 
-  constructor(private loginService: LoginService,private router: Router) {
+  constructor(private loginService: LoginService, private router: Router) {
     this.login = {passwordHash: null, email: null};
   }
+  login: Login;
+  hide = true;
+  errorOccurred = false;
+  errorMessage: string;
+  email = new FormControl('', [Validators.required, Validators.email]);
 
-  public getErrorMessage(){
+  public getErrorMessage() {
     return this.errorMessage;
   }
 
-  public loginError(error : any){
+  public loginError(error: any) {
     console.log(error.errors[0].message);
     this.errorOccurred = true;
     this.errorMessage = error.errors[0].message;
@@ -33,7 +34,7 @@ export class LoginComponent implements OnInit {
   onClickSubmit(pEmail: string, pPasswordHash: string) {
     console.log('try to login with mail adress:' + pEmail);
     this.errorOccurred = false;
-    this.errorMessage = " ";
+    this.errorMessage = ' ';
     this.login.email = pEmail.trim();
     this.login.passwordHash = sha512.sha512(pPasswordHash);
     console.log(this.login.passwordHash);
@@ -42,7 +43,6 @@ export class LoginComponent implements OnInit {
 
     this.loginService.login(this.login, error => this.loginError(error.json()));
   }
-  email = new FormControl('', [Validators.required, Validators.email]);
 
   ngOnInit() {}
 }

src/app/components/main-navigation/main-navigation.component.ts

@@ -18,7 +18,13 @@ import { OverlayContainer} from '@angular/cdk/overlay';
 })
 export class MainNavigationComponent implements OnInit {
 
-  constructor(public overlayContainer: OverlayContainer, private data: DatasharingService, private selfservice: SelfService, private breakpointObserver: BreakpointObserver, private http: Http, private router: Router) {
+  constructor(
+    public overlayContainer: OverlayContainer,
+    private data: DatasharingService,
+    private selfservice: SelfService,
+    private breakpointObserver: BreakpointObserver,
+    private http: Http, private router: Router
+  ) {
     this.overlay = overlayContainer.getContainerElement();
   }
   loggedIn = false;

src/app/components/register/register.component.ts

@@ -40,7 +40,7 @@ export class RegisterComponent implements OnInit {
   }
 
   passwordSame(pwd: string, pwd2: string) {
-    if (pwd == pwd2) {
+    if (pwd === pwd2) {
       console.log('password same');
       return true;
     } else {

src/app/components/social/groups/groups.component.ts

@@ -7,7 +7,12 @@ import { GroupInfo } from 'src/app/models/groupinfo';
   styleUrls: ['./groups.component.sass']
 })
 export class GroupsComponent implements OnInit {
-  groups: Array<GroupInfo> = [new GroupInfo(1, 'Group 1', []), new GroupInfo(1, 'Group 2', []), new GroupInfo(1, 'Group 3', []), new GroupInfo(1, 'Group 4', [])];
+  // TODO: replace with actual logic that loads the groups from the backend
+  groups: Array<GroupInfo> = [
+    new GroupInfo(1, 'Group 1', []),
+    new GroupInfo(1, 'Group 2', []),
+    new GroupInfo(1, 'Group 3', []),
+    new GroupInfo(1, 'Group 4', [])];
   constructor() { }
 
   ngOnInit() {

src/app/models/levellist.ts

@@ -9,13 +9,14 @@ export class Levellist {
       {level: 6, name: 'Intergallactic Superhero', points: 600 },
     ];
 
-  getLevelName(lev: number): any {
+  getLevelName(level: number): any {
     let name = 'not defined';
-    this.levels.forEach(rank => {
+
-      if (lev == rank.level) {
+    for (const rank of this.levels) {
+      if (level === rank.level) {
         name = rank.name;
       }
-    });
+    }
     return name;
   }
 

src/app/models/post.ts

@@ -10,7 +10,17 @@ export class Post {
     userVote: string;
     author: Author;
 
-    constructor(pId: number, pContent: string, pHtmlContent: string, pUpvotes: number, pDownvotes: number, pUserVote: string, pDate: string, pAuthor: Author) {
+    // TODO: constructor properties need normal names
+    constructor(
+      pId: number,
+      pContent: string,
+      pHtmlContent: string,
+      pUpvotes: number,
+      pDownvotes: number,
+      pUserVote: string,
+      pDate: string,
+      pAuthor: Author
+    ) {
         this.id = pId;
         this.content = pContent;
         this.htmlContent = pHtmlContent;

src/app/models/user.ts

@@ -1,15 +1,15 @@
 export class User {
-  loggedIn : boolean
+  loggedIn: boolean;
-  userID : number
+  userID: number;
-  username : string
+  username: string;
-  handle : string
+  handle: string;
-  email : string
+  email: string;
-  points : number
+  points: number;
-  level : number
+  level: number;
 
-  friendIDs : number[]
+  friendIDs: number[];
-  groupIDs : number[]
+  groupIDs: number[];
-  chatIDs : number[]
+  chatIDs: number[];
 
-  requestIDs : number[]
+  requestIDs: number[];
 }

src/app/services/chat/chat.service.ts

@@ -89,8 +89,12 @@ export class ChatService {
     this.http.post(url, this.getBodyForNewChat(pUserID));
   }
 
+  /**
+   * TODO: Needs to be used somewhere or it will be removed
+   */
   public requestAllChatPartners(): Array<FriendInfo> {
     const url = environment.graphQLUrl;
+    // tslint:disable-next-line:prefer-const
     let chatPartners: Array<FriendInfo>;
     let temp;
 
@@ -107,7 +111,7 @@ export class ChatService {
       let memberName: string;
       let memberLevel: number;
       for (const member of chat.members) {
-        if (member.id != this.ownID) {
+        if (member.id !== this.ownID) {
           memberID = member.id;
           memberName = member.name;
           memberLevel = member.level;
@@ -154,7 +158,7 @@ export class ChatService {
   public renderMessages(pResponse: any): Array<Chatmessage> {
     const messages = new Array<Chatmessage>();
       for (const message of pResponse.data.getChat.messages) {
-        if (message.author.id == this.ownID) {
+        if (message.author.id === this.ownID) {
           messages.push(new Chatmessage(message.content, message.createdAt, true));
         } else {
           messages.push(new Chatmessage(message.content, message.createdAt, false));
@@ -169,14 +173,14 @@ export class ChatService {
       let memberID: number;
       let memberName: string;
       for (const member of chat.members) {
-        if (member.id != this.ownID) {
+        if (member.id !== this.ownID) {
           memberID = member.id;
           memberName = member.name;
         }
       }
       const messages = new Array<Chatmessage>();
       for (const message of chat.messages) {
-        if (message.author.id == this.ownID) {
+        if (message.author.id === this.ownID) {
           messages.push(new Chatmessage(message.content, message.createdAt, true));
         } else {
           messages.push(new Chatmessage(message.content, message.createdAt, false));
@@ -192,14 +196,14 @@ export class ChatService {
     let memberId: number;
     let memberName: string;
     for (const member of pResponse.data.getChat.members) {
-      if (member.id != this.ownID) {
+      if (member.id !== this.ownID) {
         memberId = member.id;
         memberName = member.name;
       }
     }
     const messages = new Array<Chatmessage>();
     for (const message of pResponse.data.getChat.messages) {
-      if (message.author.id == this.ownID) {
+      if (message.author.id === this.ownID) {
         messages.push(new Chatmessage(message.content, message.createdAt, true));
       } else {
         messages.push(new Chatmessage(message.content, message.createdAt, false));

src/app/services/feed/feed.service.ts

@@ -117,29 +117,41 @@ export class FeedService {
     return this.http.post(url, this.getBodyForGetAllPostsByUserId(userId));
   }
 
-  /*getBodyForGetAllPostsByUserId(pUserId: number) {
-    const body =  {query: `query ($userId: ID) {
-        getPosts (first: 1000, offset: 0, userId: $userId) {id, content, htmlContent, upvotes, downvotes, userVote, author{name, handle, id}, createdAt}
-      }`, variables: {
-        userId: pUserId
-      }};
-      return body
-  }*/
-  
   getBodyForGetAllPostsByUserId(pUserId: number) {
     const body =  {query: `query ($userId: ID!) {
-        getPosts (first: 1000, offset: 0) {id, content, htmlContent, upvotes, downvotes, userVote(userId: $userId), author{name, handle, id}, createdAt}
+        getPosts (first: 1000, offset: 0) {
+          id,
+          content,
+          htmlContent,
+          upvotes,
+          downvotes,
+          userVote(userId: $userId),
+          author{
+            name,
+            handle,
+            id},
+          createdAt}
       }`, variables: {
         userId: pUserId
       }};
-      return body
+      return body;
   }
   getBodyForGetAllPosts() {
     const body =  {query: `query {
-        getPosts (first: 1000, offset: 0) {id, content, htmlContent, upvotes, downvotes, author{name, handle, id}, createdAt}
+        getPosts (first: 1000, offset: 0) {
+          id,
+          content,
+          htmlContent,
+          upvotes,
+          downvotes,
+          author{
+            name,
+            handle,
+            id},
+          createdAt}
       }`
-      }
+      };
-      return body
+      return body;
   }
 
   public renderAllPosts(pResponse: any): Array<Post> {

src/app/services/login/login.service.ts

@@ -33,7 +33,7 @@ export class LoginService {
     this.router.navigateByUrl('');
   }
 
-  public updateUserInfo(response : any){
+  public updateUserInfo(response: any) {
     const user: User = new User();
     user.loggedIn = true;
     user.userID = response.data.login.id;
@@ -47,7 +47,7 @@ export class LoginService {
     user.chatIDs = response.data.login.chats;
     user.requestIDs = response.data.login.requests;
 
-    this.data.changeUserInfo(user)
+    this.data.changeUserInfo(user);
 
   }
 

src/app/services/register/register.service.ts

@@ -56,7 +56,16 @@ export class RegisterService {
 
   public buildJson(registration: Registration): any {
     const body =  {query: `mutation($username: String, $email: String, $pwHash: String) {
-      register(username: $username, email: $email, passwordHash: $pwHash) {id, name, handle, points, level, friends{id}, groups{id},chats{id}}
+      register(username: $username, email: $email, passwordHash: $pwHash) {
+        id,
+        name,
+        handle,
+        points,
+        level,
+        friends{id},
+        groups{id},
+        chats{id}
+       }
     }`, variables: {
         email: registration.email,
         pwHash: registration.passwordHash,

src/tslint.json

@@ -10,7 +10,6 @@
         "component-selector": [
             true,
             "element",
-            "app",
             "kebab-case"
         ],
         "indent": {