Skip to content

Commit

Permalink
Merge pull request #3618 from shikshalokam/release-8.0.0_capacitor
Browse files Browse the repository at this point in the history 
Release 8.0.0 capacitor
  • Loading branch information
@swayangjit
swayangjit authored May 23, 2024
2 parents c69662a + 5837d3f commit 61869f1
Show file tree
Hide file tree
Showing 365 changed files with 28,270 additions and 225 deletions.
13 changes: 10 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"@capacitor/camera": "5.0.7",
"@capacitor/core": "5.5.1",
"@capacitor/device": "5.0.6",
"@capacitor/filesystem": "^6.0.0",
"@capacitor/haptics": "5.0.6",
"@capacitor/keyboard": "5.0.6",
"@capacitor/local-notifications": "5.0.7",
Expand All @@ -70,9 +71,13 @@
"@capacitor/splash-screen": "5.0.6",
"@capacitor/status-bar": "5.0.6",
"@capawesome/capacitor-file-picker": "5.1.1",
"@ionic-native/camera": "^5.36.0",
"@ionic-native/chooser": "^5.36.0",
"@ionic-native/file-chooser": "^5.36.0",
"@ionic-native/file-path": "^5.36.0",
"@ionic/angular": "6.7.5",
"@ionic/storage": "4.0.0",
"@ionic/storage-angular": "4.0.0",
"@ionic/storage": "^2.0.0",
"@ngx-translate/core": "14.0.0",
"@ngx-translate/http-loader": "6.0.0",
"@project-sunbird/client-services": "7.0.6",
Expand Down Expand Up @@ -121,9 +126,9 @@
"ngx-chips": "2.2.2",
"ngx-infinite-scroll": "16.0.0",
"ngx-moment": "5.0.0",
"pouchdb": "7.2.2",
"pouchdb": "^8.0.0",
"pouchdb-adapter-cordova-sqlite": "2.0.7",
"pouchdb-find": "7.2.2",
"pouchdb-find": "^8.0.0",
"readline": "^1.3.0",
"reflect-metadata": "0.2.1",
"rxjs": "6.6.7",
Expand Down Expand Up @@ -203,9 +208,11 @@
"es6-promise-plugin": "4.2.2",
"fs-extra": "8.1.0",
"ionic-plugin-keyboard": "2.2.1",

"jest": "29.5.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",
Expand Down
46 changes: 23 additions & 23 deletions src/app/app-routing.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { HasNotSelectedLanguageGuard } from '../guards/has-not-selected-language
import { HasNotSelectedUserTypeGuard } from '../guards/has-not-selected-user-type.guard';
import { IsGuestUserGuard } from '../guards/is-guest-user.guard';
// TODO: Capacitor temp fix
// import { MlGuard } from './manage-learn/core/guards/ml.guard';
import { MlGuard } from './manage-learn/core/guards/ml.guard';

