Skip to content

Commit 9c5163b

Browse files
committed
MOBILE-4759 chore: Add CoreBaseModule to be imported in main components
1 parent 788e40c commit 9c5163b

File tree

45 files changed

+230
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+230
-244
lines changed

src/core/base.module.ts

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// (C) Copyright 2015 Moodle Pty Ltd.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
import { NgModule } from '@angular/core';
16+
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
17+
import { TranslateModule } from '@ngx-translate/core';
18+
import { CommonModule } from '@angular/common';
19+
import { IonicModule } from '@ionic/angular';
20+
21+
@NgModule({
22+
imports: [
23+
TranslateModule.forChild(),
24+
],
25+
exports: [
26+
CommonModule,
27+
FormsModule,
28+
IonicModule,
29+
ReactiveFormsModule,
30+
TranslateModule,
31+
],
32+
})
33+
export class CoreBaseModule {}

src/core/components/attachments/attachments.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@ import { toBoolean } from '@/core/transforms/boolean';
2828
import { CoreAlerts } from '@services/overlays/alerts';
2929
import { CoreToasts } from '@services/overlays/toasts';
3030
import { CoreWSFile } from '@services/ws';
31-
import { TranslateModule } from '@ngx-translate/core';
32-
import { CoreFileComponent } from '../file/file';
33-
import { CoreLocalFileComponent } from '../local-file/local-file';
34-
import { NgFor } from '@angular/common';
35-
import { CoreFaIconDirective } from '../../directives/fa-icon';
36-
import { CoreUpdateNonReactiveAttributesDirective } from '../../directives/update-non-reactive-attributes';
37-
import { CoreMarkRequiredComponent } from '../mark-required/mark-required';
38-
import { IonicModule } from '@ionic/angular';
31+
import { CoreBaseModule } from '@/core/base.module';
3932
import { CoreLoadingComponent } from '../loading/loading';
33+
import { CoreLocalFileComponent } from '../local-file/local-file';
34+
import { CoreFileComponent } from '../file/file';
35+
import { CoreMarkRequiredComponent } from '@components/mark-required/mark-required';
36+
import { CoreFaIconDirective } from '@directives/fa-icon';
37+
import { CoreUpdateNonReactiveAttributesDirective } from '@directives/update-non-reactive-attributes';
4038

