_Bastler/bstlboard-front
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

restructure entries pages, last comments

Browse Source
This commit is contained in:
_Bastler
2021-10-06 09:49:16 +02:00
parent 4c69a9b177
commit ac7e46c627
22 changed files with 205 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/bookmarks/bookmarks.page.html
+1 -1
View File
@@ -1 +1 @@
<ui-entries [entries]="entries" [refresh]="boundRefresh" [update]="boundUpdate"></ui-entries>
<page-entries [fetch]="boundFetch"></page-entries>
src/app/pages/bookmarks/bookmarks.page.ts
+5 -64
View File
@@ -1,6 +1,4 @@
import { Component, OnInit, Input } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { PageEvent } from '@angular/material/paginator';
import { BookmarksService } from '../../services/bookmarks.service';
@@ -9,73 +7,16 @@ import { BookmarksService } from '../../services/bookmarks.service';
templateUrl: './bookmarks.page.html'
})
export class PageBookmarks implements OnInit {
boundFetch: Function;
@Input() entries: any;
boundRefresh: Function;
boundUpdate: Function;
init: boolean = true;
constructor(private bookmarksService: BookmarksService, private router: Router, private route: ActivatedRoute) { }
constructor(private bookmarksService: BookmarksService) { }
ngOnInit(): void {
this.boundRefresh = this.refresh.bind(this);
this.boundUpdate = this.update.bind(this);
this.route.queryParams.subscribe(params => {
if (this.init) {
this.entries = {};
if (params[ 'p' ]) {
this.entries.number = +params[ 'p' ] - 1;
if (this.entries.number < 0) {
this.entries.number = 0;
}
}
if (params[ 's' ]) {
this.entries.size = +params[ 's' ];
}
this.refresh();
this.init = false;
}
});
this.boundFetch = this.fetch.bind(this);
}
refresh(): void {
if (!this.entries) {
this.entries = {};
}
this.entries.content = null;
this.bookmarksService.getEntriesPages(this.entries.number || 0, this.entries.size || 30).subscribe((data: any) => {
this.entries = data;
this.entries.bookmarks = true;
}, (error) => { })
}
update(event: PageEvent) {
this.entries.content = null;
const params: any = { p: null, s: null };
if (event.pageIndex != 0) {
params.p = event.pageIndex + 1;
}
if (event.pageSize != 30) {
params.s = event.pageSize;
}
this.router.navigate(
[],
{
relativeTo: this.route,
queryParams: params,
queryParamsHandling: 'merge'
});
this.bookmarksService.getEntriesPages(event.pageIndex, event.pageSize).subscribe((data: any) => {
this.entries = data;
}, (error) => { })
fetch(page: number, size: number) {
return this.bookmarksService.getEntries(page,size);
}
}
src/app/pages/entries/entries.page.html
+1
View File
@@ -0,0 +1 @@
<ui-entries [entries]="entries" [refresh]="boundRefresh" [update]="boundUpdate"></ui-entries>
src/app/pages/entries/entries.page.ts
+81
View File
@@ -0,0 +1,81 @@
import { Component, OnInit, Input } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { PageEvent } from '@angular/material/paginator';
@Component({
selector: 'page-entries',
templateUrl: './entries.page.html'
})
export class PageEntries implements OnInit {
@Input() fetch: Function;
entries: any;
boundRefresh: Function;
boundUpdate: Function;
init: boolean = true;
constructor(private router: Router, private route: ActivatedRoute) { }
ngOnInit(): void {
this.boundRefresh = this.refresh.bind(this);
this.boundUpdate = this.update.bind(this);
this.route.queryParams.subscribe(params => {
if (this.init) {
this.entries = {};
if (params[ 'p' ]) {
this.entries.number = +params[ 'p' ] - 1;
if (this.entries.number < 0) {
this.entries.number = 0;
}
}
if (params[ 's' ]) {
this.entries.size = +params[ 's' ];
}
this.refresh();
this.init = false;
}
});
}
refresh(): void {
if (!this.entries) {
this.entries = {};
}
this.entries.content = null;
this.fetch(this.entries.number || 0, this.entries.size || 30).subscribe((data: any) => {
this.entries = data;
}, (error) => { })
}
update(event: PageEvent) {
this.entries.content = null;
const params: any = { p: null, s: null };
if (event.pageIndex != 0) {
params.p = event.pageIndex + 1;
}
if (event.pageSize != 30) {
params.s = event.pageSize;
}
this.router.navigate(
[],
{
relativeTo: this.route,
queryParams: params,
queryParamsHandling: 'merge'
});
this.fetch(event.pageIndex, event.pageSize).subscribe((data: any) => {
this.entries = data;
}, (error) => { })
}
}
src/app/pages/entry/entry.page.html
+1 -1
View File
@@ -3,7 +3,7 @@
<ng-container *ngIf="entry">
<ui-entry [entry]="entry" [change]="boundRefresh"></ui-entry>
<p class="text">{{entry.text}}</p>
<p class="text" [innerHTML]="entry.text | urltext"></p>
<ui-commentform [target]="entry.id" (replyCommentEvent)="replyCallback($event)"></ui-commentform>
src/app/pages/hot/hot.page.html
+1 -1
View File
@@ -1 +1 @@
<ui-entries [entries]="entries" [refresh]="boundRefresh" [update]="boundUpdate"></ui-entries>
<page-entries [fetch]="boundFetch"></page-entries>
src/app/pages/hot/hot.page.ts
+5 -60
View File
@@ -11,71 +11,16 @@ import { PageEvent } from '@angular/material/paginator';
})
export class PageHot implements OnInit {
entries: any;
boundRefresh: Function;
boundUpdate: Function;
init: boolean = true;
boundFetch: Function;
constructor(private entriesService: EntriesService, private router: Router, private route: ActivatedRoute) { }
constructor(private entriesService: EntriesService) { }
ngOnInit(): void {
this.boundRefresh = this.refresh.bind(this);
this.boundUpdate = this.update.bind(this);
this.route.queryParams.subscribe(params => {
if (this.init) {
this.entries = {};
if (params[ 'p' ]) {
this.entries.number = +params[ 'p' ] - 1;
if (this.entries.number < 0) {
this.entries.number = 0;
}
}
if (params[ 's' ]) {
this.entries.size = +params[ 's' ];
}
this.refresh();
this.init = false;
}
});
this.boundFetch = this.fetch.bind(this);
}
refresh(): void {
if (!this.entries) {
this.entries = {};
}
this.entries.content = null;
this.entriesService.getComments(this.entries.number || 0, this.entries.size || 30).subscribe((data: any) => {
this.entries = data;
}, (error) => { })
}
update(event: PageEvent) {
this.entries.content = null;
const params: any = { p: null, s: null };
if (event.pageIndex != 0) {
params.p = event.pageIndex + 1;
}
if (event.pageSize != 30) {
params.s = event.pageSize;
}
this.router.navigate(
[],
{
relativeTo: this.route,
queryParams: params,
queryParamsHandling: 'merge'
});
this.entriesService.getComments(event.pageIndex, event.pageSize).subscribe((data: any) => {
this.entries = data;
}, (error) => { })
fetch(page: number, size: number) {
return this.entriesService.getComments(page,size);
}
}
src/app/pages/last/last.page.html
+1
View File
@@ -0,0 +1 @@
<page-entries [fetch]="boundFetch"></page-entries>
src/app/pages/last/last.page.ts
+23
View File
@@ -0,0 +1,23 @@
import { Component, OnInit } from '@angular/core';
import { EntriesService } from '../../services/entries.service';
@Component({
selector: 'page-last',
templateUrl: './last.page.html'
})
export class PageLast implements OnInit {
boundFetch: Function;
constructor(private entriesService: EntriesService) { }
ngOnInit(): void {
this.boundFetch = this.fetch.bind(this);
}
fetch(page: number, size: number) {
return this.entriesService.getLastComment(page,size);
}
}
src/app/pages/new/new.page.html
+1 -1
View File
@@ -1 +1 @@
<ui-entries [entries]="entries" [refresh]="boundRefresh" [update]="boundUpdate"></ui-entries>
<page-entries [fetch]="boundFetch"></page-entries>
src/app/pages/new/new.page.ts
+5 -60
View File
@@ -10,71 +10,16 @@ import { EntriesService } from '../../services/entries.service';
})
export class PageNew implements OnInit {
entries: any;
boundRefresh: Function;
boundUpdate: Function;
init: boolean = true;
boundFetch: Function;
constructor(private entriesService: EntriesService, private router: Router, private route: ActivatedRoute) { }
constructor(private entriesService: EntriesService) { }
ngOnInit(): void {
this.boundRefresh = this.refresh.bind(this);
this.boundUpdate = this.update.bind(this);
this.route.queryParams.subscribe(params => {
if (this.init) {
this.entries = {};
if (params[ 'p' ]) {
this.entries.number = +params[ 'p' ] - 1;
if (this.entries.number < 0) {
this.entries.number = 0;
}
}
if (params[ 's' ]) {
this.entries.size = +params[ 's' ];
}
this.refresh();
this.init = false;
}
});
this.boundFetch = this.fetch.bind(this);
}
refresh(): void {
if (!this.entries) {
this.entries = {};
}
this.entries.content = null;
this.entriesService.getNew(this.entries.number || 0, this.entries.size || 30).subscribe((data: any) => {
this.entries = data;
}, (error) => { })
}
update(event: PageEvent) {
this.entries.content = null;
const params: any = { p: null, s: null };
if (event.pageIndex != 0) {
params.p = event.pageIndex + 1;
}
if (event.pageSize != 30) {
params.s = event.pageSize;
}
this.router.navigate(
[],
{
relativeTo: this.route,
queryParams: params,
queryParamsHandling: 'merge'
});
this.entriesService.getNew(event.pageIndex, event.pageSize).subscribe((data: any) => {
this.entries = data;
}, (error) => { })
fetch(page: number, size: number) {
return this.entriesService.getNew(page,size);
}
}
src/app/pages/submission/submission.page.ts
+11
View File
@@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { EntriesService } from '../../services/entries.service';
import { Router } from '@angular/router';
import { FormBuilder, FormGroup, Validators, NgForm } from '@angular/forms';
import { tap, distinctUntilChanged, debounceTime } from 'rxjs/operators';
@Component({
selector: 'page-submission',
@@ -38,6 +39,16 @@ export class PageSubmission implements OnInit {
this.form.get('url').setValidators([ Validators.nullValidator ]);
}
});
this.form.get('url').valueChanges.pipe(
debounceTime(800),
distinctUntilChanged()).subscribe((value) => {
if (value && !this.form.get('title').value) {
this.entriesService.titleHelper(value).subscribe((title: string) => {
this.form.get('title').setValue(title);
})
}
})
}
hasError(controlName: string): boolean {
src/app/pages/top/top.page.html
+1 -1
View File
@@ -1 +1 @@
<ui-entries [entries]="entries" [refresh]="boundRefresh" [update]="boundUpdate"></ui-entries>
<page-entries [fetch]="boundFetch"></page-entries>
src/app/pages/top/top.page.ts
+5 -63
View File
@@ -1,9 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { EntriesService } from '../../services/entries.service';
import { PageEvent } from '@angular/material/paginator';
@Component({
selector: 'page-top',
@@ -11,71 +8,16 @@ import { PageEvent } from '@angular/material/paginator';
})
export class PageTop implements OnInit {
entries: any;
boundRefresh: Function;
boundUpdate: Function;
init: boolean = true;
boundFetch: Function;
constructor(private entriesService: EntriesService, private router: Router, private route: ActivatedRoute) { }
constructor(private entriesService: EntriesService) { }
ngOnInit(): void {
this.boundRefresh = this.refresh.bind(this);
this.boundUpdate = this.update.bind(this);
this.route.queryParams.subscribe(params => {
if (this.init) {
this.entries = {};
if (params[ 'p' ]) {
this.entries.number = +params[ 'p' ] - 1;
if (this.entries.number < 0) {
this.entries.number = 0;
}
}
if (params[ 's' ]) {
this.entries.size = +params[ 's' ];
}
this.refresh();
this.init = false;
}
});
this.boundFetch = this.fetch.bind(this);
}
refresh(): void {
if (!this.entries) {
this.entries = {};
}
this.entries.content = null;
this.entriesService.getRanked(this.entries.number || 0, this.entries.size || 30).subscribe((data: any) => {
this.entries = data;
}, (error) => { })
}
update(event: PageEvent) {
this.entries.content = null;
const params: any = { p: null, s: null };
if (event.pageIndex != 0) {
params.p = event.pageIndex + 1;
}
if (event.pageSize != 30) {
params.s = event.pageSize;
}
this.router.navigate(
[],
{
relativeTo: this.route,
queryParams: params,
queryParamsHandling: 'merge'
});
this.entriesService.getRanked(event.pageIndex, event.pageSize).subscribe((data: any) => {
this.entries = data;
}, (error) => { })
fetch(page: number, size: number) {
return this.entriesService.getRanked(page,size);
}
}