From 4b60e3c3d49fff65200fa5b80fdc5b6c448ab2ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Fri, 23 Apr 2021 11:31:11 +0200 Subject: [PATCH] MOBILE-3657 core: Import and sort missing submodules --- src/addons/addons.module.ts | 26 +-- src/addons/block/block.module.ts | 15 +- src/addons/filter/filter.module.ts | 3 - .../messageoutput/messageoutput.module.ts | 4 - src/addons/mod/mod.module.ts | 40 ++--- .../quiz/accessrules/accessrules.module.ts | 3 - src/addons/qbehaviour/qbehaviour.module.ts | 8 +- src/addons/qtype/qtype.module.ts | 5 +- .../remotethemes/remotethemes.module.ts | 2 - .../userprofilefield.module.ts | 6 +- src/core/components/components.module.ts | 160 +++++++++--------- src/core/core.module.ts | 54 +++--- src/core/directives/directives.module.ts | 17 +- src/core/features/block/block.module.ts | 4 +- .../contentlinks/contentlinks.module.ts | 7 +- .../course/directives/directives.module.ts | 1 - .../features/course/format/formats.module.ts | 3 - .../course/format/social/social.module.ts | 2 - .../course/format/topics/topics.module.ts | 2 - .../course/format/weeks/weeks.module.ts | 2 - src/core/features/features.module.ts | 42 +++-- .../fileuploader/fileuploader.module.ts | 2 - src/core/features/filter/filter.module.ts | 6 +- .../components/components.module.ts | 1 - .../directives/directives.module.ts | 1 - src/core/features/xapi/xapi.module.ts | 1 - src/core/pipes/pipes.module.ts | 32 ++-- 27 files changed, 204 insertions(+), 245 deletions(-) diff --git a/src/addons/addons.module.ts b/src/addons/addons.module.ts index 42e4642f9..d7fd185a5 100644 --- a/src/addons/addons.module.ts +++ b/src/addons/addons.module.ts @@ -14,45 +14,45 @@ import { NgModule } from '@angular/core'; -import { AddonBlockModule } from './block/block.module'; -import { AddonPrivateFilesModule } from './privatefiles/privatefiles.module'; -import { AddonFilterModule } from './filter/filter.module'; -import { AddonUserProfileFieldModule } from './userprofilefield/userprofilefield.module'; import { AddonBadgesModule } from './badges/badges.module'; +import { AddonBlockModule } from './block/block.module'; +import { AddonBlogModule } from './blog/blog.module'; import { AddonCalendarModule } from './calendar/calendar.module'; +import { AddonCompetencyModule } from './competency/competency.module'; import { AddonCourseCompletionModule } from './coursecompletion/coursecompletion.module'; -import { AddonNotificationsModule } from './notifications/notifications.module'; +import { AddonFilterModule } from './filter/filter.module'; import { AddonMessageOutputModule } from './messageoutput/messageoutput.module'; import { AddonMessagesModule } from './messages/messages.module'; import { AddonModModule } from './mod/mod.module'; +import { AddonNotesModule } from './notes/notes.module'; +import { AddonNotificationsModule } from './notifications/notifications.module'; +import { AddonPrivateFilesModule } from './privatefiles/privatefiles.module'; import { AddonQbehaviourModule } from './qbehaviour/qbehaviour.module'; import { AddonQtypeModule } from './qtype/qtype.module'; -import { AddonBlogModule } from './blog/blog.module'; import { AddonRemoteThemesModule } from './remotethemes/remotethemes.module'; -import { AddonNotesModule } from './notes/notes.module'; -import { AddonCompetencyModule } from './competency/competency.module'; import { AddonStorageManagerModule } from './storagemanager/storagemanager.module'; +import { AddonUserProfileFieldModule } from './userprofilefield/userprofilefield.module'; @NgModule({ imports: [ - AddonBlockModule, AddonBadgesModule, + AddonBlockModule, AddonBlogModule, AddonCalendarModule, AddonCompetencyModule, AddonCourseCompletionModule, - AddonMessagesModule, - AddonPrivateFilesModule, AddonFilterModule, - AddonUserProfileFieldModule, - AddonNotificationsModule, AddonMessageOutputModule, + AddonMessagesModule, AddonModModule, AddonNotesModule, + AddonNotificationsModule, + AddonPrivateFilesModule, AddonQbehaviourModule, AddonQtypeModule, AddonRemoteThemesModule, AddonStorageManagerModule, + AddonUserProfileFieldModule, ], }) export class AddonsModule {} diff --git a/src/addons/block/block.module.ts b/src/addons/block/block.module.ts index 0d8ff2d47..fb0db615c 100644 --- a/src/addons/block/block.module.ts +++ b/src/addons/block/block.module.ts @@ -14,6 +14,7 @@ import { NgModule } from '@angular/core'; +import { AddonBlockActivityModulesModule } from './activitymodules/activitymodules.module'; import { AddonBlockActivityResultsModule } from './activityresults/activityresults.module'; import { AddonBlockBadgesModule } from './badges/badges.module'; import { AddonBlockBlogMenuModule } from './blogmenu/blogmenu.module'; @@ -30,19 +31,19 @@ import { AddonBlockMyOverviewModule } from './myoverview/myoverview.module'; import { AddonBlockNewsItemsModule } from './newsitems/newsitems.module'; import { AddonBlockOnlineUsersModule } from './onlineusers/onlineusers.module'; import { AddonBlockPrivateFilesModule } from './privatefiles/privatefiles.module'; +import { AddonBlockRecentActivityModule } from './recentactivity/recentactivity.module'; import { AddonBlockRecentlyAccessedCoursesModule } from './recentlyaccessedcourses/recentlyaccessedcourses.module'; +import { AddonBlockRecentlyAccessedItemsModule } from './recentlyaccesseditems/recentlyaccesseditems.module'; import { AddonBlockRssClientModule } from './rssclient/rssclient.module'; import { AddonBlockSelfCompletionModule } from './selfcompletion/selfcompletion.module'; import { AddonBlockSiteMainMenuModule } from './sitemainmenu/sitemainmenu.module'; import { AddonBlockStarredCoursesModule } from './starredcourses/starredcourses.module'; import { AddonBlockTagsModule } from './tags/tags.module'; -import { AddonBlockActivityModulesModule } from './activitymodules/activitymodules.module'; -import { AddonBlockRecentlyAccessedItemsModule } from './recentlyaccesseditems/recentlyaccesseditems.module'; import { AddonBlockTimelineModule } from './timeline/timeline.module'; @NgModule({ - declarations: [], imports: [ + AddonBlockActivityModulesModule, AddonBlockActivityResultsModule, AddonBlockBadgesModule, AddonBlockBlogMenuModule, @@ -54,22 +55,20 @@ import { AddonBlockTimelineModule } from './timeline/timeline.module'; AddonBlockCompletionStatusModule, AddonBlockGlossaryRandomModule, AddonBlockHtmlModule, - AddonBlockMyOverviewModule, AddonBlockLearningPlansModule, + AddonBlockMyOverviewModule, AddonBlockNewsItemsModule, AddonBlockOnlineUsersModule, AddonBlockPrivateFilesModule, + AddonBlockRecentActivityModule, AddonBlockRecentlyAccessedCoursesModule, + AddonBlockRecentlyAccessedItemsModule, AddonBlockRssClientModule, AddonBlockSelfCompletionModule, AddonBlockSiteMainMenuModule, AddonBlockStarredCoursesModule, AddonBlockTagsModule, - AddonBlockActivityModulesModule, - AddonBlockRecentlyAccessedItemsModule, AddonBlockTimelineModule, ], - providers: [], - exports: [], }) export class AddonBlockModule { } diff --git a/src/addons/filter/filter.module.ts b/src/addons/filter/filter.module.ts index 8053a2522..da92525ed 100644 --- a/src/addons/filter/filter.module.ts +++ b/src/addons/filter/filter.module.ts @@ -30,7 +30,6 @@ import { AddonFilterTidyModule } from './tidy/tidy.module'; import { AddonFilterUrlToLinkModule } from './urltolink/urltolink.module'; @NgModule({ - declarations: [], imports: [ AddonFilterActivityNamesModule, AddonFilterAlgebraModule, @@ -47,7 +46,5 @@ import { AddonFilterUrlToLinkModule } from './urltolink/urltolink.module'; AddonFilterTidyModule, AddonFilterUrlToLinkModule, ], - providers: [], - exports: [], }) export class AddonFilterModule { } diff --git a/src/addons/messageoutput/messageoutput.module.ts b/src/addons/messageoutput/messageoutput.module.ts index ac418e76b..dfcc6e78b 100644 --- a/src/addons/messageoutput/messageoutput.module.ts +++ b/src/addons/messageoutput/messageoutput.module.ts @@ -22,12 +22,8 @@ export const ADDON_MESSAGEOUTPUT_SERVICES: Type[] = [ ]; @NgModule({ - declarations: [ - ], imports: [ AddonMessageOutputAirnotifierModule, ], - providers: [ - ], }) export class AddonMessageOutputModule {} diff --git a/src/addons/mod/mod.module.ts b/src/addons/mod/mod.module.ts index 6561d2eda..06ed2ce2c 100644 --- a/src/addons/mod/mod.module.ts +++ b/src/addons/mod/mod.module.ts @@ -16,49 +16,49 @@ import { NgModule } from '@angular/core'; import { AddonModAssignModule } from './assign/assign.module'; import { AddonModBookModule } from './book/book.module'; +import { AddonModChatModule } from './chat/chat.module'; +import { AddonModChoiceModule } from './choice/choice.module'; import { AddonModDataModule } from './data/data.module'; +import { AddonModFeedbackModule } from './feedback/feedback.module'; import { AddonModFolderModule } from './folder/folder.module'; import { AddonModForumModule } from './forum/forum.module'; -import { AddonModLabelModule } from './label/label.module'; +import { AddonModGlossaryModule } from './glossary/glossary.module'; +import { AddonModH5PActivityModule } from './h5pactivity/h5pactivity.module'; import { AddonModImscpModule } from './imscp/imscp.module'; +import { AddonModLabelModule } from './label/label.module'; import { AddonModLessonModule } from './lesson/lesson.module'; +import { AddonModLtiModule } from './lti/lti.module'; import { AddonModPageModule } from './page/page.module'; import { AddonModQuizModule } from './quiz/quiz.module'; import { AddonModResourceModule } from './resource/resource.module'; -import { AddonModUrlModule } from './url/url.module'; -import { AddonModLtiModule } from './lti/lti.module'; -import { AddonModH5PActivityModule } from './h5pactivity/h5pactivity.module'; -import { AddonModSurveyModule } from './survey/survey.module'; import { AddonModScormModule } from './scorm/scorm.module'; -import { AddonModChoiceModule } from './choice/choice.module'; +import { AddonModSurveyModule } from './survey/survey.module'; +import { AddonModUrlModule } from './url/url.module'; import { AddonModWikiModule } from './wiki/wiki.module'; -import { AddonModGlossaryModule } from './glossary/glossary.module'; -import { AddonModChatModule } from './chat/chat.module'; -import { AddonModFeedbackModule } from './feedback/feedback.module'; @NgModule({ imports: [ AddonModAssignModule, AddonModBookModule, + AddonModChatModule, + AddonModChoiceModule, AddonModDataModule, + AddonModFeedbackModule, + AddonModFolderModule, AddonModForumModule, + AddonModGlossaryModule, + AddonModH5PActivityModule, + AddonModImscpModule, + AddonModLabelModule, AddonModLessonModule, + AddonModLtiModule, AddonModPageModule, AddonModQuizModule, - AddonModUrlModule, - AddonModLabelModule, AddonModResourceModule, - AddonModFolderModule, - AddonModImscpModule, - AddonModLtiModule, - AddonModH5PActivityModule, - AddonModSurveyModule, AddonModScormModule, - AddonModChoiceModule, + AddonModSurveyModule, + AddonModUrlModule, AddonModWikiModule, - AddonModGlossaryModule, - AddonModChatModule, - AddonModFeedbackModule, ], }) export class AddonModModule { } diff --git a/src/addons/mod/quiz/accessrules/accessrules.module.ts b/src/addons/mod/quiz/accessrules/accessrules.module.ts index efd3206b9..6c4c8e2a5 100644 --- a/src/addons/mod/quiz/accessrules/accessrules.module.ts +++ b/src/addons/mod/quiz/accessrules/accessrules.module.ts @@ -25,7 +25,6 @@ import { AddonModQuizAccessSecureWindowModule } from './securewindow/securewindo import { AddonModQuizAccessTimeLimitModule } from './timelimit/timelimit.module'; @NgModule({ - declarations: [], imports: [ AddonModQuizAccessDelayBetweenAttemptsModule, AddonModQuizAccessIpAddressModule, @@ -37,7 +36,5 @@ import { AddonModQuizAccessTimeLimitModule } from './timelimit/timelimit.module' AddonModQuizAccessSecureWindowModule, AddonModQuizAccessTimeLimitModule, ], - providers: [], - exports: [], }) export class AddonModQuizAccessRulesModule { } diff --git a/src/addons/qbehaviour/qbehaviour.module.ts b/src/addons/qbehaviour/qbehaviour.module.ts index 499ce1334..93f38bd98 100644 --- a/src/addons/qbehaviour/qbehaviour.module.ts +++ b/src/addons/qbehaviour/qbehaviour.module.ts @@ -20,12 +20,11 @@ import { AddonQbehaviourDeferredFeedbackModule } from './deferredfeedback/deferr import { AddonQbehaviourImmediateCBMModule } from './immediatecbm/immediatecbm.module'; import { AddonQbehaviourImmediateFeedbackModule } from './immediatefeedback/immediatefeedback.module'; import { AddonQbehaviourInformationItemModule } from './informationitem/informationitem.module'; -import { AddonQbehaviourInteractiveModule } from './interactive/interactive.module'; import { AddonQbehaviourInteractiveCountbackModule } from './interactivecountback/interactivecountback.module'; +import { AddonQbehaviourInteractiveModule } from './interactive/interactive.module'; import { AddonQbehaviourManualGradedModule } from './manualgraded/manualgraded.module'; @NgModule({ - declarations: [], imports: [ AddonQbehaviourAdaptiveModule, AddonQbehaviourAdaptiveNoPenaltyModule, @@ -34,12 +33,9 @@ import { AddonQbehaviourManualGradedModule } from './manualgraded/manualgraded.m AddonQbehaviourImmediateCBMModule, AddonQbehaviourImmediateFeedbackModule, AddonQbehaviourInformationItemModule, - AddonQbehaviourInteractiveModule, AddonQbehaviourInteractiveCountbackModule, + AddonQbehaviourInteractiveModule, AddonQbehaviourManualGradedModule, ], - providers: [ - ], - exports: [], }) export class AddonQbehaviourModule { } diff --git a/src/addons/qtype/qtype.module.ts b/src/addons/qtype/qtype.module.ts index 716b5b586..bd7730bf4 100644 --- a/src/addons/qtype/qtype.module.ts +++ b/src/addons/qtype/qtype.module.ts @@ -13,6 +13,7 @@ // limitations under the License. import { NgModule } from '@angular/core'; + import { AddonQtypeCalculatedModule } from './calculated/calculated.module'; import { AddonQtypeCalculatedMultiModule } from './calculatedmulti/calculatedmulti.module'; import { AddonQtypeCalculatedSimpleModule } from './calculatedsimple/calculatedsimple.module'; @@ -31,7 +32,6 @@ import { AddonQtypeShortAnswerModule } from './shortanswer/shortanswer.module'; import { AddonQtypeTrueFalseModule } from './truefalse/truefalse.module'; @NgModule({ - declarations: [], imports: [ AddonQtypeCalculatedModule, AddonQtypeCalculatedMultiModule, @@ -50,8 +50,5 @@ import { AddonQtypeTrueFalseModule } from './truefalse/truefalse.module'; AddonQtypeShortAnswerModule, AddonQtypeTrueFalseModule, ], - providers: [ - ], - exports: [], }) export class AddonQtypeModule { } diff --git a/src/addons/remotethemes/remotethemes.module.ts b/src/addons/remotethemes/remotethemes.module.ts index 7a2b74e1d..322d7744e 100644 --- a/src/addons/remotethemes/remotethemes.module.ts +++ b/src/addons/remotethemes/remotethemes.module.ts @@ -21,8 +21,6 @@ export const ADDON_REMOTETHEMES_SERVICES: Type[] = [ ]; @NgModule({ - declarations: [], - imports: [], providers: [ { provide: APP_INITIALIZER, diff --git a/src/addons/userprofilefield/userprofilefield.module.ts b/src/addons/userprofilefield/userprofilefield.module.ts index 50910d3a2..2b6096c2a 100644 --- a/src/addons/userprofilefield/userprofilefield.module.ts +++ b/src/addons/userprofilefield/userprofilefield.module.ts @@ -16,18 +16,16 @@ import { NgModule } from '@angular/core'; import { AddonUserProfileFieldCheckboxModule } from './checkbox/checkbox.module'; import { AddonUserProfileFieldDatetimeModule } from './datetime/datetime.module'; import { AddonUserProfileFieldMenuModule } from './menu/menu.module'; -import { AddonUserProfileFieldTextModule } from './text/text.module'; import { AddonUserProfileFieldTextareaModule } from './textarea/textarea.module'; +import { AddonUserProfileFieldTextModule } from './text/text.module'; @NgModule({ - declarations: [], imports: [ AddonUserProfileFieldCheckboxModule, AddonUserProfileFieldDatetimeModule, AddonUserProfileFieldMenuModule, - AddonUserProfileFieldTextModule, AddonUserProfileFieldTextareaModule, + AddonUserProfileFieldTextModule, ], - exports: [], }) export class AddonUserProfileFieldModule { } diff --git a/src/core/components/components.module.ts b/src/core/components/components.module.ts index 33596bb6b..ed321c8fa 100644 --- a/src/core/components/components.module.ts +++ b/src/core/components/components.module.ts @@ -18,80 +18,80 @@ import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; import { FormsModule } from '@angular/forms'; +import { CoreDirectivesModule } from '@directives/directives.module'; +import { CorePipesModule } from '@pipes/pipes.module'; + +import { CoreAttachmentsComponent } from './attachments/attachments'; +import { CoreBSTooltipComponent } from './bs-tooltip/bs-tooltip'; +import { CoreChartComponent } from './chart/chart'; import { CoreChronoComponent } from './chrono/chrono'; -import { CoreDownloadRefreshComponent } from './download-refresh/download-refresh'; -import { CoreFileComponent } from './file/file'; -import { CoreIconComponent } from './icon/icon'; -import { CoreIframeComponent } from './iframe/iframe'; -import { CoreInputErrorsComponent } from './input-errors/input-errors'; -import { CoreLoadingComponent } from './loading/loading'; -import { CoreMarkRequiredComponent } from './mark-required/mark-required'; -import { CoreRecaptchaComponent } from './recaptcha/recaptcha'; -import { CoreRecaptchaModalComponent } from './recaptcha/recaptcha-modal'; -import { CoreShowPasswordComponent } from './show-password/show-password'; -import { CoreSplitViewComponent } from './split-view/split-view'; -import { CoreEmptyBoxComponent } from './empty-box/empty-box'; -import { CoreTabsComponent } from './tabs/tabs'; -import { CoreTabComponent } from './tabs/tab'; -import { CoreTabsOutletComponent } from './tabs-outlet/tabs-outlet'; -import { CoreInfiniteLoadingComponent } from './infinite-loading/infinite-loading'; -import { CoreProgressBarComponent } from './progress-bar/progress-bar'; import { CoreContextMenuComponent } from './context-menu/context-menu'; import { CoreContextMenuItemComponent } from './context-menu/context-menu-item'; import { CoreContextMenuPopoverComponent } from './context-menu/context-menu-popover'; -import { CoreUserAvatarComponent } from './user-avatar/user-avatar'; +import { CoreDownloadRefreshComponent } from './download-refresh/download-refresh'; import { CoreDynamicComponent } from './dynamic-component/dynamic-component'; -import { CoreNavBarButtonsComponent } from './navbar-buttons/navbar-buttons'; -import { CoreSendMessageFormComponent } from './send-message-form/send-message-form'; -import { CoreTimerComponent } from './timer/timer'; -import { CoreNavigationBarComponent } from './navigation-bar/navigation-bar'; - -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; -import { CoreAttachmentsComponent } from './attachments/attachments'; +import { CoreEmptyBoxComponent } from './empty-box/empty-box'; +import { CoreFileComponent } from './file/file'; import { CoreFilesComponent } from './files/files'; +import { CoreIconComponent } from './icon/icon'; +import { CoreIframeComponent } from './iframe/iframe'; +import { CoreInfiniteLoadingComponent } from './infinite-loading/infinite-loading'; +import { CoreInputErrorsComponent } from './input-errors/input-errors'; +import { CoreLoadingComponent } from './loading/loading'; import { CoreLocalFileComponent } from './local-file/local-file'; -import { CoreBSTooltipComponent } from './bs-tooltip/bs-tooltip'; +import { CoreMarkRequiredComponent } from './mark-required/mark-required'; +import { CoreNavBarButtonsComponent } from './navbar-buttons/navbar-buttons'; +import { CoreNavigationBarComponent } from './navigation-bar/navigation-bar'; +import { CoreProgressBarComponent } from './progress-bar/progress-bar'; +import { CoreRecaptchaComponent } from './recaptcha/recaptcha'; +import { CoreRecaptchaModalComponent } from './recaptcha/recaptcha-modal'; +import { CoreSendMessageFormComponent } from './send-message-form/send-message-form'; +import { CoreShowPasswordComponent } from './show-password/show-password'; import { CoreSitePickerComponent } from './site-picker/site-picker'; -import { CoreChartComponent } from './chart/chart'; +import { CoreSplitViewComponent } from './split-view/split-view'; import { CoreStyleComponent } from './style/style'; +import { CoreTabComponent } from './tabs/tab'; +import { CoreTabsComponent } from './tabs/tabs'; +import { CoreTabsOutletComponent } from './tabs-outlet/tabs-outlet'; +import { CoreTimerComponent } from './timer/timer'; +import { CoreUserAvatarComponent } from './user-avatar/user-avatar'; @NgModule({ declarations: [ + CoreAttachmentsComponent, + CoreBSTooltipComponent, + CoreChartComponent, CoreChronoComponent, - CoreDownloadRefreshComponent, - CoreFileComponent, - CoreIconComponent, - CoreIframeComponent, - CoreInputErrorsComponent, - CoreLoadingComponent, - CoreMarkRequiredComponent, - CoreRecaptchaComponent, - CoreRecaptchaModalComponent, - CoreShowPasswordComponent, - CoreSplitViewComponent, - CoreStyleComponent, - CoreEmptyBoxComponent, - CoreTabsComponent, - CoreTabComponent, - CoreTabsOutletComponent, - CoreInfiniteLoadingComponent, - CoreProgressBarComponent, CoreContextMenuComponent, CoreContextMenuItemComponent, CoreContextMenuPopoverComponent, - CoreNavBarButtonsComponent, - CoreUserAvatarComponent, + CoreDownloadRefreshComponent, CoreDynamicComponent, - CoreSendMessageFormComponent, - CoreTimerComponent, - CoreNavigationBarComponent, - CoreAttachmentsComponent, + CoreEmptyBoxComponent, + CoreFileComponent, CoreFilesComponent, + CoreIconComponent, + CoreIframeComponent, + CoreInfiniteLoadingComponent, + CoreInputErrorsComponent, + CoreLoadingComponent, CoreLocalFileComponent, - CoreBSTooltipComponent, + CoreMarkRequiredComponent, + CoreNavBarButtonsComponent, + CoreNavigationBarComponent, + CoreProgressBarComponent, + CoreRecaptchaComponent, + CoreRecaptchaModalComponent, + CoreSendMessageFormComponent, + CoreShowPasswordComponent, CoreSitePickerComponent, - CoreChartComponent, + CoreSplitViewComponent, + CoreStyleComponent, + CoreTabComponent, + CoreTabsComponent, + CoreTabsOutletComponent, + CoreTimerComponent, + CoreUserAvatarComponent, ], imports: [ CommonModule, @@ -102,40 +102,40 @@ import { CoreStyleComponent } from './style/style'; CorePipesModule, ], exports: [ + CoreAttachmentsComponent, + CoreBSTooltipComponent, + CoreChartComponent, CoreChronoComponent, - CoreDownloadRefreshComponent, - CoreFileComponent, - CoreIconComponent, - CoreIframeComponent, - CoreInputErrorsComponent, - CoreLoadingComponent, - CoreMarkRequiredComponent, - CoreRecaptchaComponent, - CoreRecaptchaModalComponent, - CoreShowPasswordComponent, - CoreSplitViewComponent, - CoreStyleComponent, - CoreEmptyBoxComponent, - CoreTabsComponent, - CoreTabComponent, - CoreTabsOutletComponent, - CoreInfiniteLoadingComponent, - CoreProgressBarComponent, CoreContextMenuComponent, CoreContextMenuItemComponent, CoreContextMenuPopoverComponent, - CoreNavBarButtonsComponent, - CoreUserAvatarComponent, + CoreDownloadRefreshComponent, CoreDynamicComponent, - CoreSendMessageFormComponent, - CoreTimerComponent, - CoreNavigationBarComponent, - CoreAttachmentsComponent, + CoreEmptyBoxComponent, + CoreFileComponent, CoreFilesComponent, + CoreIconComponent, + CoreIframeComponent, + CoreInfiniteLoadingComponent, + CoreInputErrorsComponent, + CoreLoadingComponent, CoreLocalFileComponent, - CoreBSTooltipComponent, + CoreMarkRequiredComponent, + CoreNavBarButtonsComponent, + CoreNavigationBarComponent, + CoreProgressBarComponent, + CoreRecaptchaComponent, + CoreRecaptchaModalComponent, + CoreSendMessageFormComponent, + CoreShowPasswordComponent, CoreSitePickerComponent, - CoreChartComponent, + CoreSplitViewComponent, + CoreStyleComponent, + CoreTabComponent, + CoreTabsComponent, + CoreTabsOutletComponent, + CoreTimerComponent, + CoreUserAvatarComponent, ], }) export class CoreComponentsModule {} diff --git a/src/core/core.module.ts b/src/core/core.module.ts index 3ccf73400..56d5a0ee8 100644 --- a/src/core/core.module.ts +++ b/src/core/core.module.ts @@ -21,34 +21,34 @@ import { CoreInterceptor } from './classes/interceptor'; import { getDatabaseProviders } from './services/database'; import { getInitializerProviders } from './initializers'; -import { CoreDbProvider } from '@services/db'; import { CoreAppProvider } from '@services/app'; import { CoreConfigProvider } from '@services/config'; -import { CoreLangProvider } from '@services/lang'; -import { CoreTextUtilsProvider } from '@services/utils/text'; +import { CoreCronDelegateService } from '@services/cron'; +import { CoreCustomURLSchemesProvider } from '@services/urlschemes'; +import { CoreDbProvider } from '@services/db'; import { CoreDomUtilsProvider } from '@services/utils/dom'; +import { CoreFileHelperProvider } from '@services/file-helper'; +import { CoreFilepoolProvider } from '@services/filepool'; +import { CoreFileProvider } from '@services/file'; +import { CoreFileSessionProvider } from '@services/file-session'; +import { CoreForms } from '@singletons/form'; +import { CoreGeolocationProvider } from '@services/geolocation'; +import { CoreGroupsProvider } from '@services/groups'; import { CoreIframeUtilsProvider } from '@services/utils/iframe'; +import { CoreLangProvider } from '@services/lang'; +import { CoreLocalNotificationsProvider } from '@services/local-notifications'; +import { CoreMimetypeUtilsProvider } from '@services/utils/mimetype'; +import { CoreNavigatorService } from '@services/navigator'; +import { CorePluginFileDelegateService } from '@services/plugin-file-delegate'; +import { CoreScreenService } from '@services/screen'; +import { CoreSitesProvider } from '@services/sites'; +import { CoreSyncProvider } from '@services/sync'; +import { CoreTextUtilsProvider } from '@services/utils/text'; import { CoreTimeUtilsProvider } from '@services/utils/time'; +import { CoreUpdateManagerProvider } from '@services/update-manager'; import { CoreUrlUtilsProvider } from '@services/utils/url'; import { CoreUtilsProvider } from '@services/utils/utils'; -import { CoreMimetypeUtilsProvider } from '@services/utils/mimetype'; -import { CoreFileProvider } from '@services/file'; import { CoreWSProvider } from '@services/ws'; -import { CoreSitesProvider } from '@services/sites'; -import { CoreLocalNotificationsProvider } from '@services/local-notifications'; -import { CoreGroupsProvider } from '@services/groups'; -import { CoreCronDelegateService } from '@services/cron'; -import { CoreFileSessionProvider } from '@services/file-session'; -import { CoreFilepoolProvider } from '@services/filepool'; -import { CoreUpdateManagerProvider } from '@services/update-manager'; -import { CorePluginFileDelegateService } from '@services/plugin-file-delegate'; -import { CoreSyncProvider } from '@services/sync'; -import { CoreFileHelperProvider } from '@services/file-helper'; -import { CoreGeolocationProvider } from '@services/geolocation'; -import { CoreNavigatorService } from '@services/navigator'; -import { CoreScreenService } from '@services/screen'; -import { CoreCustomURLSchemesProvider } from '@services/urlschemes'; -import { CoreForms } from '@singletons/form'; export const CORE_SERVICES: Type[] = [ CoreAppProvider, @@ -56,26 +56,26 @@ export const CORE_SERVICES: Type[] = [ CoreCronDelegateService, CoreCustomURLSchemesProvider, CoreDbProvider, + CoreDomUtilsProvider, CoreFileHelperProvider, - CoreFileSessionProvider, - CoreFileProvider, CoreFilepoolProvider, + CoreFileProvider, + CoreFileSessionProvider, + CoreForms, CoreGeolocationProvider, CoreGroupsProvider, + CoreIframeUtilsProvider, CoreLangProvider, CoreLocalNotificationsProvider, + CoreMimetypeUtilsProvider, CoreNavigatorService, CorePluginFileDelegateService, CoreScreenService, CoreSitesProvider, CoreSyncProvider, - CoreUpdateManagerProvider, - CoreDomUtilsProvider, - CoreForms, - CoreIframeUtilsProvider, - CoreMimetypeUtilsProvider, CoreTextUtilsProvider, CoreTimeUtilsProvider, + CoreUpdateManagerProvider, CoreUrlUtilsProvider, CoreUtilsProvider, CoreWSProvider, diff --git a/src/core/directives/directives.module.ts b/src/core/directives/directives.module.ts index 494c1e1d2..3cf6d3303 100644 --- a/src/core/directives/directives.module.ts +++ b/src/core/directives/directives.module.ts @@ -15,41 +15,40 @@ import { NgModule } from '@angular/core'; import { CoreAutoFocusDirective } from './auto-focus'; +import { CoreAutoRowsDirective } from './auto-rows'; import { CoreExternalContentDirective } from './external-content'; import { CoreFabDirective } from './fab'; +import { CoreFaIconDirective } from './fa-icon'; import { CoreFormatTextDirective } from './format-text'; import { CoreLinkDirective } from './link'; import { CoreLongPressDirective } from './long-press'; import { CoreSupressEventsDirective } from './supress-events'; -import { CoreFaIconDirective } from './fa-icon'; import { CoreUserLinkDirective } from './user-link'; -import { CoreAutoRowsDirective } from './auto-rows'; @NgModule({ declarations: [ CoreAutoFocusDirective, + CoreAutoRowsDirective, CoreExternalContentDirective, + CoreFabDirective, + CoreFaIconDirective, CoreFormatTextDirective, CoreLinkDirective, CoreLongPressDirective, CoreSupressEventsDirective, - CoreFabDirective, - CoreFaIconDirective, CoreUserLinkDirective, - CoreAutoRowsDirective, ], - imports: [], exports: [ CoreAutoFocusDirective, + CoreAutoRowsDirective, CoreExternalContentDirective, + CoreFabDirective, + CoreFaIconDirective, CoreFormatTextDirective, CoreLinkDirective, CoreLongPressDirective, CoreSupressEventsDirective, - CoreFabDirective, - CoreFaIconDirective, CoreUserLinkDirective, - CoreAutoRowsDirective, ], }) export class CoreDirectivesModule {} diff --git a/src/core/features/block/block.module.ts b/src/core/features/block/block.module.ts index 27a447f09..736c1db78 100644 --- a/src/core/features/block/block.module.ts +++ b/src/core/features/block/block.module.ts @@ -22,7 +22,5 @@ export const CORE_BLOCK_SERVICES: Type[] = [ CoreBlockHelperProvider, ]; -@NgModule({ - providers: [], -}) +@NgModule({}) export class CoreBlockModule {} diff --git a/src/core/features/contentlinks/contentlinks.module.ts b/src/core/features/contentlinks/contentlinks.module.ts index c7d9d1210..127464bfe 100644 --- a/src/core/features/contentlinks/contentlinks.module.ts +++ b/src/core/features/contentlinks/contentlinks.module.ts @@ -22,10 +22,5 @@ export const CORE_CONTENTLINKS_SERVICES: Type[] = [ CoreContentLinksHelperProvider, ]; -@NgModule({ - declarations: [], - imports: [], - providers: [], - exports: [], -}) +@NgModule({}) export class CoreContentLinksModule {} diff --git a/src/core/features/course/directives/directives.module.ts b/src/core/features/course/directives/directives.module.ts index 41dfe1b61..ac12d9e9e 100644 --- a/src/core/features/course/directives/directives.module.ts +++ b/src/core/features/course/directives/directives.module.ts @@ -20,7 +20,6 @@ import { CoreCourseDownloadModuleMainFileDirective } from './download-module-mai declarations: [ CoreCourseDownloadModuleMainFileDirective, ], - imports: [], exports: [ CoreCourseDownloadModuleMainFileDirective, ], diff --git a/src/core/features/course/format/formats.module.ts b/src/core/features/course/format/formats.module.ts index 7da1f733a..3519b6cb0 100644 --- a/src/core/features/course/format/formats.module.ts +++ b/src/core/features/course/format/formats.module.ts @@ -20,14 +20,11 @@ import { CoreCourseFormatTopicsModule } from './topics/topics.module'; import { CoreCourseFormatWeeksModule } from './weeks/weeks.module'; @NgModule({ - declarations: [], imports: [ CoreCourseFormatSingleActivityModule, CoreCourseFormatSocialModule, CoreCourseFormatTopicsModule, CoreCourseFormatWeeksModule, ], - providers: [], - exports: [], }) export class CoreCourseFormatModule { } diff --git a/src/core/features/course/format/social/social.module.ts b/src/core/features/course/format/social/social.module.ts index 918fd0a25..16f1379c6 100644 --- a/src/core/features/course/format/social/social.module.ts +++ b/src/core/features/course/format/social/social.module.ts @@ -18,8 +18,6 @@ import { CoreCourseFormatDelegate } from '@features/course/services/format-deleg import { CoreCourseFormatSocialHandler } from './services/handlers/social-format'; @NgModule({ - declarations: [], - imports: [], providers: [ { provide: APP_INITIALIZER, diff --git a/src/core/features/course/format/topics/topics.module.ts b/src/core/features/course/format/topics/topics.module.ts index 3760c31c0..3a7594aa7 100644 --- a/src/core/features/course/format/topics/topics.module.ts +++ b/src/core/features/course/format/topics/topics.module.ts @@ -18,8 +18,6 @@ import { CoreCourseFormatDelegate } from '@features/course/services/format-deleg import { CoreCourseFormatTopicsHandler } from './services/handlers/topics-format'; @NgModule({ - declarations: [], - imports: [], providers: [ { provide: APP_INITIALIZER, diff --git a/src/core/features/course/format/weeks/weeks.module.ts b/src/core/features/course/format/weeks/weeks.module.ts index bf7c5e685..491c122e4 100644 --- a/src/core/features/course/format/weeks/weeks.module.ts +++ b/src/core/features/course/format/weeks/weeks.module.ts @@ -18,8 +18,6 @@ import { CoreCourseFormatDelegate } from '@features/course/services/format-deleg import { CoreCourseFormatWeeksHandler } from './services/handlers/weeks-format'; @NgModule({ - declarations: [], - imports: [], providers: [ { provide: APP_INITIALIZER, diff --git a/src/core/features/features.module.ts b/src/core/features/features.module.ts index cdece3e09..a8d883e7e 100644 --- a/src/core/features/features.module.ts +++ b/src/core/features/features.module.ts @@ -14,51 +14,59 @@ import { NgModule } from '@angular/core'; +import { CoreBlockModule } from './block/block.module'; +import { CoreCommentsModule } from './comments/comments.module'; +import { CoreContentLinksModule } from './contentlinks/contentlinks.module'; import { CoreCourseModule } from './course/course.module'; import { CoreCoursesModule } from './courses/courses.module'; +import { CoreEditorModule } from './editor/editor.module'; import { CoreEmulatorModule } from './emulator/emulator.module'; import { CoreFileUploaderModule } from './fileuploader/fileuploader.module'; +import { CoreFilterModule } from './filter/filter.module'; import { CoreGradesModule } from './grades/grades.module'; import { CoreH5PModule } from './h5p/h5p.module'; import { CoreLoginModule } from './login/login.module'; import { CoreMainMenuModule } from './mainmenu/mainmenu.module'; +import { CorePushNotificationsModule } from './pushnotifications/pushnotifications.module'; +import { CoreQuestionModule } from './question/question.module'; +import { CoreRatingModule } from './rating/rating.module'; +import { CoreSearchModule } from './search/search.module'; import { CoreSettingsModule } from './settings/settings.module'; +import { CoreSharedFilesModule } from './sharedfiles/sharedfiles.module'; import { CoreSiteHomeModule } from './sitehome/sitehome.module'; +import { CoreSitePluginsModule } from './siteplugins/siteplugins.module'; import { CoreTagModule } from './tag/tag.module'; import { CoreUserModule } from './user/user.module'; -import { CorePushNotificationsModule } from './pushnotifications/pushnotifications.module'; -import { CoreXAPIModule } from './xapi/xapi.module'; import { CoreViewerModule } from './viewer/viewer.module'; -import { CoreSearchModule } from './search/search.module'; -import { CoreCommentsModule } from './comments/comments.module'; -import { CoreSitePluginsModule } from './siteplugins/siteplugins.module'; -import { CoreRatingModule } from './rating/rating.module'; -import { CoreSharedFilesModule } from './sharedfiles/sharedfiles.module'; -import { CoreQuestionModule } from './question/question.module'; +import { CoreXAPIModule } from './xapi/xapi.module'; @NgModule({ imports: [ + CoreBlockModule, + CoreCommentsModule, + CoreContentLinksModule, CoreCourseModule, CoreCoursesModule, + CoreEditorModule, CoreEmulatorModule, CoreFileUploaderModule, + CoreFilterModule, CoreGradesModule, + CoreH5PModule, CoreLoginModule, CoreMainMenuModule, + CorePushNotificationsModule, + CoreQuestionModule, + CoreRatingModule, + CoreSearchModule, CoreSettingsModule, + CoreSharedFilesModule, CoreSiteHomeModule, + CoreSitePluginsModule, CoreTagModule, CoreUserModule, - CorePushNotificationsModule, - CoreSearchModule, - CoreXAPIModule, - CoreH5PModule, CoreViewerModule, - CoreCommentsModule, - CoreSitePluginsModule, - CoreRatingModule, - CoreSharedFilesModule, - CoreQuestionModule, + CoreXAPIModule, ], }) export class CoreFeaturesModule {} diff --git a/src/core/features/fileuploader/fileuploader.module.ts b/src/core/features/fileuploader/fileuploader.module.ts index 52b8d91da..8ca214fe7 100644 --- a/src/core/features/fileuploader/fileuploader.module.ts +++ b/src/core/features/fileuploader/fileuploader.module.ts @@ -30,8 +30,6 @@ export const CORE_FILEUPLOADER_SERVICES: Type[] = [ ]; @NgModule({ - imports: [], - declarations: [], providers: [ { provide: APP_INITIALIZER, diff --git a/src/core/features/filter/filter.module.ts b/src/core/features/filter/filter.module.ts index 23ddcd933..771565277 100644 --- a/src/core/features/filter/filter.module.ts +++ b/src/core/features/filter/filter.module.ts @@ -23,9 +23,5 @@ export const CORE_FILTER_SERVICES: Type[] = [ CoreFilterHelperProvider, ]; -@NgModule({ - declarations: [], - imports: [], - providers: [], -}) +@NgModule({}) export class CoreFilterModule { } diff --git a/src/core/features/siteplugins/components/components.module.ts b/src/core/features/siteplugins/components/components.module.ts index 977cceb44..8ffc0cdef 100644 --- a/src/core/features/siteplugins/components/components.module.ts +++ b/src/core/features/siteplugins/components/components.module.ts @@ -49,7 +49,6 @@ import { CoreSitePluginsOnlyTitleBlockComponent } from './only-title-block/only- CoreSharedModule, CoreCompileHtmlComponentModule, ], - providers: [], exports: [ CoreSitePluginsPluginContentComponent, CoreSitePluginsModuleIndexComponent, diff --git a/src/core/features/siteplugins/directives/directives.module.ts b/src/core/features/siteplugins/directives/directives.module.ts index d35d8e0fe..c3fd02a5d 100644 --- a/src/core/features/siteplugins/directives/directives.module.ts +++ b/src/core/features/siteplugins/directives/directives.module.ts @@ -26,7 +26,6 @@ import { CoreSitePluginsNewContentDirective } from './new-content'; CoreSitePluginsCallWSOnLoadDirective, CoreSitePluginsNewContentDirective, ], - imports: [], exports: [ CoreSitePluginsCallWSDirective, CoreSitePluginsCallWSNewContentDirective, diff --git a/src/core/features/xapi/xapi.module.ts b/src/core/features/xapi/xapi.module.ts index 6ee1d9f8a..6f8e34f6a 100644 --- a/src/core/features/xapi/xapi.module.ts +++ b/src/core/features/xapi/xapi.module.ts @@ -25,7 +25,6 @@ export const CORE_XAPI_SERVICES: Type[] = [ ]; @NgModule({ - imports: [], providers: [ { provide: CORE_SITE_SCHEMAS, diff --git a/src/core/pipes/pipes.module.ts b/src/core/pipes/pipes.module.ts index 36e2e09c7..a45223af7 100644 --- a/src/core/pipes/pipes.module.ts +++ b/src/core/pipes/pipes.module.ts @@ -13,38 +13,38 @@ // limitations under the License. import { NgModule } from '@angular/core'; + +import { CoreBytesToSizePipe } from './bytes-to-size'; import { CoreCreateLinksPipe } from './create-links'; +import { CoreDateDayOrTimePipe } from './date-day-or-time'; +import { CoreDurationPipe } from './duration'; import { CoreFormatDatePipe } from './format-date'; import { CoreNoTagsPipe } from './no-tags'; import { CoreSecondsToHMSPipe } from './seconds-to-hms'; import { CoreTimeAgoPipe } from './time-ago'; -import { CoreBytesToSizePipe } from './bytes-to-size'; -import { CoreDurationPipe } from './duration'; -import { CoreDateDayOrTimePipe } from './date-day-or-time'; import { CoreToLocaleStringPipe } from './to-locale-string'; @NgModule({ declarations: [ - CoreCreateLinksPipe, - CoreNoTagsPipe, - CoreTimeAgoPipe, - CoreFormatDatePipe, CoreBytesToSizePipe, - CoreSecondsToHMSPipe, - CoreDurationPipe, + CoreCreateLinksPipe, CoreDateDayOrTimePipe, + CoreDurationPipe, + CoreFormatDatePipe, + CoreNoTagsPipe, + CoreSecondsToHMSPipe, + CoreTimeAgoPipe, CoreToLocaleStringPipe, ], - imports: [], exports: [ - CoreCreateLinksPipe, - CoreNoTagsPipe, - CoreTimeAgoPipe, - CoreFormatDatePipe, CoreBytesToSizePipe, - CoreSecondsToHMSPipe, - CoreDurationPipe, + CoreCreateLinksPipe, CoreDateDayOrTimePipe, + CoreDurationPipe, + CoreFormatDatePipe, + CoreNoTagsPipe, + CoreSecondsToHMSPipe, + CoreTimeAgoPipe, CoreToLocaleStringPipe, ], })