diff --git a/src/addons/privatefiles/pages/index/index.page.module.ts b/src/addons/privatefiles/pages/index/index.module.ts similarity index 96% rename from src/addons/privatefiles/pages/index/index.page.module.ts rename to src/addons/privatefiles/pages/index/index.module.ts index 2c4e04763..7b071b02c 100644 --- a/src/addons/privatefiles/pages/index/index.page.module.ts +++ b/src/addons/privatefiles/pages/index/index.module.ts @@ -22,7 +22,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { AddonPrivateFilesIndexPage } from './index.page'; +import { AddonPrivateFilesIndexPage } from '.'; const routes: Routes = [ { diff --git a/src/addons/privatefiles/pages/index/index.page.ts b/src/addons/privatefiles/pages/index/index.ts similarity index 99% rename from src/addons/privatefiles/pages/index/index.page.ts rename to src/addons/privatefiles/pages/index/index.ts index d6c6c868c..c377e7cfe 100644 --- a/src/addons/privatefiles/pages/index/index.page.ts +++ b/src/addons/privatefiles/pages/index/index.ts @@ -21,7 +21,7 @@ import { CoreApp } from '@services/app'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreTextUtils } from '@services/utils/text'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; import { CoreEventObserver, CoreEvents } from '@singletons/events'; import { AddonPrivateFiles, @@ -30,7 +30,7 @@ import { AddonPrivateFilesGetUserInfoWSResult, AddonPrivateFilesGetFilesWSParams, } from '@/addons/privatefiles/services/privatefiles'; -import { AddonPrivateFilesHelper } from '@/addons/privatefiles/services/privatefiles.helper'; +import { AddonPrivateFilesHelper } from '@/addons/privatefiles/services/privatefiles-helper'; import { CoreUtils } from '@services/utils/utils'; /** diff --git a/src/addons/privatefiles/privatefiles-init.module.ts b/src/addons/privatefiles/privatefiles-init.module.ts index 8c7c3d67b..e5ca7c84d 100644 --- a/src/addons/privatefiles/privatefiles-init.module.ts +++ b/src/addons/privatefiles/privatefiles-init.module.ts @@ -15,7 +15,7 @@ import { NgModule } from '@angular/core'; import { Routes } from '@angular/router'; -import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu.delegate'; +import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-delegate'; import { CoreMainMenuRoutingModule } from '@features/mainmenu/mainmenu-routing.module'; import { AddonPrivateFilesMainMenuHandler } from './services/handlers/mainmenu'; diff --git a/src/addons/privatefiles/privatefiles-routing.module.ts b/src/addons/privatefiles/privatefiles-routing.module.ts index 97167e019..a10fe99e7 100644 --- a/src/addons/privatefiles/privatefiles-routing.module.ts +++ b/src/addons/privatefiles/privatefiles-routing.module.ts @@ -23,7 +23,7 @@ const routes: Routes = [ }, { path: ':hash', - loadChildren: () => import('./pages/index/index.page.module').then( m => m.AddonPrivateFilesIndexPageModule), + loadChildren: () => import('./pages/index/index.module').then( m => m.AddonPrivateFilesIndexPageModule), }, ]; diff --git a/src/addons/privatefiles/services/handlers/mainmenu.ts b/src/addons/privatefiles/services/handlers/mainmenu.ts index f3859f456..77dfad91c 100644 --- a/src/addons/privatefiles/services/handlers/mainmenu.ts +++ b/src/addons/privatefiles/services/handlers/mainmenu.ts @@ -14,7 +14,7 @@ import { Injectable } from '@angular/core'; -import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@features/mainmenu/services/mainmenu.delegate'; +import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@features/mainmenu/services/mainmenu-delegate'; import { AddonPrivateFiles } from '@/addons/privatefiles/services/privatefiles'; /** diff --git a/src/addons/privatefiles/services/privatefiles.helper.ts b/src/addons/privatefiles/services/privatefiles-helper.ts similarity index 96% rename from src/addons/privatefiles/services/privatefiles.helper.ts rename to src/addons/privatefiles/services/privatefiles-helper.ts index e37992cc8..e2e69fb86 100644 --- a/src/addons/privatefiles/services/privatefiles.helper.ts +++ b/src/addons/privatefiles/services/privatefiles-helper.ts @@ -16,10 +16,10 @@ import { Injectable } from '@angular/core'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; -import { CoreFileUploaderHelper } from '@features/fileuploader/services/fileuploader.helper'; +import { CoreFileUploaderHelper } from '@features/fileuploader/services/fileuploader-helper'; import { AddonPrivateFiles, AddonPrivateFilesGetUserInfoWSResult } from './privatefiles'; import { CoreError } from '@classes/errors/error'; -import { makeSingleton, Translate } from '@singletons/core.singletons'; +import { makeSingleton, Translate } from '@singletons'; /** * Service that provides some helper functions regarding private and site files. diff --git a/src/addons/privatefiles/services/privatefiles.ts b/src/addons/privatefiles/services/privatefiles.ts index d0f3101d8..997ec3426 100644 --- a/src/addons/privatefiles/services/privatefiles.ts +++ b/src/addons/privatefiles/services/privatefiles.ts @@ -18,7 +18,7 @@ import { CoreSites } from '@services/sites'; import { CoreMimetypeUtils } from '@services/utils/mimetype'; import { CoreWSExternalWarning } from '@services/ws'; import { CoreSite } from '@classes/site'; -import { makeSingleton } from '@singletons/core.singletons'; +import { makeSingleton } from '@singletons'; const ROOT_CACHE_KEY = 'mmaFiles:'; diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 2bcc80750..1e3f8e5c1 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -15,7 +15,7 @@ import { NgModule } from '@angular/core'; import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '@guards/auth.guard'; +import { AuthGuard } from '@guards/auth'; const routes: Routes = [ { diff --git a/src/app/app.component.test.ts b/src/app/app.component.test.ts index f2f11836d..625674ed9 100644 --- a/src/app/app.component.test.ts +++ b/src/app/app.component.test.ts @@ -18,7 +18,7 @@ import { NavController } from '@ionic/angular'; import { AppComponent } from '@/app/app.component'; import { CoreEvents } from '@singletons/events'; import { CoreLangProvider } from '@services/lang'; -import { Network, Platform, NgZone } from '@singletons/core.singletons'; +import { Network, Platform, NgZone } from '@singletons'; import { mock, mockSingleton, renderComponent, RenderConfig } from '@/testing/utils'; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 91c79bbaf..5b8f9f36b 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -16,7 +16,7 @@ import { Component, OnInit } from '@angular/core'; import { NavController } from '@ionic/angular'; import { CoreLangProvider } from '@services/lang'; -import { CoreLoginHelperProvider } from '@features/login/services/login.helper'; +import { CoreLoginHelperProvider } from '@features/login/services/login-helper'; import { CoreEvents, CoreEventSessionExpiredData, @@ -24,7 +24,7 @@ import { CoreEventSiteData, CoreEventSiteUpdatedData, } from '@singletons/events'; -import { Network, NgZone, Platform } from '@singletons/core.singletons'; +import { Network, NgZone, Platform } from '@singletons'; import { CoreApp } from '@services/app'; import { CoreSites } from '@services/sites'; diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts index de721524d..bd6df82ff 100644 --- a/src/core/classes/site.ts +++ b/src/core/classes/site.ts @@ -37,7 +37,7 @@ import { SQLiteDB } from '@classes/sqlitedb'; import { CoreError } from '@classes/errors/error'; import { CoreWSError } from '@classes/errors/wserror'; import { CoreLogger } from '@singletons/logger'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; import { CoreIonLoadingElement } from './ion-loading'; /** diff --git a/src/core/classes/sqlitedb.ts b/src/core/classes/sqlitedb.ts index 14fff4066..038b37967 100644 --- a/src/core/classes/sqlitedb.ts +++ b/src/core/classes/sqlitedb.ts @@ -14,7 +14,7 @@ import { SQLiteObject } from '@ionic-native/sqlite/ngx'; -import { SQLite, Platform } from '@singletons/core.singletons'; +import { SQLite, Platform } from '@singletons'; import { CoreError } from '@classes/errors/error'; /** diff --git a/src/core/classes/error.test.ts b/src/core/classes/tests/error.test.ts similarity index 93% rename from src/core/classes/error.test.ts rename to src/core/classes/tests/error.test.ts index 005da6c67..a8f90e5be 100644 --- a/src/core/classes/error.test.ts +++ b/src/core/classes/tests/error.test.ts @@ -38,7 +38,7 @@ describe('CoreError', () => { expect(error!.name).toEqual('CoreError'); expect(error!.message).toEqual(message); expect(error!.stack).not.toBeNull(); - expect(error!.stack).toContain('src/core/classes/error.test.ts'); + expect(error!.stack).toContain('src/core/classes/tests/error.test.ts'); }); it('can be subclassed', () => { @@ -70,7 +70,7 @@ describe('CoreError', () => { expect(error!.name).toEqual('CustomCoreError'); expect(error!.message).toEqual(`Custom message: ${message}`); expect(error!.stack).not.toBeNull(); - expect(error!.stack).toContain('src/core/classes/error.test.ts'); + expect(error!.stack).toContain('src/core/classes/tests/error.test.ts'); }); }); diff --git a/src/core/components/components.module.ts b/src/core/components/components.module.ts index feb716d63..cfa381f7f 100644 --- a/src/core/components/components.module.ts +++ b/src/core/components/components.module.ts @@ -26,7 +26,7 @@ import { CoreInputErrorsComponent } from './input-errors/input-errors'; import { CoreLoadingComponent } from './loading/loading'; import { CoreMarkRequiredComponent } from './mark-required/mark-required'; import { CoreRecaptchaComponent } from './recaptcha/recaptcha'; -import { CoreRecaptchaModalComponent } from './recaptcha/recaptchamodal'; +import { CoreRecaptchaModalComponent } from './recaptcha/recaptcha-modal'; import { CoreShowPasswordComponent } from './show-password/show-password'; import { CoreEmptyBoxComponent } from './empty-box/empty-box'; import { CoreTabsComponent } from './tabs/tabs'; diff --git a/src/core/components/context-menu/context-menu-item.ts b/src/core/components/context-menu/context-menu-item.ts index 0fb926e2a..42eee0c8d 100644 --- a/src/core/components/context-menu/context-menu-item.ts +++ b/src/core/components/context-menu/context-menu-item.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Component, Input, Output, OnInit, OnDestroy, EventEmitter, OnChanges, SimpleChange } from '@angular/core'; -import { CoreContextMenuComponent } from './context-menu'; +import { CoreContextMenuComponent } from '../context-menu/context-menu'; /** * This directive adds a item to the Context Menu popover. diff --git a/src/core/components/context-menu/context-menu.ts b/src/core/components/context-menu/context-menu.ts index 86c5940bd..ed46b46c2 100644 --- a/src/core/components/context-menu/context-menu.ts +++ b/src/core/components/context-menu/context-menu.ts @@ -18,7 +18,7 @@ import { auditTime } from 'rxjs/operators'; import { PopoverController } from '@ionic/angular'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@services/utils/utils'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; import { CoreContextMenuItemComponent } from './context-menu-item'; import { CoreContextMenuPopoverComponent } from './context-menu-popover'; diff --git a/src/core/components/file/file.ts b/src/core/components/file/file.ts index 5b73eabe7..4ef0645b6 100644 --- a/src/core/components/file/file.ts +++ b/src/core/components/file/file.ts @@ -16,7 +16,7 @@ import { Component, Input, Output, OnInit, OnDestroy, EventEmitter } from '@angu import { CoreApp } from '@services/app'; import { CoreFilepool } from '@services/filepool'; import { CoreFileHelper } from '@services/file-helper'; -import { CorePluginFileDelegate } from '@services/plugin-file.delegate'; +import { CorePluginFileDelegate } from '@services/plugin-file-delegate'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreMimetypeUtils } from '@services/utils/mimetype'; diff --git a/src/core/components/input-errors/input-errors.ts b/src/core/components/input-errors/input-errors.ts index 1bad391ab..7928e6e18 100644 --- a/src/core/components/input-errors/input-errors.ts +++ b/src/core/components/input-errors/input-errors.ts @@ -14,7 +14,7 @@ import { Component, Input, OnChanges, SimpleChange } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; /** * Component to show errors if an input isn't valid. diff --git a/src/core/components/loading/loading.ts b/src/core/components/loading/loading.ts index df7b9ef2c..51442cfbb 100644 --- a/src/core/components/loading/loading.ts +++ b/src/core/components/loading/loading.ts @@ -16,8 +16,8 @@ import { Component, Input, OnInit, OnChanges, SimpleChange, ViewChild, ElementRe import { CoreEventLoadingChangedData, CoreEvents } from '@singletons/events'; import { CoreUtils } from '@services/utils/utils'; -import { Translate } from '@singletons/core.singletons'; import { coreShowHideAnimation } from '@classes/animations'; +import { Translate } from '@singletons'; /** * Component to show a loading spinner and message while data is being loaded. diff --git a/src/core/components/mark-required/mark-required.ts b/src/core/components/mark-required/mark-required.ts index c62e30bd6..56f6d6550 100644 --- a/src/core/components/mark-required/mark-required.ts +++ b/src/core/components/mark-required/mark-required.ts @@ -16,7 +16,7 @@ import { Component, Input, OnInit, AfterViewInit, ElementRef } from '@angular/co import { CoreTextUtils } from '@services/utils/text'; import { CoreUtils } from '@services/utils/utils'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; /** * Directive to add a red asterisk for required input fields. diff --git a/src/core/components/recaptcha/core-recaptchamodal.html b/src/core/components/recaptcha/core-recaptcha-modal.html similarity index 100% rename from src/core/components/recaptcha/core-recaptchamodal.html rename to src/core/components/recaptcha/core-recaptcha-modal.html diff --git a/src/core/components/recaptcha/recaptchamodal.ts b/src/core/components/recaptcha/recaptcha-modal.ts similarity index 96% rename from src/core/components/recaptcha/recaptchamodal.ts rename to src/core/components/recaptcha/recaptcha-modal.ts index 5a56bc2a0..29e2c4eb0 100644 --- a/src/core/components/recaptcha/recaptchamodal.ts +++ b/src/core/components/recaptcha/recaptcha-modal.ts @@ -14,14 +14,14 @@ import { Component, Input, OnDestroy } from '@angular/core'; -import { ModalController } from '@singletons/core.singletons'; +import { ModalController } from '@singletons'; /** * Component to display a the recaptcha in a modal. */ @Component({ selector: 'core-recaptcha-modal', - templateUrl: 'core-recaptchamodal.html', + templateUrl: 'core-recaptcha-modal.html', }) export class CoreRecaptchaModalComponent implements OnDestroy { diff --git a/src/core/components/recaptcha/recaptcha.ts b/src/core/components/recaptcha/recaptcha.ts index 8edc8b2b0..4efe0fa59 100644 --- a/src/core/components/recaptcha/recaptcha.ts +++ b/src/core/components/recaptcha/recaptcha.ts @@ -17,8 +17,8 @@ import { Component, Input, OnInit } from '@angular/core'; import { CoreLang } from '@services/lang'; import { CoreSites } from '@services/sites'; import { CoreTextUtils } from '@services/utils/text'; -import { ModalController } from '@singletons/core.singletons'; -import { CoreRecaptchaModalComponent } from './recaptchamodal'; +import { ModalController } from '@singletons'; +import { CoreRecaptchaModalComponent } from './recaptcha-modal'; /** * Component that allows answering a recaptcha. diff --git a/src/core/components/tabs/tabs.ts b/src/core/components/tabs/tabs.ts index d5f79b184..1aaa7bfdf 100644 --- a/src/core/components/tabs/tabs.ts +++ b/src/core/components/tabs/tabs.ts @@ -34,7 +34,7 @@ import { CoreUtils } from '@services/utils/utils'; import { NavigationOptions } from '@ionic/angular/providers/nav-controller'; import { Params } from '@angular/router'; import { CoreNavBarButtonsComponent } from '../navbar-buttons/navbar-buttons'; -import { CoreDomUtils } from '@/core/services/utils/dom'; +import { CoreDomUtils } from '@services/utils/dom'; import { StackEvent } from '@ionic/angular/directives/navigation/stack-utils'; /** diff --git a/src/core/core.module.ts b/src/core/core.module.ts index 839c48171..34ea13519 100644 --- a/src/core/core.module.ts +++ b/src/core/core.module.ts @@ -23,10 +23,10 @@ import { CoreInit, CoreInitDelegate } from './services/init'; import { CoreInterceptor } from './classes/interceptor'; import { CoreSites, CORE_SITE_SCHEMAS } from './services/sites'; import { CoreUpdateManager } from './services/update-manager'; -import { setSingletonsInjector } from './singletons/core.singletons'; -import { SITE_SCHEMA as FILEPOOL_SITE_SCHEMA } from './services/filepool-db'; -import { SITE_SCHEMA as SITES_SITE_SCHEMA } from './services/sites-db'; -import { SITE_SCHEMA as SYNC_SITE_SCHEMA } from './services/sync-db'; +import { setSingletonsInjector } from './singletons'; +import { SITE_SCHEMA as FILEPOOL_SITE_SCHEMA } from './services/db/filepool'; +import { SITE_SCHEMA as SITES_SITE_SCHEMA } from './services/db/sites'; +import { SITE_SCHEMA as SYNC_SITE_SCHEMA } from './services/db/sync'; @NgModule({ imports: [ diff --git a/src/core/directives/external-content.ts b/src/core/directives/external-content.ts index 5af8ae90d..fa2baff68 100644 --- a/src/core/directives/external-content.ts +++ b/src/core/directives/external-content.ts @@ -21,7 +21,7 @@ import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreUrlUtils } from '@services/utils/url'; import { CoreUtils } from '@services/utils/utils'; -import { Platform } from '@singletons/core.singletons'; +import { Platform } from '@singletons'; import { CoreLogger } from '@singletons/logger'; import { CoreError } from '@classes/errors/error'; diff --git a/src/core/directives/fa-icon.ts b/src/core/directives/fa-icon.ts index 0d9da145a..29b3f5eee 100644 --- a/src/core/directives/fa-icon.ts +++ b/src/core/directives/fa-icon.ts @@ -14,7 +14,7 @@ import { Directive, ElementRef, Input, OnChanges, SimpleChange } from '@angular/core'; import { CoreLogger } from '@singletons/logger'; -import { Http } from '@singletons/core.singletons'; +import { Http } from '@singletons'; import { CoreConstants } from '@/core/constants'; /** diff --git a/src/core/directives/format-text.ts b/src/core/directives/format-text.ts index 846165404..9cf85dc6e 100644 --- a/src/core/directives/format-text.ts +++ b/src/core/directives/format-text.ts @@ -22,7 +22,7 @@ import { CoreIframeUtils, CoreIframeUtilsProvider } from '@services/utils/iframe import { CoreTextUtils } from '@services/utils/text'; import { CoreUtils } from '@services/utils/utils'; import { CoreSite } from '@classes/site'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; import { CoreExternalContentDirective } from './external-content'; import { CoreLinkDirective } from './link'; diff --git a/src/core/directives/long-press.ts b/src/core/directives/long-press.ts index 14a892eda..4dc50bf87 100644 --- a/src/core/directives/long-press.ts +++ b/src/core/directives/long-press.ts @@ -16,7 +16,7 @@ import { Directive, ElementRef, OnInit, OnDestroy, Output, EventEmitter } from '@angular/core'; import { Gesture } from '@ionic/angular'; -import { GestureController } from '@singletons/core.singletons'; +import { GestureController } from '@singletons'; /** * Directive to add long press actions to html elements. */ diff --git a/src/core/directives/tests/format-text.test.ts b/src/core/directives/tests/format-text.test.ts index 71120ea9e..79fcdb6e1 100644 --- a/src/core/directives/tests/format-text.test.ts +++ b/src/core/directives/tests/format-text.test.ts @@ -25,7 +25,7 @@ import { CoreSite } from '@classes/site'; import { CoreSites } from '@services/sites'; import { CoreUrlUtils, CoreUrlUtilsProvider } from '@services/utils/url'; import { CoreUtils, CoreUtilsProvider } from '@services/utils/utils'; -import { Platform } from '@singletons/core.singletons'; +import { Platform } from '@singletons'; import { mock, mockSingleton, RenderConfig, renderWrapperComponent } from '@/testing/utils'; diff --git a/src/core/features/contentlinks/classes/base-handler.ts b/src/core/features/contentlinks/classes/base-handler.ts index 8cf153fda..e216559d8 100644 --- a/src/core/features/contentlinks/classes/base-handler.ts +++ b/src/core/features/contentlinks/classes/base-handler.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Params } from '@angular/router'; -import { CoreContentLinksHandler, CoreContentLinksAction } from '../services/contentlinks.delegate'; +import { CoreContentLinksHandler, CoreContentLinksAction } from '../services/contentlinks-delegate'; /** * Base handler to be registered in CoreContentLinksHandler. It is useful to minimize the amount of diff --git a/src/core/features/contentlinks/classes/module-grade-handler.ts b/src/core/features/contentlinks/classes/module-grade-handler.ts index ad19f4906..e083d5781 100644 --- a/src/core/features/contentlinks/classes/module-grade-handler.ts +++ b/src/core/features/contentlinks/classes/module-grade-handler.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreContentLinksAction } from '../services/contentlinks.delegate'; +import { CoreContentLinksAction } from '../services/contentlinks-delegate'; import { CoreContentLinksHandlerBase } from './base-handler'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; diff --git a/src/core/features/contentlinks/classes/module-index-handler.ts b/src/core/features/contentlinks/classes/module-index-handler.ts index a6fee0916..786e44dc1 100644 --- a/src/core/features/contentlinks/classes/module-index-handler.ts +++ b/src/core/features/contentlinks/classes/module-index-handler.ts @@ -14,7 +14,7 @@ import { CoreContentLinksHandlerBase } from './base-handler'; import { Params } from '@angular/router'; -import { CoreContentLinksAction } from '../services/contentlinks.delegate'; +import { CoreContentLinksAction } from '../services/contentlinks-delegate'; /** * Handler to handle URLs pointing to the index of a module. diff --git a/src/core/features/contentlinks/classes/module-list-handler.ts b/src/core/features/contentlinks/classes/module-list-handler.ts index 9ba7f7078..ecb929412 100644 --- a/src/core/features/contentlinks/classes/module-list-handler.ts +++ b/src/core/features/contentlinks/classes/module-list-handler.ts @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreContentLinksHelper } from '../services/contentlinks.helper'; +import { CoreContentLinksHelper } from '../services/contentlinks-helper'; import { CoreContentLinksHandlerBase } from './base-handler'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; import { Params } from '@angular/router'; -import { CoreContentLinksAction } from '../services/contentlinks.delegate'; +import { CoreContentLinksAction } from '../services/contentlinks-delegate'; /** * Handler to handle URLs pointing to a list of a certain type of modules. diff --git a/src/core/features/contentlinks/pages/choose-site/choose-site.page.module.ts b/src/core/features/contentlinks/pages/choose-site/choose-site.module.ts similarity index 95% rename from src/core/features/contentlinks/pages/choose-site/choose-site.page.module.ts rename to src/core/features/contentlinks/pages/choose-site/choose-site.module.ts index 8f9983f31..1c493fa46 100644 --- a/src/core/features/contentlinks/pages/choose-site/choose-site.page.module.ts +++ b/src/core/features/contentlinks/pages/choose-site/choose-site.module.ts @@ -22,7 +22,7 @@ import { RouterModule, Routes } from '@angular/router'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreContentLinksChooseSitePage } from './choose-site.page'; +import { CoreContentLinksChooseSitePage } from './choose-site'; const routes: Routes = [ { diff --git a/src/core/features/contentlinks/pages/choose-site/choose-site.page.ts b/src/core/features/contentlinks/pages/choose-site/choose-site.ts similarity index 96% rename from src/core/features/contentlinks/pages/choose-site/choose-site.page.ts rename to src/core/features/contentlinks/pages/choose-site/choose-site.ts index 89812d320..818170a0b 100644 --- a/src/core/features/contentlinks/pages/choose-site/choose-site.page.ts +++ b/src/core/features/contentlinks/pages/choose-site/choose-site.ts @@ -16,10 +16,10 @@ import { Component, OnInit } from '@angular/core'; import { NavController } from '@ionic/angular'; import { CoreSiteBasicInfo, CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; -import { Translate } from '@singletons/core.singletons'; -import { CoreLoginHelper } from '@features/login/services/login.helper'; -import { CoreContentLinksAction } from '../../services/contentlinks.delegate'; -import { CoreContentLinksHelper } from '../../services/contentlinks.helper'; +import { Translate } from '@singletons'; +import { CoreLoginHelper } from '@features/login/services/login-helper'; +import { CoreContentLinksAction } from '../../services/contentlinks-delegate'; +import { CoreContentLinksHelper } from '../../services/contentlinks-helper'; import { ActivatedRoute } from '@angular/router'; import { CoreError } from '@classes/errors/error'; diff --git a/src/core/features/contentlinks/services/contentlinks.delegate.ts b/src/core/features/contentlinks/services/contentlinks-delegate.ts similarity index 100% rename from src/core/features/contentlinks/services/contentlinks.delegate.ts rename to src/core/features/contentlinks/services/contentlinks-delegate.ts diff --git a/src/core/features/contentlinks/services/contentlinks.helper.ts b/src/core/features/contentlinks/services/contentlinks-helper.ts similarity index 98% rename from src/core/features/contentlinks/services/contentlinks.helper.ts rename to src/core/features/contentlinks/services/contentlinks-helper.ts index 18cf9e33f..af777f183 100644 --- a/src/core/features/contentlinks/services/contentlinks.helper.ts +++ b/src/core/features/contentlinks/services/contentlinks-helper.ts @@ -17,11 +17,11 @@ import { NavController } from '@ionic/angular'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@services/utils/utils'; -import { CoreLoginHelper } from '@features/login/services/login.helper'; -import { CoreContentLinksDelegate, CoreContentLinksAction } from './contentlinks.delegate'; +import { CoreLoginHelper } from '@features/login/services/login-helper'; +import { CoreContentLinksDelegate, CoreContentLinksAction } from './contentlinks-delegate'; import { CoreSite } from '@classes/site'; import { CoreMainMenu } from '@features/mainmenu/services/mainmenu'; -import { makeSingleton, NgZone, Translate } from '@singletons/core.singletons'; +import { makeSingleton, NgZone, Translate } from '@singletons'; import { Params } from '@angular/router'; /** diff --git a/src/core/features/course/course.module.ts b/src/core/features/course/course.module.ts index cd23709c2..16c7dcd35 100644 --- a/src/core/features/course/course.module.ts +++ b/src/core/features/course/course.module.ts @@ -14,12 +14,12 @@ import { NgModule } from '@angular/core'; -import { CORE_SITE_SCHEMAS } from '@/core/services/sites'; +import { CORE_SITE_SCHEMAS } from '@services/sites'; import { SITE_SCHEMA as COURSE_SITE_SCHEMA, OFFLINE_SITE_SCHEMA as COURSE_OFFLINE_SITE_SCHEMA, -} from './services/course-db'; +} from './services/db/course'; @NgModule({ providers: [ diff --git a/src/core/features/course/services/course.helper.ts b/src/core/features/course/services/course-helper.ts similarity index 99% rename from src/core/features/course/services/course.helper.ts rename to src/core/features/course/services/course-helper.ts index c9ebe1572..17663eb9e 100644 --- a/src/core/features/course/services/course.helper.ts +++ b/src/core/features/course/services/course-helper.ts @@ -18,7 +18,7 @@ import { CoreSites } from '@services/sites'; import { CoreCourse, CoreCourseSection } from './course'; import { CoreConstants } from '@/core/constants'; import { CoreLogger } from '@singletons/logger'; -import { makeSingleton, Translate } from '@singletons/core.singletons'; +import { makeSingleton, Translate } from '@singletons'; import { CoreFilepool } from '@services/filepool'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@services/utils/utils'; @@ -30,9 +30,9 @@ import { CoreEnrolledCourseBasicData, CoreEnrolledCourseData, } from '@features/courses/services/courses'; -import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '@features/courses/services/courses.helper'; +import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '@features/courses/services/courses-helper'; import { CoreArray } from '@singletons/array'; -import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login.helper'; +import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login-helper'; import { CoreIonLoadingElement } from '@classes/ion-loading'; import { CoreCourseOffline } from './course-offline'; diff --git a/src/core/features/course/services/course-offline.ts b/src/core/features/course/services/course-offline.ts index 0db107fe1..406f149ea 100644 --- a/src/core/features/course/services/course-offline.ts +++ b/src/core/features/course/services/course-offline.ts @@ -13,9 +13,9 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { makeSingleton } from '@singletons/core.singletons'; +import { makeSingleton } from '@singletons'; import { CoreSites } from '@services/sites'; -import { CoreCourseManualCompletionDBRecord, MANUAL_COMPLETION_TABLE } from './course-db'; +import { CoreCourseManualCompletionDBRecord, MANUAL_COMPLETION_TABLE } from './db/course'; import { CoreStatusWithWarningsWSResponse } from '@services/ws'; /** diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts index 3a167c60a..0ae0d5c57 100644 --- a/src/core/features/course/services/course.ts +++ b/src/core/features/course/services/course.ts @@ -23,10 +23,10 @@ import { CoreTimeUtils } from '@services/utils/time'; import { CoreUtils } from '@services/utils/utils'; import { CoreSiteWSPreSets, CoreSite } from '@classes/site'; import { CoreConstants } from '@/core/constants'; -import { makeSingleton, Translate } from '@singletons/core.singletons'; +import { makeSingleton, Translate } from '@singletons'; import { CoreStatusWithWarningsWSResponse, CoreWSExternalFile } from '@services/ws'; -import { CoreCourseStatusDBRecord, COURSE_STATUS_TABLE } from './course-db'; +import { CoreCourseStatusDBRecord, COURSE_STATUS_TABLE } from './db/course'; import { CoreCourseOffline } from './course-offline'; import { CoreError } from '@classes/errors/error'; import { diff --git a/src/core/features/course/services/course-db.ts b/src/core/features/course/services/db/course.ts similarity index 100% rename from src/core/features/course/services/course-db.ts rename to src/core/features/course/services/db/course.ts diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts index 70030f056..6de42cd1f 100644 --- a/src/core/features/courses/components/course-list-item/course-list-item.ts +++ b/src/core/features/courses/components/course-list-item/course-list-item.ts @@ -15,7 +15,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { NavController } from '@ionic/angular'; import { CoreCourses, CoreCourseSearchedData } from '../../services/courses'; -import { CoreCoursesHelper, CoreCourseWithImageAndColor } from '../../services/courses.helper'; +import { CoreCoursesHelper, CoreCourseWithImageAndColor } from '../../services/courses-helper'; /** * This directive is meant to display an item for a list of courses. diff --git a/src/core/features/courses/components/course-options-menu/course-options-menu.ts b/src/core/features/courses/components/course-options-menu/course-options-menu.ts index db2e6ca64..f4f977470 100644 --- a/src/core/features/courses/components/course-options-menu/course-options-menu.ts +++ b/src/core/features/courses/components/course-options-menu/course-options-menu.ts @@ -15,8 +15,8 @@ import { Component, OnInit } from '@angular/core'; import { NavParams, PopoverController } from '@ionic/angular'; import { CoreCourses } from '../../services/courses'; -import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses.helper'; -import { CorePrefetchStatusInfo } from '@features/course/services/course.helper'; +import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses-helper'; +import { CorePrefetchStatusInfo } from '@features/course/services/course-helper'; /** * This component is meant to display a popover with the course options. diff --git a/src/core/features/courses/components/course-progress/course-progress.ts b/src/core/features/courses/components/course-progress/course-progress.ts index 446902294..2f70fad9f 100644 --- a/src/core/features/courses/components/course-progress/course-progress.ts +++ b/src/core/features/courses/components/course-progress/course-progress.ts @@ -20,10 +20,10 @@ import { CoreDomUtils } from '@services/utils/dom'; // import { CoreUserProvider } from '@core/user/providers/user'; import { CoreCourses } from '@features/courses/services/courses'; import { CoreCourse, CoreCourseProvider } from '@features/course/services/course'; -import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course.helper'; -import { Translate } from '@singletons/core.singletons'; +import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper'; +import { Translate } from '@singletons'; import { CoreConstants } from '@/core/constants'; -import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses.helper'; +import { CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses-helper'; import { CoreCoursesCourseOptionsMenuComponent } from '../course-options-menu/course-options-menu'; /** diff --git a/src/core/features/courses/courses.module.ts b/src/core/features/courses/courses.module.ts index fd53773b2..cb439bc61 100644 --- a/src/core/features/courses/courses.module.ts +++ b/src/core/features/courses/courses.module.ts @@ -14,21 +14,21 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CoreHomeRoutingModule } from '../mainmenu/pages/home/home-routing.module'; -import { CoreHomeDelegate } from '../mainmenu/services/home.delegate'; -import { CoreDashboardHomeHandler } from './services/handlers/dashboard.home'; +import { CoreHomeRoutingModule } from '@features/mainmenu/pages/home/home-routing.module'; +import { CoreHomeDelegate } from '@features/mainmenu/services/home-delegate'; +import { CoreDashboardHomeHandler } from './services/handlers/dashboard-home'; import { CoreCoursesMyCoursesHomeHandler } from './services/handlers/my-courses.home'; const homeRoutes: Routes = [ { path: 'dashboard', loadChildren: () => - import('@features/courses/pages/dashboard/dashboard.page.module').then(m => m.CoreCoursesDashboardPageModule), + import('@features/courses/pages/dashboard/dashboard.module').then(m => m.CoreCoursesDashboardPageModule), }, { path: 'courses/my', loadChildren: () => - import('@features/courses/pages/my-courses/my-courses.page.module') + import('@features/courses/pages/my-courses/my-courses.module') .then(m => m.CoreCoursesMyCoursesPageModule), }, ]; @@ -50,31 +50,31 @@ const routes: Routes = [ { path: 'categories/:id', loadChildren: () => - import('@features/courses/pages/categories/categories.page.module') + import('@features/courses/pages/categories/categories.module') .then(m => m.CoreCoursesCategoriesPageModule), }, { path: 'all', loadChildren: () => - import('@features/courses/pages/available-courses/available-courses.page.module') + import('@features/courses/pages/available-courses/available-courses.module') .then(m => m.CoreCoursesAvailableCoursesPageModule), }, { path: 'search', loadChildren: () => - import('@features/courses/pages/search/search.page.module') + import('@features/courses/pages/search/search.module') .then(m => m.CoreCoursesSearchPageModule), }, { path: 'my', loadChildren: () => - import('@features/courses/pages/my-courses/my-courses.page.module') + import('@features/courses/pages/my-courses/my-courses.module') .then(m => m.CoreCoursesMyCoursesPageModule), }, { path: 'preview', loadChildren: () => - import('@features/courses/pages/course-preview/course-preview.page.module') + import('@features/courses/pages/course-preview/course-preview.module') .then(m => m.CoreCoursesCoursePreviewPageModule), }, ], diff --git a/src/core/features/courses/pages/available-courses/available-courses.page.module.ts b/src/core/features/courses/pages/available-courses/available-courses.module.ts similarity index 99% rename from src/core/features/courses/pages/available-courses/available-courses.page.module.ts rename to src/core/features/courses/pages/available-courses/available-courses.module.ts index ef135f506..9d7232458 100644 --- a/src/core/features/courses/pages/available-courses/available-courses.page.module.ts +++ b/src/core/features/courses/pages/available-courses/available-courses.module.ts @@ -22,7 +22,7 @@ import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; import { CoreCoursesComponentsModule } from '../../components/components.module'; -import { CoreCoursesAvailableCoursesPage } from './available-courses.page'; +import { CoreCoursesAvailableCoursesPage } from './available-courses'; const routes: Routes = [ diff --git a/src/core/features/courses/pages/available-courses/available-courses.page.ts b/src/core/features/courses/pages/available-courses/available-courses.ts similarity index 100% rename from src/core/features/courses/pages/available-courses/available-courses.page.ts rename to src/core/features/courses/pages/available-courses/available-courses.ts diff --git a/src/core/features/courses/pages/categories/categories.page.module.ts b/src/core/features/courses/pages/categories/categories.module.ts similarity index 96% rename from src/core/features/courses/pages/categories/categories.page.module.ts rename to src/core/features/courses/pages/categories/categories.module.ts index 2266c2d4d..3e57c7348 100644 --- a/src/core/features/courses/pages/categories/categories.page.module.ts +++ b/src/core/features/courses/pages/categories/categories.module.ts @@ -22,7 +22,7 @@ import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; import { CoreCoursesComponentsModule } from '../../components/components.module'; -import { CoreCoursesCategoriesPage } from './categories.page'; +import { CoreCoursesCategoriesPage } from './categories'; const routes: Routes = [ diff --git a/src/core/features/courses/pages/categories/categories.page.ts b/src/core/features/courses/pages/categories/categories.ts similarity index 98% rename from src/core/features/courses/pages/categories/categories.page.ts rename to src/core/features/courses/pages/categories/categories.ts index 1980fcdf4..2926c94f6 100644 --- a/src/core/features/courses/pages/categories/categories.page.ts +++ b/src/core/features/courses/pages/categories/categories.ts @@ -18,7 +18,7 @@ import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@services/utils/utils'; import { CoreCategoryData, CoreCourses, CoreCourseSearchedData } from '../../services/courses'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; import { ActivatedRoute } from '@angular/router'; /** diff --git a/src/core/features/courses/pages/course-preview/course-preview.page.module.ts b/src/core/features/courses/pages/course-preview/course-preview.module.ts similarity index 95% rename from src/core/features/courses/pages/course-preview/course-preview.page.module.ts rename to src/core/features/courses/pages/course-preview/course-preview.module.ts index 00f9eaa9f..acf3098bb 100644 --- a/src/core/features/courses/pages/course-preview/course-preview.page.module.ts +++ b/src/core/features/courses/pages/course-preview/course-preview.module.ts @@ -22,7 +22,7 @@ import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; import { CorePipesModule } from '@pipes/pipes.module'; -import { CoreCoursesCoursePreviewPage } from './course-preview.page'; +import { CoreCoursesCoursePreviewPage } from './course-preview'; import { CoreCoursesComponentsModule } from '../../components/components.module'; const routes: Routes = [ diff --git a/src/core/features/courses/pages/course-preview/course-preview.page.ts b/src/core/features/courses/pages/course-preview/course-preview.ts similarity index 99% rename from src/core/features/courses/pages/course-preview/course-preview.page.ts rename to src/core/features/courses/pages/course-preview/course-preview.ts index 623a955b9..f9e527be8 100644 --- a/src/core/features/courses/pages/course-preview/course-preview.page.ts +++ b/src/core/features/courses/pages/course-preview/course-preview.ts @@ -29,8 +29,8 @@ import { } from '@features/courses/services/courses'; // import { CoreCourseOptionsDelegate } from '@features/course/services/options-delegate'; import { CoreCourse, CoreCourseProvider } from '@features/course/services/course'; -import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course.helper'; -import { Translate } from '@singletons/core.singletons'; +import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper'; +import { Translate } from '@singletons'; import { ActivatedRoute } from '@angular/router'; import { CoreConstants } from '@/core/constants'; import { CoreCoursesSelfEnrolPasswordComponent } from '../../components/self-enrol-password/self-enrol-password'; diff --git a/src/core/features/courses/pages/dashboard/dashboard.page.module.ts b/src/core/features/courses/pages/dashboard/dashboard.module.ts similarity index 95% rename from src/core/features/courses/pages/dashboard/dashboard.page.module.ts rename to src/core/features/courses/pages/dashboard/dashboard.module.ts index 5d71c930a..5ba48f8f2 100644 --- a/src/core/features/courses/pages/dashboard/dashboard.page.module.ts +++ b/src/core/features/courses/pages/dashboard/dashboard.module.ts @@ -21,7 +21,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreCoursesDashboardPage } from './dashboard.page'; +import { CoreCoursesDashboardPage } from './dashboard'; const routes: Routes = [ { diff --git a/src/core/features/courses/pages/dashboard/dashboard.page.ts b/src/core/features/courses/pages/dashboard/dashboard.ts similarity index 100% rename from src/core/features/courses/pages/dashboard/dashboard.page.ts rename to src/core/features/courses/pages/dashboard/dashboard.ts diff --git a/src/core/features/courses/pages/my-courses/my-courses.page.module.ts b/src/core/features/courses/pages/my-courses/my-courses.module.ts similarity index 96% rename from src/core/features/courses/pages/my-courses/my-courses.page.module.ts rename to src/core/features/courses/pages/my-courses/my-courses.module.ts index 2dd0d13a5..2fa39ccd9 100644 --- a/src/core/features/courses/pages/my-courses/my-courses.page.module.ts +++ b/src/core/features/courses/pages/my-courses/my-courses.module.ts @@ -22,7 +22,7 @@ import { FormsModule } from '@angular/forms'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreCoursesMyCoursesPage } from './my-courses.page'; +import { CoreCoursesMyCoursesPage } from './my-courses'; import { CoreCoursesComponentsModule } from '../../components/components.module'; const routes: Routes = [ diff --git a/src/core/features/courses/pages/my-courses/my-courses.page.ts b/src/core/features/courses/pages/my-courses/my-courses.ts similarity index 99% rename from src/core/features/courses/pages/my-courses/my-courses.page.ts rename to src/core/features/courses/pages/my-courses/my-courses.ts index c9b9aa1ae..dc4211730 100644 --- a/src/core/features/courses/pages/my-courses/my-courses.page.ts +++ b/src/core/features/courses/pages/my-courses/my-courses.ts @@ -22,8 +22,8 @@ import { CoreCoursesMyCoursesUpdatedEventData, CoreCourses, } from '../../services/courses'; -import { CoreCoursesHelper, CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses.helper'; -import { CoreCourseHelper } from '@features/course/services/course.helper'; +import { CoreCoursesHelper, CoreEnrolledCourseDataWithExtraInfoAndOptions } from '../../services/courses-helper'; +import { CoreCourseHelper } from '@features/course/services/course-helper'; import { CoreConstants } from '@/core/constants'; // import { CoreCourseOptionsDelegate } from '@core/course/services/options-delegate'; diff --git a/src/core/features/courses/pages/search/search.page.module.ts b/src/core/features/courses/pages/search/search.module.ts similarity index 96% rename from src/core/features/courses/pages/search/search.page.module.ts rename to src/core/features/courses/pages/search/search.module.ts index a24a9bb09..8b2e02cb9 100644 --- a/src/core/features/courses/pages/search/search.page.module.ts +++ b/src/core/features/courses/pages/search/search.module.ts @@ -23,7 +23,7 @@ import { CoreDirectivesModule } from '@directives/directives.module'; import { CoreCoursesComponentsModule } from '../../components/components.module'; import { CoreSearchComponentsModule } from '@features/search/components/components.module'; -import { CoreCoursesSearchPage } from './search.page'; +import { CoreCoursesSearchPage } from './search'; const routes: Routes = [ { @@ -49,4 +49,3 @@ const routes: Routes = [ exports: [RouterModule], }) export class CoreCoursesSearchPageModule { } - diff --git a/src/core/features/courses/pages/search/search.page.ts b/src/core/features/courses/pages/search/search.ts similarity index 100% rename from src/core/features/courses/pages/search/search.page.ts rename to src/core/features/courses/pages/search/search.ts diff --git a/src/core/features/courses/services/courses.helper.ts b/src/core/features/courses/services/courses-helper.ts similarity index 99% rename from src/core/features/courses/services/courses.helper.ts rename to src/core/features/courses/services/courses-helper.ts index f2fac5251..bd91b85d4 100644 --- a/src/core/features/courses/services/courses.helper.ts +++ b/src/core/features/courses/services/courses-helper.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { CoreUtils } from '@services/utils/utils'; import { CoreSites } from '@services/sites'; import { CoreCourses, CoreCourseSearchedData, CoreCourseUserAdminOrNavOptionIndexed, CoreEnrolledCourseData } from './courses'; -import { makeSingleton } from '@singletons/core.singletons'; +import { makeSingleton } from '@singletons'; import { CoreWSExternalFile } from '@services/ws'; // import { AddonCourseCompletionProvider } from '@addon/coursecompletion/providers/coursecompletion'; // import { CoreCoursePickerMenuPopoverComponent } from '@components/course-picker-menu/course-picker-menu-popover'; @@ -214,4 +214,3 @@ export type CoreEnrolledCourseDataWithOptions = CoreEnrolledCourseData & { * Enrolled course data with admin and navigation option availability and extra rendering info. */ export type CoreEnrolledCourseDataWithExtraInfoAndOptions = CoreEnrolledCourseDataWithExtraInfo & CoreEnrolledCourseDataWithOptions; - diff --git a/src/core/features/courses/services/courses.ts b/src/core/features/courses/services/courses.ts index 4c205ddb4..3adb6fc92 100644 --- a/src/core/features/courses/services/courses.ts +++ b/src/core/features/courses/services/courses.ts @@ -16,7 +16,7 @@ import { Injectable } from '@angular/core'; import { CoreLogger } from '@singletons/logger'; import { CoreSites, CoreSitesReadingStrategy } from '@services/sites'; import { CoreSite, CoreSiteWSPreSets } from '@classes/site'; -import { makeSingleton } from '@singletons/core.singletons'; +import { makeSingleton } from '@singletons'; import { CoreStatusWithWarningsWSResponse, CoreWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws'; import { CoreEvents } from '@singletons/events'; import { CoreWSError } from '@classes/errors/wserror'; diff --git a/src/core/features/courses/services/handlers/dashboard.home.ts b/src/core/features/courses/services/handlers/dashboard-home.ts similarity index 98% rename from src/core/features/courses/services/handlers/dashboard.home.ts rename to src/core/features/courses/services/handlers/dashboard-home.ts index 76dc61175..73aad4613 100644 --- a/src/core/features/courses/services/handlers/dashboard.home.ts +++ b/src/core/features/courses/services/handlers/dashboard-home.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreHomeHandler, CoreHomeHandlerToDisplay } from '@features/mainmenu/services/home.delegate'; +import { CoreHomeHandler, CoreHomeHandlerToDisplay } from '@features/mainmenu/services/home-delegate'; /** * Handler to add dashboard into home page. diff --git a/src/core/features/courses/services/handlers/my-courses.home.ts b/src/core/features/courses/services/handlers/my-courses.home.ts index f43c134c2..3ca7dfe5b 100644 --- a/src/core/features/courses/services/handlers/my-courses.home.ts +++ b/src/core/features/courses/services/handlers/my-courses.home.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreHomeHandler, CoreHomeHandlerToDisplay } from '@features/mainmenu/services/home.delegate'; +import { CoreHomeHandler, CoreHomeHandlerToDisplay } from '@features/mainmenu/services/home-delegate'; /** * Handler to add my courses into home page. diff --git a/src/core/features/emulator/components/capture-media/capture-media.ts b/src/core/features/emulator/components/capture-media/capture-media.ts index a4ea47e75..a096932cb 100644 --- a/src/core/features/emulator/components/capture-media/capture-media.ts +++ b/src/core/features/emulator/components/capture-media/capture-media.ts @@ -23,7 +23,7 @@ import { CoreDomUtils } from '@services/utils/dom'; import { CoreMimetypeUtils } from '@services/utils/mimetype'; import { CoreTextUtils } from '@services/utils/text'; import { CoreTimeUtils } from '@services/utils/time'; -import { Platform, ModalController, Media, Translate } from '@singletons/core.singletons'; +import { Platform, ModalController, Media, Translate } from '@singletons'; import { CoreError } from '@classes/errors/error'; import { CoreCaptureError } from '@classes/errors/captureerror'; import { CoreCanceledError } from '@classes/errors/cancelederror'; diff --git a/src/core/features/emulator/emulator.module.ts b/src/core/features/emulator/emulator.module.ts index 03efe389b..da27adf03 100644 --- a/src/core/features/emulator/emulator.module.ts +++ b/src/core/features/emulator/emulator.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { Platform } from '@ionic/angular'; import { CoreInitDelegate } from '@services/init'; -import { CoreEmulatorHelperProvider } from './services/emulator.helper'; +import { CoreEmulatorHelperProvider } from './services/emulator-helper'; import { CoreEmulatorComponentsModule } from './components/components.module'; // Ionic Native services. diff --git a/src/core/features/emulator/services/camera.ts b/src/core/features/emulator/services/camera.ts index 49c0fee01..39ee962ba 100644 --- a/src/core/features/emulator/services/camera.ts +++ b/src/core/features/emulator/services/camera.ts @@ -15,7 +15,7 @@ import { Injectable } from '@angular/core'; import { Camera, CameraOptions } from '@ionic-native/camera/ngx'; -import { CoreEmulatorCaptureHelper } from './capture.helper'; +import { CoreEmulatorCaptureHelper } from './capture-helper'; /** * Emulates the Cordova Camera plugin in browser. diff --git a/src/core/features/emulator/services/capture.helper.ts b/src/core/features/emulator/services/capture-helper.ts similarity index 99% rename from src/core/features/emulator/services/capture.helper.ts rename to src/core/features/emulator/services/capture-helper.ts index 89a3fab64..5dd6a9659 100644 --- a/src/core/features/emulator/services/capture.helper.ts +++ b/src/core/features/emulator/services/capture-helper.ts @@ -17,7 +17,7 @@ import { CameraOptions } from '@ionic-native/camera/ngx'; import { CaptureAudioOptions, CaptureImageOptions, CaptureVideoOptions, MediaFile } from '@ionic-native/media-capture/ngx'; import { CoreMimetypeUtils } from '@services/utils/mimetype'; -import { makeSingleton, ModalController } from '@singletons/core.singletons'; +import { makeSingleton, ModalController } from '@singletons'; import { CaptureMediaComponentInputs, CoreEmulatorCaptureMediaComponent } from '../components/capture-media/capture-media'; /** diff --git a/src/core/features/emulator/services/emulator.helper.ts b/src/core/features/emulator/services/emulator-helper.ts similarity index 100% rename from src/core/features/emulator/services/emulator.helper.ts rename to src/core/features/emulator/services/emulator-helper.ts diff --git a/src/core/features/emulator/services/media-capture.ts b/src/core/features/emulator/services/media-capture.ts index 9818ea22b..b981ffbe0 100644 --- a/src/core/features/emulator/services/media-capture.ts +++ b/src/core/features/emulator/services/media-capture.ts @@ -21,7 +21,7 @@ import { MediaFile, } from '@ionic-native/media-capture/ngx'; -import { CoreEmulatorCaptureHelper } from './capture.helper'; +import { CoreEmulatorCaptureHelper } from './capture-helper'; /** * Emulates the Cordova MediaCapture plugin in browser. diff --git a/src/core/features/fileuploader/fileuploader-init.module.ts b/src/core/features/fileuploader/fileuploader-init.module.ts index 12f6f533d..2486cb005 100644 --- a/src/core/features/fileuploader/fileuploader-init.module.ts +++ b/src/core/features/fileuploader/fileuploader-init.module.ts @@ -14,7 +14,7 @@ import { NgModule } from '@angular/core'; -import { CoreFileUploaderDelegate } from './services/fileuploader.delegate'; +import { CoreFileUploaderDelegate } from './services/fileuploader-delegate'; import { CoreFileUploaderAlbumHandler } from './services/handlers/album'; import { CoreFileUploaderAudioHandler } from './services/handlers/audio'; import { CoreFileUploaderCameraHandler } from './services/handlers/camera'; diff --git a/src/core/features/fileuploader/services/fileuploader.delegate.ts b/src/core/features/fileuploader/services/fileuploader-delegate.ts similarity index 100% rename from src/core/features/fileuploader/services/fileuploader.delegate.ts rename to src/core/features/fileuploader/services/fileuploader-delegate.ts diff --git a/src/core/features/fileuploader/services/fileuploader.helper.ts b/src/core/features/fileuploader/services/fileuploader-helper.ts similarity index 99% rename from src/core/features/fileuploader/services/fileuploader.helper.ts rename to src/core/features/fileuploader/services/fileuploader-helper.ts index b056ac40a..c894b2942 100644 --- a/src/core/features/fileuploader/services/fileuploader.helper.ts +++ b/src/core/features/fileuploader/services/fileuploader-helper.ts @@ -25,12 +25,12 @@ import { CoreDomUtils } from '@services/utils/dom'; import { CoreMimetypeUtils } from '@services/utils/mimetype'; import { CoreTextUtils } from '@services/utils/text'; import { CoreUtils, PromiseDefer } from '@services/utils/utils'; -import { makeSingleton, Translate, Camera, Chooser, Platform, ActionSheetController } from '@singletons/core.singletons'; +import { makeSingleton, Translate, Camera, Chooser, Platform, ActionSheetController } from '@singletons'; import { CoreLogger } from '@singletons/logger'; import { CoreCanceledError } from '@classes/errors/cancelederror'; import { CoreError } from '@classes/errors/error'; import { CoreFileUploader, CoreFileUploaderProvider, CoreFileUploaderOptions } from './fileuploader'; -import { CoreFileUploaderDelegate } from './fileuploader.delegate'; +import { CoreFileUploaderDelegate } from './fileuploader-delegate'; import { CoreCaptureError } from '@classes/errors/captureerror'; import { CoreIonLoadingElement } from '@classes/ion-loading'; import { CoreWSUploadFileResult } from '@services/ws'; diff --git a/src/core/features/fileuploader/services/fileuploader.ts b/src/core/features/fileuploader/services/fileuploader.ts index c5e4369e4..e893bed33 100644 --- a/src/core/features/fileuploader/services/fileuploader.ts +++ b/src/core/features/fileuploader/services/fileuploader.ts @@ -27,7 +27,7 @@ import { CoreTextUtils } from '@services/utils/text'; import { CoreTimeUtils } from '@services/utils/time'; import { CoreUtils } from '@services/utils/utils'; import { CoreWSExternalFile, CoreWSFileUploadOptions, CoreWSUploadFileResult } from '@services/ws'; -import { makeSingleton, Translate, MediaCapture, ModalController, Camera } from '@singletons/core.singletons'; +import { makeSingleton, Translate, MediaCapture, ModalController, Camera } from '@singletons'; import { CoreLogger } from '@singletons/logger'; import { CoreEmulatorCaptureMediaComponent } from '@features/emulator/components/capture-media/capture-media'; import { CoreError } from '@classes/errors/error'; diff --git a/src/core/features/fileuploader/services/handlers/album.ts b/src/core/features/fileuploader/services/handlers/album.ts index 8e5762bd0..36b7e2ed4 100644 --- a/src/core/features/fileuploader/services/handlers/album.ts +++ b/src/core/features/fileuploader/services/handlers/album.ts @@ -16,8 +16,8 @@ import { Injectable } from '@angular/core'; import { CoreApp } from '@services/app'; import { CoreUtils } from '@services/utils/utils'; -import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader.delegate'; -import { CoreFileUploaderHelper } from '../fileuploader.helper'; +import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader-delegate'; +import { CoreFileUploaderHelper } from '../fileuploader-helper'; /** * Handler to upload files from the album. diff --git a/src/core/features/fileuploader/services/handlers/audio.ts b/src/core/features/fileuploader/services/handlers/audio.ts index b1f68202e..ef4ccfaa4 100644 --- a/src/core/features/fileuploader/services/handlers/audio.ts +++ b/src/core/features/fileuploader/services/handlers/audio.ts @@ -16,8 +16,8 @@ import { Injectable } from '@angular/core'; import { CoreApp } from '@services/app'; import { CoreUtils } from '@services/utils/utils'; -import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader.delegate'; -import { CoreFileUploaderHelper } from '../fileuploader.helper'; +import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader-delegate'; +import { CoreFileUploaderHelper } from '../fileuploader-helper'; /** * Handler to record an audio to upload it. */ diff --git a/src/core/features/fileuploader/services/handlers/camera.ts b/src/core/features/fileuploader/services/handlers/camera.ts index 74d6021f8..682b0cfeb 100644 --- a/src/core/features/fileuploader/services/handlers/camera.ts +++ b/src/core/features/fileuploader/services/handlers/camera.ts @@ -16,8 +16,8 @@ import { Injectable } from '@angular/core'; import { CoreApp } from '@services/app'; import { CoreUtils } from '@services/utils/utils'; -import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader.delegate'; -import { CoreFileUploaderHelper } from '../fileuploader.helper'; +import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader-delegate'; +import { CoreFileUploaderHelper } from '../fileuploader-helper'; /** * Handler to take a picture to upload it. diff --git a/src/core/features/fileuploader/services/handlers/file.ts b/src/core/features/fileuploader/services/handlers/file.ts index eaf592b77..995669b34 100644 --- a/src/core/features/fileuploader/services/handlers/file.ts +++ b/src/core/features/fileuploader/services/handlers/file.ts @@ -16,10 +16,10 @@ import { Injectable } from '@angular/core'; import { CoreApp } from '@services/app'; import { CoreDomUtils } from '@services/utils/dom'; -import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader.delegate'; -import { CoreFileUploaderHelper } from '../fileuploader.helper'; +import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader-delegate'; +import { CoreFileUploaderHelper } from '../fileuploader-helper'; import { CoreFileUploader } from '../fileuploader'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; /** * Handler to upload any type of file. diff --git a/src/core/features/fileuploader/services/handlers/video.ts b/src/core/features/fileuploader/services/handlers/video.ts index 96224fef5..71212b06a 100644 --- a/src/core/features/fileuploader/services/handlers/video.ts +++ b/src/core/features/fileuploader/services/handlers/video.ts @@ -16,8 +16,8 @@ import { Injectable } from '@angular/core'; import { CoreApp } from '@services/app'; import { CoreUtils } from '@services/utils/utils'; -import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader.delegate'; -import { CoreFileUploaderHelper } from '../fileuploader.helper'; +import { CoreFileUploaderHandler, CoreFileUploaderHandlerData, CoreFileUploaderHandlerResult } from '../fileuploader-delegate'; +import { CoreFileUploaderHelper } from '../fileuploader-helper'; /** * Handler to record a video to upload it. */ diff --git a/src/core/features/login/components/site-help/site-help.ts b/src/core/features/login/components/site-help/site-help.ts index 8be6c64b6..baab97d08 100644 --- a/src/core/features/login/components/site-help/site-help.ts +++ b/src/core/features/login/components/site-help/site-help.ts @@ -15,8 +15,8 @@ import { Component } from '@angular/core'; import { CoreUtils } from '@services/utils/utils'; -import { ModalController, Translate } from '@singletons/core.singletons'; -import { CoreLoginHelperProvider } from '@features/login/services/login.helper'; +import { ModalController, Translate } from '@singletons'; +import { CoreLoginHelperProvider } from '@features/login/services/login-helper'; /** * Component that displays help to connect to a site. diff --git a/src/core/features/login/components/site-onboarding/site-onboarding.ts b/src/core/features/login/components/site-onboarding/site-onboarding.ts index 7c9f8a873..197dbe391 100644 --- a/src/core/features/login/components/site-onboarding/site-onboarding.ts +++ b/src/core/features/login/components/site-onboarding/site-onboarding.ts @@ -16,8 +16,8 @@ import { Component } from '@angular/core'; import { CoreConfig } from '@services/config'; import { CoreUtils } from '@services/utils/utils'; -import { CoreLoginHelperProvider } from '@features/login/services/login.helper'; -import { ModalController } from '@singletons/core.singletons'; +import { CoreLoginHelperProvider } from '@features/login/services/login-helper'; +import { ModalController } from '@singletons'; /** * Component that displays onboarding help regarding the CoreLoginSitePage. diff --git a/src/core/features/login/login-routing.module.ts b/src/core/features/login/login-routing.module.ts index 95ff0c8e8..94a29f292 100644 --- a/src/core/features/login/login-routing.module.ts +++ b/src/core/features/login/login-routing.module.ts @@ -23,41 +23,41 @@ const routes: Routes = [ }, { path: 'init', - loadChildren: () => import('./pages/init/init.page.module').then( m => m.CoreLoginInitPageModule), + loadChildren: () => import('./pages/init/init.module').then( m => m.CoreLoginInitPageModule), }, { path: 'site', - loadChildren: () => import('./pages/site/site.page.module').then( m => m.CoreLoginSitePageModule), + loadChildren: () => import('./pages/site/site.module').then( m => m.CoreLoginSitePageModule), }, { path: 'credentials', - loadChildren: () => import('./pages/credentials/credentials.page.module').then( m => m.CoreLoginCredentialsPageModule), + loadChildren: () => import('./pages/credentials/credentials.module').then( m => m.CoreLoginCredentialsPageModule), }, { path: 'sites', - loadChildren: () => import('./pages/sites/sites.page.module').then( m => m.CoreLoginSitesPageModule), + loadChildren: () => import('./pages/sites/sites.module').then( m => m.CoreLoginSitesPageModule), }, { path: 'forgottenpassword', - loadChildren: () => import('./pages/forgotten-password/forgotten-password.page.module') + loadChildren: () => import('./pages/forgotten-password/forgotten-password.module') .then( m => m.CoreLoginForgottenPasswordPageModule), }, { path: 'changepassword', - loadChildren: () => import('./pages/change-password/change-password.page.module') + loadChildren: () => import('./pages/change-password/change-password.module') .then( m => m.CoreLoginChangePasswordPageModule), }, { path: 'sitepolicy', - loadChildren: () => import('./pages/site-policy/site-policy.page.module').then( m => m.CoreLoginSitePolicyPageModule), + loadChildren: () => import('./pages/site-policy/site-policy.module').then( m => m.CoreLoginSitePolicyPageModule), }, { path: 'emailsignup', - loadChildren: () => import('./pages/email-signup/email-signup.page.module').then( m => m.CoreLoginEmailSignupPageModule), + loadChildren: () => import('./pages/email-signup/email-signup.module').then( m => m.CoreLoginEmailSignupPageModule), }, { path: 'reconnect', - loadChildren: () => import('./pages/reconnect/reconnect.page.module').then( m => m.CoreLoginReconnectPageModule), + loadChildren: () => import('./pages/reconnect/reconnect.module').then( m => m.CoreLoginReconnectPageModule), }, ]; diff --git a/src/core/features/login/pages/change-password/change-password.page.module.ts b/src/core/features/login/pages/change-password/change-password.module.ts similarity index 95% rename from src/core/features/login/pages/change-password/change-password.page.module.ts rename to src/core/features/login/pages/change-password/change-password.module.ts index f983cadd2..b32d3b3ef 100644 --- a/src/core/features/login/pages/change-password/change-password.page.module.ts +++ b/src/core/features/login/pages/change-password/change-password.module.ts @@ -19,7 +19,7 @@ import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreLoginChangePasswordPage } from './change-password.page'; +import { CoreLoginChangePasswordPage } from './change-password'; const routes: Routes = [ { diff --git a/src/core/features/login/pages/change-password/change-password.page.ts b/src/core/features/login/pages/change-password/change-password.ts similarity index 94% rename from src/core/features/login/pages/change-password/change-password.page.ts rename to src/core/features/login/pages/change-password/change-password.ts index 2f1a13c1d..a8e180e95 100644 --- a/src/core/features/login/pages/change-password/change-password.page.ts +++ b/src/core/features/login/pages/change-password/change-password.ts @@ -16,8 +16,8 @@ import { Component } from '@angular/core'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; -import { CoreLoginHelper } from '@features/login/services/login.helper'; -import { Translate } from '@singletons/core.singletons'; +import { CoreLoginHelper } from '@features/login/services/login-helper'; +import { Translate } from '@singletons'; /** * Page that shows instructions to change the password. diff --git a/src/core/features/login/pages/credentials/credentials.page.module.ts b/src/core/features/login/pages/credentials/credentials.module.ts similarity index 96% rename from src/core/features/login/pages/credentials/credentials.page.module.ts rename to src/core/features/login/pages/credentials/credentials.module.ts index 50b2026c0..9fd8a8a93 100644 --- a/src/core/features/login/pages/credentials/credentials.page.module.ts +++ b/src/core/features/login/pages/credentials/credentials.module.ts @@ -22,7 +22,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreLoginCredentialsPage } from './credentials.page'; +import { CoreLoginCredentialsPage } from './credentials'; const routes: Routes = [ { diff --git a/src/core/features/login/pages/credentials/credentials.page.ts b/src/core/features/login/pages/credentials/credentials.ts similarity index 99% rename from src/core/features/login/pages/credentials/credentials.page.ts rename to src/core/features/login/pages/credentials/credentials.ts index fe3e0884a..2e142adbf 100644 --- a/src/core/features/login/pages/credentials/credentials.page.ts +++ b/src/core/features/login/pages/credentials/credentials.ts @@ -21,9 +21,9 @@ import { CoreApp } from '@services/app'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@services/utils/utils'; -import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login.helper'; +import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login-helper'; import { CoreConstants } from '@/core/constants'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; import { CoreSiteIdentityProvider, CoreSitePublicConfigResponse } from '@classes/site'; import { CoreEvents } from '@singletons/events'; diff --git a/src/core/features/login/pages/email-signup/email-signup.page.module.ts b/src/core/features/login/pages/email-signup/email-signup.module.ts similarity index 96% rename from src/core/features/login/pages/email-signup/email-signup.page.module.ts rename to src/core/features/login/pages/email-signup/email-signup.module.ts index d5de916e7..7956c875d 100644 --- a/src/core/features/login/pages/email-signup/email-signup.page.module.ts +++ b/src/core/features/login/pages/email-signup/email-signup.module.ts @@ -22,7 +22,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreLoginEmailSignupPage } from './email-signup.page'; +import { CoreLoginEmailSignupPage } from './email-signup'; const routes: Routes = [ { diff --git a/src/core/features/login/pages/email-signup/email-signup.page.ts b/src/core/features/login/pages/email-signup/email-signup.ts similarity index 99% rename from src/core/features/login/pages/email-signup/email-signup.page.ts rename to src/core/features/login/pages/email-signup/email-signup.ts index 10891d231..d5e080862 100644 --- a/src/core/features/login/pages/email-signup/email-signup.page.ts +++ b/src/core/features/login/pages/email-signup/email-signup.ts @@ -23,14 +23,14 @@ import { CoreTextUtils } from '@services/utils/text'; import { CoreCountry, CoreUtils } from '@services/utils/utils'; import { CoreWS, CoreWSExternalWarning } from '@services/ws'; import { CoreConstants } from '@/core/constants'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; import { CoreSitePublicConfigResponse } from '@classes/site'; import { AuthEmailSignupProfileFieldsCategory, AuthEmailSignupSettings, CoreLoginHelper, -} from '@features/login/services/login.helper'; +} from '@features/login/services/login-helper'; /** * Page to signup using email. diff --git a/src/core/features/login/pages/forgotten-password/forgotten-password.page.module.ts b/src/core/features/login/pages/forgotten-password/forgotten-password.module.ts similarity index 99% rename from src/core/features/login/pages/forgotten-password/forgotten-password.page.module.ts rename to src/core/features/login/pages/forgotten-password/forgotten-password.module.ts index 360ab60b5..f98af2e8c 100644 --- a/src/core/features/login/pages/forgotten-password/forgotten-password.page.module.ts +++ b/src/core/features/login/pages/forgotten-password/forgotten-password.module.ts @@ -20,7 +20,7 @@ import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreLoginForgottenPasswordPage } from './forgotten-password.page'; +import { CoreLoginForgottenPasswordPage } from './forgotten-password'; const routes: Routes = [ { diff --git a/src/core/features/login/pages/forgotten-password/forgotten-password.page.ts b/src/core/features/login/pages/forgotten-password/forgotten-password.ts similarity index 96% rename from src/core/features/login/pages/forgotten-password/forgotten-password.page.ts rename to src/core/features/login/pages/forgotten-password/forgotten-password.ts index b44f968a2..d42e63054 100644 --- a/src/core/features/login/pages/forgotten-password/forgotten-password.page.ts +++ b/src/core/features/login/pages/forgotten-password/forgotten-password.ts @@ -18,8 +18,8 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { NavController } from '@ionic/angular'; import { CoreDomUtils } from '@services/utils/dom'; -import { CoreLoginHelper } from '@features/login/services/login.helper'; -import { Translate, Platform } from '@singletons/core.singletons'; +import { CoreLoginHelper } from '@features/login/services/login-helper'; +import { Translate, Platform } from '@singletons'; import { CoreWSExternalWarning } from '@services/ws'; /** diff --git a/src/core/features/login/pages/init/init.page.module.ts b/src/core/features/login/pages/init/init.module.ts similarity index 95% rename from src/core/features/login/pages/init/init.page.module.ts rename to src/core/features/login/pages/init/init.module.ts index 8cd9d79f0..b3ec8027f 100644 --- a/src/core/features/login/pages/init/init.page.module.ts +++ b/src/core/features/login/pages/init/init.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; -import { CoreLoginInitPage } from './init.page'; +import { CoreLoginInitPage } from './init'; const routes: Routes = [ { diff --git a/src/core/features/login/pages/init/init.page.ts b/src/core/features/login/pages/init/init.ts similarity index 96% rename from src/core/features/login/pages/init/init.page.ts rename to src/core/features/login/pages/init/init.ts index e1d64bdbf..92688ca08 100644 --- a/src/core/features/login/pages/init/init.page.ts +++ b/src/core/features/login/pages/init/init.ts @@ -17,10 +17,10 @@ import { NavController } from '@ionic/angular'; import { CoreApp, CoreRedirectData } from '@services/app'; import { CoreInit } from '@services/init'; -import { SplashScreen } from '@singletons/core.singletons'; +import { SplashScreen } from '@singletons'; import { CoreConstants } from '@/core/constants'; import { CoreSites } from '@services/sites'; -import { CoreLoginHelper } from '@features/login/services/login.helper'; +import { CoreLoginHelper } from '@features/login/services/login-helper'; /** * Page that displays a "splash screen" while the app is being initialized. diff --git a/src/core/features/login/pages/reconnect/reconnect.page.module.ts b/src/core/features/login/pages/reconnect/reconnect.module.ts similarity index 96% rename from src/core/features/login/pages/reconnect/reconnect.page.module.ts rename to src/core/features/login/pages/reconnect/reconnect.module.ts index fb970ca28..132f56699 100644 --- a/src/core/features/login/pages/reconnect/reconnect.page.module.ts +++ b/src/core/features/login/pages/reconnect/reconnect.module.ts @@ -22,7 +22,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreLoginReconnectPage } from './reconnect.page'; +import { CoreLoginReconnectPage } from './reconnect'; const routes: Routes = [ { diff --git a/src/core/features/login/pages/reconnect/reconnect.page.ts b/src/core/features/login/pages/reconnect/reconnect.ts similarity index 99% rename from src/core/features/login/pages/reconnect/reconnect.page.ts rename to src/core/features/login/pages/reconnect/reconnect.ts index 70c0b2afd..eee6daf88 100644 --- a/src/core/features/login/pages/reconnect/reconnect.page.ts +++ b/src/core/features/login/pages/reconnect/reconnect.ts @@ -21,7 +21,7 @@ import { CoreApp } from '@services/app'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@services/utils/utils'; -import { CoreLoginHelper } from '@features/login/services/login.helper'; +import { CoreLoginHelper } from '@features/login/services/login-helper'; import { CoreSiteIdentityProvider, CoreSitePublicConfigResponse } from '@classes/site'; import { CoreEvents } from '@singletons/events'; import { CoreError } from '@classes/errors/error'; diff --git a/src/core/features/login/pages/site-policy/site-policy.page.module.ts b/src/core/features/login/pages/site-policy/site-policy.module.ts similarity index 95% rename from src/core/features/login/pages/site-policy/site-policy.page.module.ts rename to src/core/features/login/pages/site-policy/site-policy.module.ts index 3635639c2..10aed7b8c 100644 --- a/src/core/features/login/pages/site-policy/site-policy.page.module.ts +++ b/src/core/features/login/pages/site-policy/site-policy.module.ts @@ -20,7 +20,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreLoginSitePolicyPage } from './site-policy.page'; +import { CoreLoginSitePolicyPage } from './site-policy'; const routes: Routes = [ { diff --git a/src/core/features/login/pages/site-policy/site-policy.page.ts b/src/core/features/login/pages/site-policy/site-policy.ts similarity index 98% rename from src/core/features/login/pages/site-policy/site-policy.page.ts rename to src/core/features/login/pages/site-policy/site-policy.ts index 57c6d5066..fb6e31988 100644 --- a/src/core/features/login/pages/site-policy/site-policy.page.ts +++ b/src/core/features/login/pages/site-policy/site-policy.ts @@ -20,7 +20,7 @@ import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@services/utils/utils'; import { CoreMimetypeUtils } from '@services/utils/mimetype'; -import { CoreLoginHelper } from '@features/login/services/login.helper'; +import { CoreLoginHelper } from '@features/login/services/login-helper'; import { CoreSite } from '@classes/site'; /** diff --git a/src/core/features/login/pages/site/site.page.module.ts b/src/core/features/login/pages/site/site.module.ts similarity index 96% rename from src/core/features/login/pages/site/site.page.module.ts rename to src/core/features/login/pages/site/site.module.ts index c73699573..ef21782f9 100644 --- a/src/core/features/login/pages/site/site.page.module.ts +++ b/src/core/features/login/pages/site/site.module.ts @@ -22,7 +22,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreLoginSitePage } from './site.page'; +import { CoreLoginSitePage } from './site'; const routes: Routes = [ { diff --git a/src/core/features/login/pages/site/site.page.ts b/src/core/features/login/pages/site/site.ts similarity index 99% rename from src/core/features/login/pages/site/site.page.ts rename to src/core/features/login/pages/site/site.ts index f96186bef..5abfb1859 100644 --- a/src/core/features/login/pages/site/site.page.ts +++ b/src/core/features/login/pages/site/site.ts @@ -22,11 +22,11 @@ import { CoreConfig } from '@services/config'; import { CoreSites, CoreSiteCheckResponse, CoreLoginSiteInfo, CoreSitesDemoSiteData } from '@services/sites'; import { CoreUtils } from '@services/utils/utils'; import { CoreDomUtils } from '@services/utils/dom'; -import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login.helper'; +import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login-helper'; import { CoreSite } from '@classes/site'; import { CoreError } from '@classes/errors/error'; import { CoreConstants } from '@/core/constants'; -import { Translate, ModalController } from '@singletons/core.singletons'; +import { Translate, ModalController } from '@singletons'; import { CoreUrl } from '@singletons/url'; import { CoreUrlUtils } from '@services/utils/url'; import { CoreLoginSiteHelpComponent } from '@features/login/components/site-help/site-help'; diff --git a/src/core/features/login/pages/sites/sites.page.module.ts b/src/core/features/login/pages/sites/sites.module.ts similarity index 96% rename from src/core/features/login/pages/sites/sites.page.module.ts rename to src/core/features/login/pages/sites/sites.module.ts index b70dd625f..e20a7dd13 100644 --- a/src/core/features/login/pages/sites/sites.page.module.ts +++ b/src/core/features/login/pages/sites/sites.module.ts @@ -21,7 +21,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreLoginSitesPage } from './sites.page'; +import { CoreLoginSitesPage } from './sites'; const routes: Routes = [ { diff --git a/src/core/features/login/pages/sites/sites.page.ts b/src/core/features/login/pages/sites/sites.ts similarity index 98% rename from src/core/features/login/pages/sites/sites.page.ts rename to src/core/features/login/pages/sites/sites.ts index 47cdc96d2..99de3b67b 100644 --- a/src/core/features/login/pages/sites/sites.page.ts +++ b/src/core/features/login/pages/sites/sites.ts @@ -18,7 +18,7 @@ import { Component, OnInit } from '@angular/core'; import { CoreSiteBasicInfo, CoreSites } from '@services/sites'; import { CoreLogger } from '@singletons/logger'; -import { CoreLoginHelper } from '@features/login/services/login.helper'; +import { CoreLoginHelper } from '@features/login/services/login-helper'; /** * Page that displays a "splash screen" while the app is being initialized. diff --git a/src/core/features/login/services/login.helper.ts b/src/core/features/login/services/login-helper.ts similarity index 99% rename from src/core/features/login/services/login.helper.ts rename to src/core/features/login/services/login-helper.ts index b086d9f54..a8d5a9b13 100644 --- a/src/core/features/login/services/login.helper.ts +++ b/src/core/features/login/services/login-helper.ts @@ -31,7 +31,7 @@ import { CoreConstants } from '@/core/constants'; import { CoreSite, CoreSiteIdentityProvider, CoreSitePublicConfigResponse } from '@classes/site'; import { CoreError } from '@classes/errors/error'; import { CoreWSError } from '@classes/errors/wserror'; -import { makeSingleton, Translate } from '@singletons/core.singletons'; +import { makeSingleton, Translate } from '@singletons'; import { CoreLogger } from '@singletons/logger'; import { CoreUrl } from '@singletons/url'; import { NavigationOptions } from '@ionic/angular/providers/nav-controller'; diff --git a/src/core/features/login/tests/init.page.test.ts b/src/core/features/login/tests/pages/init.test.ts similarity index 96% rename from src/core/features/login/tests/init.page.test.ts rename to src/core/features/login/tests/pages/init.test.ts index 010e42113..f2c64a6c1 100644 --- a/src/core/features/login/tests/init.page.test.ts +++ b/src/core/features/login/tests/pages/init.test.ts @@ -16,9 +16,9 @@ import { NavController } from '@ionic/angular'; import { CoreApp } from '@services/app'; import { CoreInit } from '@services/init'; -import { CoreLoginInitPage } from '@features/login/pages/init/init.page'; +import { CoreLoginInitPage } from '@features/login/pages/init/init'; import { CoreSites } from '@services/sites'; -import { SplashScreen } from '@singletons/core.singletons'; +import { SplashScreen } from '@singletons'; import { mock, mockSingleton, renderComponent, RenderConfig } from '@/testing/utils'; diff --git a/src/core/features/mainmenu/mainmenu-routing.module.ts b/src/core/features/mainmenu/mainmenu-routing.module.ts index ddf72fc95..173268d8d 100644 --- a/src/core/features/mainmenu/mainmenu-routing.module.ts +++ b/src/core/features/mainmenu/mainmenu-routing.module.ts @@ -17,8 +17,8 @@ import { RouterModule, ROUTES, Routes } from '@angular/router'; import { CoreArray } from '@singletons/array'; -import { CoreMainMenuPage } from './pages/menu/menu.page'; -import { CoreMainMenuMorePage } from './pages/more/more.page'; +import { CoreMainMenuPage } from './pages/menu/menu'; +import { CoreMainMenuMorePage } from './pages/more/more'; function buildMainMenuRoutes(injector: Injector): Routes { const routes = CoreArray.flatten(injector.get(MAIN_MENU_ROUTES, [])); @@ -30,7 +30,7 @@ function buildMainMenuRoutes(injector: Injector): Routes { children: [ { path: 'home', // @todo: Add this route dynamically. - loadChildren: () => import('./pages/home/home.page.module').then(m => m.CoreHomePageModule), + loadChildren: () => import('./pages/home/home.module').then(m => m.CoreHomePageModule), }, { path: 'more', diff --git a/src/core/features/mainmenu/mainmenu.module.ts b/src/core/features/mainmenu/mainmenu.module.ts index 3bcd75734..e01609f8b 100644 --- a/src/core/features/mainmenu/mainmenu.module.ts +++ b/src/core/features/mainmenu/mainmenu.module.ts @@ -21,11 +21,11 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreMainMenuDelegate } from './services/mainmenu.delegate'; +import { CoreMainMenuDelegate } from './services/mainmenu-delegate'; import { CoreMainMenuRoutingModule } from './mainmenu-routing.module'; -import { CoreMainMenuPage } from './pages/menu/menu.page'; -import { CoreMainMenuMorePage } from './pages/more/more.page'; +import { CoreMainMenuPage } from './pages/menu/menu'; +import { CoreMainMenuMorePage } from './pages/more/more'; import { CoreHomeMainMenuHandler } from './services/handlers/mainmenu'; diff --git a/src/core/features/mainmenu/pages/home/home-routing.module.ts b/src/core/features/mainmenu/pages/home/home-routing.module.ts index 5e85d3b64..8689eea49 100644 --- a/src/core/features/mainmenu/pages/home/home-routing.module.ts +++ b/src/core/features/mainmenu/pages/home/home-routing.module.ts @@ -17,7 +17,7 @@ import { RouterModule, ROUTES, Routes } from '@angular/router'; import { CoreArray } from '@singletons/array'; -import { CoreHomePage } from './home.page'; +import { CoreHomePage } from './home'; function buildHomeRoutes(injector: Injector): Routes { const routes = CoreArray.flatten(injector.get(HOME_ROUTES, [])); diff --git a/src/core/features/mainmenu/pages/home/home.page.module.ts b/src/core/features/mainmenu/pages/home/home.module.ts similarity index 96% rename from src/core/features/mainmenu/pages/home/home.page.module.ts rename to src/core/features/mainmenu/pages/home/home.module.ts index c0c90ab3f..1a84963d5 100644 --- a/src/core/features/mainmenu/pages/home/home.page.module.ts +++ b/src/core/features/mainmenu/pages/home/home.module.ts @@ -20,7 +20,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreHomePage } from './home.page'; +import { CoreHomePage } from './home'; import { CoreHomeRoutingModule } from './home-routing.module'; @NgModule({ diff --git a/src/core/features/mainmenu/pages/home/home.page.ts b/src/core/features/mainmenu/pages/home/home.ts similarity index 99% rename from src/core/features/mainmenu/pages/home/home.page.ts rename to src/core/features/mainmenu/pages/home/home.ts index 41c78cc17..b7f9e7611 100644 --- a/src/core/features/mainmenu/pages/home/home.page.ts +++ b/src/core/features/mainmenu/pages/home/home.ts @@ -16,9 +16,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Subscription } from 'rxjs'; import { CoreSites } from '@services/sites'; -import { CoreHomeDelegate, CoreHomeHandlerToDisplay } from '../../services/home.delegate'; import { CoreEventObserver, CoreEvents } from '@singletons/events'; import { CoreTabsComponent } from '@components/tabs/tabs'; +import { CoreHomeDelegate, CoreHomeHandlerToDisplay } from '../../services/home-delegate'; /** * Page that displays the Home. diff --git a/src/core/features/mainmenu/pages/menu/menu.page.ts b/src/core/features/mainmenu/pages/menu/menu.ts similarity index 99% rename from src/core/features/mainmenu/pages/menu/menu.page.ts rename to src/core/features/mainmenu/pages/menu/menu.ts index 820dd4b8c..4d921683d 100644 --- a/src/core/features/mainmenu/pages/menu/menu.page.ts +++ b/src/core/features/mainmenu/pages/menu/menu.ts @@ -22,9 +22,9 @@ import { CoreSites } from '@services/sites'; import { CoreTextUtils } from '@services/utils/text'; import { CoreEvents, CoreEventObserver, CoreEventLoadPageMainMenuData } from '@singletons/events'; import { CoreMainMenu } from '../../services/mainmenu'; -import { CoreMainMenuDelegate, CoreMainMenuHandlerToDisplay } from '../../services/mainmenu.delegate'; +import { CoreMainMenuDelegate, CoreMainMenuHandlerToDisplay } from '../../services/mainmenu-delegate'; import { CoreDomUtils } from '@services/utils/dom'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; /** * Page that displays the main menu of the app. diff --git a/src/core/features/mainmenu/pages/more/more.page.ts b/src/core/features/mainmenu/pages/more/more.ts similarity index 98% rename from src/core/features/mainmenu/pages/more/more.page.ts rename to src/core/features/mainmenu/pages/more/more.ts index f5d5fd3b0..48b466d84 100644 --- a/src/core/features/mainmenu/pages/more/more.page.ts +++ b/src/core/features/mainmenu/pages/more/more.ts @@ -18,8 +18,8 @@ import { Subscription } from 'rxjs'; import { CoreSites } from '@services/sites'; import { CoreUtils } from '@services/utils/utils'; import { CoreSiteInfo } from '@classes/site'; -import { CoreLoginHelper } from '@features/login/services/login.helper'; -import { CoreMainMenuDelegate, CoreMainMenuHandlerData } from '../../services/mainmenu.delegate'; +import { CoreLoginHelper } from '@features/login/services/login-helper'; +import { CoreMainMenuDelegate, CoreMainMenuHandlerData } from '../../services/mainmenu-delegate'; import { CoreMainMenu, CoreMainMenuCustomItem } from '../../services/mainmenu'; import { CoreEventObserver, CoreEvents } from '@singletons/events'; diff --git a/src/core/features/mainmenu/services/handlers/mainmenu.ts b/src/core/features/mainmenu/services/handlers/mainmenu.ts index 3ca4bf6fd..7fe947fff 100644 --- a/src/core/features/mainmenu/services/handlers/mainmenu.ts +++ b/src/core/features/mainmenu/services/handlers/mainmenu.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '../mainmenu.delegate'; +import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '../mainmenu-delegate'; /** * Handler to add Home into main menu. diff --git a/src/core/features/mainmenu/services/home.delegate.ts b/src/core/features/mainmenu/services/home-delegate.ts similarity index 100% rename from src/core/features/mainmenu/services/home.delegate.ts rename to src/core/features/mainmenu/services/home-delegate.ts diff --git a/src/core/features/mainmenu/services/mainmenu.delegate.ts b/src/core/features/mainmenu/services/mainmenu-delegate.ts similarity index 100% rename from src/core/features/mainmenu/services/mainmenu.delegate.ts rename to src/core/features/mainmenu/services/mainmenu-delegate.ts diff --git a/src/core/features/mainmenu/services/mainmenu.ts b/src/core/features/mainmenu/services/mainmenu.ts index 5baf7aad1..0d85a8ece 100644 --- a/src/core/features/mainmenu/services/mainmenu.ts +++ b/src/core/features/mainmenu/services/mainmenu.ts @@ -19,8 +19,8 @@ import { CoreLang } from '@services/lang'; import { CoreSites } from '@services/sites'; import { CoreUtils } from '@services/utils/utils'; import { CoreConstants } from '@/core/constants'; -import { CoreMainMenuDelegate, CoreMainMenuHandlerToDisplay } from './mainmenu.delegate'; -import { makeSingleton } from '@singletons/core.singletons'; +import { CoreMainMenuDelegate, CoreMainMenuHandlerToDisplay } from './mainmenu-delegate'; +import { makeSingleton } from '@singletons'; /** * Service that provides some features regarding Main Menu. diff --git a/src/core/features/search/components/search-box/search-box.ts b/src/core/features/search/components/search-box/search-box.ts index dd2048831..b9a4984d5 100644 --- a/src/core/features/search/components/search-box/search-box.ts +++ b/src/core/features/search/components/search-box/search-box.ts @@ -17,8 +17,8 @@ import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@services/utils/utils'; -import { CoreSearchHistory } from '../../services/search-history'; -import { Translate } from '@singletons/core.singletons'; +import { CoreSearchHistory } from '../../services/search-history.service'; +import { Translate } from '@singletons'; import { CoreSearchHistoryDBRecord } from '../../services/search-history-db'; /** diff --git a/src/core/features/search/services/search-history.ts b/src/core/features/search/services/search-history.service.ts similarity index 98% rename from src/core/features/search/services/search-history.ts rename to src/core/features/search/services/search-history.service.ts index 7aa98df67..f660a5aca 100644 --- a/src/core/features/search/services/search-history.ts +++ b/src/core/features/search/services/search-history.service.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { CoreSites } from '@services/sites'; import { SQLiteDB } from '@classes/sqlitedb'; import { CoreSearchHistoryDBRecord, SEARCH_HISTORY_TABLE_NAME } from './search-history-db'; -import { makeSingleton } from '@singletons/core.singletons'; +import { makeSingleton } from '@singletons'; /** * Service that enables adding a history to a search box. diff --git a/src/core/features/settings/pages/about/about.page.module.ts b/src/core/features/settings/pages/about/about.module.ts similarity index 92% rename from src/core/features/settings/pages/about/about.page.module.ts rename to src/core/features/settings/pages/about/about.module.ts index 51a9e2e66..1de71b78f 100644 --- a/src/core/features/settings/pages/about/about.page.module.ts +++ b/src/core/features/settings/pages/about/about.module.ts @@ -21,7 +21,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreSettingsAboutPage } from './about.page'; +import { CoreSettingsAboutPage } from './about'; const routes: Routes = [ { @@ -31,13 +31,13 @@ const routes: Routes = [ { path: 'deviceinfo', loadChildren: () => - import('@features/settings/pages/deviceinfo/deviceinfo.page.module') + import('@features/settings/pages/deviceinfo/deviceinfo.module') .then(m => m.CoreSettingsDeviceInfoPageModule), }, { path: 'licenses', loadChildren: () => - import('@features/settings/pages/licenses/licenses.page.module') + import('@features/settings/pages/licenses/licenses.module') .then(m => m.CoreSettingsLicensesPageModule), }, ]; diff --git a/src/core/features/settings/pages/about/about.page.ts b/src/core/features/settings/pages/about/about.ts similarity index 100% rename from src/core/features/settings/pages/about/about.page.ts rename to src/core/features/settings/pages/about/about.ts diff --git a/src/core/features/settings/pages/app/app.page.module.ts b/src/core/features/settings/pages/app/app.module.ts similarity index 96% rename from src/core/features/settings/pages/app/app.page.module.ts rename to src/core/features/settings/pages/app/app.module.ts index 2a7379c5d..b68b72b02 100644 --- a/src/core/features/settings/pages/app/app.page.module.ts +++ b/src/core/features/settings/pages/app/app.module.ts @@ -21,7 +21,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreSettingsAppPage } from './app.page'; +import { CoreSettingsAppPage } from './app'; const routes: Routes = [ { diff --git a/src/core/features/settings/pages/app/app.page.ts b/src/core/features/settings/pages/app/app.ts similarity index 100% rename from src/core/features/settings/pages/app/app.page.ts rename to src/core/features/settings/pages/app/app.ts diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.page.module.ts b/src/core/features/settings/pages/deviceinfo/deviceinfo.module.ts similarity index 95% rename from src/core/features/settings/pages/deviceinfo/deviceinfo.page.module.ts rename to src/core/features/settings/pages/deviceinfo/deviceinfo.module.ts index f0727d939..55873a40f 100644 --- a/src/core/features/settings/pages/deviceinfo/deviceinfo.page.module.ts +++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.module.ts @@ -22,7 +22,7 @@ import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; import { CorePipesModule } from '@pipes/pipes.module'; -import { CoreSettingsDeviceInfoPage } from './deviceinfo.page'; +import { CoreSettingsDeviceInfoPage } from './deviceinfo'; const routes: Routes = [ { diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.page.ts b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts similarity index 99% rename from src/core/features/settings/pages/deviceinfo/deviceinfo.page.ts rename to src/core/features/settings/pages/deviceinfo/deviceinfo.ts index 8f65d99ca..dfdb6d003 100644 --- a/src/core/features/settings/pages/deviceinfo/deviceinfo.page.ts +++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts @@ -16,7 +16,7 @@ import { CoreApp } from '@services/app'; import { Component, OnDestroy } from '@angular/core'; import { CoreConstants } from '@/core/constants'; import { CoreLocalNotifications } from '@services/local-notifications'; -import { Device, Platform, Translate, Network, NgZone } from '@singletons/core.singletons'; +import { Device, Platform, Translate, Network, NgZone } from '@singletons'; import { CoreLang } from '@services/lang'; import { CoreFile } from '@services/file'; import { CoreSites } from '@services/sites'; diff --git a/src/core/features/settings/pages/general/general.page.module.ts b/src/core/features/settings/pages/general/general.module.ts similarity index 96% rename from src/core/features/settings/pages/general/general.page.module.ts rename to src/core/features/settings/pages/general/general.module.ts index 9a37c7261..3724f1686 100644 --- a/src/core/features/settings/pages/general/general.page.module.ts +++ b/src/core/features/settings/pages/general/general.module.ts @@ -22,7 +22,7 @@ import { FormsModule } from '@angular/forms'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreSettingsGeneralPage } from './general.page'; +import { CoreSettingsGeneralPage } from './general'; const routes: Routes = [ { diff --git a/src/core/features/settings/pages/general/general.page.ts b/src/core/features/settings/pages/general/general.ts similarity index 99% rename from src/core/features/settings/pages/general/general.page.ts rename to src/core/features/settings/pages/general/general.ts index b410e130c..40cfd96a9 100644 --- a/src/core/features/settings/pages/general/general.page.ts +++ b/src/core/features/settings/pages/general/general.ts @@ -19,7 +19,7 @@ import { CoreEvents } from '@singletons/events'; import { CoreLang } from '@services/lang'; import { CoreDomUtils } from '@services/utils/dom'; // import { CorePushNotifications } from '@features/pushnotifications/services/pushnotifications'; -import { CoreSettingsHelper, CoreColorScheme } from '../../services/settings.helper'; +import { CoreSettingsHelper, CoreColorScheme } from '../../services/settings-helper'; /** * Page that displays the general settings. diff --git a/src/core/features/settings/pages/licenses/licenses.page.module.ts b/src/core/features/settings/pages/licenses/licenses.module.ts similarity index 96% rename from src/core/features/settings/pages/licenses/licenses.page.module.ts rename to src/core/features/settings/pages/licenses/licenses.module.ts index 811823ead..3009471b9 100644 --- a/src/core/features/settings/pages/licenses/licenses.page.module.ts +++ b/src/core/features/settings/pages/licenses/licenses.module.ts @@ -21,7 +21,7 @@ import { IonicModule } from '@ionic/angular'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreSettingsLicensesPage } from './licenses.page'; +import { CoreSettingsLicensesPage } from './licenses'; const routes: Routes = [ { diff --git a/src/core/features/settings/pages/licenses/licenses.page.ts b/src/core/features/settings/pages/licenses/licenses.ts similarity index 98% rename from src/core/features/settings/pages/licenses/licenses.page.ts rename to src/core/features/settings/pages/licenses/licenses.ts index d9793fd49..b1c066302 100644 --- a/src/core/features/settings/pages/licenses/licenses.page.ts +++ b/src/core/features/settings/pages/licenses/licenses.ts @@ -14,7 +14,7 @@ import { Component, OnInit } from '@angular/core'; import { CoreConstants } from '@/core/constants'; -import { Http } from '@singletons/core.singletons'; +import { Http } from '@singletons'; /** * Defines license info diff --git a/src/core/features/settings/pages/site/site.page.module.ts b/src/core/features/settings/pages/site/site.module.ts similarity index 96% rename from src/core/features/settings/pages/site/site.page.module.ts rename to src/core/features/settings/pages/site/site.module.ts index d4b8d8366..db7d710b8 100644 --- a/src/core/features/settings/pages/site/site.page.module.ts +++ b/src/core/features/settings/pages/site/site.module.ts @@ -22,7 +22,7 @@ import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; import { CorePipesModule } from '@pipes/pipes.module'; -import { CoreSitePreferencesPage } from './site.page'; +import { CoreSitePreferencesPage } from './site'; const routes: Routes = [ { diff --git a/src/core/features/settings/pages/site/site.page.ts b/src/core/features/settings/pages/site/site.ts similarity index 98% rename from src/core/features/settings/pages/site/site.page.ts rename to src/core/features/settings/pages/site/site.ts index 28f794e11..bd8acb841 100644 --- a/src/core/features/settings/pages/site/site.page.ts +++ b/src/core/features/settings/pages/site/site.ts @@ -16,16 +16,16 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { IonRefresher } from '@ionic/angular'; -import { CoreSettingsDelegate, CoreSettingsHandlerData } from '../../services/settings.delegate'; +import { CoreSettingsDelegate, CoreSettingsHandlerData } from '../../services/settings-delegate'; import { CoreEventObserver, CoreEvents, CoreEventSiteUpdatedData } from '@singletons/events'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; // import { CoreSplitViewComponent } from '@components/split-view/split-view'; // import { CoreSharedFiles } from '@features/sharedfiles/providers/sharedfiles'; -import { CoreSettingsHelper, CoreSiteSpaceUsage } from '../../services/settings.helper'; +import { CoreSettingsHelper, CoreSiteSpaceUsage } from '../../services/settings-helper'; import { CoreApp } from '@services/app'; import { CoreSiteInfo } from '@classes/site'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; /** * Page that displays the list of site settings pages. diff --git a/src/core/features/settings/pages/space-usage/space-usage.page.module.ts b/src/core/features/settings/pages/space-usage/space-usage.module.ts similarity index 95% rename from src/core/features/settings/pages/space-usage/space-usage.page.module.ts rename to src/core/features/settings/pages/space-usage/space-usage.module.ts index 336081181..b52333454 100644 --- a/src/core/features/settings/pages/space-usage/space-usage.page.module.ts +++ b/src/core/features/settings/pages/space-usage/space-usage.module.ts @@ -22,7 +22,7 @@ import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; import { CorePipesModule } from '@pipes/pipes.module'; -import { CoreSettingsSpaceUsagePage } from './space-usage.page'; +import { CoreSettingsSpaceUsagePage } from './space-usage'; const routes: Routes = [ { diff --git a/src/core/features/settings/pages/space-usage/space-usage.page.ts b/src/core/features/settings/pages/space-usage/space-usage.ts similarity index 98% rename from src/core/features/settings/pages/space-usage/space-usage.page.ts rename to src/core/features/settings/pages/space-usage/space-usage.ts index 8d37f95a5..7a1ae657d 100644 --- a/src/core/features/settings/pages/space-usage/space-usage.page.ts +++ b/src/core/features/settings/pages/space-usage/space-usage.ts @@ -17,10 +17,10 @@ import { IonRefresher } from '@ionic/angular'; import { CoreSiteBasicInfo, CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; import { CoreEventObserver, CoreEvents, CoreEventSiteUpdatedData } from '@singletons/events'; -import { CoreSettingsHelper, CoreSiteSpaceUsage } from '../../services/settings.helper'; +import { CoreSettingsHelper, CoreSiteSpaceUsage } from '../../services/settings-helper'; /** * Page that displays the space usage settings. diff --git a/src/core/features/settings/pages/synchronization/synchronization.page.module.ts b/src/core/features/settings/pages/synchronization/synchronization.module.ts similarity index 99% rename from src/core/features/settings/pages/synchronization/synchronization.page.module.ts rename to src/core/features/settings/pages/synchronization/synchronization.module.ts index 39a2121fe..8e898e4a1 100644 --- a/src/core/features/settings/pages/synchronization/synchronization.page.module.ts +++ b/src/core/features/settings/pages/synchronization/synchronization.module.ts @@ -22,7 +22,7 @@ import { IonicModule } from '@ionic/angular'; import { CoreComponentsModule } from '@components/components.module'; import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreSettingsSynchronizationPage } from './synchronization.page'; +import { CoreSettingsSynchronizationPage } from './synchronization'; import { FormsModule } from '@angular/forms'; const routes: Routes = [ diff --git a/src/core/features/settings/pages/synchronization/synchronization.page.ts b/src/core/features/settings/pages/synchronization/synchronization.ts similarity index 98% rename from src/core/features/settings/pages/synchronization/synchronization.page.ts rename to src/core/features/settings/pages/synchronization/synchronization.ts index 2802f5132..a154d80bb 100644 --- a/src/core/features/settings/pages/synchronization/synchronization.page.ts +++ b/src/core/features/settings/pages/synchronization/synchronization.ts @@ -19,8 +19,8 @@ import { CoreEventObserver, CoreEvents, CoreEventSiteUpdatedData } from '@single import { CoreSites, CoreSiteBasicInfo } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreConfig } from '@services/config'; -import { CoreSettingsHelper } from '@features/settings/services/settings.helper'; -import { Translate } from '@singletons/core.singletons'; +import { CoreSettingsHelper } from '@features/settings/services/settings-helper'; +import { Translate } from '@singletons'; /** * Page that displays the synchronization settings. diff --git a/src/core/features/settings/services/settings.delegate.ts b/src/core/features/settings/services/settings-delegate.ts similarity index 100% rename from src/core/features/settings/services/settings.delegate.ts rename to src/core/features/settings/services/settings-delegate.ts diff --git a/src/core/features/settings/services/settings.helper.ts b/src/core/features/settings/services/settings-helper.ts similarity index 99% rename from src/core/features/settings/services/settings.helper.ts rename to src/core/features/settings/services/settings-helper.ts index 54deb5a30..43b04d2c3 100644 --- a/src/core/features/settings/services/settings.helper.ts +++ b/src/core/features/settings/services/settings-helper.ts @@ -25,7 +25,7 @@ import { CoreConfig } from '@services/config'; // import { CoreFilterProvider } from '@features/filter/providers/filter'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreCourse } from '@features/course/services/course'; -import { makeSingleton, Translate } from '@singletons/core.singletons'; +import { makeSingleton, Translate } from '@singletons'; import { CoreError } from '@classes/errors/error'; /** diff --git a/src/core/features/settings/settings-init.module.ts b/src/core/features/settings/settings-init.module.ts index 6300b1bc8..c8d1b44e9 100644 --- a/src/core/features/settings/settings-init.module.ts +++ b/src/core/features/settings/settings-init.module.ts @@ -24,7 +24,7 @@ const routes: Routes = [ }, { path: 'preferences', - loadChildren: () => import('@features/settings/pages/site/site.page.module').then(m => m.CoreSitePreferencesPageModule), + loadChildren: () => import('@features/settings/pages/site/site.module').then(m => m.CoreSitePreferencesPageModule), }, ]; diff --git a/src/core/features/settings/settings-routing.module.ts b/src/core/features/settings/settings-routing.module.ts index 76538b40b..02bafefab 100644 --- a/src/core/features/settings/settings-routing.module.ts +++ b/src/core/features/settings/settings-routing.module.ts @@ -18,27 +18,27 @@ import { RouterModule, Routes } from '@angular/router'; const routes: Routes = [ { path: 'about', - loadChildren: () => import('./pages/about/about.page.module').then(m => m.CoreSettingsAboutPageModule), + loadChildren: () => import('./pages/about/about.module').then(m => m.CoreSettingsAboutPageModule), }, { path: 'general', - loadChildren: () => import('./pages/general/general.page.module').then(m => m.CoreSettingsGeneralPageModule), + loadChildren: () => import('./pages/general/general.module').then(m => m.CoreSettingsGeneralPageModule), }, { path: 'spaceusage', loadChildren: () => - import('@features/settings/pages/space-usage/space-usage.page.module') + import('@features/settings/pages/space-usage/space-usage.module') .then(m => m.CoreSettingsSpaceUsagePageModule), }, { path: 'sync', loadChildren: () => - import('@features/settings/pages/synchronization/synchronization.page.module') + import('@features/settings/pages/synchronization/synchronization.module') .then(m => m.CoreSettingsSynchronizationPageModule), }, { path: '', - loadChildren: () => import('./pages/app/app.page.module').then(m => m.CoreSettingsAppPageModule), + loadChildren: () => import('./pages/app/app.module').then(m => m.CoreSettingsAppPageModule), }, ]; diff --git a/src/core/features/sitehome/pages/index/index.page.module.ts b/src/core/features/sitehome/pages/index/index.module.ts similarity index 96% rename from src/core/features/sitehome/pages/index/index.page.module.ts rename to src/core/features/sitehome/pages/index/index.module.ts index 59e2a1986..e1871fec1 100644 --- a/src/core/features/sitehome/pages/index/index.page.module.ts +++ b/src/core/features/sitehome/pages/index/index.module.ts @@ -21,7 +21,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreDirectivesModule } from '@directives/directives.module'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreSiteHomeIndexPage } from './index.page'; +import { CoreSiteHomeIndexPage } from '.'; const routes: Routes = [ { diff --git a/src/core/features/sitehome/pages/index/index.page.ts b/src/core/features/sitehome/pages/index/index.ts similarity index 99% rename from src/core/features/sitehome/pages/index/index.page.ts rename to src/core/features/sitehome/pages/index/index.ts index a9aa029c1..997df1753 100644 --- a/src/core/features/sitehome/pages/index/index.page.ts +++ b/src/core/features/sitehome/pages/index/index.ts @@ -23,7 +23,7 @@ import { CoreSites } from '@services/sites'; import { CoreSiteHome } from '@features/sitehome/services/sitehome'; import { CoreCourses, CoreCoursesProvider } from '@features//courses/services/courses'; import { CoreEventObserver, CoreEvents } from '@singletons/events'; -import { CoreCourseHelper } from '@features/course/services/course.helper'; +import { CoreCourseHelper } from '@features/course/services/course-helper'; /** * Page that displays site home index. diff --git a/src/core/features/sitehome/services/handlers/index.link.ts b/src/core/features/sitehome/services/handlers/index-link.ts similarity index 97% rename from src/core/features/sitehome/services/handlers/index.link.ts rename to src/core/features/sitehome/services/handlers/index-link.ts index aa97435c4..c3dc6fcbc 100644 --- a/src/core/features/sitehome/services/handlers/index.link.ts +++ b/src/core/features/sitehome/services/handlers/index-link.ts @@ -16,8 +16,8 @@ import { Injectable } from '@angular/core'; import { Params } from '@angular/router'; import { CoreSites } from '@services/sites'; import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler'; -import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks.helper'; -import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks.delegate'; +import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper'; +import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate'; import { CoreSiteHome } from '../sitehome'; /** diff --git a/src/core/features/sitehome/services/handlers/sitehome.home.ts b/src/core/features/sitehome/services/handlers/sitehome-home.ts similarity index 98% rename from src/core/features/sitehome/services/handlers/sitehome.home.ts rename to src/core/features/sitehome/services/handlers/sitehome-home.ts index 3848f7b55..cda4f0df5 100644 --- a/src/core/features/sitehome/services/handlers/sitehome.home.ts +++ b/src/core/features/sitehome/services/handlers/sitehome-home.ts @@ -14,7 +14,7 @@ import { Injectable } from '@angular/core'; import { CoreSites } from '@services/sites'; -import { CoreHomeHandler, CoreHomeHandlerToDisplay } from '@features/mainmenu/services/home.delegate'; +import { CoreHomeHandler, CoreHomeHandlerToDisplay } from '@features/mainmenu/services/home-delegate'; import { CoreSiteHome } from '../sitehome'; /** diff --git a/src/core/features/sitehome/services/sitehome.ts b/src/core/features/sitehome/services/sitehome.ts index 6714dfd6e..614e3087b 100644 --- a/src/core/features/sitehome/services/sitehome.ts +++ b/src/core/features/sitehome/services/sitehome.ts @@ -16,7 +16,7 @@ import { Injectable } from '@angular/core'; import { CoreSites } from '@services/sites'; import { CoreSite, CoreSiteWSPreSets } from '@classes/site'; -import { makeSingleton } from '@singletons/core.singletons'; +import { makeSingleton } from '@singletons'; import { CoreCourse, CoreCourseSection } from '../../course/services/course'; import { CoreCourses } from '../../courses/services/courses'; @@ -193,4 +193,3 @@ export class CoreSiteHomeProvider { } export class CoreSiteHome extends makeSingleton(CoreSiteHomeProvider) {} - diff --git a/src/core/features/sitehome/sitehome-init.module.ts b/src/core/features/sitehome/sitehome-init.module.ts index 7739e17aa..e66eee94d 100644 --- a/src/core/features/sitehome/sitehome-init.module.ts +++ b/src/core/features/sitehome/sitehome-init.module.ts @@ -15,17 +15,17 @@ import { NgModule } from '@angular/core'; import { Routes } from '@angular/router'; -import { CoreSiteHomeIndexLinkHandler } from './services/handlers/index.link'; -import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks.delegate'; -import { CoreSiteHomeHomeHandler } from './services/handlers/sitehome.home'; -import { CoreHomeDelegate } from '@features/mainmenu/services/home.delegate'; +import { CoreSiteHomeIndexLinkHandler } from './services/handlers/index-link'; +import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate'; +import { CoreSiteHomeHomeHandler } from './services/handlers/sitehome-home'; +import { CoreHomeDelegate } from '@features/mainmenu/services/home-delegate'; import { CoreHomeRoutingModule } from '@features/mainmenu/pages/home/home-routing.module'; const routes: Routes = [ { path: 'sitehome', loadChildren: () => - import('@features/sitehome/pages/index/index.page.module').then(m => m.CoreSiteHomeIndexPageModule), + import('@features/sitehome/pages/index/index.module').then(m => m.CoreSiteHomeIndexPageModule), }, ]; diff --git a/src/core/guards/auth.guard.ts b/src/core/guards/auth.ts similarity index 100% rename from src/core/guards/auth.guard.ts rename to src/core/guards/auth.ts diff --git a/src/core/pipes/bytes-to-size.pipe.ts b/src/core/pipes/bytes-to-size.ts similarity index 100% rename from src/core/pipes/bytes-to-size.pipe.ts rename to src/core/pipes/bytes-to-size.ts diff --git a/src/core/pipes/create-links.pipe.ts b/src/core/pipes/create-links.ts similarity index 100% rename from src/core/pipes/create-links.pipe.ts rename to src/core/pipes/create-links.ts diff --git a/src/core/pipes/format-date.pipe.ts b/src/core/pipes/format-date.ts similarity index 100% rename from src/core/pipes/format-date.pipe.ts rename to src/core/pipes/format-date.ts diff --git a/src/core/pipes/no-tags.pipe.ts b/src/core/pipes/no-tags.ts similarity index 100% rename from src/core/pipes/no-tags.pipe.ts rename to src/core/pipes/no-tags.ts diff --git a/src/core/pipes/pipes.module.ts b/src/core/pipes/pipes.module.ts index ed1d765d8..301300530 100644 --- a/src/core/pipes/pipes.module.ts +++ b/src/core/pipes/pipes.module.ts @@ -13,12 +13,12 @@ // limitations under the License. import { NgModule } from '@angular/core'; -import { CoreCreateLinksPipe } from './create-links.pipe'; -import { CoreFormatDatePipe } from './format-date.pipe'; -import { CoreNoTagsPipe } from './no-tags.pipe'; -import { CoreSecondsToHMSPipe } from './seconds-to-hms.pipe'; -import { CoreTimeAgoPipe } from './time-ago.pipe'; -import { CoreBytesToSizePipe } from './bytes-to-size.pipe'; +import { CoreCreateLinksPipe } from './create-links'; +import { CoreFormatDatePipe } from './format-date'; +import { CoreNoTagsPipe } from './no-tags'; +import { CoreSecondsToHMSPipe } from './seconds-to-hms'; +import { CoreTimeAgoPipe } from './time-ago'; +import { CoreBytesToSizePipe } from './bytes-to-size'; @NgModule({ declarations: [ diff --git a/src/core/pipes/seconds-to-hms.pipe.ts b/src/core/pipes/seconds-to-hms.ts similarity index 100% rename from src/core/pipes/seconds-to-hms.pipe.ts rename to src/core/pipes/seconds-to-hms.ts diff --git a/src/core/pipes/time-ago.pipe.ts b/src/core/pipes/time-ago.ts similarity index 96% rename from src/core/pipes/time-ago.pipe.ts rename to src/core/pipes/time-ago.ts index a768b9a37..4d63558cf 100644 --- a/src/core/pipes/time-ago.pipe.ts +++ b/src/core/pipes/time-ago.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Pipe, PipeTransform } from '@angular/core'; -import { Translate } from '@singletons/core.singletons'; +import { Translate } from '@singletons'; import { CoreLogger } from '@singletons/logger'; import moment from 'moment'; diff --git a/src/core/services/app.ts b/src/core/services/app.ts index 6d91795c4..4c334be1c 100644 --- a/src/core/services/app.ts +++ b/src/core/services/app.ts @@ -21,12 +21,11 @@ import { CoreEvents } from '@singletons/events'; import { CoreUtils, PromiseDefer } from '@services/utils/utils'; import { CoreUrlUtils } from '@services/utils/url'; import { SQLiteDB, SQLiteDBTableSchema } from '@classes/sqlitedb'; -import { CoreConstants } from '@/core/constants'; -import { makeSingleton, Keyboard, Network, StatusBar, Platform, Device } from '@singletons/core.singletons'; +import { makeSingleton, Keyboard, Network, StatusBar, Platform, Device } from '@singletons'; import { CoreLogger } from '@singletons/logger'; -import { DBNAME, SCHEMA_VERSIONS_TABLE_NAME, SCHEMA_VERSIONS_TABLE_SCHEMA, SchemaVersionsDBEntry } from '@services/app.db'; -import { CoreColors } from '../singletons/colors'; +import { CoreColors } from '@singletons/colors'; +import { DBNAME, SCHEMA_VERSIONS_TABLE_NAME, SCHEMA_VERSIONS_TABLE_SCHEMA, SchemaVersionsDBEntry } from '@services/db/app'; /** * Factory to provide some global functionalities, like access to the global app database. diff --git a/src/core/services/config.ts b/src/core/services/config.ts index ed7d54f73..a5979f4d6 100644 --- a/src/core/services/config.ts +++ b/src/core/services/config.ts @@ -16,8 +16,8 @@ import { Injectable } from '@angular/core'; import { CoreApp } from '@services/app'; import { SQLiteDB } from '@classes/sqlitedb'; -import { makeSingleton } from '@singletons/core.singletons'; -import { CONFIG_TABLE_NAME, APP_SCHEMA, ConfigDBEntry } from '@services/config.db'; +import { makeSingleton } from '@singletons'; +import { CONFIG_TABLE_NAME, APP_SCHEMA, ConfigDBEntry } from '@services/db/config'; /** * Factory to provide access to dynamic and permanent config and settings. diff --git a/src/core/services/cron.ts b/src/core/services/cron.ts index a96fec9cb..8cc5ec81e 100644 --- a/src/core/services/cron.ts +++ b/src/core/services/cron.ts @@ -21,9 +21,9 @@ import { CoreConstants } from '@/core/constants'; import { SQLiteDB } from '@classes/sqlitedb'; import { CoreError } from '@classes/errors/error'; -import { makeSingleton, Network } from '@singletons/core.singletons'; +import { makeSingleton, Network } from '@singletons'; import { CoreLogger } from '@singletons/logger'; -import { APP_SCHEMA, CRON_TABLE_NAME, CronDBEntry } from '@services/cron.db'; +import { APP_SCHEMA, CRON_TABLE_NAME, CronDBEntry } from '@services/db/cron'; /* * Service to handle cron processes. The registered processes will be executed every certain time. diff --git a/src/core/services/db.ts b/src/core/services/db.ts index c02b1a416..5ebe04d74 100644 --- a/src/core/services/db.ts +++ b/src/core/services/db.ts @@ -16,7 +16,7 @@ import { Injectable } from '@angular/core'; import { SQLiteDB } from '@classes/sqlitedb'; import { SQLiteDBMock } from '@features/emulator/classes/sqlitedb'; -import { makeSingleton, SQLite, Platform } from '@singletons/core.singletons'; +import { makeSingleton, SQLite, Platform } from '@singletons'; /** * This service allows interacting with the local database to store and retrieve data. diff --git a/src/core/services/app.db.ts b/src/core/services/db/app.ts similarity index 100% rename from src/core/services/app.db.ts rename to src/core/services/db/app.ts diff --git a/src/core/services/config.db.ts b/src/core/services/db/config.ts similarity index 100% rename from src/core/services/config.db.ts rename to src/core/services/db/config.ts diff --git a/src/core/services/cron.db.ts b/src/core/services/db/cron.ts similarity index 100% rename from src/core/services/cron.db.ts rename to src/core/services/db/cron.ts diff --git a/src/core/services/filepool-db.ts b/src/core/services/db/filepool.ts similarity index 100% rename from src/core/services/filepool-db.ts rename to src/core/services/db/filepool.ts diff --git a/src/core/services/local-notifications.db.ts b/src/core/services/db/local-notifications.ts similarity index 100% rename from src/core/services/local-notifications.db.ts rename to src/core/services/db/local-notifications.ts diff --git a/src/core/services/sites-db.ts b/src/core/services/db/sites.ts similarity index 100% rename from src/core/services/sites-db.ts rename to src/core/services/db/sites.ts diff --git a/src/core/services/sync-db.ts b/src/core/services/db/sync.ts similarity index 100% rename from src/core/services/sync-db.ts rename to src/core/services/db/sync.ts diff --git a/src/core/services/file-helper.ts b/src/core/services/file-helper.ts index e9b68c725..f494b2433 100644 --- a/src/core/services/file-helper.ts +++ b/src/core/services/file-helper.ts @@ -25,7 +25,7 @@ import { CoreUrlUtils } from '@services/utils/url'; import { CoreUtils } from '@services/utils/utils'; import { CoreConstants } from '@/core/constants'; import { CoreError } from '@classes/errors/error'; -import { makeSingleton, Translate } from '@singletons/core.singletons'; +import { makeSingleton, Translate } from '@singletons'; /** * Provider to provide some helper functions regarding files and packages. diff --git a/src/core/services/file-session.ts b/src/core/services/file-session.ts index c9e9fc661..5ca4dda27 100644 --- a/src/core/services/file-session.ts +++ b/src/core/services/file-session.ts @@ -17,7 +17,7 @@ import { FileEntry } from '@ionic-native/file'; import { CoreSites } from '@services/sites'; import { CoreWSExternalFile } from '@services/ws'; -import { makeSingleton } from '@singletons/core.singletons'; +import { makeSingleton } from '@singletons'; /** * Helper to store some temporary data for file submission. diff --git a/src/core/services/file.ts b/src/core/services/file.ts index 2e9704fa0..30f015ae9 100644 --- a/src/core/services/file.ts +++ b/src/core/services/file.ts @@ -25,7 +25,7 @@ import { CoreConstants } from '@/core/constants'; import { CoreError } from '@classes/errors/error'; import { CoreLogger } from '@singletons/logger'; -import { makeSingleton, File, Zip, Platform, WebView } from '@singletons/core.singletons'; +import { makeSingleton, File, Zip, Platform, WebView } from '@singletons'; /** * Progress event used when writing a file data into a file. diff --git a/src/core/services/filepool.ts b/src/core/services/filepool.ts index 279d14239..28b441509 100644 --- a/src/core/services/filepool.ts +++ b/src/core/services/filepool.ts @@ -19,7 +19,7 @@ import { CoreApp } from '@services/app'; import { CoreEvents } from '@singletons/events'; import { CoreFile } from '@services/file'; import { CoreInit } from '@services/init'; -import { CorePluginFile } from '@services/plugin-file.delegate'; +import { CorePluginFile } from '@services/plugin-file-delegate'; import { CoreSites } from '@services/sites'; import { CoreWS, CoreWSExternalFile } from '@services/ws'; import { CoreDomUtils } from '@services/utils/dom'; @@ -31,7 +31,7 @@ import { CoreUtils, PromiseDefer } from '@services/utils/utils'; import { SQLiteDB } from '@classes/sqlitedb'; import { CoreError } from '@classes/errors/error'; import { CoreConstants } from '@/core/constants'; -import { makeSingleton, Network, NgZone, Translate } from '@singletons/core.singletons'; +import { makeSingleton, Network, NgZone, Translate } from '@singletons'; import { CoreLogger } from '@singletons/logger'; import { APP_SCHEMA, @@ -46,7 +46,7 @@ import { CoreFilepoolPackageEntry, CoreFilepoolQueueEntry, CoreFilepoolQueueDBEntry, -} from '@services/filepool-db'; +} from '@services/db/filepool'; /* * Factory for handling downloading files and retrieve downloaded files. diff --git a/src/core/services/geolocation.ts b/src/core/services/geolocation.ts index 05214b1f2..c64378c2c 100644 --- a/src/core/services/geolocation.ts +++ b/src/core/services/geolocation.ts @@ -17,7 +17,7 @@ import { Coordinates } from '@ionic-native/geolocation'; import { CoreApp } from '@services/app'; import { CoreError } from '@classes/errors/error'; -import { Geolocation, Diagnostic, makeSingleton } from '@singletons/core.singletons'; +import { Geolocation, Diagnostic, makeSingleton } from '@singletons'; @Injectable({ providedIn: 'root' }) export class CoreGeolocationProvider { diff --git a/src/core/services/groups.ts b/src/core/services/groups.ts index 1959cd999..f38c1efa2 100644 --- a/src/core/services/groups.ts +++ b/src/core/services/groups.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { CoreSites } from '@services/sites'; import { CoreSite, CoreSiteWSPreSets } from '@classes/site'; import { CoreError } from '@classes/errors/error'; -import { makeSingleton, Translate } from '@singletons/core.singletons'; +import { makeSingleton, Translate } from '@singletons'; import { CoreWSExternalWarning } from '@services/ws'; import { CoreCourseBase } from '@/types/global'; diff --git a/src/core/services/handlers/site-info-cron-handler.ts b/src/core/services/handlers/site-info-cron.ts similarity index 100% rename from src/core/services/handlers/site-info-cron-handler.ts rename to src/core/services/handlers/site-info-cron.ts diff --git a/src/core/services/init.ts b/src/core/services/init.ts index feb39b7a3..e391fc6f4 100644 --- a/src/core/services/init.ts +++ b/src/core/services/init.ts @@ -16,7 +16,7 @@ import { Injectable } from '@angular/core'; import { CoreUtils, PromiseDefer, OrderedPromiseData } from '@services/utils/utils'; import { CoreLogger } from '@singletons/logger'; -import { makeSingleton } from '@singletons/core.singletons'; +import { makeSingleton } from '@singletons'; /** * Interface that all init handlers must implement. diff --git a/src/core/services/lang.ts b/src/core/services/lang.ts index e4663d0a7..6ec69686f 100644 --- a/src/core/services/lang.ts +++ b/src/core/services/lang.ts @@ -18,7 +18,7 @@ import { CoreConstants } from '@/core/constants'; import { LangChangeEvent } from '@ngx-translate/core'; import { CoreAppProvider } from '@services/app'; import { CoreConfig } from '@services/config'; -import { makeSingleton, Translate, Platform } from '@singletons/core.singletons'; +import { makeSingleton, Translate, Platform } from '@singletons'; import * as moment from 'moment'; import { CoreSite } from '../classes/site'; diff --git a/src/core/services/local-notifications.ts b/src/core/services/local-notifications.ts index 353affdee..87de10d11 100644 --- a/src/core/services/local-notifications.ts +++ b/src/core/services/local-notifications.ts @@ -26,7 +26,7 @@ import { CoreSite } from '@classes/site'; import { CoreQueueRunner } from '@classes/queue-runner'; import { CoreError } from '@classes/errors/error'; import { CoreConstants } from '@/core/constants'; -import { makeSingleton, NgZone, Platform, Translate, LocalNotifications, Push } from '@singletons/core.singletons'; +import { makeSingleton, NgZone, Platform, Translate, LocalNotifications, Push } from '@singletons'; import { CoreLogger } from '@singletons/logger'; import { APP_SCHEMA, @@ -34,7 +34,7 @@ import { COMPONENTS_TABLE_NAME, SITES_TABLE_NAME, CodeRequestsQueueItem, -} from '@services/local-notifications.db'; +} from '@services/db/local-notifications'; /** * Service to handle local notifications. diff --git a/src/core/services/plugin-file.delegate.ts b/src/core/services/plugin-file-delegate.ts similarity index 99% rename from src/core/services/plugin-file.delegate.ts rename to src/core/services/plugin-file-delegate.ts index cfd57613b..f52904356 100644 --- a/src/core/services/plugin-file.delegate.ts +++ b/src/core/services/plugin-file-delegate.ts @@ -19,7 +19,7 @@ import { CoreFilepool, CoreFilepoolOnProgressCallback } from '@services/filepool import { CoreWSExternalFile } from '@services/ws'; import { CoreConstants } from '@/core/constants'; import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate'; -import { makeSingleton } from '@singletons/core.singletons'; +import { makeSingleton } from '@singletons'; /** * Delegate to register pluginfile information handlers. diff --git a/src/core/services/sites.ts b/src/core/services/sites.ts index 3d8d52de2..e635d681d 100644 --- a/src/core/services/sites.ts +++ b/src/core/services/sites.ts @@ -36,7 +36,7 @@ import { import { SQLiteDB, SQLiteDBTableSchema } from '@classes/sqlitedb'; import { CoreError } from '@classes/errors/error'; import { CoreSiteError } from '@classes/errors/siteerror'; -import { makeSingleton, Translate, Http } from '@singletons/core.singletons'; +import { makeSingleton, Translate, Http } from '@singletons'; import { CoreLogger } from '@singletons/logger'; import { APP_SCHEMA, @@ -47,7 +47,7 @@ import { SiteDBEntry, CurrentSiteDBEntry, SchemaVersionsDBEntry, -} from '@services/sites-db'; +} from '@services/db/sites'; import { CoreArray } from '../singletons/array'; export const CORE_SITE_SCHEMAS = new InjectionToken('CORE_SITE_SCHEMAS'); diff --git a/src/core/services/sync.ts b/src/core/services/sync.ts index 2b7f4a32e..b650e2998 100644 --- a/src/core/services/sync.ts +++ b/src/core/services/sync.ts @@ -15,8 +15,8 @@ import { Injectable } from '@angular/core'; import { CoreEvents } from '@singletons/events'; import { CoreSites } from '@services/sites'; -import { makeSingleton } from '@singletons/core.singletons'; -import { SYNC_TABLE_NAME, CoreSyncRecord } from '@services/sync-db'; +import { makeSingleton } from '@singletons'; +import { SYNC_TABLE_NAME, CoreSyncRecord } from '@services/db/sync'; /* * Service that provides some features regarding synchronization. diff --git a/src/core/services/update-manager.ts b/src/core/services/update-manager.ts index 78ee29cdd..453a79777 100644 --- a/src/core/services/update-manager.ts +++ b/src/core/services/update-manager.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { CoreConfig } from '@services/config'; import { CoreInitHandler, CoreInitDelegate } from '@services/init'; import { CoreConstants } from '@/core/constants'; -import { makeSingleton } from '@singletons/core.singletons'; +import { makeSingleton } from '@singletons'; import { CoreLogger } from '@singletons/logger'; const VERSION_APPLIED = 'version_applied'; diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts index 0e7473e1f..247e2e209 100644 --- a/src/core/services/utils/dom.ts +++ b/src/core/services/utils/dom.ts @@ -32,7 +32,7 @@ import { CoreCanceledError } from '@classes/errors/cancelederror'; import { CoreError } from '@classes/errors/error'; import { CoreSilentError } from '@classes/errors/silenterror'; -import { makeSingleton, Translate, AlertController, LoadingController, ToastController } from '@singletons/core.singletons'; +import { makeSingleton, Translate, AlertController, LoadingController, ToastController } from '@singletons'; import { CoreLogger } from '@singletons/logger'; /* diff --git a/src/core/services/utils/iframe.ts b/src/core/services/utils/iframe.ts index 3f0541a4e..09a5f5de1 100644 --- a/src/core/services/utils/iframe.ts +++ b/src/core/services/utils/iframe.ts @@ -26,7 +26,7 @@ import { CoreTextUtils } from '@services/utils/text'; import { CoreUrlUtils } from '@services/utils/url'; import { CoreUtils } from '@services/utils/utils'; -import { makeSingleton, Network, Platform, NgZone } from '@singletons/core.singletons'; +import { makeSingleton, Network, Platform, NgZone } from '@singletons'; import { CoreLogger } from '@singletons/logger'; import { CoreUrl } from '@singletons/url'; import { CoreWindow } from '@singletons/window'; diff --git a/src/core/services/utils/mimetype.ts b/src/core/services/utils/mimetype.ts index 4f400f8c5..b4257d084 100644 --- a/src/core/services/utils/mimetype.ts +++ b/src/core/services/utils/mimetype.ts @@ -17,7 +17,7 @@ import { FileEntry } from '@ionic-native/file'; import { CoreFile } from '@services/file'; import { CoreTextUtils } from '@services/utils/text'; -import { makeSingleton, Translate } from '@singletons/core.singletons'; +import { makeSingleton, Translate } from '@singletons'; import { CoreLogger } from '@singletons/logger'; import { CoreWSExternalFile } from '@services/ws'; import { CoreUtils } from '@services/utils/utils'; diff --git a/src/core/services/utils/text.ts b/src/core/services/utils/text.ts index a5a81301d..4530ff07a 100644 --- a/src/core/services/utils/text.ts +++ b/src/core/services/utils/text.ts @@ -18,7 +18,7 @@ import { DomSanitizer, SafeUrl } from '@angular/platform-browser'; import { CoreApp } from '@services/app'; import { CoreLang } from '@services/lang'; import { CoreError } from '@classes/errors/error'; -import { makeSingleton, Translate } from '@singletons/core.singletons'; +import { makeSingleton, Translate } from '@singletons'; import { CoreWSExternalFile } from '@services/ws'; import { Locutus } from '@singletons/locutus'; diff --git a/src/core/services/utils/time.ts b/src/core/services/utils/time.ts index 345e10008..ea9d9128c 100644 --- a/src/core/services/utils/time.ts +++ b/src/core/services/utils/time.ts @@ -16,7 +16,7 @@ import { Injectable } from '@angular/core'; import moment, { LongDateFormatKey } from 'moment'; import { CoreConstants } from '@/core/constants'; -import { makeSingleton, Translate } from '@singletons/core.singletons'; +import { makeSingleton, Translate } from '@singletons'; /* * "Utils" service with helper functions for date and time. diff --git a/src/core/services/utils/url.ts b/src/core/services/utils/url.ts index fb5489abe..ce8639ce1 100644 --- a/src/core/services/utils/url.ts +++ b/src/core/services/utils/url.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { CoreLang } from '@services/lang'; import { CoreTextUtils } from '@services/utils/text'; import { CoreConstants } from '@/core/constants'; -import { makeSingleton } from '@singletons/core.singletons'; +import { makeSingleton } from '@singletons'; import { CoreUrl } from '@singletons/url'; /* diff --git a/src/core/services/utils/utils.ts b/src/core/services/utils/utils.ts index be7c87793..6c376419d 100644 --- a/src/core/services/utils/utils.ts +++ b/src/core/services/utils/utils.ts @@ -28,7 +28,7 @@ import { CoreTextUtils } from '@services/utils/text'; import { CoreWSError } from '@classes/errors/wserror'; import { makeSingleton, Clipboard, InAppBrowser, Platform, FileOpener, WebIntent, QRScanner, Translate, -} from '@singletons/core.singletons'; +} from '@singletons'; import { CoreLogger } from '@singletons/logger'; type TreeNode = T & { children: TreeNode[] }; diff --git a/src/core/services/ws.ts b/src/core/services/ws.ts index 967b48947..366b5e6fe 100644 --- a/src/core/services/ws.ts +++ b/src/core/services/ws.ts @@ -30,7 +30,7 @@ import { CoreUtils, PromiseDefer } from '@services/utils/utils'; import { CoreConstants } from '@/core/constants'; import { CoreError } from '@classes/errors/error'; import { CoreInterceptor } from '@classes/interceptor'; -import { makeSingleton, Translate, FileTransfer, Http, Platform, NativeHttp } from '@singletons/core.singletons'; +import { makeSingleton, Translate, FileTransfer, Http, Platform, NativeHttp } from '@singletons'; import { CoreArray } from '@singletons/array'; import { CoreLogger } from '@singletons/logger'; import { CoreWSError } from '@classes/errors/wserror'; diff --git a/src/core/singletons/core.singletons.ts b/src/core/singletons/index.ts similarity index 100% rename from src/core/singletons/core.singletons.ts rename to src/core/singletons/index.ts diff --git a/src/types/global.d.ts b/src/types/global.d.ts index 21f818810..cbd429038 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -14,7 +14,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { CoreColorScheme } from '@features/settings/services/settings.helper'; +import { CoreColorScheme } from '@features/settings/services/settings-helper'; import { CoreSitesDemoSiteData } from '@services/sites'; declare global { diff --git a/tsconfig.app.json b/tsconfig.app.json index fac4237c0..1ec2414f0 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -10,7 +10,6 @@ "node" ], "paths": { - "@/*": ["*"], "@classes/*": ["core/classes/*"], "@components/*": ["core/components/*"], "@directives/*": ["core/directives/*"], @@ -18,7 +17,9 @@ "@guards/*": ["core/guards/*"], "@pipes/*": ["core/pipes/*"], "@services/*": ["core/services/*"], - "@singletons/*": ["core/singletons/*"] + "@singletons": ["core/singletons/index"], + "@singletons/*": ["core/singletons/*"], + "@/*": ["*"] } }, "files": [ diff --git a/tsconfig.json b/tsconfig.json index 549502f80..b5c383525 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -29,7 +29,6 @@ "node" ], "paths": { - "@/*": ["*"], "@classes/*": ["core/classes/*"], "@components/*": ["core/components/*"], "@directives/*": ["core/directives/*"], @@ -37,7 +36,9 @@ "@guards/*": ["core/guards/*"], "@pipes/*": ["core/pipes/*"], "@services/*": ["core/services/*"], - "@singletons/*": ["core/singletons/*"] + "@singletons": ["core/singletons/index"], + "@singletons/*": ["core/singletons/*"], + "@/*": ["*"] } }, "angularCompilerOptions": { diff --git a/tsconfig.test.json b/tsconfig.test.json index 7d7f29bfe..7c1e71c67 100644 --- a/tsconfig.test.json +++ b/tsconfig.test.json @@ -15,7 +15,6 @@ "node" ], "paths": { - "@/*": ["*"], "@classes/*": ["core/classes/*"], "@components/*": ["core/components/*"], "@directives/*": ["core/directives/*"], @@ -23,7 +22,9 @@ "@guards/*": ["core/guards/*"], "@pipes/*": ["core/pipes/*"], "@services/*": ["core/services/*"], - "@singletons/*": ["core/singletons/*"] + "@singletons": ["core/singletons/index"], + "@singletons/*": ["core/singletons/*"], + "@/*": ["*"] } }, "files": [