Merge upstream v 0.1.9

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
               with:
                   context: .
                   tags: |
-                      ghcr.io/b310-digital/teammapper:latest
+                      ghcr.io/kitsteam/teammapper:latest
 
     teammapper-backend-lint:
         runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -49,8 +49,8 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
-          platforms: linux/amd64,linux/arm64/v8
+          platforms: linux/amd64
           target: production
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}

README.md

@@ -55,7 +55,7 @@ services:
       - postgres_prod
 
   postgres_prod:
-    image: postgres:12-alpine
+    image: postgres:15-alpine
     # Pass config parameters to the postgres server.
     # Find more information below when you need to generate the ssl-relevant file your self
     # command: -c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key
@@ -227,6 +227,10 @@ be found on https://kits.blog/tools and can be used by schools for free.
 
 Logos and text provided with courtesy of kits.
 
+## Additional licence
+
+The TeamMapper[logo](https://thenounproject.com/icon/188125/) in this repo – created by [Gregor Cresnar](https://thenounproject.com/grega.cresnar) – is licenced under [CC BY 3.0 Unported](https://creativecommons.org/licenses/by/3.0/).
+
 ## Acknowledgements
 
 -   *Pictograms author: Sergio Palao. Origin: ARASAAC (http://www.arasaac.org). License: CC (BY-NC-SA). Owner: Government of Aragon (Spain)

docker-compose-prod.yml

@@ -23,20 +23,22 @@ services:
       DELETE_AFTER_DAYS: ${DELETE_AFTER_DAYS:-30}
     ports:
       - "${APP_PROD_PORT:-80}:3000"
+    restart: always
     depends_on:
       - postgres_prod
 
   postgres_prod:
     image: postgres:15-alpine
     # Pass config parameters to the postgres server.
     # Find more information below when you need to generate the ssl-relevant file your self
-    # command: -c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key
+    command: -c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key
     environment:
       PGDATA: /var/lib/postgresql/data/pgdata
       POSTGRES_DB: ${POSTGRES_PROD_DB}
       POSTGRES_PASSWORD: ${POSTGRES_PROD_PASSWORD}
       POSTGRES_PORT: ${POSTGRES_PROD_PORT:-5432}
       POSTGRES_USER: ${POSTGRES_PROD_USER}
+    restart: always
     volumes:
       # To setup an ssl-enabled postgres server locally, you need to generate a self-signed ssl certificate.
       # See README.md for more information.

teammapper-frontend/src/app/core/services/settings/settings.service.spec.ts

@@ -39,6 +39,7 @@ describe('SettingsService', () => {
       modificationSecret: '456',
       adminId: '123',
       rootName: 'test',
+      createdAt: new Date(),
     };
 
     storageService.getAllCreatedMapsFromStorage.mockResolvedValue([
@@ -65,13 +66,15 @@ describe('SettingsService', () => {
       modificationSecret: '456',
       adminId: '123',
       rootName: 'test',
+      createdAt: new Date(),
     };
 
     const otherCachedMapDataFromStorage: CachedAdminMapValue = {
       ttl: futureDateTwo,
       modificationSecret: '456',
       adminId: '123',
       rootName: 'test',
+      createdAt: new Date(),
     };
 
     storageService.getAllCreatedMapsFromStorage.mockResolvedValue([

teammapper-frontend/src/app/modules/application/components/dialog-about/dialog-about.component.html

@@ -1,27 +1,34 @@
 <h2 mat-dialog-title>{{ applicationName }} {{ version }}</h2>
 <mat-dialog-content>
   <div class="about-modal-section">
-    <img src="./assets/icons/teammapper.svg" width="150" alt="Teammapper Logo" />
+    <img
+      class="about-kits-logo"
+      alt="kits logo"
+      src="./assets/images/kits-logo.svg"
+      width="150" />
     {{ 'PAGES.ABOUT.INTRODUCTION.APPLICATION_DESCRIPTION' | translate }}
+    <br /><br />
+    <a
+      href="https://github.com/kitsteam/teammapper"
+      class="link"
+      target="_blank">
+      GitHub
+    </a>
+    · <a href="https://kits.blog/impressum/" target="_blank">Impressum</a> ·
+    <a href="https://kits.blog/datenschutz/#teammapper" target="_blank"
+      >Datenschutz</a
+    >
   </div>
   <br />
-  <div class="about-modal-section">
+  <div class="about-modal-section border-top">
     {{
       'MODALS.INFO.DELETE_AFTER_DAYS'
         | translate : { deleteAfterDays: map.deleteAfterDays }
     }}
-    <br />
+    <br /><br />
     {{ 'MODALS.INFO.DELETED_AT' | translate }}
-    {{ map.deletedAt | date : 'YYYY-MM-dd' }}<br />
-
+    {{ map.deletedAt | date : 'YYYY-MM-dd' }} <br />
     <br />
-    <a
-      href="https://github.com/b310-digital/teammapper"
-      class="link"
-      target="_blank">
-      {{ applicationName }}
-      <fa-icon [icon]="faGithub" size="lg"></fa-icon>
-    </a>
   </div>
 </mat-dialog-content>
 <mat-dialog-actions>

teammapper-frontend/src/app/modules/application/components/dialog-about/dialog-about.component.scss

@@ -1,10 +1,13 @@
+@import 'src/colors.scss';
+
 .about-modal-section {
-  img {
-    padding-right: 2rem;
-    margin-bottom: 2rem;
-    margin-right: auto;
-    margin-left: auto;
-    display: block;
+  max-width: 500px;
+  hyphens: auto;
+  float: left;
+
+  a {
+    text-decoration: none;
+    color: $font-grey;
   }
 }
 
@@ -15,3 +18,7 @@
 .mat-list-item {
   font-family: 'Fira Sans';
 }
+
+.about-kits-logo {
+  float: right;
+}

teammapper-frontend/src/app/modules/application/components/floating-buttons/floating-buttons.component.scss

@@ -1,3 +1,5 @@
+@import 'src/colors.scss';
+
 div.floating-buttons {
   .no-touch {
     width: 50px;
@@ -22,8 +24,8 @@ div.floating-buttons {
 
   .add-node button,
   .remove-node button {
-    background-color: #00a3d3;
-    color: #fff;
+    background-color: $secondary;
+    color: #ffffff;
 
     &:disabled {
       color: rgba(0, 0, 0, 0.26);

teammapper-frontend/src/app/modules/start/map-list.component.html

@@ -0,0 +1,24 @@
+<h4>Letzte Mindmaps</h4>
+<ng-container *ngIf="cachedAdminMapEntries.length > 0; else noMindmaps">
+  <mat-list>
+    <ng-container *ngFor="let cachedMapEntry of cachedAdminMapEntries">
+      <mat-list-item class="item-startpage" *ngIf="cachedMapEntry.cachedAdminMapValue.createdAt">
+        <a href="{{ getMapUrl(cachedMapEntry) }}">{{
+          getMapTitle(cachedMapEntry)
+          }}
+          vom
+          {{ cachedMapEntry.cachedAdminMapValue.createdAt | date : 'dd.MM.YYYY' }}
+          um
+          {{ cachedMapEntry.cachedAdminMapValue.createdAt | date : 'HH:mm' }}
+          Uhr
+        </a>
+      </mat-list-item>
+    </ng-container>
+  </mat-list>
+</ng-container>
+
+<ng-template #noMindmaps>
+  <mat-list>
+    -
+  </mat-list>
+</ng-template>

teammapper-frontend/src/app/modules/start/map-list.component.scss

@@ -0,0 +1,15 @@
+h4 {
+  font-size: 1.25rem;
+  margin-bottom: 0em;
+  font-weight: normal;
+}
+
+.item-startpage {
+  padding: 0;
+  height: auto !important;
+}
+
+a {
+  text-decoration: none;
+  color: rgb(0, 69, 111);
+}