From 51b6ea50d38a1ea00a1a98cda922b28a59b6a3f8 Mon Sep 17 00:00:00 2001
From: Marcel <34819524+MarcelCoding@users.noreply.github.com>
Date: Thu, 22 Aug 2024 22:01:29 +0200
Subject: [PATCH] listmonk: remove (#87)

---
 flake.nix                                     |  4 +-
 src/app/api/mailing-list.service.spec.ts      | 15 -----
 src/app/api/mailing-list.service.ts           | 20 ------
 .../mailing-list/mailing-list.component.html  | 15 +----
 .../mailing-list/mailing-list.component.ts    | 53 +++------------
 .../blog/blog-list/blog-list.component.html   |  2 +-
 .../blog-subscribe.component.html             | 12 ----
 .../blog-subscribe.component.scss             |  3 -
 .../blog-subscribe.component.spec.ts          | 21 ------
 .../blog-subscribe.component.ts               | 17 -----
 src/app/pages/blog/blog.routes.ts             |  6 +-
 .../event-list/event-list.component.html      | 20 ------
 .../event-list/event-list.component.scss      | 42 ------------
 .../event-list/event-list.component.spec.ts   | 21 ------
 .../event/event-list/event-list.component.ts  | 38 -----------
 src/app/pages/event/event.routes.ts           | 10 +--
 src/locales/en_devel.xlf                      | 65 ++-----------------
 17 files changed, 22 insertions(+), 342 deletions(-)
 delete mode 100644 src/app/api/mailing-list.service.spec.ts
 delete mode 100644 src/app/api/mailing-list.service.ts
 delete mode 100644 src/app/pages/blog/blog-subscribe/blog-subscribe.component.html
 delete mode 100644 src/app/pages/blog/blog-subscribe/blog-subscribe.component.scss
 delete mode 100644 src/app/pages/blog/blog-subscribe/blog-subscribe.component.spec.ts
 delete mode 100644 src/app/pages/blog/blog-subscribe/blog-subscribe.component.ts
 delete mode 100644 src/app/pages/event/event-list/event-list.component.html
 delete mode 100644 src/app/pages/event/event-list/event-list.component.scss
 delete mode 100644 src/app/pages/event/event-list/event-list.component.spec.ts
 delete mode 100644 src/app/pages/event/event-list/event-list.component.ts

diff --git a/flake.nix b/flake.nix
index 58eb37b..129aa72 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,11 +20,11 @@
         {
           packages = rec {
             website = pkgs.callPackage ./derivation.nix {
-              contentApi = "content.dd-ix.net";
+              contentApi = "https://content.dd-ix.net";
               mkPnpmPackage = pnpm2nix.packages."${system}".mkPnpmPackage;
             };
             website-static = pkgs.callPackage ./derivation.nix {
-              contentApi = "content.dd-ix.net";
+              contentApi = "https://content.dd-ix.net";
               static = true;
               mkPnpmPackage = pnpm2nix.packages."${system}".mkPnpmPackage;
             };
diff --git a/src/app/api/mailing-list.service.spec.ts b/src/app/api/mailing-list.service.spec.ts
deleted file mode 100644
index 93bd9f8..0000000
--- a/src/app/api/mailing-list.service.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {TestBed} from '@angular/core/testing';
-import {MailingListService} from './mailing-list.service';
-
-describe('MailingListService', () => {
-  let service: MailingListService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(MailingListService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/api/mailing-list.service.ts b/src/app/api/mailing-list.service.ts
deleted file mode 100644
index e23491d..0000000
--- a/src/app/api/mailing-list.service.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {Injectable} from '@angular/core';
-import { HttpClient } from "@angular/common/http";
-import {API_URL} from "./api.domain";
-import {map, Observable} from "rxjs";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class MailingListService {
-
-  constructor(
-    private readonly http: HttpClient
-  ) {
-  }
-
-  public subscribe(listId: number, email: string): Observable<void> {
-    return this.http.post(`${API_URL}/mailing_lists/${listId}`, {email})
-      .pipe(map(() => void 0));
-  }
-}
diff --git a/src/app/core/mailing-list/mailing-list.component.html b/src/app/core/mailing-list/mailing-list.component.html
index fe0ce62..71e6675 100644
--- a/src/app/core/mailing-list/mailing-list.component.html
+++ b/src/app/core/mailing-list/mailing-list.component.html
@@ -1,15 +1,6 @@
 <div class="typography">
   <h2 i18n>Subscribe to the {{ listName }} mailing list</h2>
-  <form (submit)="$event.preventDefault();submit()" [formGroup]="form" class="form">
-    <feel-text-field formControlName="email" i18n-label label="E-Mail" type="text">
-      <feel-form-error *ngIf="form.controls?.['email']?.touched && !form.controls?.['email']?.valid" i18n>A valid
-        e-mail
-        is required!
-      </feel-form-error>
-    </feel-text-field>
-
-    <feel-button [disabled]="working || !form.valid" class="button" i18n-label label="Submit">
-      <app-icon-send/>
-    </feel-button>
-  </form>
+  <feel-button *ngIf="listId" class="button" i18n-label label="Subscribe" [link]='buildLink(listId)'>
+    <app-icon-send />
+  </feel-button>
 </div>
diff --git a/src/app/core/mailing-list/mailing-list.component.ts b/src/app/core/mailing-list/mailing-list.component.ts
index 814de42..186c72c 100644
--- a/src/app/core/mailing-list/mailing-list.component.ts
+++ b/src/app/core/mailing-list/mailing-list.component.ts
@@ -1,11 +1,8 @@
-import {Component, Input} from '@angular/core';
-import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms'
-import {CardComponent} from "../card/card.component";
-import {CommonModule} from "@angular/common";
-import {MailingListService} from "../../api/mailing-list.service";
-import {ButtonComponent, FormErrorComponent, TextFieldComponent} from "@feel/form";
-import {IconSendComponent} from "../../icons/icon-send/icon-send.component";
-import {NotificationService} from "@feel/notification";
+import { Component, Input } from '@angular/core';
+import { CardComponent } from "../card/card.component";
+import { CommonModule } from "@angular/common";
+import { ButtonComponent } from "@feel/form";
+import { IconSendComponent } from "../../icons/icon-send/icon-send.component";
 
 @Component({
   selector: 'app-mailing-list',
@@ -13,11 +10,8 @@ import {NotificationService} from "@feel/notification";
   styleUrls: ['./mailing-list.component.scss'],
   imports: [
     CommonModule,
-    ReactiveFormsModule,
     CardComponent,
-    TextFieldComponent,
     ButtonComponent,
-    FormErrorComponent,
     IconSendComponent,
   ],
   standalone: true
@@ -27,40 +21,9 @@ export class MailingListComponent {
   @Input()
   public listName: string | null = null;
   @Input()
-  public listId: number | null = null;
-  protected form = new FormGroup({
-    email: new FormControl(null, [Validators.required, Validators.email]),
-  });
-  protected working = false;
+  public listId: string | null = null;
 
-  constructor(
-    private readonly mailingListService: MailingListService,
-    private readonly notificationService: NotificationService,
-  ) {
-  }
-
-  protected submit(): void {
-    if (!Number.isFinite(this.listId)) {
-      throw new Error("Mailing list not defined");
-    }
-
-    if (this.working || !this.form.valid) {
-      return;
-    }
-
-    const value = this.form.value;
-
-    this.working = true;
-    this.mailingListService.subscribe(this.listId!, value.email!)
-      .subscribe({
-        next: () => {
-          this.notificationService.success($localize`Successfully subscribed to mailing list.`);
-        },
-        error: err => {
-          console.error(err);
-          this.notificationService.error($localize`Failed to subscribe to mailing list.`);
-        },
-        complete: () => this.working = false,
-      });
+  protected buildLink(listId: string): string {
+    return `https://lists.dd-ix.net/postorius/lists/${listId}.lists.dd-ix.net/`;
   }
 }
diff --git a/src/app/pages/blog/blog-list/blog-list.component.html b/src/app/pages/blog/blog-list/blog-list.component.html
index be10378..97b3d0c 100644
--- a/src/app/pages/blog/blog-list/blog-list.component.html
+++ b/src/app/pages/blog/blog-list/blog-list.component.html
@@ -22,6 +22,6 @@ <h1 i18n>News &amp; Events</h1>
 
 <app-card>
   <div class="mailing-list">
-    <app-mailing-list [listId]="3" [listName]="'News'" />
+    <app-mailing-list listId="news" listName="News" />
   </div>
 </app-card>
diff --git a/src/app/pages/blog/blog-subscribe/blog-subscribe.component.html b/src/app/pages/blog/blog-subscribe/blog-subscribe.component.html
deleted file mode 100644
index 9a3ab93..0000000
--- a/src/app/pages/blog/blog-subscribe/blog-subscribe.component.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="typography body">
-  <h1 i18n>Mailing List</h1>
-  <p i18n>
-    Always stay updated by subscribing to our news mailing-list.
-  </p>
-</div>
-
-<app-card>
-  <div class="mailing-list">
-    <app-mailing-list [listId]="3" [listName]="'News'"/>
-  </div>
-</app-card>
diff --git a/src/app/pages/blog/blog-subscribe/blog-subscribe.component.scss b/src/app/pages/blog/blog-subscribe/blog-subscribe.component.scss
deleted file mode 100644
index 3f5f282..0000000
--- a/src/app/pages/blog/blog-subscribe/blog-subscribe.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.body {
-  margin-bottom: 1rem;
-}
diff --git a/src/app/pages/blog/blog-subscribe/blog-subscribe.component.spec.ts b/src/app/pages/blog/blog-subscribe/blog-subscribe.component.spec.ts
deleted file mode 100644
index 698a56f..0000000
--- a/src/app/pages/blog/blog-subscribe/blog-subscribe.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-
-import {BlogSubscribeComponent} from './blog-subscribe.component';
-
-describe('NewsSubscribeComponent', () => {
-  let component: BlogSubscribeComponent;
-  let fixture: ComponentFixture<BlogSubscribeComponent>;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [BlogSubscribeComponent]
-    });
-    fixture = TestBed.createComponent(BlogSubscribeComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/pages/blog/blog-subscribe/blog-subscribe.component.ts b/src/app/pages/blog/blog-subscribe/blog-subscribe.component.ts
deleted file mode 100644
index f3bbbc0..0000000
--- a/src/app/pages/blog/blog-subscribe/blog-subscribe.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {Component} from '@angular/core';
-import {CardComponent} from "../../../core/card/card.component";
-import {MailingListComponent} from "../../../core/mailing-list/mailing-list.component";
-
-@Component({
-  selector: 'app-blog-subscribe',
-  templateUrl: './blog-subscribe.component.html',
-  styleUrls: ['./blog-subscribe.component.scss'],
-  standalone: true,
-  imports: [
-    CardComponent,
-    MailingListComponent
-  ]
-})
-export class BlogSubscribeComponent {
-
-}
diff --git a/src/app/pages/blog/blog.routes.ts b/src/app/pages/blog/blog.routes.ts
index 71e6fbb..aad354a 100644
--- a/src/app/pages/blog/blog.routes.ts
+++ b/src/app/pages/blog/blog.routes.ts
@@ -5,11 +5,7 @@ export const routes: Routes = [
     path: '',
     loadComponent: () => import("./blog-list/blog-list.component").then(c => c.BlogListComponent),
   },
-  {
-    path: 'subscribe',
-    loadComponent: () => import("./blog-subscribe/blog-subscribe.component").then(c => c.BlogSubscribeComponent)
-  },
-  {
+   {
     path: ':slug',
     loadComponent: () => import("./blog-post/blog-post.component").then(c => c.BlogPostComponent)
   },
diff --git a/src/app/pages/event/event-list/event-list.component.html b/src/app/pages/event/event-list/event-list.component.html
deleted file mode 100644
index 8adc6ae..0000000
--- a/src/app/pages/event/event-list/event-list.component.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="typography">
-  <div class="header">
-    <h1 i18n>Events</h1>
-    <feel-button class="event-button" i18n-label label="Blog!" link="/blog">
-      <app-icon-send/>
-    </feel-button>
-  </div>
-</div>
-
-<ul class="not news">
-  <li *ngFor="let event of events | async">
-    <app-event-card [event]="event"/>
-  </li>
-</ul>
-
-<app-card>
-  <div class="mailing-list">
-    <app-mailing-list [listId]="3" [listName]="'News'"/>
-  </div>
-</app-card>
diff --git a/src/app/pages/event/event-list/event-list.component.scss b/src/app/pages/event/event-list/event-list.component.scss
deleted file mode 100644
index 2377906..0000000
--- a/src/app/pages/event/event-list/event-list.component.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-@import "vars";
-
-ul {
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-  margin-bottom: 4rem;
-}
-
-.news {
-  list-style-type: none;
-}
-
-.mailing-list {
-  max-width: 36rem;
-}
-
-.keywords {
-  display: flex;
-  gap: 1rem;
-  margin-bottom: 1rem;
-  flex-wrap: wrap;
-
-  .keyword {
-    background-color: $c-card;
-    border: 0.1rem solid $c-card-secondary;
-    padding: 0.2rem 0.6rem;
-    border-radius: 5rem;
-    cursor: pointer;
-    outline: none;
-
-    &.selected {
-      background-color: $c-primary;
-    }
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  margin: 1rem;
-}
diff --git a/src/app/pages/event/event-list/event-list.component.spec.ts b/src/app/pages/event/event-list/event-list.component.spec.ts
deleted file mode 100644
index 703bc75..0000000
--- a/src/app/pages/event/event-list/event-list.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-
-import {EventListComponent} from './event-list.component';
-
-describe('NewsListComponent', () => {
-  let component: EventListComponent;
-  let fixture: ComponentFixture<EventListComponent>;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [EventListComponent]
-    });
-    fixture = TestBed.createComponent(EventListComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/pages/event/event-list/event-list.component.ts b/src/app/pages/event/event-list/event-list.component.ts
deleted file mode 100644
index c2eacee..0000000
--- a/src/app/pages/event/event-list/event-list.component.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import {ChangeDetectionStrategy, Component} from '@angular/core';
-import {BlogService} from "../../../api/blog.service";
-import {BehaviorSubject, map, Observable, switchMap} from "rxjs";
-import {AsyncPipe, NgForOf, NgIf} from "@angular/common";
-import {BlogCardComponent} from "../../../core/blog-card/blog-card.component";
-import {CardComponent} from "../../../core/card/card.component";
-import {MailingListComponent} from "../../../core/mailing-list/mailing-list.component";
-import {EventCardComponent} from "../../../core/event-card/event-card.component";
-import {ButtonComponent} from "@feel/form";
-import {IconSendComponent} from "../../../icons/icon-send/icon-send.component";
-
-@Component({
-  selector: 'app-blog-list',
-  templateUrl: './event-list.component.html',
-  styleUrls: ['./event-list.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
-    imports: [
-        AsyncPipe,
-        NgIf,
-        NgForOf,
-        BlogCardComponent,
-        CardComponent,
-        MailingListComponent,
-        EventCardComponent,
-        ButtonComponent,
-        IconSendComponent
-    ]
-})
-export class EventListComponent {
-
-  protected readonly events =  this.blogService.getEventPosts();
-
-  constructor(
-    private readonly blogService: BlogService,
-  ) {
-  }
-}
diff --git a/src/app/pages/event/event.routes.ts b/src/app/pages/event/event.routes.ts
index b9fb9a0..e25e69d 100644
--- a/src/app/pages/event/event.routes.ts
+++ b/src/app/pages/event/event.routes.ts
@@ -1,14 +1,6 @@
-import {Routes} from '@angular/router';
+import { Routes } from '@angular/router';
 
 export const routes: Routes = [
-  {
-    path: '',
-    loadComponent: () => import("./event-list/event-list.component").then(c => c.EventListComponent),
-  },
-  {
-    path: 'subscribe',
-    loadComponent: () => import("../blog/blog-subscribe/blog-subscribe.component").then(c => c.BlogSubscribeComponent)
-  },
   {
     path: ':slug',
     loadComponent: () => import("./event-post/event-post.component").then(c => c.EventPostComponent)
diff --git a/src/locales/en_devel.xlf b/src/locales/en_devel.xlf
index 912a4fe..2548838 100644
--- a/src/locales/en_devel.xlf
+++ b/src/locales/en_devel.xlf
@@ -48,10 +48,6 @@
           <context context-type="sourcefile">src/app/api/team.domain.ts</context>
           <context context-type="linenumber">23</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/pages/event/event-list/event-list.component.html</context>
-          <context context-type="linenumber">3,4</context>
-        </context-group>
       </trans-unit>
       <trans-unit id="76537845515412840" datatype="html">
         <source>Finance and Legal</source>
@@ -300,39 +296,11 @@
           <context context-type="linenumber">2,3</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8115083664628466958" datatype="html">
-        <source>E-Mail</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/mailing-list/mailing-list.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="6856821060067506866" datatype="html">
-        <source>A valid e-mail is required! </source>
+      <trans-unit id="1144407473317535723" datatype="html">
+        <source>Subscribe</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/mailing-list/mailing-list.component.html</context>
-          <context context-type="linenumber">6,7</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="935187492052582731" datatype="html">
-        <source>Submit</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/mailing-list/mailing-list.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="5632099839746836994" datatype="html">
-        <source>Successfully subscribed to mailing list.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/mailing-list/mailing-list.component.ts</context>
-          <context context-type="linenumber">57</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="6451157462027879592" datatype="html">
-        <source>Failed to subscribe to mailing list.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/core/mailing-list/mailing-list.component.ts</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="linenumber">3</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6052766076365105714" datatype="html">
@@ -461,20 +429,6 @@
           <context context-type="linenumber">9,10</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="9158112486914865946" datatype="html">
-        <source>Mailing List</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/pages/blog/blog-subscribe/blog-subscribe.component.html</context>
-          <context context-type="linenumber">2,3</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="4786405675269305220" datatype="html">
-        <source> Always stay updated by subscribing to our news mailing-list. </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/pages/blog/blog-subscribe/blog-subscribe.component.html</context>
-          <context context-type="linenumber">4,6</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="6439365426343089851" datatype="html">
         <source>General</source>
         <context-group purpose="location">
@@ -503,13 +457,6 @@
           <context context-type="linenumber">60,61</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5671081150775766327" datatype="html">
-        <source>Blog!</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/pages/event/event-list/event-list.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="8510289285271281479" datatype="html">
         <source>Keep Local Traffic Local</source>
         <context-group purpose="location">
@@ -581,21 +528,21 @@
         <source>Socials</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/pages/home/home.component.html</context>
-          <context context-type="linenumber">77,78</context>
+          <context context-type="linenumber">86,87</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1796207335100151791" datatype="html">
         <source>Our Sustaining Members</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/pages/home/home.component.html</context>
-          <context context-type="linenumber">104,105</context>
+          <context context-type="linenumber">113,114</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9011408879965086386" datatype="html">
         <source>Our Patrons</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/pages/home/home.component.html</context>
-          <context context-type="linenumber">131,132</context>
+          <context context-type="linenumber">140,141</context>
         </context-group>
       </trans-unit>
       <trans-unit id="28467023014692598" datatype="html">