Feature/1048 add accepting to terms and privacy policy before entering an exercise

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project does **not** adhere to [Semantic Versioning](https://semver.org
 -   this software has now a license (with some exceptions), see LICENSE-README.md
     -   the software includes a file with third party acknoledgments, a license.html and the docker container will include a git archive of the source code downloadable in zip format
     -   new npm run commands for licensing (third party acknowledgements) and creating source code archive
+-   new terms file and needs terms acceptiong before joining an exercise
 
 ## [0.7.1] - 2023-07-10
 

docker-compose.yml

@@ -19,7 +19,7 @@ services:
         volumes:
             - dfm-data:/${DFM_PERSISTENT_DATA_PATH}
             # To overwrite the contents of the about pages, mount a directory into the container
-            # The directory can contain imprint.html, privacy.html and license.html
+            # The directory can contain terms.html, license.html, privacy.html and imprint.html
             # Example
             # - ./about:/usr/local/app/frontend/dist/digital-fuesim-manv/assets/about
     db:

frontend/src/app/pages/about/about-routing.module.ts

@@ -4,12 +4,17 @@ import { RouterModule } from '@angular/router';
 import { ImprintComponent } from './imprint/imprint.component';
 import { LicenseComponent } from './license/license.component';
 import { PrivacyComponent } from './privacy/privacy.component';
+import { TermsComponent } from './terms/terms.component';
 
 const routes: Routes = [
     {
         path: 'imprint',
         component: ImprintComponent,
     },
+    {
+        path: 'terms',
+        component: TermsComponent,
+    },
     {
         path: 'license',
         component: LicenseComponent,

frontend/src/app/pages/about/about.module.ts

@@ -6,11 +6,13 @@ import { AboutRoutingModule } from './about-routing.module';
 import { ImprintComponent } from './imprint/imprint.component';
 import { PrivacyComponent } from './privacy/privacy.component';
 import { LicenseComponent } from './license/license.component';
+import { TermsComponent } from './terms/terms.component';
 import { AboutPlaceholderComponent } from './about-placeholder/about-placeholder.component';
 
 @NgModule({
     declarations: [
         ImprintComponent,
+        TermsComponent,
         PrivacyComponent,
         LicenseComponent,
         AboutPlaceholderComponent,

frontend/src/app/pages/about/terms/terms.component.html

@@ -0,0 +1,4 @@
+<app-about-placeholder
+    pageTitle="Nutzungsbedingungen"
+    contentFile="terms.html"
+/>

frontend/src/app/pages/about/terms/terms.component.ts

@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+    selector: 'app-terms',
+    templateUrl: './terms.component.html',
+    styleUrls: ['./terms.component.scss'],
+})
+export class TermsComponent {}

frontend/src/app/pages/exercises/exercise/exercise/exercise.component.html

@@ -70,22 +70,7 @@ <h2>
                         </button>
                     </div>
                 </div>
-                <a
-                    class="btn btn-outline-primary ms-3"
-                    href="mailto:BP2022HG1-feedback@hpi.de?subject=Feedback zur Digitalen FüSim MANV Version {{
-                        version
-                    }}"
-                >
-                    Feedback
-                </a>
                 <div class="btn-group ms-3" role="group">
-                    <a
-                        class="btn btn-outline-secondary"
-                        href="/about/imprint"
-                        target="_blank"
-                    >
-                        Impressum
-                    </a>
                     <a
                         class="btn btn-outline-secondary"
                         href="/about/privacy"
@@ -95,12 +80,49 @@ <h2>
                     </a>
                     <a
                         class="btn btn-outline-secondary"
-                        href="/about/license"
+                        href="/about/imprint"
                         target="_blank"
                     >
-                        Lizenz
+                        Impressum
                     </a>
                 </div>
+                <div ngbDropdown class="d-inline-block">
+                    <button
+                        type="button"
+                        class="btn btn-outline-secondary"
+                        ngbDropdownToggle
+                    >
+                        Infos
+                    </button>
+                    <!-- "position: absolute" is only set with a delay by "ngbDropdownMenu", therefore the map canvas has the wrong height when it is initialized -->
+                    <div ngbDropdownMenu class="position-absolute">
+                        <a
+                            ngbDropdownItem
+                            class="btn btn-outline-secondary"
+                            href="/about/terms"
+                            target="_blank"
+                        >
+                            Nutzungsbedingungen
+                        </a>
+                        <a
+                            ngbDropdownItem
+                            class="btn btn-outline-secondary"
+                            href="/about/license"
+                            target="_blank"
+                        >
+                            Lizenz
+                        </a>
+                        <a
+                            ngbDropdownItem
+                            class="btn btn-outline-secondary"
+                            href="mailto:BP2022HG1-feedback@hpi.de?subject=Feedback zur Digitalen FüSim MANV Version {{
+                                version
+                            }}"
+                        >
+                            Feedback
+                        </a>
+                    </div>
+                </div>
             </div>
         </h2>
     </div>