4139
/**
4240
* Component to render attachments, allow adding more and delete the current ones.
@@ -57,15 +55,13 @@ import { CoreLoadingComponent } from '../loading/loading';
5755
styleUrl: 'attachments.scss',
5856
standalone: true,
5957
imports: [
60-
CoreLoadingComponent,
61-
IonicModule,
62-
CoreMarkRequiredComponent,
63-
CoreUpdateNonReactiveAttributesDirective,
58+
CoreBaseModule,
6459
CoreFaIconDirective,
65-
NgFor,
60+
CoreUpdateNonReactiveAttributesDirective,
61+
CoreLoadingComponent,
6662
CoreLocalFileComponent,
6763
CoreFileComponent,
68-
TranslateModule,
64+
CoreMarkRequiredComponent,
6965
],
7066
})
7167
export class CoreAttachmentsComponent implements OnInit {

src/core/components/bs-tooltip/bs-tooltip.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
import { CoreBaseModule } from '@/core/base.module';
1516
import { toBoolean } from '@/core/transforms/boolean';
1617
import { Component, Input } from '@angular/core';
17-
import { IonicModule } from '@ionic/angular';
1818

1919
/**
2020
* Component to display a Bootstrap Tooltip in a popover.
@@ -23,7 +23,7 @@ import { IonicModule } from '@ionic/angular';
2323
selector: 'core-bs-tooltip',
2424
templateUrl: 'core-bs-tooltip.html',
2525
standalone: true,
26-
imports: [IonicModule],
26+
imports: [CoreBaseModule],
2727
})
2828
export class CoreBSTooltipComponent {
2929

src/core/components/button-with-spinner/button-with-spinner.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
import { toBoolean } from '@/core/transforms/boolean';
1616
import { Component, Input } from '@angular/core';
1717
import { CoreAnimations } from '@components/animations';
18-
import { TranslateModule } from '@ngx-translate/core';
19-
import { IonicModule } from '@ionic/angular';
18+
import { CoreBaseModule } from '@/core/base.module';
2019

2120
/**
2221
* Component to show a button or a spinner when loading.
@@ -32,7 +31,7 @@ import { IonicModule } from '@ionic/angular';
3231
styleUrl: 'button-with-spinner.scss',
3332
animations: [CoreAnimations.SHOW_HIDE],
3433
standalone: true,
35-
imports: [IonicModule, TranslateModule],
34+
imports: [CoreBaseModule],
3635
})
3736
export class CoreButtonWithSpinnerComponent {
3837

src/core/components/chart/chart.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import { Component, Input, OnDestroy, OnInit, ElementRef, OnChanges, ViewChild,
1818
import { CoreFilter } from '@features/filter/services/filter';
1919
import { CoreFilterHelper } from '@features/filter/services/filter-helper';
2020
import { ChartLegendLabelItem, ChartLegendOptions } from 'chart.js';
21-
import { CoreFaIconDirective } from '../../directives/fa-icon';
22-
import { IonicModule } from '@ionic/angular';
21+
import { CoreBaseModule } from '@/core/base.module';
22+
import { CoreFaIconDirective } from '@directives/fa-icon';
2323

2424
/**
2525
* This component shows a chart using chart.js.
@@ -34,7 +34,10 @@ import { IonicModule } from '@ionic/angular';
3434
templateUrl: 'core-chart.html',
3535
styleUrl: 'chart.scss',
3636
standalone: true,
37-
imports: [IonicModule, CoreFaIconDirective],
37+
imports: [
38+
CoreBaseModule,
39+
CoreFaIconDirective,
40+
],
3841
})
3942
export class CoreChartComponent implements OnDestroy, OnInit, OnChanges {
4043

src/core/components/chrono/chrono.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import {
2424
SimpleChange,
2525
ChangeDetectorRef,
2626
} from '@angular/core';
27-
import { CoreSecondsToHMSPipe } from '../../pipes/seconds-to-hms';
27+
import { CoreBaseModule } from '@/core/base.module';
28+
import { CoreSecondsToHMSPipe } from '@pipes/seconds-to-hms';
2829

2930
/**
3031
* This component shows a chronometer in format HH:MM:SS.
@@ -43,6 +44,7 @@ import { CoreSecondsToHMSPipe } from '../../pipes/seconds-to-hms';
4344
templateUrl: 'core-chrono.html',
4445
standalone: true,
4546
imports: [
47+
CoreBaseModule,
4648
CoreSecondsToHMSPipe,
4749
],
4850
})

src/core/components/combobox/combobox.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
1616
import { Translate } from '@singletons';
1717
import { ModalOptions } from '@ionic/core';
1818
import { CoreModals } from '@services/overlays/modals';
19-
import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms';
19+
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
2020
import { toBoolean } from '@/core/transforms/boolean';
21-
import { CoreFormatTextDirective } from '../../directives/format-text';
22-
import { CoreUpdateNonReactiveAttributesDirective } from '../../directives/update-non-reactive-attributes';
23-
import { CoreFaIconDirective } from '../../directives/fa-icon';
24-
import { IonicModule } from '@ionic/angular';
21+
import { CoreBaseModule } from '@/core/base.module';
22+
import { CoreFaIconDirective } from '@directives/fa-icon';
23+
import { CoreFormatTextDirective } from '@directives/format-text';
24+
import { CoreUpdateNonReactiveAttributesDirective } from '@directives/update-non-reactive-attributes';
2525

2626
/**
2727
* Component that show a combo select button (combobox).
@@ -54,8 +54,7 @@ import { IonicModule } from '@ionic/angular';
5454
],
5555
standalone: true,
5656
imports: [
57-
IonicModule,
58-
FormsModule,
57+
CoreBaseModule,
5958
CoreFaIconDirective,
6059
CoreUpdateNonReactiveAttributesDirective,
6160
CoreFormatTextDirective,

src/core/components/context-menu/context-menu-popover.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ import { Component } from '@angular/core';
1717
import { NavParams } from '@ionic/angular';
1818
import { PopoverController } from '@singletons';
1919
import { CoreContextMenuItemComponent } from './context-menu-item';
20-
import { CoreSharedModule } from '@/core/shared.module';
20+
import { CoreBaseModule } from '@/core/base.module';
21+
import { CoreFaIconDirective } from '@directives/fa-icon';
22+
import { CoreLinkDirective } from '@directives/link';
2123

2224
/**
2325
* Component to display a list of items received by param in a popover.
@@ -28,7 +30,9 @@ import { CoreSharedModule } from '@/core/shared.module';
2830
styleUrl: 'context-menu-popover.scss',
2931
standalone: true,
3032
imports: [
31-
CoreSharedModule,
33+
CoreBaseModule,
34+
CoreFaIconDirective,
35+
CoreLinkDirective,
3236
],
3337
})
3438
export class CoreContextMenuPopoverComponent {

src/core/components/context-menu/context-menu.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import { CoreUtils } from '@singletons/utils';
2020
import { Translate } from '@singletons';
2121
import { CoreContextMenuItemComponent } from './context-menu-item';
2222
import { CoreDirectivesRegistry } from '@singletons/directives-registry';
23-
import { CoreFaIconDirective } from '../../directives/fa-icon';
24-
import { CoreUpdateNonReactiveAttributesDirective } from '../../directives/update-non-reactive-attributes';
25-
import { IonicModule } from '@ionic/angular';
23+
import { CoreBaseModule } from '@/core/base.module';
24+
import { CoreFaIconDirective } from '@directives/fa-icon';
25+
import { CoreUpdateNonReactiveAttributesDirective } from '@directives/update-non-reactive-attributes';
2626

2727
/**
2828
* This component adds a button (usually in the navigation bar) that displays a context menu popover.
@@ -32,7 +32,7 @@ import { IonicModule } from '@ionic/angular';
3232
templateUrl: 'core-context-menu.html',
3333
standalone: true,
3434
imports: [
35-
IonicModule,
35+
CoreBaseModule,
3636
CoreUpdateNonReactiveAttributesDirective,
3737
CoreFaIconDirective,
3838
],

src/core/components/course-image/course-image.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ import { Component, ElementRef, HostBinding, input, effect } from '@angular/core
1717
import { CoreCourseListItem } from '@features/courses/services/courses';
1818
import { CoreCoursesHelper } from '@features/courses/services/courses-helper';
1919
import { CoreColors } from '@singletons/colors';
20-
import { CoreExternalContentDirective } from '../../directives/external-content';
21-
import { CoreFaIconDirective } from '../../directives/fa-icon';
22-
import { IonicModule } from '@ionic/angular';
20+
import { CoreBaseModule } from '@/core/base.module';
21+
import { CoreExternalContentDirective } from '@directives/external-content';
22+
import { CoreFaIconDirective } from '@directives/fa-icon';
2323

2424
@Component({
2525
selector: 'core-course-image',
2626
templateUrl: 'course-image.html',
2727
styleUrl: './course-image.scss',
2828
standalone: true,
2929
imports: [
30-
IonicModule,
30+
CoreBaseModule,
3131
CoreFaIconDirective,
3232
CoreExternalContentDirective,
3333
],

0 commit comments

Comments
 (0)