AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Series Relations Schema (#1654)

Browse source 
* Bump loader-utils from 2.0.2 to 2.0.3 in /UI/Web

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.3/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v2.0.2...v2.0.3)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fixed is want to read coming back as a string and not working correctly.

* Changed from to Continue to be more explicit

* Added the first migration which exports data as a csv in temp/. This is the backup in case data is lost in the migration.

* Note for later

* Fixed the migration for the series relation so when deleting any series on any edge of the relationship, the SeriesRelation row deletes.

* Change buttons back to titles on series detail page

* Wrote the code to import relations from the backup.

* Added an additional version check to avoid file io on migration.

* Code cleanup

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
Joe Milazzo 2022-11-15 08:45:02 -06:00 • committed by GitHub
parent d5a7c31c7d
commit 15e09a0cf1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 2111 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

5
UI/Web/src/app/_services/series.service.ts
View file

@ -131,7 +131,10 @@ export class SeriesService {
}
isWantToRead(seriesId: number) {
return this.httpClient.get<boolean>(this.baseUrl + 'want-to-read?seriesId=' + seriesId, {responseType: 'text' as 'json'});
return this.httpClient.get<string>(this.baseUrl + 'want-to-read?seriesId=' + seriesId, {responseType: 'text' as 'json'})
.pipe(map(val => {
return val === 'true';
}));
}
getOnDeck(libraryId: number = 0, pageNum?: number, itemsPerPage?: number, filter?: SeriesFilter) {

8
UI/Web/src/app/series-detail/series-detail.component.html
View file

@ -64,7 +64,7 @@
</div>
<app-image height="100%" maxHeight="400px" objectFit="contain" background="none" [imageUrl]="seriesImage"></app-image>
<div class="under-image mt-1" *ngIf="hasReadingProgress && currentlyReadingChapter && !currentlyReadingChapter.isSpecial">
From {{ContinuePointTitle}}
Continue {{ContinuePointTitle}}
</div>
</div>
<div class="col-xlg-10 col-lg-8 col-md-8 col-xs-8 col-sm-6 mt-2">
@ -78,14 +78,14 @@
</button>
</div>
<div class="col-auto ms-2">
<button class="btn btn-secondary" (click)="toggleWantToRead()" placement="top" [closeDelay]="100000" ngbTooltip="{{isWantToRead ? 'Remove from' : 'Add to'}} Want to Read">
<button class="btn btn-secondary" (click)="toggleWantToRead()" title="{{isWantToRead ? 'Remove from' : 'Add to'}} Want to Read">
<span>
<i class="fa-{{isWantToRead ? 'solid' : 'regular'}} fa-star" aria-hidden="true"></i>
<i class="{{isWantToRead ? 'fa-solid' : 'fa-regular'}} fa-star" aria-hidden="true"></i>
</span>
</button>
</div>
<div class="col-auto ms-2" *ngIf="isAdmin">
<button class="btn btn-secondary" (click)="openEditSeriesModal()" placement="top" ngbTooltip="Edit Series information">
<button class="btn btn-secondary" (click)="openEditSeriesModal()" title="Edit Series information">
<span>
<i class="fa fa-pen" aria-hidden="true"></i>
</span>

9
UI/Web/src/app/series-detail/series-detail.component.scss
View file

@ -2,17 +2,8 @@
font-style: italic;
}
.want-to-read-star {
//position: absolute;
//top: 15px;
//left: 20px;
//color: var(--primary-color);
}
.to-read-counter {
position: absolute;
// top: 15px;
// right: 20px;
top: 15px;
left: 20px;
}