From 832a6d2be8ee626e5cef4a9b77740640c66107ce Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Tue, 12 Jan 2021 15:36:18 +0100 Subject: [PATCH] MOBILE-3633 core: Use CoreSharedModule everywhere --- .../badges/pages/issued-badge/issued-badge.module.ts | 9 ++------- .../badges/pages/user-badges/user-badges.module.ts | 9 ++------- .../activityresults/components/components.module.ts | 7 ++----- src/addons/block/badges/components/components.module.ts | 7 ++----- .../block/blogmenu/components/components.module.ts | 7 ++----- .../block/blogrecent/components/components.module.ts | 7 ++----- .../block/blogtags/components/components.module.ts | 7 ++----- .../block/myoverview/components/components.module.ts | 7 ++----- .../block/newsitems/components/components.module.ts | 7 ++----- .../block/onlineusers/components/components.module.ts | 7 ++----- .../block/recentactivity/components/components.module.ts | 7 ++----- .../components/components.module.ts | 6 ++---- .../recentlyaccessedcourses.module.ts | 4 ++-- .../block/rssclient/components/components.module.ts | 7 ++----- .../block/sitemainmenu/components/components.module.ts | 6 ++---- src/addons/block/sitemainmenu/sitemainmenu.module.ts | 6 ++---- .../block/starredcourses/components/components.module.ts | 6 ++---- src/addons/block/tags/components/components.module.ts | 7 ++----- src/addons/calendar/components/components.module.ts | 8 ++------ src/addons/calendar/pages/day/day.module.ts | 8 ++------ .../calendar/pages/edit-event/edit-event.module.ts | 6 ++---- src/addons/calendar/pages/event/event.module.ts | 8 ++------ src/addons/calendar/pages/index/index.module.ts | 8 ++------ src/addons/calendar/pages/list/list.module.ts | 8 ++------ .../airnotifier/pages/devices/devices.module.ts | 6 ++---- src/addons/privatefiles/pages/index/index.module.ts | 7 ++----- src/addons/userprofilefield/checkbox/checkbox.module.ts | 4 ++-- src/addons/userprofilefield/datetime/datetime.module.ts | 6 ++---- src/addons/userprofilefield/menu/menu.module.ts | 6 ++---- src/addons/userprofilefield/text/text.module.ts | 6 ++---- src/addons/userprofilefield/textarea/textarea.module.ts | 6 ++---- src/core/features/block/components/components.module.ts | 6 ++---- .../contentlinks/pages/choose-site/choose-site.module.ts | 7 ++----- .../features/courses/components/components.module.ts | 9 ++------- .../pages/available-courses/available-courses.module.ts | 6 ++---- .../courses/pages/categories/categories.module.ts | 6 ++---- .../pages/course-preview/course-preview.module.ts | 9 ++------- .../features/courses/pages/dashboard/dashboard.module.ts | 6 ++---- .../courses/pages/my-courses/my-courses.module.ts | 7 ++----- src/core/features/courses/pages/search/search.module.ts | 6 ++---- src/core/features/editor/components/components.module.ts | 4 ++-- .../features/emulator/components/components.module.ts | 8 ++------ src/core/features/h5p/components/components.module.ts | 6 ++---- src/core/features/login/login-lazy.module.ts | 6 ++---- .../pages/change-password/change-password.module.ts | 4 ++-- .../login/pages/credentials/credentials.module.ts | 7 ++----- .../login/pages/email-signup/email-signup.module.ts | 6 ++---- .../forgotten-password/forgotten-password.module.ts | 4 ++-- .../features/login/pages/reconnect/reconnect.module.ts | 7 ++----- .../login/pages/site-policy/site-policy.module.ts | 6 ++---- src/core/features/login/pages/site/site.module.ts | 7 ++----- src/core/features/login/pages/sites/sites.module.ts | 7 ++----- src/core/features/mainmenu/mainmenu-lazy.module.ts | 8 ++------ src/core/features/mainmenu/pages/home/home.module.ts | 6 ++---- src/core/features/mainmenu/pages/more/more.module.ts | 6 ++---- src/core/features/search/components/components.module.ts | 7 ++----- src/core/features/settings/pages/about/about.module.ts | 7 ++----- src/core/features/settings/pages/app/app.module.ts | 7 ++----- .../settings/pages/deviceinfo/deviceinfo.module.ts | 9 ++------- .../features/settings/pages/general/general.module.ts | 7 ++----- .../features/settings/pages/licenses/licenses.module.ts | 7 ++----- src/core/features/settings/pages/site/site.module.ts | 9 ++------- .../settings/pages/space-usage/space-usage.module.ts | 9 ++------- .../pages/synchronization/synchronization.module.ts | 7 ++----- src/core/features/sitehome/pages/index/index.module.ts | 6 ++---- .../tag/pages/index-area/index-area.page.module.ts | 7 ++----- src/core/features/tag/pages/index/index.page.module.ts | 7 ++----- src/core/features/tag/pages/search/search.page.module.ts | 6 ++---- src/core/features/user/components/components.module.ts | 8 ++------ src/core/features/user/pages/about/about.module.ts | 6 ++---- src/core/features/user/pages/profile/profile.module.ts | 7 ++----- 71 files changed, 142 insertions(+), 338 deletions(-) diff --git a/src/addons/badges/pages/issued-badge/issued-badge.module.ts b/src/addons/badges/pages/issued-badge/issued-badge.module.ts index e29cbe77d..dcf0c421c 100644 --- a/src/addons/badges/pages/issued-badge/issued-badge.module.ts +++ b/src/addons/badges/pages/issued-badge/issued-badge.module.ts @@ -18,10 +18,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { RouterModule, Routes } from '@angular/router'; import { CommonModule } from '@angular/common'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { AddonBadgesIssuedBadgePage } from './issued-badge.page'; const routes: Routes = [ @@ -37,9 +34,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, ], declarations: [ AddonBadgesIssuedBadgePage, diff --git a/src/addons/badges/pages/user-badges/user-badges.module.ts b/src/addons/badges/pages/user-badges/user-badges.module.ts index 92a9b6978..11da23507 100644 --- a/src/addons/badges/pages/user-badges/user-badges.module.ts +++ b/src/addons/badges/pages/user-badges/user-badges.module.ts @@ -18,10 +18,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { RouterModule, Routes } from '@angular/router'; import { CommonModule } from '@angular/common'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { AddonBadgesUserBadgesPage } from './user-badges.page'; const routes: Routes = [ @@ -37,9 +34,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, ], declarations: [ AddonBadgesUserBadgesPage, diff --git a/src/addons/block/activityresults/components/components.module.ts b/src/addons/block/activityresults/components/components.module.ts index c7910cee2..0278e68f8 100644 --- a/src/addons/block/activityresults/components/components.module.ts +++ b/src/addons/block/activityresults/components/components.module.ts @@ -18,9 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { AddonBlockActivityResultsComponent } from './activityresults/activityresults'; @NgModule({ @@ -32,8 +30,7 @@ import { AddonBlockActivityResultsComponent } from './activityresults/activityre IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], exports: [ AddonBlockActivityResultsComponent, diff --git a/src/addons/block/badges/components/components.module.ts b/src/addons/block/badges/components/components.module.ts index b4e67d7c8..db379c8aa 100644 --- a/src/addons/block/badges/components/components.module.ts +++ b/src/addons/block/badges/components/components.module.ts @@ -18,9 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { AddonBlockBadgesComponent } from './badges/badges'; @NgModule({ @@ -32,8 +30,7 @@ import { AddonBlockBadgesComponent } from './badges/badges'; IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], exports: [ AddonBlockBadgesComponent, diff --git a/src/addons/block/blogmenu/components/components.module.ts b/src/addons/block/blogmenu/components/components.module.ts index ac8ea52ad..1429e23ca 100644 --- a/src/addons/block/blogmenu/components/components.module.ts +++ b/src/addons/block/blogmenu/components/components.module.ts @@ -18,9 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { AddonBlockBlogMenuComponent } from './blogmenu/blogmenu'; @NgModule({ @@ -32,8 +30,7 @@ import { AddonBlockBlogMenuComponent } from './blogmenu/blogmenu'; IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], exports: [ AddonBlockBlogMenuComponent, diff --git a/src/addons/block/blogrecent/components/components.module.ts b/src/addons/block/blogrecent/components/components.module.ts index 552884705..5e0d74f9c 100644 --- a/src/addons/block/blogrecent/components/components.module.ts +++ b/src/addons/block/blogrecent/components/components.module.ts @@ -18,9 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { AddonBlockBlogRecentComponent } from './blogrecent/blogrecent'; @NgModule({ @@ -32,8 +30,7 @@ import { AddonBlockBlogRecentComponent } from './blogrecent/blogrecent'; IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], exports: [ AddonBlockBlogRecentComponent, diff --git a/src/addons/block/blogtags/components/components.module.ts b/src/addons/block/blogtags/components/components.module.ts index 8e07f0c0c..d7d3f6a90 100644 --- a/src/addons/block/blogtags/components/components.module.ts +++ b/src/addons/block/blogtags/components/components.module.ts @@ -18,9 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { AddonBlockBlogTagsComponent } from './blogtags/blogtags'; @NgModule({ @@ -32,8 +30,7 @@ import { AddonBlockBlogTagsComponent } from './blogtags/blogtags'; IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], exports: [ AddonBlockBlogTagsComponent, diff --git a/src/addons/block/myoverview/components/components.module.ts b/src/addons/block/myoverview/components/components.module.ts index 29199d738..d6f88d30f 100644 --- a/src/addons/block/myoverview/components/components.module.ts +++ b/src/addons/block/myoverview/components/components.module.ts @@ -18,10 +18,8 @@ import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreCoursesComponentsModule } from '@features/courses/components/components.module'; - import { AddonBlockMyOverviewComponent } from './myoverview/myoverview'; @NgModule({ @@ -33,8 +31,7 @@ import { AddonBlockMyOverviewComponent } from './myoverview/myoverview'; IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, CoreCoursesComponentsModule, ], exports: [ diff --git a/src/addons/block/newsitems/components/components.module.ts b/src/addons/block/newsitems/components/components.module.ts index 55c178d71..0622e150d 100644 --- a/src/addons/block/newsitems/components/components.module.ts +++ b/src/addons/block/newsitems/components/components.module.ts @@ -18,9 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { AddonBlockNewsItemsComponent } from './newsitems/newsitems'; @NgModule({ @@ -32,8 +30,7 @@ import { AddonBlockNewsItemsComponent } from './newsitems/newsitems'; IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], exports: [ AddonBlockNewsItemsComponent, diff --git a/src/addons/block/onlineusers/components/components.module.ts b/src/addons/block/onlineusers/components/components.module.ts index 384ffd1d2..fdeb6a210 100644 --- a/src/addons/block/onlineusers/components/components.module.ts +++ b/src/addons/block/onlineusers/components/components.module.ts @@ -18,9 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { AddonBlockOnlineUsersComponent } from './onlineusers/onlineusers'; @NgModule({ @@ -32,8 +30,7 @@ import { AddonBlockOnlineUsersComponent } from './onlineusers/onlineusers'; IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], exports: [ AddonBlockOnlineUsersComponent, diff --git a/src/addons/block/recentactivity/components/components.module.ts b/src/addons/block/recentactivity/components/components.module.ts index ce4fe2ba0..354e0ffff 100644 --- a/src/addons/block/recentactivity/components/components.module.ts +++ b/src/addons/block/recentactivity/components/components.module.ts @@ -18,9 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { AddonBlockRecentActivityComponent } from './recentactivity/recentactivity'; @NgModule({ @@ -32,8 +30,7 @@ import { AddonBlockRecentActivityComponent } from './recentactivity/recentactivi IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], exports: [ AddonBlockRecentActivityComponent, diff --git a/src/addons/block/recentlyaccessedcourses/components/components.module.ts b/src/addons/block/recentlyaccessedcourses/components/components.module.ts index 560df1e3e..9326c73e5 100644 --- a/src/addons/block/recentlyaccessedcourses/components/components.module.ts +++ b/src/addons/block/recentlyaccessedcourses/components/components.module.ts @@ -17,8 +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/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreCoursesComponentsModule } from '@features/courses/components/components.module'; import { AddonBlockRecentlyAccessedCoursesComponent } from './recentlyaccessedcourses/recentlyaccessedcourses'; @@ -31,8 +30,7 @@ import { AddonBlockRecentlyAccessedCoursesComponent } from './recentlyaccessedco CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, CoreCoursesComponentsModule, ], exports: [ diff --git a/src/addons/block/recentlyaccessedcourses/recentlyaccessedcourses.module.ts b/src/addons/block/recentlyaccessedcourses/recentlyaccessedcourses.module.ts index aeac5a5df..ae2ac0928 100644 --- a/src/addons/block/recentlyaccessedcourses/recentlyaccessedcourses.module.ts +++ b/src/addons/block/recentlyaccessedcourses/recentlyaccessedcourses.module.ts @@ -15,7 +15,7 @@ import { APP_INITIALIZER, NgModule } from '@angular/core'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreBlockDelegate } from '@features/block/services/block-delegate'; import { AddonBlockRecentlyAccessedCoursesComponentsModule } from './components/components.module'; import { AddonBlockRecentlyAccessedCoursesHandler } from './services/block-handler'; @@ -23,7 +23,7 @@ import { AddonBlockRecentlyAccessedCoursesHandler } from './services/block-handl @NgModule({ imports: [ IonicModule, - CoreComponentsModule, + CoreSharedModule, AddonBlockRecentlyAccessedCoursesComponentsModule, TranslateModule.forChild(), ], diff --git a/src/addons/block/rssclient/components/components.module.ts b/src/addons/block/rssclient/components/components.module.ts index b94be30d3..20087cf54 100644 --- a/src/addons/block/rssclient/components/components.module.ts +++ b/src/addons/block/rssclient/components/components.module.ts @@ -18,9 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { AddonBlockRssClientComponent } from './rssclient/rssclient'; @NgModule({ @@ -32,8 +30,7 @@ import { AddonBlockRssClientComponent } from './rssclient/rssclient'; IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], exports: [ AddonBlockRssClientComponent, diff --git a/src/addons/block/sitemainmenu/components/components.module.ts b/src/addons/block/sitemainmenu/components/components.module.ts index 726a43dbb..52c1968e8 100644 --- a/src/addons/block/sitemainmenu/components/components.module.ts +++ b/src/addons/block/sitemainmenu/components/components.module.ts @@ -17,8 +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/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; // import { CoreCourseComponentsModule } from '@features/course/components/components.module'; import { AddonBlockSiteMainMenuComponent } from './sitemainmenu/sitemainmenu'; @@ -32,8 +31,7 @@ import { AddonBlockSiteMainMenuComponent } from './sitemainmenu/sitemainmenu'; CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, // CoreCourseComponentsModule, ], exports: [ diff --git a/src/addons/block/sitemainmenu/sitemainmenu.module.ts b/src/addons/block/sitemainmenu/sitemainmenu.module.ts index bc8310b50..a5b2d4e77 100644 --- a/src/addons/block/sitemainmenu/sitemainmenu.module.ts +++ b/src/addons/block/sitemainmenu/sitemainmenu.module.ts @@ -15,8 +15,7 @@ import { APP_INITIALIZER, NgModule } from '@angular/core'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { AddonBlockSiteMainMenuComponentsModule } from './components/components.module'; import { CoreBlockDelegate } from '@features/block/services/block-delegate'; import { AddonBlockSiteMainMenuHandler } from './services/block-handler'; @@ -24,8 +23,7 @@ import { AddonBlockSiteMainMenuHandler } from './services/block-handler'; @NgModule({ imports: [ IonicModule, - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, AddonBlockSiteMainMenuComponentsModule, TranslateModule.forChild(), ], diff --git a/src/addons/block/starredcourses/components/components.module.ts b/src/addons/block/starredcourses/components/components.module.ts index 8dc0291d0..3265a6dee 100644 --- a/src/addons/block/starredcourses/components/components.module.ts +++ b/src/addons/block/starredcourses/components/components.module.ts @@ -17,8 +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/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreCoursesComponentsModule } from '@features/courses/components/components.module'; import { AddonBlockStarredCoursesComponent } from './starredcourses/starredcourses'; @@ -31,8 +30,7 @@ import { AddonBlockStarredCoursesComponent } from './starredcourses/starredcours CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, CoreCoursesComponentsModule, ], exports: [ diff --git a/src/addons/block/tags/components/components.module.ts b/src/addons/block/tags/components/components.module.ts index e26cc198b..bd2774f82 100644 --- a/src/addons/block/tags/components/components.module.ts +++ b/src/addons/block/tags/components/components.module.ts @@ -18,9 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { AddonBlockTagsComponent } from './tags/tags'; @NgModule({ @@ -32,8 +30,7 @@ import { AddonBlockTagsComponent } from './tags/tags'; IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], exports: [ AddonBlockTagsComponent, diff --git a/src/addons/calendar/components/components.module.ts b/src/addons/calendar/components/components.module.ts index 7f0b02c5b..078687589 100644 --- a/src/addons/calendar/components/components.module.ts +++ b/src/addons/calendar/components/components.module.ts @@ -18,9 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { AddonCalendarCalendarComponent } from './calendar/calendar'; import { AddonCalendarUpcomingEventsComponent } from './upcoming-events/upcoming-events'; @@ -37,9 +35,7 @@ import { AddonCalendarFilterPopoverComponent } from './filter/filter'; IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, ], providers: [ ], diff --git a/src/addons/calendar/pages/day/day.module.ts b/src/addons/calendar/pages/day/day.module.ts index 20d149967..b260cdb57 100644 --- a/src/addons/calendar/pages/day/day.module.ts +++ b/src/addons/calendar/pages/day/day.module.ts @@ -18,9 +18,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { RouterModule, Routes } from '@angular/router'; import { CommonModule } from '@angular/common'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { AddonCalendarComponentsModule } from '../../components/components.module'; import { AddonCalendarDayPage } from './day.page'; @@ -38,9 +36,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, AddonCalendarComponentsModule, ], declarations: [ diff --git a/src/addons/calendar/pages/edit-event/edit-event.module.ts b/src/addons/calendar/pages/edit-event/edit-event.module.ts index f9cf8c730..f08fef737 100644 --- a/src/addons/calendar/pages/edit-event/edit-event.module.ts +++ b/src/addons/calendar/pages/edit-event/edit-event.module.ts @@ -19,8 +19,7 @@ import { RouterModule, Routes } from '@angular/router'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreEditorComponentsModule } from '@features/editor/components/components.module'; import { AddonCalendarEditEventPage } from './edit-event.page'; @@ -40,8 +39,7 @@ const routes: Routes = [ FormsModule, ReactiveFormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, CoreEditorComponentsModule, ], declarations: [ diff --git a/src/addons/calendar/pages/event/event.module.ts b/src/addons/calendar/pages/event/event.module.ts index 6fbc37425..565382336 100644 --- a/src/addons/calendar/pages/event/event.module.ts +++ b/src/addons/calendar/pages/event/event.module.ts @@ -19,9 +19,7 @@ import { RouterModule, Routes } from '@angular/router'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { AddonCalendarComponentsModule } from '../../components/components.module'; import { AddonCalendarEventPage } from './event.page'; @@ -40,9 +38,7 @@ const routes: Routes = [ IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, AddonCalendarComponentsModule, ], declarations: [ diff --git a/src/addons/calendar/pages/index/index.module.ts b/src/addons/calendar/pages/index/index.module.ts index 86a385d70..077ed990e 100644 --- a/src/addons/calendar/pages/index/index.module.ts +++ b/src/addons/calendar/pages/index/index.module.ts @@ -18,9 +18,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { RouterModule, Routes } from '@angular/router'; import { CommonModule } from '@angular/common'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { AddonCalendarComponentsModule } from '../../components/components.module'; import { AddonCalendarIndexPage } from './index.page'; @@ -38,9 +36,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, AddonCalendarComponentsModule, ], declarations: [ diff --git a/src/addons/calendar/pages/list/list.module.ts b/src/addons/calendar/pages/list/list.module.ts index ebbdeb4c8..18d32c117 100644 --- a/src/addons/calendar/pages/list/list.module.ts +++ b/src/addons/calendar/pages/list/list.module.ts @@ -18,9 +18,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { RouterModule, Routes } from '@angular/router'; import { CommonModule } from '@angular/common'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { AddonCalendarListPage } from './list.page'; @@ -37,9 +35,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, ], declarations: [ AddonCalendarListPage, diff --git a/src/addons/messageoutput/airnotifier/pages/devices/devices.module.ts b/src/addons/messageoutput/airnotifier/pages/devices/devices.module.ts index fa7cb1aac..1d1926d88 100644 --- a/src/addons/messageoutput/airnotifier/pages/devices/devices.module.ts +++ b/src/addons/messageoutput/airnotifier/pages/devices/devices.module.ts @@ -19,8 +19,7 @@ import { FormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { AddonMessageOutputAirnotifierDevicesPage } from './devices'; const routes: Routes = [ @@ -37,8 +36,7 @@ const routes: Routes = [ IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ AddonMessageOutputAirnotifierDevicesPage, diff --git a/src/addons/privatefiles/pages/index/index.module.ts b/src/addons/privatefiles/pages/index/index.module.ts index 7b071b02c..5f35fd906 100644 --- a/src/addons/privatefiles/pages/index/index.module.ts +++ b/src/addons/privatefiles/pages/index/index.module.ts @@ -19,9 +19,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { AddonPrivateFilesIndexPage } from '.'; const routes: Routes = [ @@ -38,8 +36,7 @@ const routes: Routes = [ IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ AddonPrivateFilesIndexPage, diff --git a/src/addons/userprofilefield/checkbox/checkbox.module.ts b/src/addons/userprofilefield/checkbox/checkbox.module.ts index 4b232c5e2..37083eded 100644 --- a/src/addons/userprofilefield/checkbox/checkbox.module.ts +++ b/src/addons/userprofilefield/checkbox/checkbox.module.ts @@ -21,7 +21,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { AddonUserProfileFieldCheckboxHandler } from './services/handlers/checkbox'; import { CoreUserProfileFieldDelegate } from '@features/user/services/user-profile-field-delegate'; import { AddonUserProfileFieldCheckboxComponent } from './component/checkbox'; -import { CoreComponentsModule } from '@components/components.module'; +import { CoreSharedModule } from '@/core/shared.module'; @NgModule({ declarations: [ @@ -33,7 +33,7 @@ import { CoreComponentsModule } from '@components/components.module'; TranslateModule.forChild(), FormsModule, ReactiveFormsModule, - CoreComponentsModule, + CoreSharedModule, ], providers: [ { diff --git a/src/addons/userprofilefield/datetime/datetime.module.ts b/src/addons/userprofilefield/datetime/datetime.module.ts index 4d9625d8a..31b638042 100644 --- a/src/addons/userprofilefield/datetime/datetime.module.ts +++ b/src/addons/userprofilefield/datetime/datetime.module.ts @@ -21,8 +21,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { AddonUserProfileFieldDatetimeHandler } from './services/handlers/datetime'; import { CoreUserProfileFieldDelegate } from '@features/user/services/user-profile-field-delegate'; import { AddonUserProfileFieldDatetimeComponent } from './component/datetime'; -import { CoreComponentsModule } from '@components/components.module'; -import { CorePipesModule } from '@pipes/pipes.module'; +import { CoreSharedModule } from '@/core/shared.module'; @NgModule({ declarations: [ @@ -34,8 +33,7 @@ import { CorePipesModule } from '@pipes/pipes.module'; TranslateModule.forChild(), FormsModule, ReactiveFormsModule, - CoreComponentsModule, - CorePipesModule, + CoreSharedModule, ], providers: [ { diff --git a/src/addons/userprofilefield/menu/menu.module.ts b/src/addons/userprofilefield/menu/menu.module.ts index 792d82624..54430b13c 100644 --- a/src/addons/userprofilefield/menu/menu.module.ts +++ b/src/addons/userprofilefield/menu/menu.module.ts @@ -21,8 +21,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { AddonUserProfileFieldMenuHandler } from './services/handlers/menu'; import { CoreUserProfileFieldDelegate } from '@features/user/services/user-profile-field-delegate'; import { AddonUserProfileFieldMenuComponent } from './component/menu'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; @NgModule({ declarations: [ @@ -34,8 +33,7 @@ import { CoreDirectivesModule } from '@directives/directives.module'; TranslateModule.forChild(), FormsModule, ReactiveFormsModule, - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], providers: [ { diff --git a/src/addons/userprofilefield/text/text.module.ts b/src/addons/userprofilefield/text/text.module.ts index edc4f1299..48d7faabe 100644 --- a/src/addons/userprofilefield/text/text.module.ts +++ b/src/addons/userprofilefield/text/text.module.ts @@ -21,8 +21,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { AddonUserProfileFieldTextHandler } from './services/handlers/text'; import { CoreUserProfileFieldDelegate } from '@features/user/services/user-profile-field-delegate'; import { AddonUserProfileFieldTextComponent } from './component/text'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; @NgModule({ declarations: [ @@ -34,8 +33,7 @@ import { CoreDirectivesModule } from '@directives/directives.module'; TranslateModule.forChild(), FormsModule, ReactiveFormsModule, - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], providers: [ { diff --git a/src/addons/userprofilefield/textarea/textarea.module.ts b/src/addons/userprofilefield/textarea/textarea.module.ts index e07ef0e71..a417f7b55 100644 --- a/src/addons/userprofilefield/textarea/textarea.module.ts +++ b/src/addons/userprofilefield/textarea/textarea.module.ts @@ -21,8 +21,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { AddonUserProfileFieldTextareaHandler } from './services/handlers/textarea'; import { CoreUserProfileFieldDelegate } from '@features/user/services/user-profile-field-delegate'; import { AddonUserProfileFieldTextareaComponent } from './component/textarea'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreEditorComponentsModule } from '@features/editor/components/components.module'; @NgModule({ @@ -35,8 +34,7 @@ import { CoreEditorComponentsModule } from '@features/editor/components/componen TranslateModule.forChild(), FormsModule, ReactiveFormsModule, - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, CoreEditorComponentsModule, ], providers: [ diff --git a/src/core/features/block/components/components.module.ts b/src/core/features/block/components/components.module.ts index 70aec8124..261667ffa 100644 --- a/src/core/features/block/components/components.module.ts +++ b/src/core/features/block/components/components.module.ts @@ -16,12 +16,11 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreDirectivesModule } from '@directives/directives.module'; import { CoreBlockComponent } from './block/block'; import { CoreBlockOnlyTitleComponent } from './only-title-block/only-title-block'; import { CoreBlockPreRenderedComponent } from './pre-rendered-block/pre-rendered-block'; import { CoreBlockCourseBlocksComponent } from './course-blocks/course-blocks'; -import { CoreComponentsModule } from '@components/components.module'; +import { CoreSharedModule } from '@/core/shared.module'; @NgModule({ declarations: [ @@ -33,9 +32,8 @@ import { CoreComponentsModule } from '@components/components.module'; imports: [ CommonModule, IonicModule, - CoreDirectivesModule, TranslateModule.forChild(), - CoreComponentsModule, + CoreSharedModule, ], exports: [ CoreBlockComponent, diff --git a/src/core/features/contentlinks/pages/choose-site/choose-site.module.ts b/src/core/features/contentlinks/pages/choose-site/choose-site.module.ts index 1c493fa46..090742124 100644 --- a/src/core/features/contentlinks/pages/choose-site/choose-site.module.ts +++ b/src/core/features/contentlinks/pages/choose-site/choose-site.module.ts @@ -19,9 +19,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CommonModule } from '@angular/common'; import { RouterModule, Routes } from '@angular/router'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreContentLinksChooseSitePage } from './choose-site'; const routes: Routes = [ @@ -40,8 +38,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], }) export class CoreContentLinksChooseSitePageModule {} diff --git a/src/core/features/courses/components/components.module.ts b/src/core/features/courses/components/components.module.ts index 6b9eae348..83fa47b8f 100644 --- a/src/core/features/courses/components/components.module.ts +++ b/src/core/features/courses/components/components.module.ts @@ -18,10 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; import { FormsModule } from '@angular/forms'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreCoursesCourseListItemComponent } from './course-list-item/course-list-item'; import { CoreCoursesCourseProgressComponent } from './course-progress/course-progress'; import { CoreCoursesCourseOptionsMenuComponent } from './course-options-menu/course-options-menu'; @@ -39,9 +36,7 @@ import { CoreCoursesSelfEnrolPasswordComponent } from './self-enrol-password/sel IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, ], exports: [ CoreCoursesCourseListItemComponent, diff --git a/src/core/features/courses/pages/available-courses/available-courses.module.ts b/src/core/features/courses/pages/available-courses/available-courses.module.ts index 9d7232458..604374b35 100644 --- a/src/core/features/courses/pages/available-courses/available-courses.module.ts +++ b/src/core/features/courses/pages/available-courses/available-courses.module.ts @@ -18,8 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreCoursesComponentsModule } from '../../components/components.module'; import { CoreCoursesAvailableCoursesPage } from './available-courses'; @@ -38,8 +37,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, CoreCoursesComponentsModule, ], declarations: [ diff --git a/src/core/features/courses/pages/categories/categories.module.ts b/src/core/features/courses/pages/categories/categories.module.ts index 3e57c7348..38561da93 100644 --- a/src/core/features/courses/pages/categories/categories.module.ts +++ b/src/core/features/courses/pages/categories/categories.module.ts @@ -18,8 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreCoursesComponentsModule } from '../../components/components.module'; import { CoreCoursesCategoriesPage } from './categories'; @@ -38,8 +37,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, CoreCoursesComponentsModule, ], declarations: [ diff --git a/src/core/features/courses/pages/course-preview/course-preview.module.ts b/src/core/features/courses/pages/course-preview/course-preview.module.ts index acf3098bb..d91a92516 100644 --- a/src/core/features/courses/pages/course-preview/course-preview.module.ts +++ b/src/core/features/courses/pages/course-preview/course-preview.module.ts @@ -18,10 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreCoursesCoursePreviewPage } from './course-preview'; import { CoreCoursesComponentsModule } from '../../components/components.module'; @@ -38,9 +35,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, CoreCoursesComponentsModule, ], declarations: [ diff --git a/src/core/features/courses/pages/dashboard/dashboard.module.ts b/src/core/features/courses/pages/dashboard/dashboard.module.ts index 40924f020..6ed3f27e1 100644 --- a/src/core/features/courses/pages/dashboard/dashboard.module.ts +++ b/src/core/features/courses/pages/dashboard/dashboard.module.ts @@ -18,8 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreBlockComponentsModule } from '@features/block/components/components.module'; import { CoreCoursesDashboardPage } from './dashboard'; @@ -37,8 +36,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, CoreBlockComponentsModule, ], declarations: [ diff --git a/src/core/features/courses/pages/my-courses/my-courses.module.ts b/src/core/features/courses/pages/my-courses/my-courses.module.ts index 2fa39ccd9..631d6ec86 100644 --- a/src/core/features/courses/pages/my-courses/my-courses.module.ts +++ b/src/core/features/courses/pages/my-courses/my-courses.module.ts @@ -19,9 +19,7 @@ import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; import { FormsModule } from '@angular/forms'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreCoursesMyCoursesPage } from './my-courses'; import { CoreCoursesComponentsModule } from '../../components/components.module'; @@ -39,8 +37,7 @@ const routes: Routes = [ FormsModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, CoreCoursesComponentsModule, ], declarations: [ diff --git a/src/core/features/courses/pages/search/search.module.ts b/src/core/features/courses/pages/search/search.module.ts index 8b2e02cb9..fdcb74580 100644 --- a/src/core/features/courses/pages/search/search.module.ts +++ b/src/core/features/courses/pages/search/search.module.ts @@ -18,8 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreCoursesComponentsModule } from '../../components/components.module'; import { CoreSearchComponentsModule } from '@features/search/components/components.module'; @@ -38,8 +37,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, CoreCoursesComponentsModule, CoreSearchComponentsModule, ], diff --git a/src/core/features/editor/components/components.module.ts b/src/core/features/editor/components/components.module.ts index b57a73036..01dfd5469 100644 --- a/src/core/features/editor/components/components.module.ts +++ b/src/core/features/editor/components/components.module.ts @@ -18,7 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreEditorRichTextEditorComponent } from './rich-text-editor/rich-text-editor'; -import { CoreComponentsModule } from '@components/components.module'; +import { CoreSharedModule } from '@/core/shared.module'; @NgModule({ declarations: [ @@ -28,7 +28,7 @@ import { CoreComponentsModule } from '@components/components.module'; CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, + CoreSharedModule, ], providers: [ ], diff --git a/src/core/features/emulator/components/components.module.ts b/src/core/features/emulator/components/components.module.ts index 831546f26..c655fcd74 100644 --- a/src/core/features/emulator/components/components.module.ts +++ b/src/core/features/emulator/components/components.module.ts @@ -17,9 +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/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreEmulatorCaptureMediaComponent } from './capture-media/capture-media'; @NgModule({ @@ -30,9 +28,7 @@ import { CoreEmulatorCaptureMediaComponent } from './capture-media/capture-media CommonModule, IonicModule.forRoot(), TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, ], exports: [ CoreEmulatorCaptureMediaComponent, diff --git a/src/core/features/h5p/components/components.module.ts b/src/core/features/h5p/components/components.module.ts index e7842c6f6..be4ec55f8 100644 --- a/src/core/features/h5p/components/components.module.ts +++ b/src/core/features/h5p/components/components.module.ts @@ -17,8 +17,7 @@ import { CommonModule } from '@angular/common'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreComponentsModule } from '@components/components.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreH5PPlayerComponent } from './h5p-player/h5p-player'; import { CoreH5PIframeComponent } from './h5p-iframe/h5p-iframe'; @@ -30,9 +29,8 @@ import { CoreH5PIframeComponent } from './h5p-iframe/h5p-iframe'; imports: [ CommonModule, IonicModule, - CoreDirectivesModule, + CoreSharedModule, TranslateModule.forChild(), - CoreComponentsModule, ], providers: [ ], diff --git a/src/core/features/login/login-lazy.module.ts b/src/core/features/login/login-lazy.module.ts index dfe077134..ae934e357 100644 --- a/src/core/features/login/login-lazy.module.ts +++ b/src/core/features/login/login-lazy.module.ts @@ -18,8 +18,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/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreLoginSiteHelpComponent } from './components/site-help/site-help'; import { CoreLoginSiteOnboardingComponent } from './components/site-onboarding/site-onboarding'; @@ -74,8 +73,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, RouterModule.forChild(routes), ], declarations: [ diff --git a/src/core/features/login/pages/change-password/change-password.module.ts b/src/core/features/login/pages/change-password/change-password.module.ts index b32d3b3ef..5d81313fd 100644 --- a/src/core/features/login/pages/change-password/change-password.module.ts +++ b/src/core/features/login/pages/change-password/change-password.module.ts @@ -18,7 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreLoginChangePasswordPage } from './change-password'; const routes: Routes = [ @@ -34,7 +34,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ CoreLoginChangePasswordPage, diff --git a/src/core/features/login/pages/credentials/credentials.module.ts b/src/core/features/login/pages/credentials/credentials.module.ts index 9fd8a8a93..0a77cc9fd 100644 --- a/src/core/features/login/pages/credentials/credentials.module.ts +++ b/src/core/features/login/pages/credentials/credentials.module.ts @@ -19,9 +19,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreLoginCredentialsPage } from './credentials'; const routes: Routes = [ @@ -39,8 +37,7 @@ const routes: Routes = [ TranslateModule.forChild(), FormsModule, ReactiveFormsModule, - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ CoreLoginCredentialsPage, diff --git a/src/core/features/login/pages/email-signup/email-signup.module.ts b/src/core/features/login/pages/email-signup/email-signup.module.ts index b1a454123..3ea6bc521 100644 --- a/src/core/features/login/pages/email-signup/email-signup.module.ts +++ b/src/core/features/login/pages/email-signup/email-signup.module.ts @@ -19,8 +19,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreUserComponentsModule } from '@features/user/components/components.module'; import { CoreLoginEmailSignupPage } from './email-signup'; @@ -40,8 +39,7 @@ const routes: Routes = [ TranslateModule.forChild(), FormsModule, ReactiveFormsModule, - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, CoreUserComponentsModule, ], declarations: [ diff --git a/src/core/features/login/pages/forgotten-password/forgotten-password.module.ts b/src/core/features/login/pages/forgotten-password/forgotten-password.module.ts index f98af2e8c..4570064dc 100644 --- a/src/core/features/login/pages/forgotten-password/forgotten-password.module.ts +++ b/src/core/features/login/pages/forgotten-password/forgotten-password.module.ts @@ -19,7 +19,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreLoginForgottenPasswordPage } from './forgotten-password'; const routes: Routes = [ @@ -37,7 +37,7 @@ const routes: Routes = [ TranslateModule.forChild(), FormsModule, ReactiveFormsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ CoreLoginForgottenPasswordPage, diff --git a/src/core/features/login/pages/reconnect/reconnect.module.ts b/src/core/features/login/pages/reconnect/reconnect.module.ts index 132f56699..40d964dc1 100644 --- a/src/core/features/login/pages/reconnect/reconnect.module.ts +++ b/src/core/features/login/pages/reconnect/reconnect.module.ts @@ -19,9 +19,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreLoginReconnectPage } from './reconnect'; const routes: Routes = [ @@ -39,8 +37,7 @@ const routes: Routes = [ TranslateModule.forChild(), FormsModule, ReactiveFormsModule, - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ CoreLoginReconnectPage, diff --git a/src/core/features/login/pages/site-policy/site-policy.module.ts b/src/core/features/login/pages/site-policy/site-policy.module.ts index 10aed7b8c..07e675296 100644 --- a/src/core/features/login/pages/site-policy/site-policy.module.ts +++ b/src/core/features/login/pages/site-policy/site-policy.module.ts @@ -18,8 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreLoginSitePolicyPage } from './site-policy'; const routes: Routes = [ @@ -35,8 +34,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ CoreLoginSitePolicyPage, diff --git a/src/core/features/login/pages/site/site.module.ts b/src/core/features/login/pages/site/site.module.ts index ef21782f9..36d1c4999 100644 --- a/src/core/features/login/pages/site/site.module.ts +++ b/src/core/features/login/pages/site/site.module.ts @@ -19,9 +19,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreLoginSitePage } from './site'; const routes: Routes = [ @@ -39,8 +37,7 @@ const routes: Routes = [ TranslateModule.forChild(), FormsModule, ReactiveFormsModule, - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ CoreLoginSitePage, diff --git a/src/core/features/login/pages/sites/sites.module.ts b/src/core/features/login/pages/sites/sites.module.ts index e20a7dd13..f95a68134 100644 --- a/src/core/features/login/pages/sites/sites.module.ts +++ b/src/core/features/login/pages/sites/sites.module.ts @@ -18,9 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreLoginSitesPage } from './sites'; const routes: Routes = [ @@ -36,8 +34,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ CoreLoginSitesPage, diff --git a/src/core/features/mainmenu/mainmenu-lazy.module.ts b/src/core/features/mainmenu/mainmenu-lazy.module.ts index 0ba61adb2..03464fccf 100644 --- a/src/core/features/mainmenu/mainmenu-lazy.module.ts +++ b/src/core/features/mainmenu/mainmenu-lazy.module.ts @@ -15,11 +15,9 @@ import { CommonModule } from '@angular/common'; import { Injector, NgModule } from '@angular/core'; import { ROUTES, Routes } from '@angular/router'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CorePipesModule } from '@pipes/pipes.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { resolveModuleRoutes } from '@/app/app-routing.module'; @@ -60,9 +58,7 @@ function buildRoutes(injector: Injector): Routes { CommonModule, IonicModule, TranslateModule, - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, ], declarations: [ CoreMainMenuPage, diff --git a/src/core/features/mainmenu/pages/home/home.module.ts b/src/core/features/mainmenu/pages/home/home.module.ts index c61770912..ac5ab6b19 100644 --- a/src/core/features/mainmenu/pages/home/home.module.ts +++ b/src/core/features/mainmenu/pages/home/home.module.ts @@ -19,8 +19,7 @@ import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; import { resolveModuleRoutes } from '@/app/app-routing.module'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreMainMenuHomePage } from './home'; import { MAIN_MENU_HOME_ROUTES } from './home-routing.module'; @@ -44,8 +43,7 @@ function buildRoutes(injector: Injector): Routes { CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], providers: [ { provide: ROUTES, multi: true, useFactory: buildRoutes, deps: [Injector] }, diff --git a/src/core/features/mainmenu/pages/more/more.module.ts b/src/core/features/mainmenu/pages/more/more.module.ts index 0893e966c..03acaf749 100644 --- a/src/core/features/mainmenu/pages/more/more.module.ts +++ b/src/core/features/mainmenu/pages/more/more.module.ts @@ -18,8 +18,7 @@ import { RouterModule, ROUTES } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreMainMenuMorePage } from './more'; import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module'; @@ -28,8 +27,7 @@ import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.modu CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], providers: [ { diff --git a/src/core/features/search/components/components.module.ts b/src/core/features/search/components/components.module.ts index 132197f91..498e2e359 100644 --- a/src/core/features/search/components/components.module.ts +++ b/src/core/features/search/components/components.module.ts @@ -18,9 +18,7 @@ import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreComponentsModule } from '@components/components.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreSearchBoxComponent } from './search-box/search-box'; @@ -33,8 +31,7 @@ import { CoreSearchBoxComponent } from './search-box/search-box'; IonicModule, FormsModule, TranslateModule.forChild(), - CoreDirectivesModule, - CoreComponentsModule, + CoreSharedModule, ], exports: [ CoreSearchBoxComponent, diff --git a/src/core/features/settings/pages/about/about.module.ts b/src/core/features/settings/pages/about/about.module.ts index 1de71b78f..768b416cb 100644 --- a/src/core/features/settings/pages/about/about.module.ts +++ b/src/core/features/settings/pages/about/about.module.ts @@ -18,9 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreSettingsAboutPage } from './about'; const routes: Routes = [ @@ -48,8 +46,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ CoreSettingsAboutPage, diff --git a/src/core/features/settings/pages/app/app.module.ts b/src/core/features/settings/pages/app/app.module.ts index b68b72b02..90a8ef602 100644 --- a/src/core/features/settings/pages/app/app.module.ts +++ b/src/core/features/settings/pages/app/app.module.ts @@ -18,9 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreSettingsAppPage } from './app'; const routes: Routes = [ @@ -36,8 +34,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ CoreSettingsAppPage, diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.module.ts b/src/core/features/settings/pages/deviceinfo/deviceinfo.module.ts index 55873a40f..011669519 100644 --- a/src/core/features/settings/pages/deviceinfo/deviceinfo.module.ts +++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.module.ts @@ -18,10 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreSettingsDeviceInfoPage } from './deviceinfo'; const routes: Routes = [ @@ -37,9 +34,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, ], declarations: [ CoreSettingsDeviceInfoPage, diff --git a/src/core/features/settings/pages/general/general.module.ts b/src/core/features/settings/pages/general/general.module.ts index 3724f1686..568ed194b 100644 --- a/src/core/features/settings/pages/general/general.module.ts +++ b/src/core/features/settings/pages/general/general.module.ts @@ -19,9 +19,7 @@ import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; import { FormsModule } from '@angular/forms'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreSettingsGeneralPage } from './general'; const routes: Routes = [ @@ -38,8 +36,7 @@ const routes: Routes = [ IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ CoreSettingsGeneralPage, diff --git a/src/core/features/settings/pages/licenses/licenses.module.ts b/src/core/features/settings/pages/licenses/licenses.module.ts index 3009471b9..668db6008 100644 --- a/src/core/features/settings/pages/licenses/licenses.module.ts +++ b/src/core/features/settings/pages/licenses/licenses.module.ts @@ -18,9 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { CommonModule } from '@angular/common'; import { IonicModule } from '@ionic/angular'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreSettingsLicensesPage } from './licenses'; const routes: Routes = [ @@ -36,8 +34,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ CoreSettingsLicensesPage, diff --git a/src/core/features/settings/pages/site/site.module.ts b/src/core/features/settings/pages/site/site.module.ts index db7d710b8..cde02bba8 100644 --- a/src/core/features/settings/pages/site/site.module.ts +++ b/src/core/features/settings/pages/site/site.module.ts @@ -18,10 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { CommonModule } from '@angular/common'; import { IonicModule } from '@ionic/angular'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreSitePreferencesPage } from './site'; const routes: Routes = [ @@ -40,9 +37,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, ], }) export class CoreSitePreferencesPageModule {} diff --git a/src/core/features/settings/pages/space-usage/space-usage.module.ts b/src/core/features/settings/pages/space-usage/space-usage.module.ts index b52333454..4db70ccd8 100644 --- a/src/core/features/settings/pages/space-usage/space-usage.module.ts +++ b/src/core/features/settings/pages/space-usage/space-usage.module.ts @@ -18,10 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { CommonModule } from '@angular/common'; import { IonicModule } from '@ionic/angular'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreSettingsSpaceUsagePage } from './space-usage'; const routes: Routes = [ @@ -37,9 +34,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, ], declarations: [ CoreSettingsSpaceUsagePage, diff --git a/src/core/features/settings/pages/synchronization/synchronization.module.ts b/src/core/features/settings/pages/synchronization/synchronization.module.ts index 8e898e4a1..0cadd1822 100644 --- a/src/core/features/settings/pages/synchronization/synchronization.module.ts +++ b/src/core/features/settings/pages/synchronization/synchronization.module.ts @@ -19,9 +19,7 @@ import { RouterModule, Routes } from '@angular/router'; import { CommonModule } from '@angular/common'; import { IonicModule } from '@ionic/angular'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreSettingsSynchronizationPage } from './synchronization'; import { FormsModule } from '@angular/forms'; @@ -39,8 +37,7 @@ const routes: Routes = [ IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ CoreSettingsSynchronizationPage, diff --git a/src/core/features/sitehome/pages/index/index.module.ts b/src/core/features/sitehome/pages/index/index.module.ts index b0a5457d4..2122eafe3 100644 --- a/src/core/features/sitehome/pages/index/index.module.ts +++ b/src/core/features/sitehome/pages/index/index.module.ts @@ -18,8 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreDirectivesModule } from '@directives/directives.module'; -import { CoreComponentsModule } from '@components/components.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreBlockComponentsModule } from '@/core/features/block/components/components.module'; import { CoreSiteHomeIndexPage } from '.'; @@ -37,8 +36,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreDirectivesModule, - CoreComponentsModule, + CoreSharedModule, CoreBlockComponentsModule, ], declarations: [ diff --git a/src/core/features/tag/pages/index-area/index-area.page.module.ts b/src/core/features/tag/pages/index-area/index-area.page.module.ts index cbda0ac1b..5bc977a9b 100644 --- a/src/core/features/tag/pages/index-area/index-area.page.module.ts +++ b/src/core/features/tag/pages/index-area/index-area.page.module.ts @@ -18,9 +18,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { RouterModule, Routes } from '@angular/router'; import { CommonModule } from '@angular/common'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreTagIndexAreaPage } from './index-area.page'; const routes: Routes = [ @@ -39,8 +37,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], exports: [RouterModule], }) diff --git a/src/core/features/tag/pages/index/index.page.module.ts b/src/core/features/tag/pages/index/index.page.module.ts index ff96bc857..2f21892ed 100644 --- a/src/core/features/tag/pages/index/index.page.module.ts +++ b/src/core/features/tag/pages/index/index.page.module.ts @@ -18,9 +18,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CommonModule } from '@angular/common'; import { RouterModule, Routes } from '@angular/router'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreTagIndexPage } from './index.page'; const routes: Routes = [ @@ -39,8 +37,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], exports: [RouterModule], }) diff --git a/src/core/features/tag/pages/search/search.page.module.ts b/src/core/features/tag/pages/search/search.page.module.ts index f370c592a..87511074e 100644 --- a/src/core/features/tag/pages/search/search.page.module.ts +++ b/src/core/features/tag/pages/search/search.page.module.ts @@ -18,8 +18,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { CommonModule } from '@angular/common'; import { RouterModule, Routes } from '@angular/router'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreSearchComponentsModule } from '@features/search/components/components.module'; import { CoreTagSearchPage } from './search.page'; @@ -41,8 +40,7 @@ const routes: Routes = [ IonicModule, FormsModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, CoreSearchComponentsModule, ], exports: [RouterModule], diff --git a/src/core/features/user/components/components.module.ts b/src/core/features/user/components/components.module.ts index 00837117a..2b4d53afe 100644 --- a/src/core/features/user/components/components.module.ts +++ b/src/core/features/user/components/components.module.ts @@ -17,9 +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/directives.module'; -import { CorePipesModule } from '@pipes/pipes.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreUserProfileFieldComponent } from './user-profile-field/user-profile-field'; import { CoreUserTagAreaComponent } from './tag-area/tag-area'; @@ -32,9 +30,7 @@ import { CoreUserTagAreaComponent } from './tag-area/tag-area'; CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - CorePipesModule, + CoreSharedModule, ], providers: [ ], diff --git a/src/core/features/user/pages/about/about.module.ts b/src/core/features/user/pages/about/about.module.ts index 2c2e2c340..98b7c73a4 100644 --- a/src/core/features/user/pages/about/about.module.ts +++ b/src/core/features/user/pages/about/about.module.ts @@ -18,8 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; +import { CoreSharedModule } from '@/core/shared.module'; import { CoreUserComponentsModule } from '@features/user/components/components.module'; import { CoreUserAboutPage } from './about.page'; @@ -37,8 +36,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, CoreUserComponentsModule, ], declarations: [ diff --git a/src/core/features/user/pages/profile/profile.module.ts b/src/core/features/user/pages/profile/profile.module.ts index 67f81126b..c408e3b0f 100644 --- a/src/core/features/user/pages/profile/profile.module.ts +++ b/src/core/features/user/pages/profile/profile.module.ts @@ -18,9 +18,7 @@ import { RouterModule, Routes } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - +import { CoreSharedModule } from '@/core/shared.module'; import { CoreUserProfilePage } from './profile.page'; const routes: Routes = [ @@ -36,8 +34,7 @@ const routes: Routes = [ CommonModule, IonicModule, TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, + CoreSharedModule, ], declarations: [ CoreUserProfilePage,