Milestone.

Author: gnu4cn

electron/src/book.backend.ts

@@ -66,7 +66,7 @@ export class BookBackend {
 
         bookWindow.setMaximizable(true);
         bookWindow.setMaximizable(true);
-        bookWindow.setMinimumSize(1024, 768);
+        bookWindow.setMinimumSize(1024, 600);
         const webContents = bookWindow.webContents;
         webContents.openDevTools();
 

src/app/home/components/book-list.component.html

@@ -27,7 +27,7 @@
                 </mat-card-header>
 
                 <mat-card-content *ngIf="book.desc.length > 0">
-                    <mat-label><b>“</b>{{book.desc}}<b>”</b></mat-label>
+                    <mat-label><b>“</b>{{book.desc.length > 256 ? book.desc.slice(0,256)+'...' : book.desc}}<b>”</b></mat-label>
                 </mat-card-content>
 
                 <mat-card-content fxLayout="row" fxLayoutGap="5px" class="cate-list">

src/app/home/components/new-book-dialog.component.ts

@@ -2,6 +2,7 @@ import {
     Component, 
     OnInit, 
     ElementRef, 
+    Inject,
     ViewChild 
 } from '@angular/core';
 import { FormControl, Validators } from '@angular/forms';
@@ -12,6 +13,7 @@ import { map, startWith } from 'rxjs/operators';
 
 import { 
     MatDialogRef, 
+    MAT_DIALOG_DATA,
 } from '@angular/material/dialog';
 import { MatAutocompleteSelectedEvent, MatAutocomplete} from '@angular/material/autocomplete';
 import { MatChipInputEvent } from '@angular/material/chips';
@@ -55,9 +57,10 @@ export class NewBookDialog implements OnInit{
         public dialogRef: MatDialogRef<NewBookDialog>,
         private book: BookService,
         private cate: CateService,
+        @Inject(MAT_DIALOG_DATA) public bookUri: string 
     ) {
+        this.newBook.bookUri = bookUri ? bookUri : '';
         this.cateList = this.cate.list;
-
         this.filteredCateList = this.cateListInputControl.valueChanges.pipe(
             startWith(null),
             map((cateInput: string | null) => cateInput ? this._filter(cateInput) : this.tempCateList.slice())
@@ -68,7 +71,6 @@ export class NewBookDialog implements OnInit{
 
     ngOnInit() {
         this.tempCateList = this.cateList.slice();
-
         this.uriInputControl.setValidators(IsQualifiedAndNotExistedGitRepoValidatorFn(this.book.list.slice()));
     }
 

src/app/home/components/reading-record.dialog.html

@@ -8,7 +8,7 @@ <h2 mat-dialog-title>{{data.name|uppercase}} 阅读记录 - 共 {{recordList.len
                 style="height: 40px; padding: 0">
                 <ion-label color="dark" class="ion-float-left" style="width: 360px;">
                     <ion-text class="ion-float-left" style="width: 350px;">
-                        <b>{{getReadableDate(record.dateCreated)}}</b> - <i>{{record.dateCreated | date : 'yyyy-M-d H:mm:ss' : 'GMT+8' }}</i>
+                        <b>{{getReadableDate(record.dateCreated)}}</b> - <i>{{record.dateCreated | date : 'yyyy-MM-dd HH:mm:ss' : 'GMT+8' }}</i>
                     </ion-text>
                 </ion-label>
             </mgl-timeline-entry-header>

src/app/home/components/search.component.html

@@ -5,6 +5,9 @@
                      fxLayoutGap="10px" 
                      fxFlexOffset="10px">
         <mat-card class="search-result" *ngFor="let book of bookList">
+            <ion-button color="success" size="small" class="save-cloud-book" (click)="saveCloudBook(book)">
+                <ion-icon name="magnet-outline"></ion-icon>放到书架
+            </ion-button>
             <mat-card-header>
                 <img mat-card-avatar 
                      uiImageLoader
@@ -27,7 +30,7 @@
                     获星<ion-icon name="star"></ion-icon>：<i>{{book.stars}}</i>
                 </ion-label>
                 <ion-label>
-                    更新时间：<i>{{book.dateUpdated | date : 'yyyy-M-d H:mm:ss' : 'GMT+8' }}</i>
+                    更新时间：<i>{{book.dateUpdated | date : 'yyyy-MM-dd HH:mm:ss' : 'GMT+8' }}</i>
                 </ion-label>
             </mat-card-footer>
         </mat-card>

src/app/home/components/search.component.scss

@@ -1 +1,11 @@
+mat-card:hover .save-cloud-book{
+    display: block;
+}
+
+ion-button.save-cloud-book {
+    position: absolute; 
+    right: 10px; 
+    top: 5px;
+    display: none;
+}
 

src/app/home/components/search.component.ts

@@ -1,6 +1,17 @@
 import { Component, OnInit, Input } from '@angular/core';
 
-import { ICloudBook } from '../../vendor';
+import { 
+    ICloudBook,
+    IAddBookDialogResData,
+} from '../../vendor';
+
+import { NewBookDialog } from './new-book-dialog.component';
+import { BookService } from '../services/book.service';
+
+import { 
+    MatDialog, 
+} from '@angular/material/dialog';
+
 @Component({
     selector: 'app-books-cloud-search',
     templateUrl: './search.component.html',
@@ -10,7 +21,22 @@ export class SearchComponent implements OnInit {
     @Input() bookList: Array<ICloudBook>;
     @Input() searching: boolean;
 
-    constructor() {}
+    constructor(
+        private dialog: MatDialog,
+        private book: BookService
+    ) {}
 
     ngOnInit() {}
+
+    saveCloudBook = (cloudBook: ICloudBook) => {
+        const dialogRef = this.dialog.open(NewBookDialog, {
+            width: '480px',
+            data: cloudBook.url
+        });
+
+        dialogRef.afterClosed().subscribe((res: IAddBookDialogResData) => {
+            if(res) this.book.save(res);
+        });
+
+    }
 }

src/app/home/home.page.html

@@ -92,15 +92,15 @@
                                  [(ngModel)]="platformSelected" fxLayoutGap="10px">
                     <mat-radio-button *ngFor="let platform of platforms" [value]="platform.name">
                         <mat-chip>
-                            <ion-icon [src]="platform.icon"></ion-icon>{{platform.name}}
+                            <ion-icon [src]="platform.icon"></ion-icon> {{platform.name}}
                         </mat-chip>
                     </mat-radio-button>
                 </mat-radio-group>
 
                 <button mat-stroked-button color="primary" 
                                            (click)="cloudSearch(1)"
                                            [disabled]="!keywordsFormControl.valid">
-                    <ion-text color="light"><ion-icon name="search-outline"></ion-icon>搜索</ion-text>
+                    <ion-text color="light"><ion-icon name="search-outline"></ion-icon>搜 索</ion-text>
                 </button>
             </div>
         </form>

src/app/home/home.page.ts

@@ -252,7 +252,9 @@ export class HomePage implements OnInit, AfterViewInit {
     }
 
     cloudSearch = async (page: number) => {
+        if(page === 1) this.bookListCloud = [].slice();
         this.searching = true;
+
         const res = await this.fetchService.searchBooks(this.platformSelected, this.keywords, page) as object[] | object;
         this.searching = false;
 
@@ -263,7 +265,6 @@ export class HomePage implements OnInit, AfterViewInit {
             _bookList = (res as object[]).slice();
         }
 
-        if(page === 1) this.bookListCloud = [].slice();
         _bookList.map((bookRaw: object) => {
             const book: ICloudBook = {
                 fullName: '',