Merge remote-tracking branch 'origin/develop' into BETTERZON-52

# Conflicts:
#	Frontend/angular.json
#	Frontend/package-lock.json
#	Frontend/package.json
#	Frontend/src/app/app.module.ts
#	Frontend/src/index.html

Frontend/src/app/app.module.ts

@@ -17,8 +17,48 @@ import {FormsModule} from '@angular/forms';
 import {PageNotFoundPageComponent} from './pages/page-not-found-page/page-not-found-page.component';
 import {MatMenuModule} from '@angular/material/menu';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { ImprintComponent } from './pages/imprint/imprint.component';
-import { PrivacyComponent } from './pages/privacy/privacy.component';
+import {ImprintComponent} from './pages/imprint/imprint.component';
+import {PrivacyComponent} from './pages/privacy/privacy.component';
+import {NgcCookieConsentModule, NgcCookieConsentConfig} from 'ngx-cookieconsent';
+
+// For cookie popup
+const cookieConfig: NgcCookieConsentConfig = {
+    cookie: {
+        domain: 'betterzon.xyz'
+    },
+    palette: {
+        popup: {
+            background: '#000'
+        },
+        button: {
+            background: '#f1d600'
+        }
+    },
+    theme: 'edgeless',
+    type: 'opt-out',
+    layout: 'my-custom-layout',
+    layouts: {
+        'my-custom-layout': '{{messagelink}}{{compliance}}'
+    },
+    elements: {
+        messagelink: `
+    <span id="cookieconsent:desc" class="cc-message">{{message}}
+      <a aria-label="learn more about cookies" tabindex="0" class="cc-link" href="{{whatAreCookiesHref}}" target="_blank">{{whatAreCookiesLink}}</a>
+      <a aria-label="learn more about our privacy policy" tabindex="1" class="cc-link" href="{{privacyPolicyHref}}" target="_blank">{{privacyPolicyLink}}</a>
+    </span>
+    `,
+    },
+    content: {
+        // Custom message
+        // message: 'By using our site, you acknowledge that you have read and understand our ',
+
+        whatAreCookiesLink: 'Learn more',
+        whatAreCookiesHref: 'https://www.cookiesandyou.com/',
+
+        privacyPolicyLink: 'Privacy Policy',
+        privacyPolicyHref: '/datenschutz',
+    }
+};
 
 @NgModule({
     declarations: [
@@ -42,7 +82,8 @@ import { PrivacyComponent } from './pages/privacy/privacy.component';
         NgApexchartsModule,
         FormsModule,
         MatMenuModule,
-        BrowserAnimationsModule
+        BrowserAnimationsModule,
+        NgcCookieConsentModule.forRoot(cookieConfig)
     ],
     providers: [],
     bootstrap: [AppComponent]