Merge branch 'max_dev' of Software_Engineering_I/greenvironment-frontend into master

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

@@ -30,10 +30,10 @@ export class DialogCreateGroupComponent {
     if (name) {
       this.social.createGroup(name).subscribe(() => {
         this.dialogRef.close();
-      }, ((error: IErrorResponse) => {
+      }, (error: IErrorResponse) => {
         this.errorMessage = error.error.errors[0].message;
         this.errorOccurred = true;
-      }));
+      });
     }
   }
 

src/app/services/social/social.service.ts

@@ -4,7 +4,6 @@ import {HttpClient} from '@angular/common/http';
 import {BaseService} from '../base.service';
 import { tap } from 'rxjs/internal/operators/tap';
 import {DatasharingService} from 'src/app/services/datasharing.service';
-import { group } from '@angular/animations';
 import { Group } from 'src/app/models/group';
 import { GroupInfo } from 'src/app/models/groupinfo';
 
@@ -47,10 +46,10 @@ export class SocialService extends BaseService {
     const body = SocialService.buildGroupCreateBody(name);
     return this.postGraphql(body, null,  0)
       .pipe(tap(response => {
-        let group_ = new Group();
+        let group = new Group();
-        group_ = response.data.createGroup;
+        group = response.data.createGroup;
-        group_.picture = group_.buildPictureUrl(group_.picture);
+        group.picture = group.buildPictureUrl(group.picture);
-        this.data.addGroupToUser(group_);
+        this.data.addGroupToUser(group);
       }));
   }