From d83a5f74d33f02ce46c30f3c315812b5e51a7b0e Mon Sep 17 00:00:00 2001 From: Pratiksha Khandagale Date: Fri, 18 Oct 2024 16:22:50 +0530 Subject: [PATCH] bot api end point change --- capacitor.config.ts | 7 ++++++- configuration/environment.prod.ts | 6 +++--- src/app/pages/home/home.page.html | 12 ++++++------ src/app/pages/home/home.page.ts | 2 +- src/app/pages/mypitara/mypitara.page.html | 4 ++-- .../playlist-details.page.html | 14 ++------------ .../qr-scan-result/qr-scan-result.page.html | 2 +- src/app/pages/search/search.page.html | 3 +-- src/app/pages/view-all/view-all.page.html | 4 ++-- .../services/api/http.capacitor.adapter.ts | 19 +++++++++++++++++-- 10 files changed, 41 insertions(+), 32 deletions(-) diff --git a/capacitor.config.ts b/capacitor.config.ts index 8db1696f..3a735168 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -6,7 +6,12 @@ const config: CapacitorConfig = { loggingBehavior: "none", webDir: 'www', server: { - androidScheme: 'https' + androidScheme: 'https', + allowNavigation: [ + "https://drive.google.com", + "https://docs.google.com", + "https://photos.app.goo.gl" + ] }, plugins: { CapacitorSQLite: { diff --git a/configuration/environment.prod.ts b/configuration/environment.prod.ts index 22a05972..4b13cb1e 100644 --- a/configuration/environment.prod.ts +++ b/configuration/environment.prod.ts @@ -11,11 +11,11 @@ export const config = { CONTEXT_SEARCH: 'api/aiutility/v1/context', CONTENT_SEARCH_API: 'content/search', TELEMETRY_SYNC: 'telemetry/v1/telemetry', - BOT_QUERY_API: 'v1/query', + BOT_QUERY_API: 'v1/chat', SEARCH_API: 'content/search', CONFIRM_API: 'confirm', - BOT_SAKHI_API_PATH: 'v1/query', - BOT_ACTIVITY_API_PATH: 'api/activitybot/v1/query', + BOT_SAKHI_API_PATH: 'v1/chat', + BOT_ACTIVITY_API_PATH: 'api/activitybot/v1/chat', REGISTER_DEVICE_API_PATH: 'api/registerMobileDevice', KEY: 'myjp-0.1', diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html index bd0d34bf..dee05609 100644 --- a/src/app/pages/home/home.page.html +++ b/src/app/pages/home/home.page.html @@ -48,18 +48,18 @@
{{"Teacher Tara" | translate }}
--> -
+
- + - - - + + + - + diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts index 1aa2f6be..38a2261b 100644 --- a/src/app/pages/home/home.page.ts +++ b/src/app/pages/home/home.page.ts @@ -212,7 +212,7 @@ export class HomePage implements OnInit, OnTabViewWillEnter, OnDestroy { } async mappUIContentList(content: Array) { - // await this.contentService.deleteAllContents(); + await this.contentService.deleteAllContents(); this.showSheenAnimation = false; this.configContents = []; this.contentList = []; diff --git a/src/app/pages/mypitara/mypitara.page.html b/src/app/pages/mypitara/mypitara.page.html index 02c1d28f..7dc7cb41 100644 --- a/src/app/pages/mypitara/mypitara.page.html +++ b/src/app/pages/mypitara/mypitara.page.html @@ -21,8 +21,8 @@ - - + +
{{content.metaData.name |translate}}
diff --git a/src/app/pages/playlist-details/playlist-details.page.html b/src/app/pages/playlist-details/playlist-details.page.html index 56a9627f..837a1e3f 100644 --- a/src/app/pages/playlist-details/playlist-details.page.html +++ b/src/app/pages/playlist-details/playlist-details.page.html @@ -6,22 +6,12 @@
- - + - - - - - - + diff --git a/src/app/pages/qr-scan-result/qr-scan-result.page.html b/src/app/pages/qr-scan-result/qr-scan-result.page.html index b72bc8ec..0bfdc93c 100644 --- a/src/app/pages/qr-scan-result/qr-scan-result.page.html +++ b/src/app/pages/qr-scan-result/qr-scan-result.page.html @@ -35,7 +35,7 @@ - +
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 00ba0402..de6a1888 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -56,9 +56,8 @@ - - +
diff --git a/src/app/pages/view-all/view-all.page.html b/src/app/pages/view-all/view-all.page.html index 10d8e418..355d30ff 100644 --- a/src/app/pages/view-all/view-all.page.html +++ b/src/app/pages/view-all/view-all.page.html @@ -8,8 +8,8 @@ - - + +
diff --git a/src/app/services/api/http.capacitor.adapter.ts b/src/app/services/api/http.capacitor.adapter.ts index 58ca6419..d165a9f0 100644 --- a/src/app/services/api/http.capacitor.adapter.ts +++ b/src/app/services/api/http.capacitor.adapter.ts @@ -111,6 +111,20 @@ export class HttpCapacitorAdapter implements HttpClient { return match ? match[1] : null; } + + convertGoogleDriveUrl(driveUrl: string): string | null { + const regex = /\/d\/([a-zA-Z0-9_-]+)\//; + const match = driveUrl.match(regex); + + if (match && match[1]) { + const fileId = match[1]; + return `https://drive.google.com/thumbnail?id=${fileId}`; + } + + return null; // Return null if no match + } + + private invokeRequest(type: ApiHttpRequestType, url: string, parametersOrData: any, headers: { [key: string]: string }): Observable { const observable = new Subject(); @@ -144,7 +158,8 @@ export class HttpCapacitorAdapter implements HttpClient { receivedData.data.djp_contents.forEach((item : any) => { // let mimetype = item?.url ? this.checkMimieType(item?.url) : 'text/html'; let url = this.isGoogleDriveLink(item?.url) ? item?.url.replace('/view', '/preview'): item?.url; - let thumbnail = item?.thumbnail != null && this.isGoogleDriveLink(item?.thumbnail) ? "" : ""; + item.thumbnail = (item?.thumbnail != null && this.isGoogleDriveLink(item?.thumbnail)) ? this.convertGoogleDriveUrl(item?.thumbnail): item?.thumbnail; + let mimetype = this.checkMimieType(url); // Traverse through the items array of each provider const content: SearchContentMetaData = { @@ -162,7 +177,7 @@ export class HttpCapacitorAdapter implements HttpClient { provider_name: item.provider_name, name: item.name, description: item.description, - thumbnail: thumbnail, + thumbnail: item?.thumbnail, domain: item.domain, unique_id: item.unique_id, language: item.language,