
* Started with the redesign of the cover image chooser redesign to be less click intensive for volume/chapter images. Made some headings bold in card detail drawer. * Tweaked the styles * Moved where the info cards show * Added an ability to open a page settings drawer * Cleaned up some old code that isn't needed anymore. * Started implementing a list view. Refactored some title code to a dedicated component * List view implemented but way too many API calls. Either need caching or adjusting the SeriesDetail api. * Fixed a bug where if the progress bar didn't render on a card item while a download was in progress, the download indicator would be removed. * Large refactor to move a lot of the needed fields to the chapter and volume dtos for series detail. All fields are noted when only used in series detail. * Implemented cards for other tabs (except related) * Fixed the unit test which needed a mocked reader service call. * More cleanup around age rating and removing old code from the refactor. Commented out sorting till i feel motivated to work on that. * Some cleanup and restored cards as initial layout. Time to test this out and see if there is value add. * Added ability for Chapters tab to show the volume chapters belong to (if applicable) * Adding style fixes * Cover image updates, don't allow the first image (which is what is currently set) to respond to cover changes. Hide the ID field on list item for series detail. * Refactored the title for list item to be injectable * Cleaned up the selection code to make it less finicky on mobile when tap scrolling. * Refactored chapter tab to show volume as well on list view. * Ensure word count shows for Volumes * Started adding virtual scrolling, pushing up so Robbie can mess around * Started adding virtual scrolling, pushing up so Robbie can mess around * Fixed a bug where all chapters would come under specials * Show title data as accent if set. * Style fixes for virtual scroller * Restyling scroll * Implemented a way to show storyline with virtual scrolling * Show Word Count for chapters and cleaned up some logics. * I might have card layout working with virtual scroll code. * Some cleanup to hide more system like properties from info bar on series detail page. Fixed some missing time estimate info on storyline chapters. * Fixed a regression on series service when I integrated VolumeTitle. * Refactored read time to the backend. Added WordCount to the volume itself so we don't need to calculate on frontend. When asking to analyze files from a series, force the calculation. * Fixed SeriesDetail api code * Fixed up the code in the drawer to better update list/card mode * Basic infinite scroll implemented, however due to how we are updating the list to render, we are re-rending cards that haven't been touched. * Updated how we render and layout data for infinite scroll on library detail. It's almost there. * Started laying foundation for loading pages backwards. Removed lazy loading of images since we are now using virtual paging. * Hooked in some basic code to allow user to load a prev page with infinite scroll. * Fixed up series detail api and undid the non-lazy loaded images. Changed the router to help with this infinite loading on Firefox issue. * Fixed up some naming issues with Series Detail and added a new test. * This is an infinite scroll without pagination implementation. It is not fully done, but off to a good start. Virtual scroller with jump bar is working pretty well, def needs more polishing and tweaking. There are hacks in this implementation that need to be revisited. * Refactored code so that we don't use any pagination and load all results by default. * Misc code cleanup from build warnings. * Cleaned up some logic for how to display titles in list view. * More title cleanup for specials * Hooked up page layout to user preferences and renamed an existing user pref name to match the dto. * Swapped out everything but storyline with virtual-scroller over CDK * Removed CDK from series detail. * Default value for migration on page layout * Updating card layout for library detail page * fixing height for mobile * Moved scrollbar * Tweaked some styling for layouts when there is no data * Refactored the series cards into their own component to make it re-usable. * More tweaks on series info cards layout and enhanced a few pages with trackby functions. * Removed some dead code * Added download on series detail to actionables to fit in with new scroll strategy. * Fixed language not being updated and sent to the backend for series update. * Fixed a bad migration (if you ran any prior migration in this branch, you need to undo before you use this commit) * Adding sticky tabs * fixed mobile gap on sticky tab * Enhanced the card title for books to show number up front. * Adjusted the gutters on admin dashboard * Removed debug code * Removing duplicate book title * Cleaned up old references to cdk scroller * Implemented a basic jump bar scaling algorithm. Not perfect, but works pretty well. * Code smells Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
211 lines
6.2 KiB
TypeScript
211 lines
6.2 KiB
TypeScript
import { Component, EventEmitter, Inject, Input, OnDestroy, OnInit, Output } from '@angular/core';
|
|
import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
|
|
import { NgxFileDropEntry, FileSystemFileEntry } from 'ngx-file-drop';
|
|
import { fromEvent, Subject } from 'rxjs';
|
|
import { takeWhile } from 'rxjs/operators';
|
|
import { ToastrService } from 'ngx-toastr';
|
|
import { ImageService } from 'src/app/_services/image.service';
|
|
import { KEY_CODES } from 'src/app/shared/_services/utility.service';
|
|
import { UploadService } from 'src/app/_services/upload.service';
|
|
import { DOCUMENT } from '@angular/common';
|
|
|
|
export type SelectCoverFunction = (selectedCover: string) => void;
|
|
|
|
@Component({
|
|
selector: 'app-cover-image-chooser',
|
|
templateUrl: './cover-image-chooser.component.html',
|
|
styleUrls: ['./cover-image-chooser.component.scss']
|
|
})
|
|
export class CoverImageChooserComponent implements OnInit, OnDestroy {
|
|
|
|
/**
|
|
* If buttons show under images to allow immediate selection of cover images.
|
|
*/
|
|
@Input() showApplyButton: boolean = false;
|
|
/**
|
|
* When a cover image is selected, this will be called with a base url representation of the file.
|
|
*/
|
|
@Output() applyCover: EventEmitter<string> = new EventEmitter<string>();
|
|
/**
|
|
* When a cover image is reset, this will be called.
|
|
*/
|
|
@Output() resetCover: EventEmitter<void> = new EventEmitter<void>();
|
|
|
|
@Input() imageUrls: Array<string> = [];
|
|
@Output() imageUrlsChange: EventEmitter<Array<string>> = new EventEmitter<Array<string>>();
|
|
|
|
/**
|
|
* Should the control give the ability to select an image that emits the reset status for cover image
|
|
*/
|
|
@Input() showReset: boolean = false;
|
|
@Output() resetClicked: EventEmitter<void> = new EventEmitter<void>();
|
|
|
|
/**
|
|
* Emits the selected index. Used usually to check if something other than the default image was selected.
|
|
*/
|
|
@Output() imageSelected: EventEmitter<number> = new EventEmitter<number>();
|
|
/**
|
|
* Emits a base64 encoded image
|
|
*/
|
|
@Output() selectedBase64Url: EventEmitter<string> = new EventEmitter<string>();
|
|
|
|
|
|
|
|
selectedIndex: number = 0;
|
|
/**
|
|
* Only applies for showApplyButton. Used to track which image is applied.
|
|
*/
|
|
appliedIndex: number = 0;
|
|
form!: FormGroup;
|
|
files: NgxFileDropEntry[] = [];
|
|
|
|
mode: 'file' | 'url' | 'all' = 'all';
|
|
private readonly onDestroy = new Subject<void>();
|
|
|
|
constructor(public imageService: ImageService, private fb: FormBuilder, private toastr: ToastrService, private uploadService: UploadService,
|
|
@Inject(DOCUMENT) private document: Document) { }
|
|
|
|
ngOnInit(): void {
|
|
this.form = this.fb.group({
|
|
coverImageUrl: new FormControl('', [])
|
|
});
|
|
}
|
|
|
|
ngOnDestroy() {
|
|
this.onDestroy.next();
|
|
this.onDestroy.complete();
|
|
}
|
|
|
|
getBase64Image(img: HTMLImageElement) {
|
|
const canvas = document.createElement("canvas");
|
|
canvas.width = img.width;
|
|
canvas.height = img.height;
|
|
const ctx = canvas.getContext("2d", {alpha: false});
|
|
if (!ctx) {
|
|
return '';
|
|
}
|
|
|
|
ctx.drawImage(img, 0, 0);
|
|
var dataURL = canvas.toDataURL("image/png");
|
|
return dataURL;
|
|
}
|
|
|
|
selectImage(index: number) {
|
|
if (this.selectedIndex === index) { return; }
|
|
this.selectedIndex = index;
|
|
this.imageSelected.emit(this.selectedIndex);
|
|
this.selectedBase64Url.emit(this.imageUrls[this.selectedIndex]);
|
|
}
|
|
|
|
applyImage(index: number) {
|
|
if (this.showApplyButton) {
|
|
this.applyCover.emit(this.imageUrls[index]);
|
|
this.appliedIndex = index;
|
|
}
|
|
}
|
|
|
|
resetImage() {
|
|
if (this.showApplyButton) {
|
|
this.resetCover.emit();
|
|
}
|
|
}
|
|
|
|
loadImage() {
|
|
const url = this.form.get('coverImageUrl')?.value.trim();
|
|
if (url && url != '') {
|
|
|
|
this.uploadService.uploadByUrl(url).subscribe(filename => {
|
|
const img = new Image();
|
|
img.crossOrigin = 'Anonymous';
|
|
img.src = this.imageService.getCoverUploadImage(filename);
|
|
img.onload = (e) => this.handleUrlImageAdd(img);
|
|
img.onerror = (e) => {
|
|
this.toastr.error('The image could not be fetched due to server refusing request. Please download and upload from file instead.');
|
|
this.form.get('coverImageUrl')?.setValue('');
|
|
};
|
|
this.form.get('coverImageUrl')?.setValue('');
|
|
});
|
|
}
|
|
}
|
|
|
|
changeMode(mode: 'url') {
|
|
this.mode = mode;
|
|
this.setupEnterHandler();
|
|
|
|
setTimeout(() => (this.document.querySelector('#load-image') as HTMLInputElement)?.focus(), 10);
|
|
}
|
|
|
|
public dropped(files: NgxFileDropEntry[]) {
|
|
this.files = files;
|
|
for (const droppedFile of files) {
|
|
|
|
// Is it a file?
|
|
if (droppedFile.fileEntry.isFile) {
|
|
const fileEntry = droppedFile.fileEntry as FileSystemFileEntry;
|
|
fileEntry.file((file: File) => {
|
|
const reader = new FileReader();
|
|
reader.onload = (e) => this.handleFileImageAdd(e);
|
|
reader.readAsDataURL(file);
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
handleFileImageAdd(e: any) {
|
|
if (e.target == null) return;
|
|
|
|
this.imageUrls.push(e.target.result);
|
|
this.imageUrlsChange.emit(this.imageUrls);
|
|
this.selectedIndex += 1;
|
|
this.imageSelected.emit(this.selectedIndex); // Auto select newly uploaded image
|
|
this.selectedBase64Url.emit(e.target.result);
|
|
}
|
|
|
|
handleUrlImageAdd(img: HTMLImageElement) {
|
|
const url = this.getBase64Image(img);
|
|
this.imageUrls.push(url);
|
|
this.imageUrlsChange.emit(this.imageUrls);
|
|
|
|
setTimeout(() => {
|
|
// Auto select newly uploaded image and tell parent of new base64 url
|
|
this.selectImage(this.selectedIndex + 1);
|
|
});
|
|
}
|
|
|
|
public fileOver(event: any){
|
|
}
|
|
|
|
public fileLeave(event: any){
|
|
}
|
|
|
|
reset() {
|
|
this.resetClicked.emit();
|
|
this.selectedIndex = -1;
|
|
}
|
|
|
|
setupEnterHandler() {
|
|
setTimeout(() => {
|
|
const elem = document.querySelector('input[id="load-image"]');
|
|
if (elem == null) return;
|
|
fromEvent(elem, 'keydown')
|
|
.pipe(takeWhile(() => this.mode === 'url')).subscribe((event) => {
|
|
const evt = <KeyboardEvent>event;
|
|
switch(evt.key) {
|
|
case KEY_CODES.ENTER:
|
|
{
|
|
this.loadImage();
|
|
break;
|
|
}
|
|
|
|
case KEY_CODES.ESC_KEY:
|
|
this.mode = 'all';
|
|
event.stopPropagation();
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
});
|
|
});
|
|
}
|
|
|
|
}
|