frontend/src/app/pages/exercises/shared/join-exercise-modal/join-exercise-modal.component.html

@@ -13,6 +13,11 @@ <h4 class="modal-title">Übung {{ exerciseId }} beitreten</h4>
             [maxlength]="255"
             type="text"
         />
+        <br />
+        Mit dem beitreten der Übung stimmen Sie den
+        <a href="/about/terms" target="_blank">Nutzungsbedingungen</a> und der
+        <a href="/about/privacy" target="_blank">Datenschutzerklärung</a>
+        zu.
     </div>
     <br />
 

frontend/src/app/shared/components/footer/footer.component.html

@@ -9,9 +9,11 @@
         >
     </div>
 
+    <!--If you change it here, also change it in index.html so it available even without JavaScript-->
     <div>
-        <a routerLink="/about/imprint">Impressum</a> |
+        <a routerLink="/about/terms">Nutzungsbedingungen</a> |
+        <a routerLink="/about/license">Lizenz</a> |
         <a routerLink="/about/privacy">Datenschutz</a> |
-        <a routerLink="/about/license">Lizenz</a>
+        <a routerLink="/about/imprint">Impressum</a>
     </div>
 </div>

frontend/src/assets/about/license.html

@@ -1,13 +1,13 @@
 <p>This software is a digital implementation of the "FüSim MANV"/"FueSim MANV" (Führungssimulation Massenanfall von Verletzen), a German paper-based simulation game for training emergency medical services leadership personnel in managing Mass Casualty Incidents.</p>
 
 <p>
-The software is licensed under the GNU Affero General Public License as published by
+The software (except some exceptions, see the link in the next paragraph) is licensed under the GNU Affero General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version. You can find a copy of this license at <a href="https://github.com/hpi-sam/digital-fuesim-manv/LICENSE.md" target="_blank" rel="noopener noreferrer">https://github.com/hpi-sam/digital-fuesim-manv/LICENSE.md</a>.
+(at your option) any later version. You can find a copy of this license at <a href="https://github.com/hpi-sam/digital-fuesim-manv/blob/dev/LICENSE.md" target="_blank" rel="noopener noreferrer">https://github.com/hpi-sam/digital-fuesim-manv/blob/dev/LICENSE.md</a>.
 </p>
 
 <p>
-For more information look at <a href="https://github.com/hpi-sam/digital-fuesim-manv/LICENSE-README.md" target="_blank" rel="noopener noreferrer">https://github.com/hpi-sam/digital-fuesim-manv/LICENSE-README.md</a>,
+For more information look at <a href="https://github.com/hpi-sam/digital-fuesim-manv/blob/dev/LICENSE-README.md" target="_blank" rel="noopener noreferrer">https://github.com/hpi-sam/digital-fuesim-manv/blob/dev/LICENSE-README.md</a>,
 for example exceptions that apply to images and datasets and how these two are defined.
 </p>
 

frontend/src/index.html

@@ -21,6 +21,12 @@
                     Bitte aktivieren Sie JavaScript, um diese Anwendung zu
                     verwenden.
                 </p>
+                <div>
+                    <a href="/about/terms">Nutzungsbedingungen</a> |
+                    <a href="/about/license">Lizenz</a> |
+                    <a href="/about/privacy">Datenschutz</a> |
+                    <a href="/about/imprint">Impressum</a>
+                </div>
             </div>
         </noscript>
     </body>