Merge branch 'dev' of https://github.com/dicdiksha/SunbirdEd-portal i…

…nto fix/79518/ncert-navigate/dev
dicdiksha · Oct 31, 2023 · 71c7a83 · 71c7a83
2 parents 628c351 + 1c034d0
commit 71c7a83
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/app/client/angular.json b/src/app/client/angular.json
@@ -42,7 +42,7 @@
               },
               {
                 "glob": "**/*",
-                "input": "node_modules/@project-sunbird/sunbird-video-player-v9/lib/assets/",
+                "input": "node_modules/dictrigyn-video-player-v9/lib/assets/",
                 "output": "/assets/"
               },
               {
@@ -76,7 +76,7 @@
               "./node_modules/@project-sunbird/sb-themes/themes/themes-df.scss",
               "./node_modules/@project-sunbird/sb-themes/themes/themes-portal.scss",
               "./node_modules/@project-sunbird/discussions-ui-v8/assets/styles/global.scss",
-              "node_modules/@project-sunbird/sunbird-video-player-v9/lib/assets/videojs.markers.min.css",
+              "node_modules/dictrigyn-video-player-v9/lib/assets/videojs.markers.min.css",
               "node_modules/videojs-http-source-selector/dist/videojs-http-source-selector.css"
             ],
             "stylePreprocessorOptions": {
@@ -97,8 +97,7 @@
               "node_modules/jquery.fancytree/dist/jquery.fancytree-all-deps.min.js",
               "src/assets/libs/semantic-ui/modal.min.js",
               "node_modules/video.js/dist/video.js",
-              "node_modules/@project-sunbird/sunbird-video-player-v9/lib/assets/videojs-markers.js",
-              "node_modules/videojs-contrib-quality-levels/dist/videojs-contrib-quality-levels.min.js",
+              "node_modules/dictrigyn-video-player-v9/lib/assets/videojs-markers.js",
               "node_modules/videojs-http-source-selector/dist/videojs-http-source-selector.min.js",
               {
                 "inject": false,

diff --git a/src/app/client/package.json b/src/app/client/package.json
@@ -73,7 +73,6 @@
     "@project-sunbird/sunbird-question-editor": "0.0.9",
     "@project-sunbird/sunbird-quml-player-v9": "5.1.5",
     "@project-sunbird/sunbird-resource-library": "0.0.19",
-    "@project-sunbird/sunbird-video-player-v9": "5.1.3",
     "@project-sunbird/telemetry-sdk": "0.0.29",
     "@project-sunbird/web-extensions": "^0.0.2",
     "@samagra-x/uci-console": "1.3.7",
@@ -94,6 +93,7 @@
     "core-js": "^2.4.1",
     "datatables.net-dt": "^1.10.20",
     "dayjs": "^1.8.26",
+    "dictrigyn-video-player-v9": "^5.1.3",
     "dom-to-image": "^2.6.0",
     "epubjs": "0.3.88",
     "export-to-csv": "0.2.1",

diff --git a/src/app/client/src/app/modules/player-helper/player-helper.module.ts b/src/app/client/src/app/modules/player-helper/player-helper.module.ts
@@ -16,7 +16,7 @@ import { FormsModule } from '@angular/forms';
 import { CommonConsumptionModule } from '@project-sunbird/common-consumption';
 // import {SunbirdPdfPlayerModule} from '@project-sunbird/sunbird-pdf-player-v9';
 import { SunbirdPdfPlayerModule} from '@dictrigyn/pdf-player';
-import { SunbirdVideoPlayerModule } from '@project-sunbird/sunbird-video-player-v9';
+import { SunbirdVideoPlayerModule } from 'dictrigyn-video-player-v9';
 import { SunbirdEpubPlayerModule } from '@project-sunbird/sunbird-epub-player-v9';
 import { QumlPlayerService } from './service/quml-player/quml-player.service';
 import { QumlLibraryModule, QuestionCursor } from '@project-sunbird/sunbird-quml-player-v9';

diff --git a/src/app/client/src/app/modules/public/module/help/help.module.ts b/src/app/client/src/app/modules/public/module/help/help.module.ts
@@ -9,7 +9,7 @@ import { CommonConsumptionModule } from '@project-sunbird/common-consumption';
 import { FaqReportComponent } from './components/faq-report/faq-report.component';
 import { CommonFormElementsModule } from '@dictrigyn/common-form-elements';
 import { SuiModalModule } from 'ng2-semantic-ui-v9';
-import { SunbirdVideoPlayerModule } from '@project-sunbird/sunbird-video-player-v9';
+import { SunbirdVideoPlayerModule } from 'dictrigyn-video-player-v9';
 
 @NgModule({
   imports: [