Skip to content

Commit

Permalink
Issue #ED-3915 merge: Merge pull request #3586 from vpPavithra/releas…
Browse files Browse the repository at this point in the history 
…e-8.0.0_capacitor

Issue #ED-3915 fix: updated package for capaciitor - ng15 merge
  • Loading branch information
@swayangjit
swayangjit authored Apr 1, 2024
2 parents 5896e8c + 8987589 commit e8822d2
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 68 deletions.
18 changes: 3 additions & 15 deletions angular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,11 @@
"input": "./node_modules/@project-sunbird/common-consumption/assets",
"output": "./assets/common-consumption"
},
{
"glob": "**/*",
"input": "node_modules/@project-sunbird/sunbird-pdf-player-v9/lib/assets/",
"output": "/assets/"
},
{
"glob": "**/*.*",
"input": "./node_modules/@project-sunbird/discussions-ui/assets",
"output": "./assets/discussion-ui"
},
{
"glob": "**/*.*",
"input": "./node_modules/@project-sunbird/sunbird-quml-player-web-component/assets",
"output": "/assets/"
},
{
"glob": "**/*",
"input": "./node_modules/@project-sunbird/sunbird-video-player-web-component/assets",
Expand Down Expand Up @@ -94,7 +84,6 @@
"node_modules/@project-sunbird/sunbird-epub-player-web-component/styles.css",
"node_modules/@project-sunbird/sunbird-quml-player-web-component/styles.css",
"node_modules/@project-sunbird/sunbird-pdf-player-web-component/styles.css",
"node_modules/@project-sunbird/sunbird-epub-player-web-component/styles.css",
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
{
"input": "src/global.scss"
Expand All @@ -115,8 +104,7 @@
"node_modules/@project-sunbird/sunbird-epub-player-web-component/sunbird-epub-player.js",
"node_modules/@project-sunbird/sunbird-quml-player-web-component/sunbird-quml-player.js",
"node_modules/reflect-metadata/Reflect.js",
"node_modules/@project-sunbird/sunbird-pdf-player-web-component/sunbird-pdf-player.js",
"node_modules/@project-sunbird/sunbird-epub-player-web-component/sunbird-epub-player.js"
"node_modules/@project-sunbird/sunbird-pdf-player-web-component/sunbird-pdf-player.js"
],
"preserveSymlinks": true
},
Expand All @@ -139,8 +127,8 @@
"budgets": [
{
"type": "initial",
"maximumWarning": "8mb",
"maximumError": "16mb"
"maximumWarning": "10mb",
"maximumError": "18mb"
}
]
},
Expand Down
69 changes: 33 additions & 36 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
"private": true,
"dependencies": {
"@angular/animations": "15.2.10",
"@angular/cdk": "^15.2.9",
"@angular/cdk": "15.2.9",
"@angular/common": "15.2.10",
"@angular/core": "15.2.10",
"@angular/forms": "15.2.10",
"@angular/localize": "15.2.10",
"@angular/material": "^15.2.9",
"@angular/material": "15.2.9",
"@angular/platform-browser": "15.2.10",
"@angular/platform-browser-dynamic": "15.2.10",
"@angular/router": "15.2.10",
Expand Down Expand Up @@ -73,32 +73,30 @@
"@capawesome/capacitor-file-picker": "5.1.1",
"@ionic/angular": "6.7.4",
"@ionic/storage": "2.2.0",
"@ngx-translate/core": "^11.0.1",
"@ngx-translate/http-loader": "^4.0.0",
"@project-sunbird/client-services": "7.0.4",
"@project-sunbird/common-consumption": "^8.0.1",
"@project-sunbird/common-form-elements": "^8.0.0",
"@ngx-translate/core": "11.0.1",
"@ngx-translate/http-loader": "4.0.0",
"@project-sunbird/client-services": "7.0.6",
"@project-sunbird/common-consumption": "8.0.1",
"@project-sunbird/common-form-elements": "8.0.5",
"@project-sunbird/content-player": "5.1.0",
"@project-sunbird/discussions-ui": "8.0.0",
"@project-sunbird/sb-dashlet": "^8.0.0",
"@project-sunbird/sb-notification": "^8.0.0",
"@project-sunbird/discussions-ui": "8.0.4",
"@project-sunbird/sb-dashlet": "8.0.0",
"@project-sunbird/sb-notification": "8.0.0",
"@project-sunbird/sb-styles": "0.0.16",
"@project-sunbird/sb-svg2pdf": "^8.0.1",
"@project-sunbird/sunbird-epub-player-v9": "^5.6.0",
"@project-sunbird/sb-svg2pdf": "8.0.4",
"@project-sunbird/sunbird-epub-player-web-component": "^1.2.0",
"@project-sunbird/sunbird-pdf-player-v9": "^5.6.0",
"@project-sunbird/sunbird-pdf-player-web-component": "^1.1.0",
"@project-sunbird/sunbird-pdf-player-web-component": "1.1.0",
"@project-sunbird/sunbird-quml-player-web-component": "3.0.3",
"@project-sunbird/sunbird-sdk": "7.0.21",
"@project-sunbird/sunbird-video-player-web-component": "1.0.1",
"chart.js": "2.9.4",
"chartjs-plugin-datalabels": "0.7.0",
"chartjs-plugin-stacked100": "0.7.1",
"colors": "1.4.0",
"cordova-plugin-android-permissions": "^1.1.2",
"cordova-plugin-android-permissions": "1.1.2",
"cordova-plugin-qr-scanner": "git+https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#release-7.0.0_cap",
"core-js": "3.23.3",
"crypto-js": "^4.2.0",
"crypto-js": "4.2.0",
"datatables.net-dt": "1.13.4",
"datatables.net-fixedcolumns": "3.3.3",
"dayjs": "1.9.8",
Expand All @@ -112,22 +110,22 @@
"jwt-decode": "2.2.0",
"katex": "0.11.1",
"lodash": "4.17.21",
"lodash-es": "^4.17.20",
"lodash-es": "4.17.20",
"material-design-icons": "3.0.1",
"moment": "2.29.4",
"ng-recaptcha": "9.0.0",
"ng-recaptcha": "11.0.0",
"ng2-charts": "2.4.2",
"ng2-material-dropdown": "1.0.0",
"ngx-bootstrap": "8.0.0",
"ngx-bootstrap": "10.2.1",
"ngx-chips": "2.2.2",
"ngx-infinite-scroll": "13.1.0",
"ngx-infinite-scroll": "15.0.0",
"ngx-moment": "5.0.0",
"pouchdb": "7.2.2",
"pouchdb-adapter-cordova-sqlite": "2.0.7",
"pouchdb-find": "7.2.2",
"reflect-metadata": "0.2.1",
"rxjs": "6.6.7",
"sb-tag-manager": "3.9.19",
"sb-tag-manager": "^3.9.19",
"stream-browserify": "3.0.0",
"tslib": "2.0.0",
"typescript-collections": "1.3.3",
Expand Down Expand Up @@ -186,28 +184,27 @@
"cordova-plugin-inappupdatemanager": "git+https://github.com/subranil/cordova-plugin-inappupdatemanager.git#release-3.7.0",
"cordova-plugin-media": "7.0.0",
"cordova-plugin-printer": "git+https://github.com/vpPavithra/cordova-plugin-printer.git#release-7.0.0_cap",
"cordova-plugin-streaming-media": "^2.3.0",
"cordova-plugin-streaming-media": "2.3.0",
"cordova-plugin-telerik-imagepicker": "git+https://github.com/vpPavithra/ImagePicker.git#release-7.0.0_cap",
"cordova-plugin-webview-checker": "^1.0.1",
"cordova-plugin-zip": "^3.1.0",
"cordova-plugin-webview-checker": "1.0.1",
"cordova-plugin-zip": "3.1.0",
"cordova-zip-plugin": "git+https://github.com/Sunbird-Ed/jjdltc-cordova-plugin-zip.git",
"cordova.plugins.diagnostic": "6.1.1",
"es6-promise-plugin": "^4.2.2",
"fs-extra": "^8.1.0",
"ionic-plugin-keyboard": "^2.2.1",
"jest": "^29.0.0",
"plist": "^3.0.2",
"properties-reader": "^2.2.0",
"es6-promise-plugin": "4.2.2",
"fs-extra": "8.1.0",
"ionic-plugin-keyboard": "2.2.1",
"jest": "29.0.0",
"plist": "3.0.2",
"properties-reader": "2.2.0",
"sb-cordova-plugin-customtabs": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git#release-5.0.2",
"sb-cordova-plugin-db": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-db.git#release-6.0.0",
"sb-cordova-plugin-sync": "git+https://github.com/project-sunbird/sb-cordova-plugin-sync.git#release-4.9.0",
"sb-cordova-plugin-utility": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-utility.git#release-6.0.0",
"sonarqube-scanner": "^3.3.0",
"tiny-glob": "^0.2.9",
"ts-node": "^10.9.1",
"tslint": "~6.1.0",
"typescript": "4.9.5",
"uk.co.workingedge.phonegap.plugin.istablet": "^1.2.0"
"sonarqube-scanner": "3.3.0",
"tiny-glob": "0.2.9",
"ts-node": "10.9.1",
"tslint": "6.1.0",
"typescript": "4.9.5"
},
"description": "An Ionic project",
"jest": {
Expand Down
6 changes: 2 additions & 4 deletions src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ import { LocalNotifications } from '@capacitor/local-notifications';
import { buildConfig } from '../environments/environment.stag';
import { Keyboard } from '@capacitor/keyboard';

declare const cordova;
declare const window;

@Component({
Expand Down Expand Up @@ -92,7 +91,7 @@ export class AppComponent implements OnInit, AfterViewInit {
timeLeft: string;
eventSubscription: Subscription;
isTimeAvailable = false;
isOnBoardingCompleted: boolean;
isOnBoardingCompleted: boolean = false;
public swipeGesture = this.platform.is('ios')? false : true;

constructor(
Expand Down Expand Up @@ -155,7 +154,7 @@ export class AppComponent implements OnInit, AfterViewInit {
}

async ngOnInit() {
this.platform.ready().then(async () => {
await this.platform.ready().then(async () => {
if (this.platform.is('iphone') || this.platform.is('ipad')) {
this.iosDeeplink();
}
Expand All @@ -169,7 +168,6 @@ export class AppComponent implements OnInit, AfterViewInit {
this.networkAvailability.init();
await this.fcmTokenWatcher(); // Notification related
this.getSystemConfig();
buildConfig.VERSION_NAME
this.utilityService.getBuildConfigValue(GenericAppConfig.VERSION_NAME)
.then(versionName => {
this.appVersion = versionName;
Expand Down
1 change: 0 additions & 1 deletion src/app/components/components.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ import { DownloadTranscriptPopupComponent } from './popups/download-transcript-p
FormsModule,
ReactiveFormsModule,
IonicModule,
ReactiveFormsModule,
PipesModule,
CommonConsumptionModule,
IonicRatingModule,
Expand Down
10 changes: 0 additions & 10 deletions src/app/player/player.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@ import { IonicModule } from '@ionic/angular';

import { PlayerPage } from './player.page';
import { CanvasPlayerService } from '../../services/canvas-player.service';
import { SunbirdPdfPlayerModule } from '@project-sunbird/sunbird-pdf-player-v9';
// import { QumlLibraryModule } from '@project-sunbird/sunbird-quml-player';
// import { SunbirdEpubPlayerModule } from '@project-sunbird/sunbird-epub-player-v9';





const routes: Routes = [
{
Expand All @@ -26,9 +19,6 @@ const routes: Routes = [
imports: [
CommonModule,
FormsModule,
SunbirdPdfPlayerModule,
// QumlLibraryModule,
// SunbirdEpubPlayerModule,
IonicModule,
RouterModule.forChild(routes)
],
Expand Down
2 changes: 0 additions & 2 deletions src/app/player/player.page.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import { ContentUtil } from '../../util/content-util';
import { PrintPdfService } from '../../services/print-pdf/print-pdf.service';
import { FormConstants } from '../form.constants';
import { File } from '@awesome-cordova-plugins/file/ngx';
import { UtilityService } from '../../services/utility-service';

declare const cordova;

Expand Down Expand Up @@ -72,7 +71,6 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat
@ViewChild('epub') epub: ElementRef;
@ViewChild('pdf') pdf!: ElementRef;
@ViewChild('qumlPlayer', { static: false }) qumlPlayer: ElementRef;
@ViewChild('epub') epub: ElementRef;

constructor(
@Inject('COURSE_SERVICE') private courseService: CourseService,
Expand Down

0 comments on commit e8822d2

Please sign in to comment.