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

src/app/components/group/group.component.html

@@ -79,6 +79,14 @@
                   [disabled]="!isAdmin">
             <mat-icon>event</mat-icon>
           </button>
+          <div style="display: contents;" *ngIf="groupProfile.deletable">
+            <button mat-icon-button
+                    class="request-button"
+                    matTooltip="delete this group" matTooltipShowDelay="0"
+                    (click)="deleteGroup()">
+              <mat-icon>delete</mat-icon>
+            </button>
+          </div>
         </div>
       </mat-toolbar-row>
       <mat-toolbar-row>
@@ -115,14 +123,6 @@
                           (click)="leaveEvent(event)"
                           [disabled]="!event.joined">
                     <mat-icon>event_busy</mat-icon>
-                    <div style="display: contents;" *ngIf="groupProfile.deletable">
-                      <button mat-icon-button
-                              class="request-button"
-                              matTooltip="delete this group" matTooltipShowDelay="0"
-                              (click)="deleteGroup()">
-                        <mat-icon>delete</mat-icon>
-                      </button>
-                    </div>
                   </button>
                 </div>
               </mat-card-header>

src/app/services/group/group.service.ts

@@ -121,8 +121,7 @@ export class GroupService extends BaseService {
   public deleteGroup(groupId: number) {
     const body = {
       query: `mutation($groupId: ID!) {
-      deleteGroup(groupId: $groupId) {
+      deleteGroup(groupId: $groupId)
-      }
     }`, variables: {
         groupId
       }