From b49dce844d792ddd01164b4dcdfe011e76f212ee Mon Sep 17 00:00:00 2001
From: Lurkars <git@lh8.de>
Date: Sat, 13 Mar 2021 10:43:34 +0100
Subject: [PATCH] flex

---
 package-lock.json                             |  8 +++++
 package.json                                  |  1 +
 src/app/material/material.module.ts           |  7 ++--
 .../pages/services/services.component.html    | 35 +++++++++++--------
 .../pages/services/services.component.scss    | 10 ++++++
 src/assets/i18n/de-informal.json              |  8 ++++-
 6 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dd4b293..b0bed6e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -568,6 +568,14 @@
         "tslib": "^2.0.0"
       }
     },
+    "@angular/flex-layout": {
+      "version": "11.0.0-beta.33",
+      "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-11.0.0-beta.33.tgz",
+      "integrity": "sha512-unfhw3abZuKtdwQicRStHCYGbANPTHYg4WNRQk/RC5Mxq+4WOp4Q8HI7GqRHCGUYDCGUP7w1sU/oDt8f09nM8w==",
+      "requires": {
+        "tslib": "^2.0.0"
+      }
+    },
     "@angular/forms": {
       "version": "10.1.5",
       "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-10.1.5.tgz",
diff --git a/package.json b/package.json
index b6c495c..d27b9b4 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "@angular/common": "~10.1.5",
     "@angular/compiler": "~10.1.5",
     "@angular/core": "~10.1.5",
+    "@angular/flex-layout": "^11.0.0-beta.33",
     "@angular/forms": "~10.1.5",
     "@angular/material": "^10.2.4",
     "@angular/material-moment-adapter": "^10.2.7",
diff --git a/src/app/material/material.module.ts b/src/app/material/material.module.ts
index 65abf6c..15bd99f 100644
--- a/src/app/material/material.module.ts
+++ b/src/app/material/material.module.ts
@@ -43,6 +43,7 @@ import { MatPaginatorModule } from '@angular/material/paginator';
 import { MatSortModule } from '@angular/material/sort';
 import { MatTableModule } from '@angular/material/table';
 import { MatMomentDateModule } from '@angular/material-moment-adapter';
+import { FlexLayoutModule } from '@angular/flex-layout';
 
 @NgModule({
   declarations: [],
@@ -83,7 +84,8 @@ import { MatMomentDateModule } from '@angular/material-moment-adapter';
     MatPaginatorModule,
     MatSortModule,
     MatTableModule,
-    MatMomentDateModule
+    MatMomentDateModule,
+    FlexLayoutModule
   ],
   exports: [
     MatAutocompleteModule,
@@ -120,7 +122,8 @@ import { MatMomentDateModule } from '@angular/material-moment-adapter';
     MatTooltipModule,
     MatPaginatorModule,
     MatSortModule,
-    MatTableModule
+    MatTableModule,
+    FlexLayoutModule
   ]
 })
 export class MaterialModule { }
diff --git a/src/app/pages/services/services.component.html b/src/app/pages/services/services.component.html
index f7024b0..6991e00 100644
--- a/src/app/pages/services/services.component.html
+++ b/src/app/pages/services/services.component.html
@@ -1,17 +1,22 @@
 <h3>{{'services' | i18n}}</h3>
 
-<mat-card *ngFor="let service of services">
-    <mat-card-header>
-        <mat-icon>{{'services.' + service.name + '.icon' | i18n}}</mat-icon>
-        <mat-card-title>{{'services.' + service.name + '.title'  | i18n}}</mat-card-title>
-        <mat-card-subtitle>{{'services.' + service.name + '.subtitle' | i18n}}</mat-card-subtitle>
-    </mat-card-header>
-    <mat-card-content>
-        <p>
-            {{ 'services.' + service.name + '.text'  | i18n}}
-        </p>
-    </mat-card-content>
-    <mat-card-actions>
-        <a href="{{service.url}}" target="_blank" mat-raised-button color="primary">{{'services.goto'  | i18n}}</a>
-    </mat-card-actions>
-</mat-card>
\ No newline at end of file
+<div fxLayout="row wrap" fxLayoutGap="16px grid">
+    <div fxFlex="33.33%" fxFlex.sm="50%" fxFlex.xs="100%" *ngFor="let service of services">
+        <mat-card>
+            <mat-card-header>
+                <mat-icon>{{'services.' + service.name + '.icon' | i18n}}</mat-icon>
+                <mat-card-title>{{'services.' + service.name + '.title' | i18n}}</mat-card-title>
+                <mat-card-subtitle>{{'services.' + service.name + '.subtitle' | i18n}}</mat-card-subtitle>
+            </mat-card-header>
+            <mat-card-content>
+                <p>
+                    {{ 'services.' + service.name + '.text' | i18n}}
+                </p>
+            </mat-card-content>
+            <mat-card-actions>
+                <a href="{{service.url}}" target="_blank" mat-raised-button color="primary">{{'services.goto' |
+                    i18n}}</a>
+            </mat-card-actions>
+        </mat-card>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/services/services.component.scss b/src/app/pages/services/services.component.scss
index e69de29..6479517 100644
--- a/src/app/pages/services/services.component.scss
+++ b/src/app/pages/services/services.component.scss
@@ -0,0 +1,10 @@
+mat-card {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+mat-card-content {
+  flex-grow: 1;
+  overflow: auto;
+}
diff --git a/src/assets/i18n/de-informal.json b/src/assets/i18n/de-informal.json
index 1ad2816..361c475 100644
--- a/src/assets/i18n/de-informal.json
+++ b/src/assets/i18n/de-informal.json
@@ -214,7 +214,7 @@
       "text": "Alternative zu Diensten wie GitHub, Source Code von bstly-Entwicklungen",
       "title": "Gitea"
     },
-    "goto": "Gehe zum Dienst",
+    "goto": "Zum Dienst",
     "mail": {
       "icon": "email",
       "subtitle": "E-Mail Konto",
@@ -250,6 +250,12 @@
       "subtitle": "Mitgliedschaft im Bastelei e. V.",
       "text": "Reguläres Mitglied im Bastelei e. V.",
       "title": "Vereinsmitgliedschaft"
+    },
+    "wikijs": {
+      "icon": "school",
+      "subtitle": "Informationen, Dokumentation, Anleitungen",
+      "text": "Alle Information rund um Bastelei e. V. und den angebotenen Diensten, sowie Anleitungen für einzelne Dienste und Funktionen",
+      "title": "Wiki"
     }
   },
   "software": "Software",