From 60eb2acf08fd74b3da5928653f0d097b33cc6f0c Mon Sep 17 00:00:00 2001 From: vishnubansal Date: Thu, 25 Jul 2024 14:32:24 +0530 Subject: [PATCH] update for cios mweb issues --- .../app-toc-about.component.html | 6 +-- .../app-toc-about.component.scss | 2 + .../app-toc-about/app-toc-about.component.ts | 1 + .../toc-kpi-values.component.ts | 1 - package.json | 2 +- .../app-toc-cios-home.component.html | 50 +++++++++++++++++-- .../app-toc-cios-home.component.scss | 9 +++- .../app-toc-cios-home.component.ts | 7 ++- .../see-all-home/see-all-home.component.html | 2 +- 9 files changed, 69 insertions(+), 11 deletions(-) diff --git a/library/ws-widget/collection/src/lib/_common/content-toc/app-toc-about/app-toc-about.component.html b/library/ws-widget/collection/src/lib/_common/content-toc/app-toc-about/app-toc-about.component.html index 9c6055b1d7..ecf37f9541 100644 --- a/library/ws-widget/collection/src/lib/_common/content-toc/app-toc-about/app-toc-about.component.html +++ b/library/ws-widget/collection/src/lib/_common/content-toc/app-toc-about/app-toc-about.component.html @@ -76,7 +76,7 @@ -
+
@@ -181,7 +181,7 @@
- + @@ -403,7 +403,7 @@
- +
{{ 'apptocsinglepage.authorsAndCurators' | translate }}
diff --git a/library/ws-widget/collection/src/lib/_common/content-toc/app-toc-about/app-toc-about.component.scss b/library/ws-widget/collection/src/lib/_common/content-toc/app-toc-about/app-toc-about.component.scss index dfff4d853f..7731bccb46 100644 --- a/library/ws-widget/collection/src/lib/_common/content-toc/app-toc-about/app-toc-about.component.scss +++ b/library/ws-widget/collection/src/lib/_common/content-toc/app-toc-about/app-toc-about.component.scss @@ -73,6 +73,8 @@ .mob-text { color: rgba($color: #000000, $alpha: 0.6); + word-wrap: break-word; + width: 100%; } } diff --git a/library/ws-widget/collection/src/lib/_common/content-toc/app-toc-about/app-toc-about.component.ts b/library/ws-widget/collection/src/lib/_common/content-toc/app-toc-about/app-toc-about.component.ts index 605d36a247..edfe28cf51 100644 --- a/library/ws-widget/collection/src/lib/_common/content-toc/app-toc-about/app-toc-about.component.ts +++ b/library/ws-widget/collection/src/lib/_common/content-toc/app-toc-about/app-toc-about.component.ts @@ -104,6 +104,7 @@ export class AppTocAboutComponent implements OnInit, OnChanges, AfterViewInit, O @Input() fromViewer = false @Input() selectedBatchData: any @Input() selectedTabValue = 0 + @Input() fromMarketPlace? = false @ViewChild('summaryElem', { static: false }) summaryElem !: ElementRef @ViewChild('objectivesElem', { static: false }) objectivesElem !: ElementRef @ViewChild('descElem', { static: false }) descElem !: ElementRef diff --git a/library/ws-widget/collection/src/lib/_common/content-toc/toc-kpi-values/toc-kpi-values.component.ts b/library/ws-widget/collection/src/lib/_common/content-toc/toc-kpi-values/toc-kpi-values.component.ts index 23c2847f58..25f3f555b7 100644 --- a/library/ws-widget/collection/src/lib/_common/content-toc/toc-kpi-values/toc-kpi-values.component.ts +++ b/library/ws-widget/collection/src/lib/_common/content-toc/toc-kpi-values/toc-kpi-values.component.ts @@ -13,7 +13,6 @@ export class TocKpiValuesComponent implements OnInit { @Input() content: NsContent.IContent | null = null @Input() isMobile = false @Input() showInstructorLedMsg = false - constructor() { } ngOnInit() { diff --git a/package.json b/package.json index 2ae41f062d..1cc377b1e8 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@project-sunbird/sb-styles": "0.0.7", "@project-sunbird/sunbird-quml-player": "0.0.6", "@project-sunbird/telemetry-sdk": "0.0.26", - "@sunbird-cb/consumption": "0.0.61", + "@sunbird-cb/consumption": "0.0.63", "@sunbird-cb/design-system": "0.0.2", "@sunbird-cb/discussions-ui-v8": "2.1.3", "@sunbird-cb/micro-surveys": "^2.0.17", diff --git a/project/ws/app/src/lib/routes/app-toc/components/app-toc-cios-home/app-toc-cios-home.component.html b/project/ws/app/src/lib/routes/app-toc/components/app-toc-cios-home/app-toc-cios-home.component.html index 3c6bcdc089..57504039b9 100644 --- a/project/ws/app/src/lib/routes/app-toc/components/app-toc-cios-home/app-toc-cios-home.component.html +++ b/project/ws/app/src/lib/routes/app-toc/components/app-toc-cios-home/app-toc-cios-home.component.html @@ -79,9 +79,53 @@
+
+
+ + + + + + + {{ 'apptochome.redirect' | translate }} + open_in_new + + + + + + +
+
+
+ web image +
{{ extContentReadData?.duration * 60 | pipeDurationTransform: 'hms' }}
+
+
+
-
-
+
+
@@ -95,7 +139,7 @@
- +
diff --git a/project/ws/app/src/lib/routes/app-toc/components/app-toc-cios-home/app-toc-cios-home.component.scss b/project/ws/app/src/lib/routes/app-toc/components/app-toc-cios-home/app-toc-cios-home.component.scss index a1904ea1ac..9947d200c9 100644 --- a/project/ws/app/src/lib/routes/app-toc/components/app-toc-cios-home/app-toc-cios-home.component.scss +++ b/project/ws/app/src/lib/routes/app-toc/components/app-toc-cios-home/app-toc-cios-home.component.scss @@ -63,6 +63,7 @@ .banner-text { color: rgba(255, 255, 255, 0.95); + word-wrap: break-word; } } @@ -820,7 +821,13 @@ ul{ text-align: center; } -.kpi-values[_ngcontent-feq-c30] img[_ngcontent-feq-c30] { +.kpi-values img { height: 24px; width: 24px; +} + +.position-bottom { + position: fixed; + width: 88%; + bottom: 0; } \ No newline at end of file diff --git a/project/ws/app/src/lib/routes/app-toc/components/app-toc-cios-home/app-toc-cios-home.component.ts b/project/ws/app/src/lib/routes/app-toc/components/app-toc-cios-home/app-toc-cios-home.component.ts index 95d3783ae5..aad422ed67 100644 --- a/project/ws/app/src/lib/routes/app-toc/components/app-toc-cios-home/app-toc-cios-home.component.ts +++ b/project/ws/app/src/lib/routes/app-toc/components/app-toc-cios-home/app-toc-cios-home.component.ts @@ -26,7 +26,7 @@ export class AppTocCiosHomeComponent implements OnInit, AfterViewInit { @ViewChild('rightContainer', { static: false }) rcElement!: ElementRef scrollLimit: any scrolled: boolean | undefined - + isMobile = false @HostListener('window:scroll', ['$event']) handleScroll() { @@ -74,6 +74,11 @@ export class AppTocCiosHomeComponent implements OnInit, AfterViewInit { } ngOnInit() { + if (window.innerWidth <= 1200) { + this.isMobile = true + } else { + this.isMobile = false + } } handleCapitalize(str: string, type?: string): string { diff --git a/project/ws/app/src/lib/routes/see-all/components/see-all-home/see-all-home.component.html b/project/ws/app/src/lib/routes/see-all/components/see-all-home/see-all-home.component.html index a3aaa6dd3b..1fba9f708b 100644 --- a/project/ws/app/src/lib/routes/see-all/components/see-all-home/see-all-home.component.html +++ b/project/ws/app/src/lib/routes/see-all/components/see-all-home/see-all-home.component.html @@ -14,7 +14,7 @@
-
+