diff --git a/capacitor.config.ts b/capacitor.config.ts index 2f97d55..cf605d4 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -5,8 +5,12 @@ const config: CapacitorConfig = { appName: 'library', webDir: 'www', server: { - androidScheme: 'https' - } + androidScheme: 'https', + cleartext: true, + }, + ios: { + handleApplicationNotifications: false, + }, }; export default config; diff --git a/src/app/modals/book-page/book-page.component.html b/src/app/modals/book-page/book-page.component.html index 2ec35e3..ea3d82b 100644 --- a/src/app/modals/book-page/book-page.component.html +++ b/src/app/modals/book-page/book-page.component.html @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ - + Название: {{ item.volumeInfo.title }} @@ -28,20 +28,6 @@ Колличество страниц: {{ item.volumeInfo.pageCount }} - -
-
- - Скачать книгу в pdf - -
-
- - Скачать книгу в epub - -
-
-
Книга выдана: diff --git a/src/app/modals/book-page/book-page.component.ts b/src/app/modals/book-page/book-page.component.ts index daec223..704c859 100644 --- a/src/app/modals/book-page/book-page.component.ts +++ b/src/app/modals/book-page/book-page.component.ts @@ -24,11 +24,21 @@ export class BookPageComponent implements OnInit { @Input() trigger!: string; public openBrowser(url: string) { InAppBrowser.create(url, '_blank', { - location: 'no', + allowInlineMediaPlayback: 'yes', + toolbar: 'yes', + useWideViewPort: 'yes', + hidden: 'no', }); } constructor(private storage: StorageService) {} + public httpToHttps(url: string) { + if (url.startsWith('http://')) { + return url.replace('http://', 'https://'); + } + return url; + } + ngOnInit() { this.getIssuers(); } @@ -57,7 +67,6 @@ export class BookPageComponent implements OnInit { parseDate(date: string) { return new Date(date).toLocaleDateString(); } - onWillDismiss(event: Event) {} protected readonly open = open; } diff --git a/src/app/tabs/RentPage/rent.page.html b/src/app/tabs/RentPage/rent.page.html index d0b6a66..39b46fb 100644 --- a/src/app/tabs/RentPage/rent.page.html +++ b/src/app/tabs/RentPage/rent.page.html @@ -22,7 +22,7 @@ - + {{ item.book.volumeInfo.title }} Выдан: {{ item.user?.fio }} diff --git a/src/app/tabs/RentPage/rent.page.ts b/src/app/tabs/RentPage/rent.page.ts index 44887de..dd9c133 100644 --- a/src/app/tabs/RentPage/rent.page.ts +++ b/src/app/tabs/RentPage/rent.page.ts @@ -63,4 +63,11 @@ export class RentPage implements OnInit { let _date = new Date(date); return _date.toLocaleDateString(); } + + public httpToHttps(url: string) { + if (url.startsWith('http://')) { + return url.replace('http://', 'https://'); + } + return url; + } } diff --git a/src/app/tabs/SearchPage/search.page.html b/src/app/tabs/SearchPage/search.page.html index 10687dc..b5da7f9 100644 --- a/src/app/tabs/SearchPage/search.page.html +++ b/src/app/tabs/SearchPage/search.page.html @@ -18,7 +18,7 @@ - + {{item.volumeInfo.title}} diff --git a/src/app/tabs/SearchPage/search.page.ts b/src/app/tabs/SearchPage/search.page.ts index 8481402..86c5233 100644 --- a/src/app/tabs/SearchPage/search.page.ts +++ b/src/app/tabs/SearchPage/search.page.ts @@ -29,4 +29,11 @@ export class SearchPage { }, }); } + + public httpToHttps(url: string) { + if (url.startsWith('http://')) { + return url.replace('http://', 'https://'); + } + return url; + } }