const routes: Routes = [
{
Expand Down Expand Up @@ -98,35 +98,35 @@ const routes: Routes = [
{ path: RouterLinks.MY_GROUPS, loadChildren: () => import('./my-groups/my-groups.module').then(m => m.MyGroupsPageModule) },
{ path: RouterLinks.CURRICULUM_COURSES, loadChildren: () => import('./curriculum-courses/curriculum-courses.module').then(m => m.CurriculumCoursesPageModule) },
// TODO: Capacitor temp fix
// { path: RouterLinks.PROGRAM, loadChildren: () => import('./manage-learn/programs/programs.module').then(m => m.ProgramsModule), canActivate:[MlGuard] },
// { path: RouterLinks.SURVEY, loadChildren: () => import('./manage-learn/survey/survey.module').then(m => m.SurveyModule), canActivate:[MlGuard] },
// { path: RouterLinks.PROJECT, loadChildren: () => import('./manage-learn/project/project.module').then(m => m.ProjectModule)},
// { path: RouterLinks.REPORTS, loadChildren: () => import('./manage-learn/reports/reports.module').then(m => m.ReportsModule),canActivate:[MlGuard] },
// {
// path: RouterLinks.QUESTIONNAIRE,
// loadChildren: () => import('./manage-learn/questionnaire/questionnaire.module').then(m => m.QuestionnairePageModule)
// },
{ path: RouterLinks.PROGRAM, loadChildren: () => import('./manage-learn/programs/programs.module').then(m => m.ProgramsModule), canActivate:[MlGuard] },
{ path: RouterLinks.SURVEY, loadChildren: () => import('./manage-learn/survey/survey.module').then(m => m.SurveyModule), canActivate:[MlGuard] },
{ path: RouterLinks.PROJECT, loadChildren: () => import('./manage-learn/project/project.module').then(m => m.ProjectModule)},
{ path: RouterLinks.REPORTS, loadChildren: () => import('./manage-learn/reports/reports.module').then(m => m.ReportsModule),canActivate:[MlGuard] },
{
path: RouterLinks.QUESTIONNAIRE,
loadChildren: () => import('./manage-learn/questionnaire/questionnaire.module').then(m => m.QuestionnairePageModule)
},

// { path: RouterLinks.OBSERVATION, loadChildren: () => import('./manage-learn/observation/observation.module').then(m => m.ObservationModule) , canActivate:[MlGuard]},
{ path: RouterLinks.OBSERVATION, loadChildren: () => import('./manage-learn/observation/observation.module').then(m => m.ObservationModule) , canActivate:[MlGuard]},
{ path: RouterLinks.CATEGORY_LIST, loadChildren: () => import('./category-list/category-list-page.module').then(m => m.CategoryListPageModule) },
{ path: RouterLinks.GUEST_PROFILE, loadChildren: () => import('./profile/guest-profile/guest-profile.module').then(m => m.GuestProfilePageModule) },
// { path: RouterLinks.ECM_LISTING, loadChildren: () => import('./manage-learn/ecm-listing/ecm-listing.module').then(m => m.EcmListingPageModule) },
// { path: RouterLinks.SECTION_LISTING, loadChildren: () => import('./manage-learn/section-listing/section-listing.module').then(m => m.SectionListingPageModule) },
// { path: RouterLinks.SUBMISSION_PREVIEW, loadChildren: () => import('./manage-learn/submission-preview/submission-preview.module').then(m => m.SubmissionPreviewModule) },
// { path: RouterLinks.IMAGE_LISTING, loadChildren: () => import('./manage-learn/image-listing/image-listing.module').then(m => m.ImageListingModule) },
// { path: RouterLinks.ALL_EVIDENCE, loadChildren: () => import('./manage-learn/all-evidence-list/all-evidence-list.module').then(m => m.AllEvidenceListModule) },
// { path: RouterLinks.PROJECT_REPORT, loadChildren: () => import('./manage-learn/project-report/project-report.module').then(m => m.ProjectReportModule) },
// { path: `${RouterLinks.DEEPLINK_REDIRECT}/:extra`, loadChildren: () => import('./manage-learn/deeplink-redirect/deeplink-redirect.module').then(m => m.DeeplinkRedirectModule) },
{ path: RouterLinks.ECM_LISTING, loadChildren: () => import('./manage-learn/ecm-listing/ecm-listing.module').then(m => m.EcmListingPageModule) },
{ path: RouterLinks.SECTION_LISTING, loadChildren: () => import('./manage-learn/section-listing/section-listing.module').then(m => m.SectionListingPageModule) },
{ path: RouterLinks.SUBMISSION_PREVIEW, loadChildren: () => import('./manage-learn/submission-preview/submission-preview.module').then(m => m.SubmissionPreviewModule) },
{ path: RouterLinks.IMAGE_LISTING, loadChildren: () => import('./manage-learn/image-listing/image-listing.module').then(m => m.ImageListingModule) },
{ path: RouterLinks.ALL_EVIDENCE, loadChildren: () => import('./manage-learn/all-evidence-list/all-evidence-list.module').then(m => m.AllEvidenceListModule) },
{ path: RouterLinks.PROJECT_REPORT, loadChildren: () => import('./manage-learn/project-report/project-report.module').then(m => m.ProjectReportModule) },
{ path: `${RouterLinks.DEEPLINK_REDIRECT}/:extra`, loadChildren: () => import('./manage-learn/deeplink-redirect/deeplink-redirect.module').then(m => m.DeeplinkRedirectModule) },
{ path: RouterLinks.CATEGORY_LIST, loadChildren: () => import('./category-list/category-list-page.module').then(m => m.CategoryListPageModule)},
{ path: RouterLinks.GUEST_PROFILE, loadChildren: () => import('./profile/guest-profile/guest-profile.module').then(m => m.GuestProfilePageModule) },
{ path: RouterLinks.DISCUSSION, loadChildren: () => import('./discussion-forum/discussion-forum.module').then(m => m.DiscussionForumModule) },
{ path: RouterLinks.SEARCH_FILTER, loadChildren: () => import('./search-filter/search-filter.module').then(m => m.SearchFilterPageModule) },
// { path: RouterLinks.GENERIC_REPORT, loadChildren: () => import('./manage-learn/generic-reports/generic-reports.module').then(m => m.GenericReportsModule) , canActivate:[MlGuard]},
// { path: RouterLinks.DOMAIN_ECM_LISTING, loadChildren: () => import('./manage-learn/domain-ecm-listing/domain-ecm-listing.module').then(m => m.DomainEcmListingModule) },
// {
// path: RouterLinks.IMP_SUGGESTIONS,
// loadChildren: () => import('./manage-learn/imp-suggestions/imp-suggestions.module').then(m => m.ImpSuggestionsPageModule)
// },
{ path: RouterLinks.GENERIC_REPORT, loadChildren: () => import('./manage-learn/generic-reports/generic-reports.module').then(m => m.GenericReportsModule) , canActivate:[MlGuard]},
{ path: RouterLinks.DOMAIN_ECM_LISTING, loadChildren: () => import('./manage-learn/domain-ecm-listing/domain-ecm-listing.module').then(m => m.DomainEcmListingModule) },
{
path: RouterLinks.IMP_SUGGESTIONS,
loadChildren: () => import('./manage-learn/imp-suggestions/imp-suggestions.module').then(m => m.ImpSuggestionsPageModule)
},
{ path: RouterLinks.SIGN_IN, loadChildren: () => import('./sign-in/sign-in.module').then(m => m.SignInPageModule)},
{
path: RouterLinks.SIGNUP_BASIC,
Expand Down
18 changes: 9 additions & 9 deletions src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import {
} from './app.constant';
import { EventParams } from './components/sign-in-card/event-params.interface';
// TODO: Capacitor temp fix
// import { ApiUtilsService, DbService, LoaderService, NetworkService } from './manage-learn/core';
import { ApiUtilsService, DbService, LoaderService, NetworkService } from './manage-learn/core';
import { SBTagModule } from 'sb-tag-manager';
import { SegmentationTagService, TagPrefixConstants } from '../services/segmentation-tag/segmentation-tag.service';
import { ScreenOrientation } from '@capacitor/screen-orientation';
Expand Down Expand Up @@ -127,12 +127,12 @@ export class AppComponent implements OnInit, AfterViewInit {
private localCourseService: LocalCourseService,
// TODO: Capacitor temp fix
// private splaschreenDeeplinkActionHandlerDelegate: SplaschreenDeeplinkActionHandlerDelegate,
// private utils: ApiUtilsService,
// private networkServ: NetworkService,
// private db: DbService,
private utils: ApiUtilsService,
private networkServ: NetworkService,
private db: DbService,
private loginHandlerService: LoginHandlerService,
private segmentationTagService: SegmentationTagService,
// private mlloader: LoaderService,
private mlloader: LoaderService,
private onboardingConfigurationService: OnboardingConfigurationService
) {
this.telemetryAutoSync = this.telemetryService.autoSync;
Expand Down Expand Up @@ -225,8 +225,8 @@ export class AppComponent implements OnInit, AfterViewInit {
await this.checkForTheme();
this.onTraceIdUpdate();
// TODO: Capacitor temp fix
// await this.utils.initilizeML();
// this.networkServ.netWorkCheck();
await this.utils.initilizeML();
this.networkServ.netWorkCheck();
await this.applyJoyfulTheme();
}).catch(e => console.error(e));
await this.handleEvents();
Expand Down Expand Up @@ -508,7 +508,7 @@ export class AppComponent implements OnInit, AfterViewInit {
this.events.publish(AppGlobalService.USER_INFO_UPDATED, eventParams);
this.toggleRouterOutlet = true;
await this.reloadSigninEvents();
// await this.db.createDb(); // TODO: Capacitor temp fix
await this.db.createDb(); // TODO: Capacitor temp fix
this.events.publish('UPDATE_TABS', skipNavigation);
if (batchDetails) {
await this.localCourseService.checkCourseRedirect();
Expand Down Expand Up @@ -602,7 +602,7 @@ export class AppComponent implements OnInit, AfterViewInit {
this.headerService.sidebarEvent('back');
} else {
if (this.location.back && !this.rootPageDisplayed) {
// await this.mlloader.stopLoader() // TODO: Capacitor temp fix
await this.mlloader.stopLoader() // TODO: Capacitor temp fix
this.location.back();
}
}
Expand Down
Loading

0 comments on commit 61869f1

Please sign in to comment.