Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

home: rename blog section #83

Merged
merged 2 commits into from
Jul 7, 2024
Merged

home: rename blog section #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
239d7db
home: rename blog section
MarcelCoding Jul 3, 2024
269a8ce
merged events & blog
MarcelCoding Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<nav class="nav">
<a class="not" routerLink="/blog" routerLinkActive="selected">
<!-- <app-icon-s class="nav-icon"/>-->
<span class="label" i18n>Blog</span>
<span class="label" i18n>News &amp; Events</span>
</a>
<a class="not" routerLink="/network" routerLinkActive="selected">
<span class="label" i18n>Network</span>
Expand Down
13 changes: 7 additions & 6 deletions src/app/pages/blog/blog-list/blog-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,26 @@
<div class="header">
<h1 i18n>Blog</h1>
<feel-button class="event-button" i18n-label label="Events!" link="/event">
<app-icon-send/>
<app-icon-send />
</feel-button>
</div>
<div *ngIf="(keywords | async) as keywords" class="keywords">
<button (click)="toggleKeyword(keyword)" *ngFor="let keyword of keywords"
[class.selected]="isSelected(keyword) | async"
class="keyword">{{ keyword }}
[class.selected]="isSelected(keyword) | async" class="keyword">
{{ keyword }}
</button>
</div>
</div>

<ul class="not news">
<li *ngFor="let post of posts | async">
<app-blog-card [post]="post"/>
<li *ngFor="let entry of entries | async">
<app-blog-card *ngIf="!isEvent(entry)" [post]="castPost(entry)" />
<app-event-card *ngIf="isEvent(entry)" [event]="castEvent(entry)" />
</li>
</ul>

<app-card>
<div class="mailing-list">
<app-mailing-list [listId]="3" [listName]="'News'"/>
<app-mailing-list [listId]="3" [listName]="'News'" />
</div>
</app-card>
43 changes: 32 additions & 11 deletions src/app/pages/blog/blog-list/blog-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
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 {ButtonComponent} from "@feel/form";
import {IconSendComponent} from "../../../icons/icon-send/icon-send.component";
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { BlogService } from "../../../api/blog.service";
import { BehaviorSubject, combineLatest, 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 { ButtonComponent } from "@feel/form";
import { IconSendComponent } from "../../../icons/icon-send/icon-send.component";
import { EventCardComponent } from "../../../core/event-card/event-card.component";
import { SmallBlogPost, SmallEvent } from '../../../api/blog.domain';

@Component({
selector: 'app-blog-list',
Expand All @@ -22,13 +24,20 @@ import {IconSendComponent} from "../../../icons/icon-send/icon-send.component";
CardComponent,
MailingListComponent,
ButtonComponent,
IconSendComponent
IconSendComponent,
EventCardComponent
]
})
export class BlogListComponent {

protected readonly selectedKeywords = new BehaviorSubject<string[]>([]);
protected readonly posts = this.selectedKeywords.pipe(switchMap(keywords => this.blogService.getBlogPosts(keywords)));
protected readonly entries = combineLatest({
events: this.blogService.getEventPosts(),
posts: this.selectedKeywords.pipe(switchMap(keywords => this.blogService.getBlogPosts(keywords)))
})
.pipe(map(({ events, posts }) =>
([...events, ...posts].sort(eventOrPost => Date.parse(eventOrPost.published)))
));
protected readonly keywords = this.blogService.getBlogKeywords();

constructor(
Expand All @@ -47,4 +56,16 @@ export class BlogListComponent {
this.selectedKeywords.next(this.selectedKeywords.value.filter(existing => existing !== keyword));
}
}

protected isEvent(eventOrPost: SmallEvent | SmallBlogPost): boolean {
return 'start_time' in eventOrPost;
}

protected castEvent(eventOrPost: SmallEvent | SmallBlogPost): SmallEvent {
return eventOrPost as SmallEvent;
}

protected castPost(eventOrPost: SmallEvent | SmallBlogPost): SmallBlogPost {
return eventOrPost as SmallBlogPost;
}
}
2 changes: 1 addition & 1 deletion src/app/pages/home/home.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ <h1 i18n>Support</h1>
</div>

<div class="typography">
<h1 i18n>Blog</h1>
<h1 i18n>Events &amp; News</h1>
</div>
<ul class="not news">
<li *ngFor="let event of events | async">
Expand Down
3 changes: 1 addition & 2 deletions src/app/pages/home/home.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {RouterLink} from "@angular/router";
import {IconGithubComponent} from "../../icons/icon-github/icon-github.component";
import {IconMastodonComponent} from "../../icons/icon-mastodon/icon-mastodon.component";
import {IconLinkedinComponent} from "../../icons/icon-linkedin/icon-linkedin.component";
import {map, Observable, share, switchMap} from "rxjs";
import {map, share, switchMap} from "rxjs";
import {IconIbhComponent} from "../../icons/icon-ibh/icon-ibh.component";
import {IconBcixComponent} from "../../icons/icon-bcix/icon-bcix.component";
import {IconTudComponent} from "../../icons/icon-tud/icon-tud.component";
Expand All @@ -18,7 +18,6 @@ import {IconSocialComponent} from "../../icons/icon-social/icon-social.component
import {IconSendComponent} from "../../icons/icon-send/icon-send.component";
import {ButtonComponent} from "@feel/form";
import {IconDsiComponent} from "../../icons/icon-dsi/icon-dsi.component";
import {PostOrEvent, SmallEvent} from "../../api/blog.domain";
import {EventCardComponent} from "../../core/event-card/event-card.component";

@Component({
Expand Down
36 changes: 21 additions & 15 deletions src/locales/en_devel.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,23 +86,11 @@
<context context-type="linenumber">82,83</context>
</context-group>
</trans-unit>
<trans-unit id="7751010942038334793" datatype="html">
<source>Blog</source>
<trans-unit id="5948442423891185229" datatype="html">
<source>News &amp; Events</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/app.component.html</context>
<context context-type="linenumber">10,11</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/app.routes.ts</context>
<context context-type="linenumber">15</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/blog/blog-list/blog-list.component.html</context>
<context context-type="linenumber">3,4</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/home/home.component.html</context>
<context context-type="linenumber">65,66</context>
<context context-type="linenumber">10</context>
</context-group>
</trans-unit>
<trans-unit id="6718726533481404495" datatype="html">
Expand Down Expand Up @@ -277,6 +265,17 @@
<context context-type="linenumber">3,4</context>
</context-group>
</trans-unit>
<trans-unit id="7751010942038334793" datatype="html">
<source>Blog</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/app.routes.ts</context>
<context context-type="linenumber">15</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/blog/blog-list/blog-list.component.html</context>
<context context-type="linenumber">3,4</context>
</context-group>
</trans-unit>
<trans-unit id="3304972143698843178" datatype="html">
<source>Event</source>
<context-group purpose="location">
Expand Down Expand Up @@ -633,6 +632,13 @@
<context context-type="linenumber">57</context>
</context-group>
</trans-unit>
<trans-unit id="5390240553289554839" datatype="html">
<source>Events &amp; News</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/home/home.component.html</context>
<context context-type="linenumber">65,66</context>
</context-group>
</trans-unit>
<trans-unit id="3670532182581004841" datatype="html">
<source>Socials</source>
<context-group purpose="location">
Expand Down
Loading