diff --git a/config/webpack.config.js b/config/webpack.config.js index 2118f9cb2..203780578 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -6,12 +6,13 @@ const customConfig = { resolve: { alias: { '@addon': resolve('./src/addon'), + '@app': resolve('./src/app'), '@classes': resolve('./src/classes'), '@core': resolve('./src/core'), '@providers': resolve('./src/providers'), '@components': resolve('./src/components'), - '@directives': resolve('./src/directives/directives.module'), - '@pipes': resolve('./src/pipes/pipes.module') + '@directives': resolve('./src/directives'), + '@pipes': resolve('./src/pipes') } } }; diff --git a/src/addon/calendar/pages/event/event.module.ts b/src/addon/calendar/pages/event/event.module.ts index d579114cc..fe5029958 100644 --- a/src/addon/calendar/pages/event/event.module.ts +++ b/src/addon/calendar/pages/event/event.module.ts @@ -16,8 +16,8 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; -import { CorePipesModule } from '@pipes'; +import { CoreDirectivesModule } from '@directives/directives.module'; +import { CorePipesModule } from '@pipes/pipes.module'; import { AddonCalendarEventPage } from './event'; @NgModule({ diff --git a/src/addon/calendar/pages/list/list.module.ts b/src/addon/calendar/pages/list/list.module.ts index b685b6578..bfe0f7ecd 100644 --- a/src/addon/calendar/pages/list/list.module.ts +++ b/src/addon/calendar/pages/list/list.module.ts @@ -16,8 +16,8 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; -import { CorePipesModule } from '@pipes'; +import { CoreDirectivesModule } from '@directives/directives.module'; +import { CorePipesModule } from '@pipes/pipes.module'; import { AddonCalendarListPage } from './list'; @NgModule({ diff --git a/src/addon/calendar/pages/settings/settings.module.ts b/src/addon/calendar/pages/settings/settings.module.ts index 93f443bd0..8b9fbaa23 100644 --- a/src/addon/calendar/pages/settings/settings.module.ts +++ b/src/addon/calendar/pages/settings/settings.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { AddonCalendarSettingsPage } from './settings'; -import { CorePipesModule } from '@pipes'; +import { CorePipesModule } from '@pipes/pipes.module'; @NgModule({ declarations: [ diff --git a/src/addon/files/pages/list/list.module.ts b/src/addon/files/pages/list/list.module.ts index f819f5512..94fd35db4 100644 --- a/src/addon/files/pages/list/list.module.ts +++ b/src/addon/files/pages/list/list.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; import { AddonFilesListPage } from './list'; @NgModule({ diff --git a/src/addon/messages/components/components.module.ts b/src/addon/messages/components/components.module.ts index 270ed0e3a..929d642f4 100644 --- a/src/addon/messages/components/components.module.ts +++ b/src/addon/messages/components/components.module.ts @@ -17,8 +17,8 @@ import { CommonModule } from '@angular/common'; import { IonicModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; -import { CorePipesModule } from '@pipes'; +import { CoreDirectivesModule } from '@directives/directives.module'; +import { CorePipesModule } from '@pipes/pipes.module'; import { AddonMessagesDiscussionsComponent } from '../components/discussions/discussions'; import { AddonMessagesContactsComponent } from '../components/contacts/contacts'; diff --git a/src/addon/messages/pages/discussion/discussion.module.ts b/src/addon/messages/pages/discussion/discussion.module.ts index e0f82d74a..edf7ef9cb 100644 --- a/src/addon/messages/pages/discussion/discussion.module.ts +++ b/src/addon/messages/pages/discussion/discussion.module.ts @@ -17,8 +17,8 @@ import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { AddonMessagesDiscussionPage } from './discussion'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; -import { CorePipesModule } from '@pipes'; +import { CoreDirectivesModule } from '@directives/directives.module'; +import { CorePipesModule } from '@pipes/pipes.module'; @NgModule({ declarations: [ diff --git a/src/addon/messages/pages/settings/settings.module.ts b/src/addon/messages/pages/settings/settings.module.ts index a20e5f382..6e9071710 100644 --- a/src/addon/messages/pages/settings/settings.module.ts +++ b/src/addon/messages/pages/settings/settings.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { AddonMessagesSettingsPage } from './settings'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; import { AddonMessagesComponentsModule } from '../../components/components.module'; @NgModule({ diff --git a/src/addon/mod/book/components/components.module.ts b/src/addon/mod/book/components/components.module.ts index cf175a12f..b3db11442 100644 --- a/src/addon/mod/book/components/components.module.ts +++ b/src/addon/mod/book/components/components.module.ts @@ -17,7 +17,7 @@ import { CommonModule } from '@angular/common'; import { IonicModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; import { CoreCourseComponentsModule } from '@core/course/components/components.module'; import { AddonModBookIndexComponent } from './index/index'; import { AddonModBookTocPopoverComponent } from './toc-popover/toc-popover'; diff --git a/src/addon/mod/book/pages/index/index.module.ts b/src/addon/mod/book/pages/index/index.module.ts index bce50baa7..14d2d6a29 100644 --- a/src/addon/mod/book/pages/index/index.module.ts +++ b/src/addon/mod/book/pages/index/index.module.ts @@ -15,7 +15,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; import { AddonModBookComponentsModule } from '../../components/components.module'; import { AddonModBookIndexPage } from './index'; diff --git a/src/addon/pushnotifications/providers/pushnotifications.ts b/src/addon/pushnotifications/providers/pushnotifications.ts index 75bbee3d4..9482de788 100644 --- a/src/addon/pushnotifications/providers/pushnotifications.ts +++ b/src/addon/pushnotifications/providers/pushnotifications.ts @@ -25,7 +25,7 @@ import { CoreLocalNotificationsProvider } from '@providers/local-notifications'; import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreTextUtilsProvider } from '@providers/utils/text'; import { CoreConfigProvider } from '@providers/config'; -import { CoreConfigConstants } from '.././../../configconstants'; +import { CoreConfigConstants } from '../../../configconstants'; /** * Service to handle push notifications. diff --git a/src/addon/userprofilefield/checkbox/providers/handler.ts b/src/addon/userprofilefield/checkbox/providers/handler.ts index b160a08bd..4383da420 100644 --- a/src/addon/userprofilefield/checkbox/providers/handler.ts +++ b/src/addon/userprofilefield/checkbox/providers/handler.ts @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Injectable, Injector } from '@angular/core'; -import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from - '../../../../core/user/providers/user-profile-field-delegate'; +import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from '@core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldCheckboxComponent } from '../component/checkbox'; /** diff --git a/src/addon/userprofilefield/datetime/datetime.module.ts b/src/addon/userprofilefield/datetime/datetime.module.ts index 9814fc7e5..dd2b3f85d 100644 --- a/src/addon/userprofilefield/datetime/datetime.module.ts +++ b/src/addon/userprofilefield/datetime/datetime.module.ts @@ -19,7 +19,7 @@ import { AddonUserProfileFieldDatetimeHandler } from './providers/handler'; import { CoreUserProfileFieldDelegate } from '@core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldDatetimeComponent } from './component/datetime'; import { CoreComponentsModule } from '@components/components.module'; -import { CorePipesModule } from '@pipes'; +import { CorePipesModule } from '@pipes/pipes.module'; @NgModule({ declarations: [ diff --git a/src/addon/userprofilefield/datetime/providers/handler.ts b/src/addon/userprofilefield/datetime/providers/handler.ts index 819d75f4c..2f2ae2513 100644 --- a/src/addon/userprofilefield/datetime/providers/handler.ts +++ b/src/addon/userprofilefield/datetime/providers/handler.ts @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Injectable, Injector } from '@angular/core'; -import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from - '../../../../core/user/providers/user-profile-field-delegate'; +import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from '@core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldDatetimeComponent } from '../component/datetime'; /** diff --git a/src/addon/userprofilefield/menu/menu.module.ts b/src/addon/userprofilefield/menu/menu.module.ts index 0329b2c78..df81f32b5 100644 --- a/src/addon/userprofilefield/menu/menu.module.ts +++ b/src/addon/userprofilefield/menu/menu.module.ts @@ -19,7 +19,7 @@ import { AddonUserProfileFieldMenuHandler } from './providers/handler'; import { CoreUserProfileFieldDelegate } from '@core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldMenuComponent } from './component/menu'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/addon/userprofilefield/menu/providers/handler.ts b/src/addon/userprofilefield/menu/providers/handler.ts index c02edb812..89d536561 100644 --- a/src/addon/userprofilefield/menu/providers/handler.ts +++ b/src/addon/userprofilefield/menu/providers/handler.ts @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Injectable, Injector } from '@angular/core'; -import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from - '../../../../core/user/providers/user-profile-field-delegate'; +import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from '@core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldMenuComponent } from '../component/menu'; /** diff --git a/src/addon/userprofilefield/text/providers/handler.ts b/src/addon/userprofilefield/text/providers/handler.ts index 7f9c3df5e..5c4ce7d9f 100644 --- a/src/addon/userprofilefield/text/providers/handler.ts +++ b/src/addon/userprofilefield/text/providers/handler.ts @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Injectable, Injector } from '@angular/core'; -import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from - '../../../../core/user/providers/user-profile-field-delegate'; +import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from '@core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldTextComponent } from '../component/text'; import { CoreTextUtilsProvider } from '@providers/utils/text'; diff --git a/src/addon/userprofilefield/text/text.module.ts b/src/addon/userprofilefield/text/text.module.ts index a0cf647a6..8bc58388f 100644 --- a/src/addon/userprofilefield/text/text.module.ts +++ b/src/addon/userprofilefield/text/text.module.ts @@ -19,7 +19,7 @@ import { AddonUserProfileFieldTextHandler } from './providers/handler'; import { CoreUserProfileFieldDelegate } from '@core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldTextComponent } from './component/text'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/addon/userprofilefield/textarea/providers/handler.ts b/src/addon/userprofilefield/textarea/providers/handler.ts index c945e07aa..b2bffda4e 100644 --- a/src/addon/userprofilefield/textarea/providers/handler.ts +++ b/src/addon/userprofilefield/textarea/providers/handler.ts @@ -13,8 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Injectable, Injector } from '@angular/core'; -import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from - '../../../../core/user/providers/user-profile-field-delegate'; +import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from '@core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldTextareaComponent } from '../component/textarea'; import { CoreTextUtilsProvider } from '@providers/utils/text'; diff --git a/src/addon/userprofilefield/textarea/textarea.module.ts b/src/addon/userprofilefield/textarea/textarea.module.ts index 1c2ce58ef..1a307b685 100644 --- a/src/addon/userprofilefield/textarea/textarea.module.ts +++ b/src/addon/userprofilefield/textarea/textarea.module.ts @@ -19,7 +19,7 @@ import { AddonUserProfileFieldTextareaHandler } from './providers/handler'; import { CoreUserProfileFieldDelegate } from '@core/user/providers/user-profile-field-delegate'; import { AddonUserProfileFieldTextareaComponent } from './component/textarea'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/components/components.module.ts b/src/components/components.module.ts index 0c4a8b7de..ff4ae9592 100644 --- a/src/components/components.module.ts +++ b/src/components/components.module.ts @@ -15,8 +15,8 @@ import { NgModule } from '@angular/core'; import { IonicModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreDirectivesModule } from '@directives'; -import { CorePipesModule } from '@pipes'; +import { CoreDirectivesModule } from '@directives/directives.module'; +import { CorePipesModule } from '@pipes/pipes.module'; import { CoreLoadingComponent } from './loading/loading'; import { CoreMarkRequiredComponent } from './mark-required/mark-required'; import { CoreInputErrorsComponent } from './input-errors/input-errors'; diff --git a/src/core/compile/components/compile-html/compile-html.ts b/src/core/compile/components/compile-html/compile-html.ts index 3583a76df..fcbd23171 100644 --- a/src/core/compile/components/compile-html/compile-html.ts +++ b/src/core/compile/components/compile-html/compile-html.ts @@ -17,7 +17,7 @@ import { ElementRef, Optional } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { CoreCompileProvider } from '../../../compile/providers/compile'; +import { CoreCompileProvider } from '../../providers/compile'; import { BehaviorSubject } from 'rxjs'; /** diff --git a/src/core/compile/providers/compile.ts b/src/core/compile/providers/compile.ts index 33b43e5b1..d864d999f 100644 --- a/src/core/compile/providers/compile.ts +++ b/src/core/compile/providers/compile.ts @@ -18,24 +18,24 @@ import { IonicModule } from 'ionic-angular'; import { TranslateService, TranslateModule } from '@ngx-translate/core'; -import { CoreLoggerProvider } from '../../../providers/logger'; +import { CoreLoggerProvider } from '@providers/logger'; // Import core providers. -import { CORE_PROVIDERS } from '../../../app/app.module'; -import { CORE_CONTENTLINKS_PROVIDERS } from '../../contentlinks/contentlinks.module'; -import { CORE_COURSE_PROVIDERS } from '../../course/course.module'; -import { CORE_COURSES_PROVIDERS } from '../../courses/courses.module'; -import { CORE_FILEUPLOADER_PROVIDERS } from '../../fileuploader/fileuploader.module'; -import { CORE_GRADES_PROVIDERS } from '../../grades/grades.module'; -import { CORE_LOGIN_PROVIDERS } from '../../login/login.module'; -import { CORE_MAINMENU_PROVIDERS } from '../../mainmenu/mainmenu.module'; -import { CORE_SHAREDFILES_PROVIDERS } from '../../sharedfiles/sharedfiles.module'; -import { CORE_SITEHOME_PROVIDERS } from '../../sitehome/sitehome.module'; -import { CORE_USER_PROVIDERS } from '../../user/user.module'; -import { IONIC_NATIVE_PROVIDERS } from '../../emulator/emulator.module'; +import { CORE_PROVIDERS } from '@app/app.module'; +import { CORE_CONTENTLINKS_PROVIDERS } from '@core/contentlinks/contentlinks.module'; +import { CORE_COURSE_PROVIDERS } from '@core/course/course.module'; +import { CORE_COURSES_PROVIDERS } from '@core/courses/courses.module'; +import { CORE_FILEUPLOADER_PROVIDERS } from '@core/fileuploader/fileuploader.module'; +import { CORE_GRADES_PROVIDERS } from '@core/grades/grades.module'; +import { CORE_LOGIN_PROVIDERS } from '@core/login/login.module'; +import { CORE_MAINMENU_PROVIDERS } from '@core/mainmenu/mainmenu.module'; +import { CORE_SHAREDFILES_PROVIDERS } from '@core/sharedfiles/sharedfiles.module'; +import { CORE_SITEHOME_PROVIDERS } from '@core/sitehome/sitehome.module'; +import { CORE_USER_PROVIDERS } from '@core/user/user.module'; +import { IONIC_NATIVE_PROVIDERS } from '@core/emulator/emulator.module'; // Import only this provider to prevent circular dependencies. -import { CoreSitePluginsProvider } from '../../siteplugins/providers/siteplugins'; +import { CoreSitePluginsProvider } from '@core/siteplugins/providers/siteplugins'; // Import other libraries and providers. import { DomSanitizer } from '@angular/platform-browser'; @@ -43,36 +43,36 @@ import { FormBuilder, Validators } from '@angular/forms'; import { Http } from '@angular/http'; import { HttpClient } from '@angular/common/http'; import { CoreConfigConstants } from '../../../configconstants'; -import { CoreConstants } from '../../constants'; +import { CoreConstants } from '@core/constants'; import * as moment from 'moment'; import { Md5 } from 'ts-md5/dist/md5'; // Import core classes that can be useful for site plugins. -import { CoreSyncBaseProvider } from '../../../classes/base-sync'; -import { CoreCache } from '../../../classes/cache'; -import { CoreDelegate } from '../../../classes/delegate'; -import { CoreContentLinksHandlerBase } from '../../contentlinks/classes/base-handler'; -import { CoreContentLinksModuleGradeHandler } from '../../contentlinks/classes/module-grade-handler'; -import { CoreContentLinksModuleIndexHandler } from '../../contentlinks/classes/module-index-handler'; -import { CoreCourseModulePrefetchHandlerBase } from '../../course/classes/module-prefetch-handler'; +import { CoreSyncBaseProvider } from '@classes/base-sync'; +import { CoreCache } from '@classes/cache'; +import { CoreDelegate } from '@classes/delegate'; +import { CoreContentLinksHandlerBase } from '@core/contentlinks/classes/base-handler'; +import { CoreContentLinksModuleGradeHandler } from '@core/contentlinks/classes/module-grade-handler'; +import { CoreContentLinksModuleIndexHandler } from '@core/contentlinks/classes/module-index-handler'; +import { CoreCourseModulePrefetchHandlerBase } from '@core/course/classes/module-prefetch-handler'; // Import all modules that define components, directives and pipes. -import { CoreComponentsModule } from '../../../components/components.module'; -import { CoreDirectivesModule } from '../../../directives/directives.module'; -import { CorePipesModule } from '../../../pipes/pipes.module'; -import { CoreCourseComponentsModule } from '../../course/components/components.module'; -import { CoreCourseDirectivesModule } from '../../course/directives/directives.module'; -import { CoreCoursesComponentsModule } from '../../courses/components/components.module'; -import { CoreSitePluginsDirectivesModule } from '../../siteplugins/directives/directives.module'; -import { CoreSiteHomeComponentsModule } from '../../sitehome/components/components.module'; -import { CoreUserComponentsModule } from '../../user/components/components.module'; +import { CoreComponentsModule } from '@components/components.module'; +import { CoreDirectivesModule } from '@directives/directives.module'; +import { CorePipesModule } from '@pipes/pipes.module'; +import { CoreCourseComponentsModule } from '@core/course/components/components.module'; +import { CoreCourseDirectivesModule } from '@core/course/directives/directives.module'; +import { CoreCoursesComponentsModule } from '@core/courses/components/components.module'; +import { CoreSitePluginsDirectivesModule } from '@core/siteplugins/directives/directives.module'; +import { CoreSiteHomeComponentsModule } from '@core/sitehome/components/components.module'; +import { CoreUserComponentsModule } from '@core/user/components/components.module'; // Import some components listed in entryComponents so they can be injected dynamically. -import { CoreCourseUnsupportedModuleComponent } from '../../course/components/unsupported-module/unsupported-module'; -import { CoreCourseFormatSingleActivityComponent } from '../../course/formats/singleactivity/components/singleactivity'; -import { CoreSitePluginsModuleIndexComponent } from '../../siteplugins/components/module-index/module-index'; -import { CoreSitePluginsCourseOptionComponent } from '../../siteplugins/components/course-option/course-option'; -import { CoreSitePluginsCourseFormatComponent } from '../../siteplugins/components/course-format/course-format'; +import { CoreCourseUnsupportedModuleComponent } from '@core/course/components/unsupported-module/unsupported-module'; +import { CoreCourseFormatSingleActivityComponent } from '@core/course/formats/singleactivity/components/singleactivity'; +import { CoreSitePluginsModuleIndexComponent } from '@core/siteplugins/components/module-index/module-index'; +import { CoreSitePluginsCourseOptionComponent } from '@core/siteplugins/components/course-option/course-option'; +import { CoreSitePluginsCourseFormatComponent } from '@core/siteplugins/components/course-format/course-format'; /** * Service to provide functionalities regarding compiling dynamic HTML and Javascript. diff --git a/src/core/contentlinks/classes/module-grade-handler.ts b/src/core/contentlinks/classes/module-grade-handler.ts index 36296e5b6..68c26f9b6 100644 --- a/src/core/contentlinks/classes/module-grade-handler.ts +++ b/src/core/contentlinks/classes/module-grade-handler.ts @@ -17,7 +17,7 @@ import { CoreContentLinksAction } from '../providers/delegate'; import { CoreContentLinksHandlerBase } from './base-handler'; import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; -import { CoreCourseHelperProvider } from '../../course/providers/helper'; +import { CoreCourseHelperProvider } from '@core/course/providers/helper'; /** * Handler to handle URLs pointing to the grade of a module. diff --git a/src/core/contentlinks/classes/module-index-handler.ts b/src/core/contentlinks/classes/module-index-handler.ts index 32fb2007a..28413ed26 100644 --- a/src/core/contentlinks/classes/module-index-handler.ts +++ b/src/core/contentlinks/classes/module-index-handler.ts @@ -14,7 +14,7 @@ import { CoreContentLinksAction } from '../providers/delegate'; import { CoreContentLinksHandlerBase } from './base-handler'; -import { CoreCourseHelperProvider } from '../../course/providers/helper'; +import { CoreCourseHelperProvider } from '@core/course/providers/helper'; /** * Handler to handle URLs pointing to the index of a module. diff --git a/src/core/contentlinks/pages/choose-site/choose-site.module.ts b/src/core/contentlinks/pages/choose-site/choose-site.module.ts index 10e7ffe90..881bde925 100644 --- a/src/core/contentlinks/pages/choose-site/choose-site.module.ts +++ b/src/core/contentlinks/pages/choose-site/choose-site.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { CoreContentLinksChooseSitePage } from './choose-site'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/contentlinks/providers/helper.ts b/src/core/contentlinks/providers/helper.ts index 1ee1ea864..2eb8be01f 100644 --- a/src/core/contentlinks/providers/helper.ts +++ b/src/core/contentlinks/providers/helper.ts @@ -23,11 +23,11 @@ import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreTextUtilsProvider } from '@providers/utils/text'; import { CoreUrlUtilsProvider } from '@providers/utils/url'; -import { CoreLoginHelperProvider } from '../../login/providers/helper'; +import { CoreLoginHelperProvider } from '@core/login/providers/helper'; import { CoreContentLinksDelegate, CoreContentLinksAction } from './delegate'; -import { CoreConstants } from '../../constants'; +import { CoreConstants } from '@core/constants'; import { CoreConfigConstants } from '../../../configconstants'; -import { CoreSitePluginsProvider } from '../../siteplugins/providers/siteplugins'; +import { CoreSitePluginsProvider } from '@core/siteplugins/providers/siteplugins'; /** * Service that provides some features regarding content links. diff --git a/src/core/course/components/components.module.ts b/src/core/course/components/components.module.ts index 021427bf3..a56f920d8 100644 --- a/src/core/course/components/components.module.ts +++ b/src/core/course/components/components.module.ts @@ -17,7 +17,7 @@ import { CommonModule } from '@angular/common'; import { IonicModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; import { CoreCourseFormatComponent } from './format/format'; import { CoreCourseModuleComponent } from './module/module'; import { CoreCourseModuleCompletionComponent } from './module-completion/module-completion'; diff --git a/src/core/course/components/format/format.ts b/src/core/course/components/format/format.ts index 51cd9555c..504f5d0a3 100644 --- a/src/core/course/components/format/format.ts +++ b/src/core/course/components/format/format.ts @@ -20,10 +20,10 @@ import { TranslateService } from '@ngx-translate/core'; import { CoreEventsProvider } from '@providers/events'; import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; -import { CoreCourseProvider } from '../../../course/providers/course'; -import { CoreCourseHelperProvider } from '../../../course/providers/helper'; -import { CoreCourseFormatDelegate } from '../../../course/providers/format-delegate'; -import { CoreCourseModulePrefetchDelegate } from '../../../course/providers/module-prefetch-delegate'; +import { CoreCourseProvider } from '@core/course/providers/course'; +import { CoreCourseHelperProvider } from '@core/course/providers/helper'; +import { CoreCourseFormatDelegate } from '@core/course/providers/format-delegate'; +import { CoreCourseModulePrefetchDelegate } from '@core/course/providers/module-prefetch-delegate'; import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-component'; /** diff --git a/src/core/course/components/module-completion/module-completion.ts b/src/core/course/components/module-completion/module-completion.ts index 6290ae798..1389ff1b7 100644 --- a/src/core/course/components/module-completion/module-completion.ts +++ b/src/core/course/components/module-completion/module-completion.ts @@ -17,7 +17,7 @@ import { TranslateService } from '@ngx-translate/core'; import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreTextUtilsProvider } from '@providers/utils/text'; -import { CoreUserProvider } from '../../../user/providers/user'; +import { CoreUserProvider } from '@core/user/providers/user'; /** * Component to handle activity completion. It shows a checkbox with the current status, and allows manually changing diff --git a/src/core/course/directives/download-module-main-file.ts b/src/core/course/directives/download-module-main-file.ts index 569a215fb..80fe1fb99 100644 --- a/src/core/course/directives/download-module-main-file.ts +++ b/src/core/course/directives/download-module-main-file.ts @@ -15,7 +15,7 @@ import { Directive, Input, OnInit, ElementRef } from '@angular/core'; import { CoreCourseProvider } from '../providers/course'; import { CoreCourseHelperProvider } from '../providers/helper'; -import { CoreDomUtilsProvider } from '../../../providers/utils/dom'; +import { CoreDomUtilsProvider } from '@providers/utils/dom'; /** * Directive to allow downloading and open the main file of a module. diff --git a/src/core/course/pages/section/section.module.ts b/src/core/course/pages/section/section.module.ts index bfa4d3eb3..db558c4c3 100644 --- a/src/core/course/pages/section/section.module.ts +++ b/src/core/course/pages/section/section.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreCourseSectionPage } from './section'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; import { CoreCourseComponentsModule } from '../../components/components.module'; @NgModule({ diff --git a/src/core/course/pages/section/section.ts b/src/core/course/pages/section/section.ts index ac47adf2b..b5d5806ca 100644 --- a/src/core/course/pages/section/section.ts +++ b/src/core/course/pages/section/section.ts @@ -25,7 +25,7 @@ import { CoreCourseFormatDelegate } from '../../providers/format-delegate'; import { CoreCourseModulePrefetchDelegate } from '../../providers/module-prefetch-delegate'; import { CoreCourseOptionsDelegate, CoreCourseOptionsHandlerToDisplay } from '../../providers/options-delegate'; import { CoreCourseFormatComponent } from '../../components/format/format'; -import { CoreCoursesProvider } from '../../../courses/providers/courses'; +import { CoreCoursesProvider } from '@core/courses/providers/courses'; /** * Page that displays the list of courses the user is enrolled in. diff --git a/src/core/course/pages/unsupported-module/unsupported-module.module.ts b/src/core/course/pages/unsupported-module/unsupported-module.module.ts index 5d2ca24a9..d3772a0da 100644 --- a/src/core/course/pages/unsupported-module/unsupported-module.module.ts +++ b/src/core/course/pages/unsupported-module/unsupported-module.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreCourseUnsupportedModulePage } from './unsupported-module'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; import { CoreCourseComponentsModule } from '../../components/components.module'; @NgModule({ diff --git a/src/core/course/providers/default-format.ts b/src/core/course/providers/default-format.ts index 2bf1991d1..2e9a58a17 100644 --- a/src/core/course/providers/default-format.ts +++ b/src/core/course/providers/default-format.ts @@ -14,7 +14,7 @@ import { Injectable } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { CoreCoursesProvider } from '../../courses/providers/courses'; +import { CoreCoursesProvider } from '@core/courses/providers/courses'; import { CoreCourseFormatHandler } from './format-delegate'; import { CoreCourseProvider } from './course'; diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts index c883ed13b..236b227dd 100644 --- a/src/core/course/providers/helper.ts +++ b/src/core/course/providers/helper.ts @@ -26,12 +26,12 @@ import { CoreTextUtilsProvider } from '@providers/utils/text'; import { CoreTimeUtilsProvider } from '@providers/utils/time'; import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreCourseOptionsDelegate, CoreCourseOptionsHandlerToDisplay } from './options-delegate'; -import { CoreSiteHomeProvider } from '../../sitehome/providers/sitehome'; +import { CoreSiteHomeProvider } from '@core/sitehome/providers/sitehome'; import { CoreCourseProvider } from './course'; import { CoreCourseModuleDelegate } from './module-delegate'; import { CoreCourseModulePrefetchDelegate } from './module-prefetch-delegate'; -import { CoreLoginHelperProvider } from '../../login/providers/helper'; -import { CoreConstants } from '../../constants'; +import { CoreLoginHelperProvider } from '@core/login/providers/helper'; +import { CoreConstants } from '@core/constants'; import { CoreSite } from '@classes/site'; import * as moment from 'moment'; diff --git a/src/core/course/providers/options-delegate.ts b/src/core/course/providers/options-delegate.ts index 93fe43a1e..569476d70 100644 --- a/src/core/course/providers/options-delegate.ts +++ b/src/core/course/providers/options-delegate.ts @@ -18,7 +18,7 @@ import { CoreEventsProvider } from '@providers/events'; import { CoreLoggerProvider } from '@providers/logger'; import { CoreSitesProvider } from '@providers/sites'; import { CoreUtilsProvider, PromiseDefer } from '@providers/utils/utils'; -import { CoreCoursesProvider } from '../../courses/providers/courses'; +import { CoreCoursesProvider } from '@core/courses/providers/courses'; import { CoreCourseProvider } from './course'; /** diff --git a/src/core/courses/components/components.module.ts b/src/core/courses/components/components.module.ts index d8dbe5a35..d873b3d82 100644 --- a/src/core/courses/components/components.module.ts +++ b/src/core/courses/components/components.module.ts @@ -17,8 +17,8 @@ import { CommonModule } from '@angular/common'; import { IonicModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; -import { CorePipesModule } from '@pipes'; +import { CoreDirectivesModule } from '@directives/directives.module'; +import { CorePipesModule } from '@pipes/pipes.module'; import { CoreCoursesCourseProgressComponent } from '../components/course-progress/course-progress'; import { CoreCoursesCourseListItemComponent } from '../components/course-list-item/course-list-item'; import { CoreCoursesOverviewEventsComponent } from '../components/overview-events/overview-events'; diff --git a/src/core/courses/components/course-progress/course-progress.ts b/src/core/courses/components/course-progress/course-progress.ts index 77c81a975..c0690dba1 100644 --- a/src/core/courses/components/course-progress/course-progress.ts +++ b/src/core/courses/components/course-progress/course-progress.ts @@ -17,9 +17,9 @@ import { NavController } from 'ionic-angular'; import { CoreEventsProvider } from '@providers/events'; import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; -import { CoreCourseFormatDelegate } from '../../../course/providers/format-delegate'; -import { CoreCourseProvider } from '../../../course/providers/course'; -import { CoreCourseHelperProvider } from '../../../course/providers/helper'; +import { CoreCourseFormatDelegate } from '@core/course/providers/format-delegate'; +import { CoreCourseProvider } from '@core/course/providers/course'; +import { CoreCourseHelperProvider } from '@core/course/providers/helper'; /** * This component is meant to display a course for a list of courses with progress. diff --git a/src/core/courses/components/overview-events/overview-events.ts b/src/core/courses/components/overview-events/overview-events.ts index 50b866569..cf59b3f49 100644 --- a/src/core/courses/components/overview-events/overview-events.ts +++ b/src/core/courses/components/overview-events/overview-events.ts @@ -18,8 +18,8 @@ import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreTextUtilsProvider } from '@providers/utils/text'; import { CoreUtilsProvider } from '@providers/utils/utils'; -import { CoreCourseProvider } from '../../../course/providers/course'; -import { CoreContentLinksHelperProvider } from '../../../contentlinks/providers/helper'; +import { CoreCourseProvider } from '@core/course/providers/course'; +import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper'; import * as moment from 'moment'; /** diff --git a/src/core/courses/courses.module.ts b/src/core/courses/courses.module.ts index d38dad816..0156449fb 100644 --- a/src/core/courses/courses.module.ts +++ b/src/core/courses/courses.module.ts @@ -19,8 +19,8 @@ import { CoreCoursesMyOverviewProvider } from './providers/my-overview'; import { CoreCoursesCourseLinkHandler } from './providers/course-link-handler'; import { CoreCoursesIndexLinkHandler } from './providers/courses-index-link-handler'; import { CoreCoursesMyOverviewLinkHandler } from './providers/my-overview-link-handler'; -import { CoreMainMenuDelegate } from '../mainmenu/providers/delegate'; -import { CoreContentLinksDelegate } from '../contentlinks/providers/delegate'; +import { CoreMainMenuDelegate } from '@core/mainmenu/providers/delegate'; +import { CoreContentLinksDelegate } from '@core/contentlinks/providers/delegate'; // List of providers (without handlers). export const CORE_COURSES_PROVIDERS: any[] = [ diff --git a/src/core/courses/pages/categories/categories.module.ts b/src/core/courses/pages/categories/categories.module.ts index 2e27333b6..c60b37cc3 100644 --- a/src/core/courses/pages/categories/categories.module.ts +++ b/src/core/courses/pages/categories/categories.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreCoursesCategoriesPage } from './categories'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; import { CoreCoursesComponentsModule } from '../../components/components.module'; @NgModule({ diff --git a/src/core/courses/pages/course-preview/course-preview.module.ts b/src/core/courses/pages/course-preview/course-preview.module.ts index 9b65092c2..2a34ddf92 100644 --- a/src/core/courses/pages/course-preview/course-preview.module.ts +++ b/src/core/courses/pages/course-preview/course-preview.module.ts @@ -17,8 +17,8 @@ import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreCoursesCoursePreviewPage } from './course-preview'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; -import { CorePipesModule } from '@pipes'; +import { CoreDirectivesModule } from '@directives/directives.module'; +import { CorePipesModule } from '@pipes/pipes.module'; @NgModule({ declarations: [ diff --git a/src/core/courses/pages/course-preview/course-preview.ts b/src/core/courses/pages/course-preview/course-preview.ts index a7877ece2..288baabcf 100644 --- a/src/core/courses/pages/course-preview/course-preview.ts +++ b/src/core/courses/pages/course-preview/course-preview.ts @@ -21,9 +21,9 @@ import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreTextUtilsProvider } from '@providers/utils/text'; import { CoreCoursesProvider } from '../../providers/courses'; -import { CoreCourseOptionsDelegate } from '../../../course/providers/options-delegate'; -import { CoreCourseProvider } from '../../../course/providers/course'; -import { CoreCourseHelperProvider } from '../../../course/providers/helper'; +import { CoreCourseOptionsDelegate } from '@core/course/providers/options-delegate'; +import { CoreCourseProvider } from '@core/course/providers/course'; +import { CoreCourseHelperProvider } from '@core/course/providers/helper'; /** * Page that allows "previewing" a course and enrolling in it if enabled and not enrolled. diff --git a/src/core/courses/pages/my-courses/my-courses.ts b/src/core/courses/pages/my-courses/my-courses.ts index 9ad191833..1508052d4 100644 --- a/src/core/courses/pages/my-courses/my-courses.ts +++ b/src/core/courses/pages/my-courses/my-courses.ts @@ -18,8 +18,8 @@ import { CoreEventsProvider } from '@providers/events'; import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreCoursesProvider } from '../../providers/courses'; -import { CoreCourseHelperProvider } from '../../../course/providers/helper'; -import { CoreCourseOptionsDelegate } from '../../../course/providers/options-delegate'; +import { CoreCourseHelperProvider } from '@core/course/providers/helper'; +import { CoreCourseOptionsDelegate } from '@core/course/providers/options-delegate'; /** * Page that displays the list of courses the user is enrolled in. diff --git a/src/core/courses/pages/my-overview/my-overview.module.ts b/src/core/courses/pages/my-overview/my-overview.module.ts index 8825f5ab0..9c1611b8e 100644 --- a/src/core/courses/pages/my-overview/my-overview.module.ts +++ b/src/core/courses/pages/my-overview/my-overview.module.ts @@ -18,7 +18,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreCoursesMyOverviewPage } from './my-overview'; import { CoreComponentsModule } from '@components/components.module'; import { CoreCoursesComponentsModule } from '../../components/components.module'; -import { CoreSiteHomeComponentsModule } from '../../../sitehome/components/components.module'; +import { CoreSiteHomeComponentsModule } from '@core/sitehome/components/components.module'; @NgModule({ declarations: [ diff --git a/src/core/courses/pages/my-overview/my-overview.ts b/src/core/courses/pages/my-overview/my-overview.ts index a90972fb1..552208dfa 100644 --- a/src/core/courses/pages/my-overview/my-overview.ts +++ b/src/core/courses/pages/my-overview/my-overview.ts @@ -18,9 +18,9 @@ import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreCoursesProvider } from '../../providers/courses'; import { CoreCoursesMyOverviewProvider } from '../../providers/my-overview'; -import { CoreCourseHelperProvider } from '../../../course/providers/helper'; -import { CoreCourseOptionsDelegate } from '../../../course/providers/options-delegate'; -import { CoreSiteHomeProvider } from '../../../sitehome/providers/sitehome'; +import { CoreCourseHelperProvider } from '@core/course/providers/helper'; +import { CoreCourseOptionsDelegate } from '@core/course/providers/options-delegate'; +import { CoreSiteHomeProvider } from '@core/sitehome/providers/sitehome'; import * as moment from 'moment'; /** diff --git a/src/core/courses/pages/self-enrol-password/self-enrol-password.module.ts b/src/core/courses/pages/self-enrol-password/self-enrol-password.module.ts index d1aaa6da6..3c24736b0 100644 --- a/src/core/courses/pages/self-enrol-password/self-enrol-password.module.ts +++ b/src/core/courses/pages/self-enrol-password/self-enrol-password.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { CoreCoursesSelfEnrolPasswordPage } from './self-enrol-password'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/courses/providers/course-link-handler.ts b/src/core/courses/providers/course-link-handler.ts index 3dfb1fd39..1720cb9b6 100644 --- a/src/core/courses/providers/course-link-handler.ts +++ b/src/core/courses/providers/course-link-handler.ts @@ -16,10 +16,10 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; -import { CoreContentLinksHandlerBase } from '../../contentlinks/classes/base-handler'; -import { CoreContentLinksAction } from '../../contentlinks/providers/delegate'; -import { CoreLoginHelperProvider } from '../../login/providers/helper'; -import { CoreCourseProvider } from '../../course/providers/course'; +import { CoreContentLinksHandlerBase } from '@core/contentlinks/classes/base-handler'; +import { CoreContentLinksAction } from '@core/contentlinks/providers/delegate'; +import { CoreLoginHelperProvider } from '@core/login/providers/helper'; +import { CoreCourseProvider } from '@core/course/providers/course'; import { CoreCoursesProvider } from './courses'; /** diff --git a/src/core/courses/providers/courses-index-link-handler.ts b/src/core/courses/providers/courses-index-link-handler.ts index ebf41c4cf..0183689df 100644 --- a/src/core/courses/providers/courses-index-link-handler.ts +++ b/src/core/courses/providers/courses-index-link-handler.ts @@ -13,9 +13,9 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreContentLinksHandlerBase } from '../../contentlinks/classes/base-handler'; -import { CoreContentLinksAction } from '../../contentlinks/providers/delegate'; -import { CoreLoginHelperProvider } from '../../login/providers/helper'; +import { CoreContentLinksHandlerBase } from '@core/contentlinks/classes/base-handler'; +import { CoreContentLinksAction } from '@core/contentlinks/providers/delegate'; +import { CoreLoginHelperProvider } from '@core/login/providers/helper'; import { CoreCoursesProvider } from './courses'; /** diff --git a/src/core/courses/providers/mainmenu-handler.ts b/src/core/courses/providers/mainmenu-handler.ts index 6727ff832..17073d458 100644 --- a/src/core/courses/providers/mainmenu-handler.ts +++ b/src/core/courses/providers/mainmenu-handler.ts @@ -14,7 +14,7 @@ import { Injectable } from '@angular/core'; import { CoreCoursesProvider } from './courses'; -import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '../../mainmenu/providers/delegate'; +import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@core/mainmenu/providers/delegate'; import { CoreCoursesMyOverviewProvider } from '../providers/my-overview'; /** diff --git a/src/core/courses/providers/my-overview-link-handler.ts b/src/core/courses/providers/my-overview-link-handler.ts index 1622bc5e7..e35151615 100644 --- a/src/core/courses/providers/my-overview-link-handler.ts +++ b/src/core/courses/providers/my-overview-link-handler.ts @@ -13,9 +13,9 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreContentLinksHandlerBase } from '../../contentlinks/classes/base-handler'; -import { CoreContentLinksAction } from '../../contentlinks/providers/delegate'; -import { CoreLoginHelperProvider } from '../../login/providers/helper'; +import { CoreContentLinksHandlerBase } from '@core/contentlinks/classes/base-handler'; +import { CoreContentLinksAction } from '@core/contentlinks/providers/delegate'; +import { CoreLoginHelperProvider } from '@core/login/providers/helper'; /** * Handler to treat links to my overview. diff --git a/src/core/emulator/providers/local-notifications.ts b/src/core/emulator/providers/local-notifications.ts index 6e19d6474..f59120623 100644 --- a/src/core/emulator/providers/local-notifications.ts +++ b/src/core/emulator/providers/local-notifications.ts @@ -17,7 +17,7 @@ import { LocalNotifications, ILocalNotification } from '@ionic-native/local-noti import { CoreAppProvider } from '@providers/app'; import { CoreUtilsProvider } from '@providers/utils/utils'; import { SQLiteDB } from '@classes/sqlitedb'; -import { CoreConstants } from '../../constants'; +import { CoreConstants } from '@core/constants'; import { CoreConfigConstants } from '../../../configconstants'; import * as moment from 'moment'; diff --git a/src/core/grades/components/components.module.ts b/src/core/grades/components/components.module.ts index 872bb100f..8088706e7 100644 --- a/src/core/grades/components/components.module.ts +++ b/src/core/grades/components/components.module.ts @@ -18,8 +18,8 @@ import { IonicModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreGradesCourseComponent } from './course/course'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; -import { CorePipesModule } from '@pipes'; +import { CoreDirectivesModule } from '@directives/directives.module'; +import { CorePipesModule } from '@pipes/pipes.module'; @NgModule({ declarations: [ diff --git a/src/core/grades/grades.module.ts b/src/core/grades/grades.module.ts index 136715c3d..d6f3d9889 100644 --- a/src/core/grades/grades.module.ts +++ b/src/core/grades/grades.module.ts @@ -15,19 +15,19 @@ import { NgModule } from '@angular/core'; import { CoreGradesProvider } from './providers/grades'; import { CoreGradesHelperProvider } from './providers/helper'; -import { CoreMainMenuDelegate } from '../mainmenu/providers/delegate'; +import { CoreMainMenuDelegate } from '@core/mainmenu/providers/delegate'; import { CoreGradesMainMenuHandler } from './providers/mainmenu-handler'; import { CoreGradesCourseOptionHandler } from './providers/course-option-handler'; import { CoreGradesComponentsModule } from './components/components.module'; -import { CoreCourseOptionsDelegate } from '../course/providers/options-delegate'; +import { CoreCourseOptionsDelegate } from '@core/course/providers/options-delegate'; import { CoreGradesUserLinkHandler } from './providers/user-link-handler'; import { CoreGradesOverviewLinkHandler } from './providers/overview-link-handler'; -import { CoreContentLinksDelegate } from '../contentlinks/providers/delegate'; +import { CoreContentLinksDelegate } from '@core/contentlinks/providers/delegate'; import { CoreGradesUserHandler } from './providers/user-handler'; -import { CoreUserDelegate } from '../user/providers/user-delegate'; +import { CoreUserDelegate } from '@core/user/providers/user-delegate'; import { CoreEventsProvider } from '@providers/events'; import { CoreSitesProvider } from '@providers/sites'; -import { CoreUserProvider } from '../user/providers/user'; +import { CoreUserProvider } from '@core/user/providers/user'; // List of providers (without handlers). export const CORE_GRADES_PROVIDERS: any[] = [ diff --git a/src/core/grades/pages/courses/courses.module.ts b/src/core/grades/pages/courses/courses.module.ts index 05bb74eab..40339d8ff 100644 --- a/src/core/grades/pages/courses/courses.module.ts +++ b/src/core/grades/pages/courses/courses.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreGradesCoursesPage } from './courses'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/grades/pages/grade/grade.module.ts b/src/core/grades/pages/grade/grade.module.ts index 159a3c28e..6e6c55fa9 100644 --- a/src/core/grades/pages/grade/grade.module.ts +++ b/src/core/grades/pages/grade/grade.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreGradesGradePage } from './grade'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/grades/providers/course-option-handler.ts b/src/core/grades/providers/course-option-handler.ts index 87ac8540f..2a13d0bfe 100644 --- a/src/core/grades/providers/course-option-handler.ts +++ b/src/core/grades/providers/course-option-handler.ts @@ -14,10 +14,10 @@ import { Injectable, Injector } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { CoreCourseOptionsHandler, CoreCourseOptionsHandlerData } from '../../course/providers/options-delegate'; -import { CoreCourseProvider } from '../../course/providers/course'; +import { CoreCourseOptionsHandler, CoreCourseOptionsHandlerData } from '@core/course/providers/options-delegate'; +import { CoreCourseProvider } from '@core/course/providers/course'; import { CoreGradesProvider } from './grades'; -import { CoreCoursesProvider } from '../../courses/providers/courses'; +import { CoreCoursesProvider } from '@core/courses/providers/courses'; import { CoreGradesCourseComponent } from '../components/course/course'; /** diff --git a/src/core/grades/providers/grades.ts b/src/core/grades/providers/grades.ts index 15f21e1b4..241ca14fb 100644 --- a/src/core/grades/providers/grades.ts +++ b/src/core/grades/providers/grades.ts @@ -16,7 +16,7 @@ import { Injectable } from '@angular/core'; import { CoreLoggerProvider } from '@providers/logger'; import { CoreSite } from '@classes/site'; import { CoreSitesProvider } from '@providers/sites'; -import { CoreCoursesProvider } from '../../courses/providers/courses'; +import { CoreCoursesProvider } from '@core/courses/providers/courses'; /** * Service to provide grade functionalities. diff --git a/src/core/grades/providers/helper.ts b/src/core/grades/providers/helper.ts index ceffae450..ef98334ed 100644 --- a/src/core/grades/providers/helper.ts +++ b/src/core/grades/providers/helper.ts @@ -16,8 +16,8 @@ import { Injectable } from '@angular/core'; import { CoreLoggerProvider } from '@providers/logger'; import { CoreSitesProvider } from '@providers/sites'; import { TranslateService } from '@ngx-translate/core'; -import { CoreCoursesProvider } from '../../courses/providers/courses'; -import { CoreCourseProvider } from '../../course/providers/course'; +import { CoreCoursesProvider } from '@core/courses/providers/courses'; +import { CoreCourseProvider } from '@core/course/providers/course'; import { CoreGradesProvider } from './grades'; import { CoreTextUtilsProvider } from '@providers/utils/text'; import { CoreUrlUtilsProvider } from '@providers/utils/url'; diff --git a/src/core/grades/providers/mainmenu-handler.ts b/src/core/grades/providers/mainmenu-handler.ts index 59c2b016e..fe3b96a77 100644 --- a/src/core/grades/providers/mainmenu-handler.ts +++ b/src/core/grades/providers/mainmenu-handler.ts @@ -14,7 +14,7 @@ import { Injectable } from '@angular/core'; import { CoreGradesProvider } from './grades'; -import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '../../mainmenu/providers/delegate'; +import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@core/mainmenu/providers/delegate'; /** * Handler to inject an option into main menu. diff --git a/src/core/grades/providers/overview-link-handler.ts b/src/core/grades/providers/overview-link-handler.ts index 915b9e2c2..32ab28ac1 100644 --- a/src/core/grades/providers/overview-link-handler.ts +++ b/src/core/grades/providers/overview-link-handler.ts @@ -13,9 +13,9 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreContentLinksHandlerBase } from '../../contentlinks/classes/base-handler'; -import { CoreContentLinksAction } from '../../contentlinks/providers/delegate'; -import { CoreContentLinksHelperProvider } from '../../contentlinks/providers/helper'; +import { CoreContentLinksHandlerBase } from '@core/contentlinks/classes/base-handler'; +import { CoreContentLinksAction } from '@core/contentlinks/providers/delegate'; +import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper'; import { CoreGradesProvider } from './grades'; /** diff --git a/src/core/grades/providers/user-handler.ts b/src/core/grades/providers/user-handler.ts index ba95dc857..b7f5f42bf 100644 --- a/src/core/grades/providers/user-handler.ts +++ b/src/core/grades/providers/user-handler.ts @@ -13,9 +13,9 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreUserDelegate, CoreUserProfileHandler, CoreUserProfileHandlerData } from '../../user/providers/user-delegate'; +import { CoreUserDelegate, CoreUserProfileHandler, CoreUserProfileHandlerData } from '@core/user/providers/user-delegate'; import { CoreSitesProvider } from '@providers/sites'; -import { CoreContentLinksHelperProvider } from '../../contentlinks/providers/helper'; +import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper'; import { CoreGradesProvider } from './grades'; /** diff --git a/src/core/grades/providers/user-link-handler.ts b/src/core/grades/providers/user-link-handler.ts index 589f258aa..91e0d4f19 100644 --- a/src/core/grades/providers/user-link-handler.ts +++ b/src/core/grades/providers/user-link-handler.ts @@ -13,9 +13,9 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreContentLinksHandlerBase } from '../../contentlinks/classes/base-handler'; -import { CoreContentLinksAction } from '../../contentlinks/providers/delegate'; -import { CoreContentLinksHelperProvider } from '../../contentlinks/providers/helper'; +import { CoreContentLinksHandlerBase } from '@core/contentlinks/classes/base-handler'; +import { CoreContentLinksAction } from '@core/contentlinks/providers/delegate'; +import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper'; import { CoreGradesProvider } from './grades'; /** diff --git a/src/core/login/pages/credentials/credentials.module.ts b/src/core/login/pages/credentials/credentials.module.ts index a5b767d10..98918503d 100644 --- a/src/core/login/pages/credentials/credentials.module.ts +++ b/src/core/login/pages/credentials/credentials.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { CoreLoginCredentialsPage } from './credentials'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/login/pages/credentials/credentials.ts b/src/core/login/pages/credentials/credentials.ts index 75ffd2b0b..b80ee030e 100644 --- a/src/core/login/pages/credentials/credentials.ts +++ b/src/core/login/pages/credentials/credentials.ts @@ -21,8 +21,8 @@ import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreLoginHelperProvider } from '../../providers/helper'; -import { CoreContentLinksDelegate } from '../../../contentlinks/providers/delegate'; -import { CoreContentLinksHelperProvider } from '../../../contentlinks/providers/helper'; +import { CoreContentLinksDelegate } from '@core/contentlinks/providers/delegate'; +import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; /** diff --git a/src/core/login/pages/email-signup/email-signup.module.ts b/src/core/login/pages/email-signup/email-signup.module.ts index cf128a353..c0db4ac71 100644 --- a/src/core/login/pages/email-signup/email-signup.module.ts +++ b/src/core/login/pages/email-signup/email-signup.module.ts @@ -17,8 +17,8 @@ import { IonicPageModule } from 'ionic-angular'; import { CoreLoginEmailSignupPage } from './email-signup'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; -import { CoreUserComponentsModule } from '../../../user/components/components.module'; +import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreUserComponentsModule } from '@core/user/components/components.module'; @NgModule({ declarations: [ diff --git a/src/core/login/pages/email-signup/email-signup.ts b/src/core/login/pages/email-signup/email-signup.ts index 606178f13..b713caab5 100644 --- a/src/core/login/pages/email-signup/email-signup.ts +++ b/src/core/login/pages/email-signup/email-signup.ts @@ -22,7 +22,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreWSProvider } from '@providers/ws'; import { CoreLoginHelperProvider } from '../../providers/helper'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { CoreUserProfileFieldDelegate } from '../../../user/providers/user-profile-field-delegate'; +import { CoreUserProfileFieldDelegate } from '@core/user/providers/user-profile-field-delegate'; /** * Page to signup using email. diff --git a/src/core/login/pages/reconnect/reconnect.module.ts b/src/core/login/pages/reconnect/reconnect.module.ts index 40f59485f..412de6c45 100644 --- a/src/core/login/pages/reconnect/reconnect.module.ts +++ b/src/core/login/pages/reconnect/reconnect.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreLoginReconnectPage } from './reconnect'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/login/pages/site-error/site-error.module.ts b/src/core/login/pages/site-error/site-error.module.ts index 60284f65f..a7276f0a7 100644 --- a/src/core/login/pages/site-error/site-error.module.ts +++ b/src/core/login/pages/site-error/site-error.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { CoreLoginSiteErrorPage } from './site-error'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/login/pages/site-help/site-help.module.ts b/src/core/login/pages/site-help/site-help.module.ts index c9f01d134..8aa07277d 100644 --- a/src/core/login/pages/site-help/site-help.module.ts +++ b/src/core/login/pages/site-help/site-help.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { CoreLoginSiteHelpPage } from './site-help'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/login/pages/site-policy/site-policy.module.ts b/src/core/login/pages/site-policy/site-policy.module.ts index 65475306b..21e868074 100644 --- a/src/core/login/pages/site-policy/site-policy.module.ts +++ b/src/core/login/pages/site-policy/site-policy.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { CoreLoginSitePolicyPage } from './site-policy'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/login/pages/site/site.module.ts b/src/core/login/pages/site/site.module.ts index a188fdfc9..230f60cd6 100644 --- a/src/core/login/pages/site/site.module.ts +++ b/src/core/login/pages/site/site.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { CoreLoginSitePage } from './site'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/login/pages/sites/sites.module.ts b/src/core/login/pages/sites/sites.module.ts index 5bf8716fd..72b515f38 100644 --- a/src/core/login/pages/sites/sites.module.ts +++ b/src/core/login/pages/sites/sites.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreLoginSitesPage } from './sites'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/mainmenu/pages/more/more.module.ts b/src/core/mainmenu/pages/more/more.module.ts index 0f2e6b72c..0c5705079 100644 --- a/src/core/mainmenu/pages/more/more.module.ts +++ b/src/core/mainmenu/pages/more/more.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreMainMenuMorePage } from './more'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/settings/pages/list/list.module.ts b/src/core/settings/pages/list/list.module.ts index 5c2fcaf3a..56cc21396 100644 --- a/src/core/settings/pages/list/list.module.ts +++ b/src/core/settings/pages/list/list.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreSettingsListPage } from './list'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/sharedfiles/pages/choose-site/choose-site.module.ts b/src/core/sharedfiles/pages/choose-site/choose-site.module.ts index 4acb401d6..4711cc588 100644 --- a/src/core/sharedfiles/pages/choose-site/choose-site.module.ts +++ b/src/core/sharedfiles/pages/choose-site/choose-site.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { CoreSharedFilesChooseSitePage } from './choose-site'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/sharedfiles/pages/list/list.module.ts b/src/core/sharedfiles/pages/list/list.module.ts index 9fbe43b58..2211d812f 100644 --- a/src/core/sharedfiles/pages/list/list.module.ts +++ b/src/core/sharedfiles/pages/list/list.module.ts @@ -17,7 +17,7 @@ import { IonicPageModule } from 'ionic-angular'; import { CoreSharedFilesListPage } from './list'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/sharedfiles/providers/helper.ts b/src/core/sharedfiles/providers/helper.ts index 36cbcbba7..a3a4341e3 100644 --- a/src/core/sharedfiles/providers/helper.ts +++ b/src/core/sharedfiles/providers/helper.ts @@ -23,7 +23,7 @@ import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreSharedFilesProvider } from './sharedfiles'; -import { CoreFileUploaderProvider } from '../../fileuploader/providers/fileuploader'; +import { CoreFileUploaderProvider } from '@core/fileuploader/providers/fileuploader'; /** * Helper service to share files with the app. diff --git a/src/core/sharedfiles/providers/upload-handler.ts b/src/core/sharedfiles/providers/upload-handler.ts index abb4331de..da602b2b3 100644 --- a/src/core/sharedfiles/providers/upload-handler.ts +++ b/src/core/sharedfiles/providers/upload-handler.ts @@ -14,7 +14,7 @@ import { Injectable } from '@angular/core'; import { Platform } from 'ionic-angular'; -import { CoreFileUploaderHandler, CoreFileUploaderHandlerData } from '../../fileuploader/providers/delegate'; +import { CoreFileUploaderHandler, CoreFileUploaderHandlerData } from '@core/fileuploader/providers/delegate'; import { CoreSharedFilesHelperProvider } from './helper'; /** * Handler to upload files from the album. diff --git a/src/core/sharedfiles/sharedfiles.module.ts b/src/core/sharedfiles/sharedfiles.module.ts index fabe30c12..dcb47ad1c 100644 --- a/src/core/sharedfiles/sharedfiles.module.ts +++ b/src/core/sharedfiles/sharedfiles.module.ts @@ -17,7 +17,7 @@ import { Platform } from 'ionic-angular'; import { CoreSharedFilesProvider } from './providers/sharedfiles'; import { CoreSharedFilesHelperProvider } from './providers/helper'; import { CoreSharedFilesUploadHandler } from './providers/upload-handler'; -import { CoreFileUploaderDelegate } from '../fileuploader/providers/delegate'; +import { CoreFileUploaderDelegate } from '@core/fileuploader/providers/delegate'; // List of providers (without handlers). export const CORE_SHAREDFILES_PROVIDERS: any[] = [ diff --git a/src/core/sitehome/components/all-course-list/all-course-list.ts b/src/core/sitehome/components/all-course-list/all-course-list.ts index 3e71c3373..4d8785918 100644 --- a/src/core/sitehome/components/all-course-list/all-course-list.ts +++ b/src/core/sitehome/components/all-course-list/all-course-list.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Component } from '@angular/core'; -import { CoreCoursesProvider } from '../../../courses/providers/courses'; +import { CoreCoursesProvider } from '@core/courses/providers/courses'; /** * Component to open the page to view the list of all courses. diff --git a/src/core/sitehome/components/categories/categories.ts b/src/core/sitehome/components/categories/categories.ts index 3ae52da32..9bd62f2f0 100644 --- a/src/core/sitehome/components/categories/categories.ts +++ b/src/core/sitehome/components/categories/categories.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Component } from '@angular/core'; -import { CoreCoursesProvider } from '../../../courses/providers/courses'; +import { CoreCoursesProvider } from '@core/courses/providers/courses'; /** * Component to open the page to view the list of categories. diff --git a/src/core/sitehome/components/components.module.ts b/src/core/sitehome/components/components.module.ts index 9a2a04469..d0fd2ddf8 100644 --- a/src/core/sitehome/components/components.module.ts +++ b/src/core/sitehome/components/components.module.ts @@ -17,8 +17,8 @@ import { CommonModule } from '@angular/common'; import { IonicModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; -import { CoreCourseComponentsModule } from '../../course/components/components.module'; +import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreCourseComponentsModule } from '@core/course/components/components.module'; import { CoreSiteHomeIndexComponent } from './index/index'; import { CoreSiteHomeAllCourseListComponent } from './all-course-list/all-course-list'; import { CoreSiteHomeCategoriesComponent } from './categories/categories'; diff --git a/src/core/sitehome/components/course-search/course-search.ts b/src/core/sitehome/components/course-search/course-search.ts index 454a3d1f4..558d53ee8 100644 --- a/src/core/sitehome/components/course-search/course-search.ts +++ b/src/core/sitehome/components/course-search/course-search.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Component } from '@angular/core'; -import { CoreCoursesProvider } from '../../../courses/providers/courses'; +import { CoreCoursesProvider } from '@core/courses/providers/courses'; /** * Component to open the page to search courses. diff --git a/src/core/sitehome/components/enrolled-course-list/enrolled-course-list.ts b/src/core/sitehome/components/enrolled-course-list/enrolled-course-list.ts index 4c53ab4ff..efe66f205 100644 --- a/src/core/sitehome/components/enrolled-course-list/enrolled-course-list.ts +++ b/src/core/sitehome/components/enrolled-course-list/enrolled-course-list.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Component, OnInit } from '@angular/core'; -import { CoreCoursesProvider } from '../../../courses/providers/courses'; +import { CoreCoursesProvider } from '@core/courses/providers/courses'; /** * Component to open the page to view the list of courses the user is enrolled in. diff --git a/src/core/sitehome/components/index/index.ts b/src/core/sitehome/components/index/index.ts index 2c6140efb..27b414e28 100644 --- a/src/core/sitehome/components/index/index.ts +++ b/src/core/sitehome/components/index/index.ts @@ -15,9 +15,9 @@ import { Component, OnInit } from '@angular/core'; import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; -import { CoreCourseProvider } from '../../../course/providers/course'; -import { CoreCourseHelperProvider } from '../../../course/providers/helper'; -import { CoreCourseModulePrefetchDelegate } from '../../../course/providers/module-prefetch-delegate'; +import { CoreCourseProvider } from '@core/course/providers/course'; +import { CoreCourseHelperProvider } from '@core/course/providers/helper'; +import { CoreCourseModulePrefetchDelegate } from '@core/course/providers/module-prefetch-delegate'; /** * Component that displays site home index. diff --git a/src/core/sitehome/pages/index/index.ts b/src/core/sitehome/pages/index/index.ts index 162ca1561..4262af9e1 100644 --- a/src/core/sitehome/pages/index/index.ts +++ b/src/core/sitehome/pages/index/index.ts @@ -15,7 +15,7 @@ import { Component } from '@angular/core'; import { IonicPage, NavParams, NavController } from 'ionic-angular'; import { CoreSitesProvider } from '@providers/sites'; -import { CoreCourseHelperProvider } from '../../../course/providers/helper'; +import { CoreCourseHelperProvider } from '@core/course/providers/helper'; /** * Page that displays site home index. diff --git a/src/core/sitehome/providers/index-link-handler.ts b/src/core/sitehome/providers/index-link-handler.ts index 12ec609cb..d8d5c5c64 100644 --- a/src/core/sitehome/providers/index-link-handler.ts +++ b/src/core/sitehome/providers/index-link-handler.ts @@ -14,9 +14,9 @@ import { Injectable } from '@angular/core'; import { CoreSitesProvider } from '@providers/sites'; -import { CoreContentLinksHandlerBase } from '../../contentlinks/classes/base-handler'; -import { CoreContentLinksAction } from '../../contentlinks/providers/delegate'; -import { CoreLoginHelperProvider } from '../../login/providers/helper'; +import { CoreContentLinksHandlerBase } from '@core/contentlinks/classes/base-handler'; +import { CoreContentLinksAction } from '@core/contentlinks/providers/delegate'; +import { CoreLoginHelperProvider } from '@core/login/providers/helper'; import { CoreSiteHomeProvider } from './sitehome'; /** diff --git a/src/core/sitehome/providers/mainmenu-handler.ts b/src/core/sitehome/providers/mainmenu-handler.ts index c2cb016b2..56cd67156 100644 --- a/src/core/sitehome/providers/mainmenu-handler.ts +++ b/src/core/sitehome/providers/mainmenu-handler.ts @@ -14,8 +14,8 @@ import { Injectable } from '@angular/core'; import { CoreSiteHomeProvider } from './sitehome'; -import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '../../mainmenu/providers/delegate'; -import { CoreCoursesMyOverviewProvider } from '../../courses/providers/my-overview'; +import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@core/mainmenu/providers/delegate'; +import { CoreCoursesMyOverviewProvider } from '@core/courses/providers/my-overview'; /** * Handler to add Site Home into main menu. diff --git a/src/core/sitehome/providers/sitehome.ts b/src/core/sitehome/providers/sitehome.ts index 036828a8a..de8957226 100644 --- a/src/core/sitehome/providers/sitehome.ts +++ b/src/core/sitehome/providers/sitehome.ts @@ -16,7 +16,7 @@ import { Injectable } from '@angular/core'; import { CoreLoggerProvider } from '@providers/logger'; import { CoreSitesProvider } from '@providers/sites'; import { CoreSite } from '@classes/site'; -import { CoreCourseProvider } from '../../course/providers/course'; +import { CoreCourseProvider } from '@core/course/providers/course'; /** * Service that provides some features regarding site home. diff --git a/src/core/sitehome/sitehome.module.ts b/src/core/sitehome/sitehome.module.ts index d24f3c2df..303859c7d 100644 --- a/src/core/sitehome/sitehome.module.ts +++ b/src/core/sitehome/sitehome.module.ts @@ -16,8 +16,8 @@ import { NgModule } from '@angular/core'; import { CoreSiteHomeProvider } from './providers/sitehome'; import { CoreSiteHomeMainMenuHandler } from './providers/mainmenu-handler'; import { CoreSiteHomeIndexLinkHandler } from './providers/index-link-handler'; -import { CoreMainMenuDelegate } from '../mainmenu/providers/delegate'; -import { CoreContentLinksDelegate } from '../contentlinks/providers/delegate'; +import { CoreMainMenuDelegate } from '@core/mainmenu/providers/delegate'; +import { CoreContentLinksDelegate } from '@core/contentlinks/providers/delegate'; // List of providers (without handlers). export const CORE_SITEHOME_PROVIDERS: any[] = [ diff --git a/src/core/siteplugins/classes/base-handler.ts b/src/core/siteplugins/classes/base-handler.ts index 61ee1c8ad..7226a0202 100644 --- a/src/core/siteplugins/classes/base-handler.ts +++ b/src/core/siteplugins/classes/base-handler.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreDelegateHandler } from '../../../classes/delegate'; +import { CoreDelegateHandler } from '@classes/delegate'; /** * Super class for handlers for site plugins. diff --git a/src/core/siteplugins/classes/call-ws-click-directive.ts b/src/core/siteplugins/classes/call-ws-click-directive.ts index 944c6a6b6..7f535eaad 100644 --- a/src/core/siteplugins/classes/call-ws-click-directive.ts +++ b/src/core/siteplugins/classes/call-ws-click-directive.ts @@ -14,7 +14,7 @@ import { Input, OnInit, ElementRef } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { CoreDomUtilsProvider } from '../../../providers/utils/dom'; +import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreSitePluginsProvider } from '../providers/siteplugins'; import { CoreSitePluginsPluginContentComponent } from '../components/plugin-content/plugin-content'; import { CoreSitePluginsCallWSBaseDirective } from './call-ws-directive'; diff --git a/src/core/siteplugins/classes/call-ws-directive.ts b/src/core/siteplugins/classes/call-ws-directive.ts index 72f9f945e..8d7dedc4b 100644 --- a/src/core/siteplugins/classes/call-ws-directive.ts +++ b/src/core/siteplugins/classes/call-ws-directive.ts @@ -14,7 +14,7 @@ import { Input, OnInit, OnDestroy, ElementRef } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { CoreDomUtilsProvider } from '../../../providers/utils/dom'; +import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreSitePluginsProvider } from '../providers/siteplugins'; import { CoreSitePluginsPluginContentComponent } from '../components/plugin-content/plugin-content'; import { Subscription } from 'rxjs'; diff --git a/src/core/siteplugins/classes/course-format-handler.ts b/src/core/siteplugins/classes/course-format-handler.ts index 197c58bec..91e3a5366 100644 --- a/src/core/siteplugins/classes/course-format-handler.ts +++ b/src/core/siteplugins/classes/course-format-handler.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Injector } from '@angular/core'; -import { CoreCourseFormatHandler } from '../../course/providers/format-delegate'; +import { CoreCourseFormatHandler } from '@core/course/providers/format-delegate'; import { CoreSitePluginsBaseHandler } from './base-handler'; import { CoreSitePluginsCourseFormatComponent } from '../components/course-format/course-format'; diff --git a/src/core/siteplugins/classes/course-option-handler.ts b/src/core/siteplugins/classes/course-option-handler.ts index fa9509836..c54f049a3 100644 --- a/src/core/siteplugins/classes/course-option-handler.ts +++ b/src/core/siteplugins/classes/course-option-handler.ts @@ -14,7 +14,7 @@ import { Injector } from '@angular/core'; import { CoreSitePluginsProvider } from '../providers/siteplugins'; -import { CoreCourseOptionsHandler, CoreCourseOptionsHandlerData } from '../../course/providers/options-delegate'; +import { CoreCourseOptionsHandler, CoreCourseOptionsHandlerData } from '@core/course/providers/options-delegate'; import { CoreSitePluginsBaseHandler } from './base-handler'; import { CoreSitePluginsCourseOptionComponent } from '../components/course-option/course-option'; diff --git a/src/core/siteplugins/classes/main-menu-handler.ts b/src/core/siteplugins/classes/main-menu-handler.ts index e43b4df8a..7be3245ac 100644 --- a/src/core/siteplugins/classes/main-menu-handler.ts +++ b/src/core/siteplugins/classes/main-menu-handler.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '../../mainmenu/providers/delegate'; +import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@core/mainmenu/providers/delegate'; import { CoreSitePluginsBaseHandler } from './base-handler'; /** diff --git a/src/core/siteplugins/classes/module-handler.ts b/src/core/siteplugins/classes/module-handler.ts index a9d0eb098..69ec55ba8 100644 --- a/src/core/siteplugins/classes/module-handler.ts +++ b/src/core/siteplugins/classes/module-handler.ts @@ -14,7 +14,7 @@ import { Injector } from '@angular/core'; import { NavController, NavOptions } from 'ionic-angular'; -import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '../../course/providers/module-delegate'; +import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@core/course/providers/module-delegate'; import { CoreSitePluginsBaseHandler } from './base-handler'; import { CoreSitePluginsModuleIndexComponent } from '../components/module-index/module-index'; diff --git a/src/core/siteplugins/classes/module-prefetch-handler.ts b/src/core/siteplugins/classes/module-prefetch-handler.ts index a6b83c784..e309067e6 100644 --- a/src/core/siteplugins/classes/module-prefetch-handler.ts +++ b/src/core/siteplugins/classes/module-prefetch-handler.ts @@ -14,7 +14,7 @@ import { Injector } from '@angular/core'; import { CoreSitePluginsProvider } from '../providers/siteplugins'; -import { CoreCourseModulePrefetchHandlerBase } from '../../course/classes/module-prefetch-handler'; +import { CoreCourseModulePrefetchHandlerBase } from '@core/course/classes/module-prefetch-handler'; /** * Handler to prefetch a module site plugin. diff --git a/src/core/siteplugins/classes/user-handler.ts b/src/core/siteplugins/classes/user-handler.ts index 25b00c6b2..0b003e56e 100644 --- a/src/core/siteplugins/classes/user-handler.ts +++ b/src/core/siteplugins/classes/user-handler.ts @@ -13,7 +13,7 @@ // limitations under the License. import { NavController } from 'ionic-angular'; -import { CoreUserDelegate, CoreUserProfileHandler, CoreUserProfileHandlerData } from '../../user/providers/user-delegate'; +import { CoreUserDelegate, CoreUserProfileHandler, CoreUserProfileHandlerData } from '@core/user/providers/user-delegate'; import { CoreSitePluginsProvider } from '../providers/siteplugins'; import { CoreSitePluginsBaseHandler } from './base-handler'; diff --git a/src/core/siteplugins/classes/user-profile-field-handler.ts b/src/core/siteplugins/classes/user-profile-field-handler.ts index 6f88c6cc7..9fd8ed73b 100644 --- a/src/core/siteplugins/classes/user-profile-field-handler.ts +++ b/src/core/siteplugins/classes/user-profile-field-handler.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Injector } from '@angular/core'; -import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from '../../user/providers/user-profile-field-delegate'; +import { CoreUserProfileFieldHandler, CoreUserProfileFieldHandlerData } from '@core/user/providers/user-profile-field-delegate'; import { CoreSitePluginsBaseHandler } from './base-handler'; import { CoreSitePluginsUserProfileFieldComponent } from '../components/user-profile-field/user-profile-field'; diff --git a/src/core/siteplugins/components/components.module.ts b/src/core/siteplugins/components/components.module.ts index f53ae7c01..53a3d912c 100644 --- a/src/core/siteplugins/components/components.module.ts +++ b/src/core/siteplugins/components/components.module.ts @@ -16,8 +16,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { IonicModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '../../../components/components.module'; -import { CoreCompileHtmlComponentModule } from '../../compile/components/compile-html/compile-html.module'; +import { CoreComponentsModule } from '@components/components.module'; +import { CoreCompileHtmlComponentModule } from '@core/compile/components/compile-html/compile-html.module'; import { CoreSitePluginsPluginContentComponent } from './plugin-content/plugin-content'; import { CoreSitePluginsModuleIndexComponent } from './module-index/module-index'; import { CoreSitePluginsCourseOptionComponent } from './course-option/course-option'; diff --git a/src/core/siteplugins/components/module-index/module-index.ts b/src/core/siteplugins/components/module-index/module-index.ts index 72322f59f..c3cfb5e01 100644 --- a/src/core/siteplugins/components/module-index/module-index.ts +++ b/src/core/siteplugins/components/module-index/module-index.ts @@ -14,11 +14,11 @@ import { Component, OnInit, OnDestroy, Input, ViewChild } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { CoreTextUtilsProvider } from '../../../../providers/utils/text'; +import { CoreTextUtilsProvider } from '@providers/utils/text'; import { CoreSitePluginsProvider } from '../../providers/siteplugins'; -import { CoreCourseModuleMainComponent } from '../../../course/providers/module-delegate'; -import { CoreCourseModulePrefetchDelegate } from '../../../course/providers/module-prefetch-delegate'; -import { CoreCourseHelperProvider } from '../../../course/providers/helper'; +import { CoreCourseModuleMainComponent } from '@core/course/providers/module-delegate'; +import { CoreCourseModulePrefetchDelegate } from '@core/course/providers/module-prefetch-delegate'; +import { CoreCourseHelperProvider } from '@core/course/providers/helper'; import { CoreSitePluginsPluginContentComponent } from '../plugin-content/plugin-content'; /** diff --git a/src/core/siteplugins/components/plugin-content/plugin-content.ts b/src/core/siteplugins/components/plugin-content/plugin-content.ts index 77636c765..0e31421ea 100644 --- a/src/core/siteplugins/components/plugin-content/plugin-content.ts +++ b/src/core/siteplugins/components/plugin-content/plugin-content.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { CoreDomUtilsProvider } from '../../../../providers/utils/dom'; +import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreSitePluginsProvider } from '../../providers/siteplugins'; import { Subject } from 'rxjs'; diff --git a/src/core/siteplugins/components/user-profile-field/user-profile-field.ts b/src/core/siteplugins/components/user-profile-field/user-profile-field.ts index 9d017ce2e..84030ba62 100644 --- a/src/core/siteplugins/components/user-profile-field/user-profile-field.ts +++ b/src/core/siteplugins/components/user-profile-field/user-profile-field.ts @@ -14,7 +14,7 @@ import { Component, OnInit, Input, ViewChild, OnDestroy } from '@angular/core'; import { CoreSitePluginsProvider } from '../../providers/siteplugins'; -import { CoreCompileHtmlComponent } from '../../../compile/components/compile-html/compile-html'; +import { CoreCompileHtmlComponent } from '@core/compile/components/compile-html/compile-html'; import { Subscription } from 'rxjs'; /** diff --git a/src/core/siteplugins/directives/call-ws-new-content.ts b/src/core/siteplugins/directives/call-ws-new-content.ts index 43991db73..7f1346ef5 100644 --- a/src/core/siteplugins/directives/call-ws-new-content.ts +++ b/src/core/siteplugins/directives/call-ws-new-content.ts @@ -15,8 +15,8 @@ import { Directive, Input, ElementRef, Optional } from '@angular/core'; import { NavController } from 'ionic-angular'; import { TranslateService } from '@ngx-translate/core'; -import { CoreDomUtilsProvider } from '../../../providers/utils/dom'; -import { CoreUtilsProvider } from '../../../providers/utils/utils'; +import { CoreDomUtilsProvider } from '@providers/utils/dom'; +import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreSitePluginsProvider } from '../providers/siteplugins'; import { CoreSitePluginsCallWSOnClickBaseDirective } from '../classes/call-ws-click-directive'; import { CoreSitePluginsPluginContentComponent } from '../components/plugin-content/plugin-content'; diff --git a/src/core/siteplugins/directives/call-ws-on-load.ts b/src/core/siteplugins/directives/call-ws-on-load.ts index 37b09de1f..14290e22a 100644 --- a/src/core/siteplugins/directives/call-ws-on-load.ts +++ b/src/core/siteplugins/directives/call-ws-on-load.ts @@ -14,8 +14,8 @@ import { Directive, Input, OnInit, ElementRef, Optional } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { CoreDomUtilsProvider } from '../../../providers/utils/dom'; -import { CoreUtilsProvider } from '../../../providers/utils/utils'; +import { CoreDomUtilsProvider } from '@providers/utils/dom'; +import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreSitePluginsProvider } from '../providers/siteplugins'; import { CoreSitePluginsCallWSBaseDirective } from '../classes/call-ws-directive'; import { CoreSitePluginsPluginContentComponent } from '../components/plugin-content/plugin-content'; diff --git a/src/core/siteplugins/directives/call-ws.ts b/src/core/siteplugins/directives/call-ws.ts index d41ead26e..ee6034380 100644 --- a/src/core/siteplugins/directives/call-ws.ts +++ b/src/core/siteplugins/directives/call-ws.ts @@ -15,8 +15,8 @@ import { Directive, Input, ElementRef, Optional } from '@angular/core'; import { NavController } from 'ionic-angular'; import { TranslateService } from '@ngx-translate/core'; -import { CoreDomUtilsProvider } from '../../../providers/utils/dom'; -import { CoreUtilsProvider } from '../../../providers/utils/utils'; +import { CoreDomUtilsProvider } from '@providers/utils/dom'; +import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreSitePluginsProvider } from '../providers/siteplugins'; import { CoreSitePluginsCallWSOnClickBaseDirective } from '../classes/call-ws-click-directive'; import { CoreSitePluginsPluginContentComponent } from '../components/plugin-content/plugin-content'; diff --git a/src/core/siteplugins/directives/new-content.ts b/src/core/siteplugins/directives/new-content.ts index 7e9b38dd2..6503ed5a2 100644 --- a/src/core/siteplugins/directives/new-content.ts +++ b/src/core/siteplugins/directives/new-content.ts @@ -14,8 +14,8 @@ import { Directive, Input, OnInit, ElementRef, Optional } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { CoreDomUtilsProvider } from '../../../providers/utils/dom'; -import { CoreUtilsProvider } from '../../../providers/utils/utils'; +import { CoreDomUtilsProvider } from '@providers/utils/dom'; +import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreSitePluginsProvider } from '../providers/siteplugins'; import { CoreSitePluginsPluginContentComponent } from '../components/plugin-content/plugin-content'; diff --git a/src/core/siteplugins/providers/helper.ts b/src/core/siteplugins/providers/helper.ts index 435ead192..422b7791d 100644 --- a/src/core/siteplugins/providers/helper.ts +++ b/src/core/siteplugins/providers/helper.ts @@ -13,23 +13,23 @@ // limitations under the License. import { Injectable, Injector } from '@angular/core'; -import { CoreEventsProvider } from '../../../providers/events'; -import { CoreLangProvider } from '../../../providers/lang'; -import { CoreLoggerProvider } from '../../../providers/logger'; -import { CoreSite } from '../../../classes/site'; -import { CoreSitesProvider } from '../../../providers/sites'; -import { CoreUtilsProvider } from '../../../providers/utils/utils'; +import { CoreEventsProvider } from '@providers/events'; +import { CoreLangProvider } from '@providers/lang'; +import { CoreLoggerProvider } from '@providers/logger'; +import { CoreSite } from '@classes/site'; +import { CoreSitesProvider } from '@providers/sites'; +import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreSitePluginsProvider } from './siteplugins'; -import { CoreCompileProvider } from '../../compile/providers/compile'; +import { CoreCompileProvider } from '@core/compile/providers/compile'; // Delegates -import { CoreMainMenuDelegate } from '../../mainmenu/providers/delegate'; -import { CoreCourseModuleDelegate } from '../../course/providers/module-delegate'; -import { CoreCourseModulePrefetchDelegate } from '../../course/providers/module-prefetch-delegate'; -import { CoreCourseOptionsDelegate } from '../../course/providers/options-delegate'; -import { CoreCourseFormatDelegate } from '../../course/providers/format-delegate'; -import { CoreUserDelegate } from '../../user/providers/user-delegate'; -import { CoreUserProfileFieldDelegate } from '../../user/providers/user-profile-field-delegate'; +import { CoreMainMenuDelegate } from '@core/mainmenu/providers/delegate'; +import { CoreCourseModuleDelegate } from '@core/course/providers/module-delegate'; +import { CoreCourseModulePrefetchDelegate } from '@core/course/providers/module-prefetch-delegate'; +import { CoreCourseOptionsDelegate } from '@core/course/providers/options-delegate'; +import { CoreCourseFormatDelegate } from '@core/course/providers/format-delegate'; +import { CoreUserDelegate } from '@core/user/providers/user-delegate'; +import { CoreUserProfileFieldDelegate } from '@core/user/providers/user-profile-field-delegate'; // Handler classes. import { CoreSitePluginsCourseFormatHandler } from '../classes/course-format-handler'; diff --git a/src/core/siteplugins/providers/siteplugins.ts b/src/core/siteplugins/providers/siteplugins.ts index 3ca664d7c..42640537d 100644 --- a/src/core/siteplugins/providers/siteplugins.ts +++ b/src/core/siteplugins/providers/siteplugins.ts @@ -14,15 +14,15 @@ import { Injectable } from '@angular/core'; import { Platform } from 'ionic-angular'; -import { CoreAppProvider } from '../../../providers/app'; -import { CoreFilepoolProvider } from '../../../providers/filepool'; -import { CoreLangProvider } from '../../../providers/lang'; -import { CoreLoggerProvider } from '../../../providers/logger'; -import { CoreSite, CoreSiteWSPreSets } from '../../../classes/site'; -import { CoreSitesProvider } from '../../../providers/sites'; -import { CoreUtilsProvider } from '../../../providers/utils/utils'; +import { CoreAppProvider } from '@providers/app'; +import { CoreFilepoolProvider } from '@providers/filepool'; +import { CoreLangProvider } from '@providers/lang'; +import { CoreLoggerProvider } from '@providers/logger'; +import { CoreSite, CoreSiteWSPreSets } from '@classes/site'; +import { CoreSitesProvider } from '@providers/sites'; +import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreConfigConstants } from '../../../configconstants'; -import { CoreCoursesProvider } from '../../courses/providers/courses'; +import { CoreCoursesProvider } from '@core/courses/providers/courses'; /** * Handler of a site plugin. diff --git a/src/core/user/components/components.module.ts b/src/core/user/components/components.module.ts index a996fbb8c..7e7427c17 100644 --- a/src/core/user/components/components.module.ts +++ b/src/core/user/components/components.module.ts @@ -19,8 +19,8 @@ import { TranslateModule } from '@ngx-translate/core'; import { CoreUserParticipantsComponent } from './participants/participants'; import { CoreUserProfileFieldComponent } from './user-profile-field/user-profile-field'; import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives'; -import { CorePipesModule } from '@pipes'; +import { CoreDirectivesModule } from '@directives/directives.module'; +import { CorePipesModule } from '@pipes/pipes.module'; @NgModule({ declarations: [ diff --git a/src/core/user/pages/about/about.module.ts b/src/core/user/pages/about/about.module.ts index 18abe73ea..736e06435 100644 --- a/src/core/user/pages/about/about.module.ts +++ b/src/core/user/pages/about/about.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreUserAboutPage } from './about'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; import { CoreComponentsModule } from '@components/components.module'; import { CoreUserComponentsModule } from '../../components/components.module'; diff --git a/src/core/user/pages/profile/profile.module.ts b/src/core/user/pages/profile/profile.module.ts index 3b7e17e5c..2511d5573 100644 --- a/src/core/user/pages/profile/profile.module.ts +++ b/src/core/user/pages/profile/profile.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreUserProfilePage } from './profile'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; import { CoreComponentsModule } from '@components/components.module'; @NgModule({ diff --git a/src/core/user/providers/course-option-handler.ts b/src/core/user/providers/course-option-handler.ts index 8266e95af..7de414c9e 100644 --- a/src/core/user/providers/course-option-handler.ts +++ b/src/core/user/providers/course-option-handler.ts @@ -14,8 +14,8 @@ import { Injectable, Injector } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { CoreCourseOptionsHandler, CoreCourseOptionsHandlerData } from '../../course/providers/options-delegate'; -import { CoreCourseProvider } from '../../course/providers/course'; +import { CoreCourseOptionsHandler, CoreCourseOptionsHandlerData } from '@core/course/providers/options-delegate'; +import { CoreCourseProvider } from '@core/course/providers/course'; import { CoreUserProvider } from './user'; import { CoreUserParticipantsComponent } from '../components/participants/participants'; diff --git a/src/core/user/providers/user-link-handler.ts b/src/core/user/providers/user-link-handler.ts index 5495105d9..faaa55c81 100644 --- a/src/core/user/providers/user-link-handler.ts +++ b/src/core/user/providers/user-link-handler.ts @@ -13,9 +13,9 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreContentLinksHandlerBase } from '../../contentlinks/classes/base-handler'; -import { CoreContentLinksAction } from '../../contentlinks/providers/delegate'; -import { CoreContentLinksHelperProvider } from '../../contentlinks/providers/helper'; +import { CoreContentLinksHandlerBase } from '@core/contentlinks/classes/base-handler'; +import { CoreContentLinksAction } from '@core/contentlinks/providers/delegate'; +import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper'; /** * Handler to treat links to user profiles. diff --git a/src/core/viewer/pages/image/image.module.ts b/src/core/viewer/pages/image/image.module.ts index 1f1a6f8e6..f3f864171 100644 --- a/src/core/viewer/pages/image/image.module.ts +++ b/src/core/viewer/pages/image/image.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreViewerImagePage } from './image'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; @NgModule({ declarations: [ diff --git a/src/core/viewer/pages/text/text.module.ts b/src/core/viewer/pages/text/text.module.ts index 2a951b7d3..2cfce877b 100644 --- a/src/core/viewer/pages/text/text.module.ts +++ b/src/core/viewer/pages/text/text.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreViewerTextPage } from './text'; -import { CoreDirectivesModule } from '@directives'; +import { CoreDirectivesModule } from '@directives/directives.module'; /** * Module to lazy load the page. diff --git a/src/directives/download-file.ts b/src/directives/download-file.ts index 3418d87d1..d4c4e311a 100644 --- a/src/directives/download-file.ts +++ b/src/directives/download-file.ts @@ -13,9 +13,9 @@ // limitations under the License. import { Directive, Input, OnInit, ElementRef } from '@angular/core'; -import { CoreFileHelperProvider } from '../providers/file-helper'; -import { CoreDomUtilsProvider } from '../providers/utils/dom'; -import { CoreUtilsProvider } from '../providers/utils/utils'; +import { CoreFileHelperProvider } from '@providers/file-helper'; +import { CoreDomUtilsProvider } from '@providers/utils/dom'; +import { CoreUtilsProvider } from '@providers/utils/utils'; /** * Directive to allow downloading and open a file. When the item with this directive is clicked, the file will be diff --git a/src/providers/file-helper.ts b/src/providers/file-helper.ts index 88feef0dc..94315a513 100644 --- a/src/providers/file-helper.ts +++ b/src/providers/file-helper.ts @@ -19,7 +19,7 @@ import { CoreFileProvider } from './file'; import { CoreFilepoolProvider } from './filepool'; import { CoreSitesProvider } from './sites'; import { CoreUtilsProvider } from './utils/utils'; -import { CoreConstants } from '../core/constants'; +import { CoreConstants } from '@core/constants'; /** * Provider to provide some helper functions regarding files and packages. diff --git a/tsconfig.json b/tsconfig.json index a6feed9c8..95c37d168 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,12 +15,13 @@ "baseUrl": "./src", "paths": { "@addon/*": ["addon/*"], + "@app/*": ["app/*"], "@classes/*": ["classes/*"], "@core/*": ["core/*"], "@providers/*": ["providers/*"], "@components/*": ["components/*"], - "@directives": ["directives/directives.module"], - "@pipes": ["pipes/pipes.module"] + "@directives/*": ["directives/*"], + "@pipes/*": ["pipes/*"] } }, "include": [