Skip to content

Commit

Permalink
fix(auth): use IgoAuthModule instead of TranslateModule
Browse files Browse the repository at this point in the history
  • Loading branch information
alecarn committed May 1, 2024
1 parent 114f911 commit 3277105
Show file tree
Hide file tree
Showing 110 changed files with 258 additions and 250 deletions.
4 changes: 2 additions & 2 deletions packages/auth/form/src/auth-form/auth-form.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import {
AuthMicrosoftb2cComponent
} from '@igo2/auth/microsoft';
import { ConfigService } from '@igo2/core/config';
import { IgoLanguageModule } from '@igo2/core/language';

import { TranslateModule } from '@ngx-translate/core';
import { filter } from 'rxjs/operators';

import { AuthFormOptions } from '../shared';
Expand All @@ -40,7 +40,7 @@ import { AuthFormOptions } from '../shared';
AuthFacebookComponent,
AuthInternComponent,
MatButtonModule,
TranslateModule
IgoLanguageModule
]
})
export class AuthFormComponent implements OnInit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ import { MatProgressSpinner } from '@angular/material/progress-spinner';

import { AuthService } from '@igo2/auth';
import { LanguageService } from '@igo2/core/language';

import { TranslateModule } from '@ngx-translate/core';
import { IgoLanguageModule } from '@igo2/core/language';

@Component({
selector: 'igo-auth-intern',
Expand All @@ -37,7 +36,7 @@ import { TranslateModule } from '@ngx-translate/core';
MatButtonModule,
MatProgressSpinner,
NgIf,
TranslateModule
IgoLanguageModule
]
})
export class AuthInternComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { MatButtonModule } from '@angular/material/button';
import { AuthService } from '@igo2/auth';
import { IconSvg, IgoIconComponent, MICROSOFT_ICON } from '@igo2/common';
import { ConfigService } from '@igo2/core/config';
import { IgoLanguageModule } from '@igo2/core/language';

import {
MSAL_GUARD_CONFIG,
Expand All @@ -25,7 +26,6 @@ import {
PublicClientApplication,
SilentRequest
} from '@azure/msal-browser';
import { TranslateModule } from '@ngx-translate/core';
import { Subject } from 'rxjs';
import { filter, takeUntil } from 'rxjs/operators';

Expand All @@ -40,7 +40,7 @@ import {
styleUrls: ['./auth-microsoft.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [MatButtonModule, TranslateModule, IgoIconComponent]
imports: [MatButtonModule, IgoLanguageModule, IgoIconComponent]
})
export class AuthMicrosoftComponent {
private options?: AuthMicrosoftOptions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { MatButtonModule } from '@angular/material/button';
import { AuthService } from '@igo2/auth';
import { IconSvg, IgoIconComponent, MICROSOFT_ICON } from '@igo2/common';
import { ConfigService } from '@igo2/core/config';
import { IgoLanguageModule } from '@igo2/core/language';

import { MSAL_GUARD_CONFIG } from '@azure/msal-angular';
import {
Expand All @@ -21,7 +22,6 @@ import {
PublicClientApplication,
SilentRequest
} from '@azure/msal-browser';
import { TranslateModule } from '@ngx-translate/core';
import { Subject } from 'rxjs';
import { filter, takeUntil } from 'rxjs/operators';

Expand All @@ -38,7 +38,7 @@ import { MsalServiceb2c } from './auth-msalServiceb2c.service';
styleUrls: ['./auth-microsoftb2c.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [MatButtonModule, TranslateModule, IgoIconComponent],
imports: [MatButtonModule, IgoLanguageModule, IgoIconComponent],
providers: [MsalServiceb2c]
})
export class AuthMicrosoftb2cComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { TestBed } from '@angular/core/testing';
import { AuthService } from '@igo2/auth';
import { IgoAuthFormModule } from '@igo2/auth/form';
import { ConfigService } from '@igo2/core/config';
import { provideMockRootTranslation } from '@igo2/core/language';
import { provideMockTranslation } from '@igo2/core/language';
import { MessageService } from '@igo2/core/message';
import {
AnyMonitoringOptions,
Expand All @@ -22,7 +22,7 @@ const initialize = (
TestBed.configureTestingModule({
imports: [
HttpClientModule,
provideMockRootTranslation(),
provideMockTranslation(),
IgoAuthFormModule,
ToastrModule
],
Expand Down
7 changes: 2 additions & 5 deletions packages/auth/src/lib/shared/auth.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { HttpClientModule } from '@angular/common/http';
import { TestBed, inject } from '@angular/core/testing';

import {
IgoLanguageModule,
provideMockRootTranslation
} from '@igo2/core/language';
import { IgoLanguageModule, provideMockTranslation } from '@igo2/core/language';
import { IgoMessageModule } from '@igo2/core/message';

import { AuthService } from './auth.service';
Expand All @@ -14,7 +11,7 @@ describe('AuthService', () => {
TestBed.configureTestingModule({
imports: [
HttpClientModule,
provideMockRootTranslation(),
provideMockTranslation(),
IgoLanguageModule,
IgoMessageModule
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ import { MatIconModule } from '@angular/material/icon';
import { MatListModule } from '@angular/material/list';
import { MatTooltipModule } from '@angular/material/tooltip';

import { TranslateModule } from '@ngx-translate/core';
import { IgoLanguageModule } from '@igo2/core/language';

import { BehaviorSubject, Subscription, isObservable } from 'rxjs';

import { IgoIconComponent } from '../../icons';
Expand All @@ -38,7 +39,7 @@ import { Action } from '../shared/action.interfaces';
MatIconModule,
MatCheckboxModule,
AsyncPipe,
TranslateModule,
IgoLanguageModule,
IgoIconComponent
]
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import {
} from '@angular/material/menu';
import { MatTooltipModule } from '@angular/material/tooltip';

import { IgoLanguageModule } from '@igo2/core/language';
import { Media, MediaService } from '@igo2/core/media';

import { TranslateModule } from '@ngx-translate/core';
import { BehaviorSubject } from 'rxjs';

import { EntityStoreWatcher } from '../../entity';
Expand Down Expand Up @@ -54,7 +54,7 @@ import { ActionbarItemComponent } from './actionbar-item.component';
MatMenuModule,
MatCardModule,
AsyncPipe,
TranslateModule
IgoLanguageModule
]
})
export class ActionbarComponent implements OnDestroy, OnChanges {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import { MatButtonModule } from '@angular/material/button';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';

import { TranslateModule } from '@ngx-translate/core';
import { IgoLanguageModule } from '@igo2/core/language';

import { ColorEvent } from 'ngx-color';
import { ColorChromeModule } from 'ngx-color/chrome';
import tinycolor, { ColorInput } from 'tinycolor2';
Expand All @@ -37,7 +38,7 @@ type ColorFormat = 'hex' | 'rgba' | 'hsla';
CdkConnectedOverlay,
ColorChromeModule,
MatButtonModule,
TranslateModule
IgoLanguageModule
]
})
export class ColorPickerFormFieldComponent implements ControlValueAccessor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
MatDialogTitle
} from '@angular/material/dialog';

import { TranslateModule } from '@ngx-translate/core';
import { IgoLanguageModule } from '@igo2/core/language';

@Component({
selector: 'igo-confirm-dialog',
Expand All @@ -19,7 +19,7 @@ import { TranslateModule } from '@ngx-translate/core';
MatDialogContent,
MatDialogActions,
MatButtonModule,
TranslateModule
IgoLanguageModule
]
})
export class ConfirmDialogComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ import { MatSortModule } from '@angular/material/sort';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { MatTooltipModule } from '@angular/material/tooltip';

import { IgoLanguageModule } from '@igo2/core/language';
import { StringUtils } from '@igo2/utils';

import { TranslateModule } from '@ngx-translate/core';
import { default as moment } from 'moment';
import { BehaviorSubject, Observable, Subscription } from 'rxjs';
import { debounceTime, map } from 'rxjs/operators';
Expand Down Expand Up @@ -125,7 +125,7 @@ interface RowData {
SanitizeHtmlPipe,
SecureImagePipe,
StopPropagationDirective,
TranslateModule
IgoLanguageModule
]
})
export class EntityTableComponent implements OnInit, OnChanges, OnDestroy {
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/lib/form-dialog/form-dialog.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
} from '@angular/material/dialog';

import { LanguageService } from '@igo2/core/language';
import { IgoLanguageModule } from '@igo2/core/language';

import { TranslateModule } from '@ngx-translate/core';
import { BehaviorSubject } from 'rxjs';

import { CustomHtmlComponent } from '../custom-html/custom-html.component';
Expand Down Expand Up @@ -42,7 +42,7 @@ import { FormDialogData } from './form-dialog.interface';
MatButtonModule,
CustomHtmlComponent,
AsyncPipe,
TranslateModule
IgoLanguageModule
]
})
export class FormDialogComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
import { MatSelectModule } from '@angular/material/select';

import { TranslateModule } from '@ngx-translate/core';
import { IgoLanguageModule } from '@igo2/core/language';

import { BehaviorSubject } from 'rxjs';

import { IgoFormFieldComponent } from '../shared/form-field-component';
Expand Down Expand Up @@ -41,7 +42,7 @@ import {
NgIf,
MatIconModule,
AsyncPipe,
TranslateModule
IgoLanguageModule
]
})
export class FormFieldSelectComponent implements OnInit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';

import { TranslateModule } from '@ngx-translate/core';
import { IgoLanguageModule } from '@igo2/core/language';

import { BehaviorSubject } from 'rxjs';

import { IgoFormFieldComponent } from '../shared/form-field-component';
Expand All @@ -40,7 +41,7 @@ import {
MatIconModule,
MatButtonModule,
AsyncPipe,
TranslateModule
IgoLanguageModule
]
})
export class FormFieldTextComponent implements OnInit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';

import { TranslateModule } from '@ngx-translate/core';
import { IgoLanguageModule } from '@igo2/core/language';

import { BehaviorSubject } from 'rxjs';

import { IgoFormFieldComponent } from '../shared/form-field-component';
Expand All @@ -37,7 +38,7 @@ import {
NgIf,
MatIconModule,
AsyncPipe,
TranslateModule
IgoLanguageModule
]
})
export class FormFieldTextareaComponent implements OnInit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { UntypedFormGroup } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';

import { TranslateModule } from '@ngx-translate/core';
import { IgoLanguageModule } from '@igo2/core/language';

import { FormFieldComponent } from '../form-field/form-field.component';
import { FormField, FormFieldGroup } from '../shared/form.interfaces';
Expand All @@ -26,7 +26,7 @@ import { getControlErrorMessage } from '../shared/form.utils';
NgClass,
FormFieldComponent,
MatFormFieldModule,
TranslateModule
IgoLanguageModule
]
})
export class FormGroupComponent {
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/lib/home-button/home-button.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { MatTooltipModule } from '@angular/material/tooltip';

import { TranslateModule } from '@ngx-translate/core';
import { IgoLanguageModule } from '@igo2/core/language';

@Component({
selector: 'igo-home-button',
templateUrl: './home-button.component.html',
styleUrls: ['./home-button.component.scss'],
standalone: true,
imports: [MatButtonModule, MatTooltipModule, MatIconModule, TranslateModule]
imports: [MatButtonModule, MatTooltipModule, MatIconModule, IgoLanguageModule]
})
export class HomeButtonComponent {
@Output() unselectButton = new EventEmitter<any>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { MatTooltipModule } from '@angular/material/tooltip';

import { TranslateModule } from '@ngx-translate/core';
import { IgoLanguageModule } from '@igo2/core/language';

import { Observable, of } from 'rxjs';

import {
Expand All @@ -28,7 +29,7 @@ import { InteractiveTourService } from './interactive-tour.service';
MatTooltipModule,
MatIconModule,
AsyncPipe,
TranslateModule,
IgoLanguageModule,
IgoIconComponent
]
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import {
import { MatRadioChange, MatRadioModule } from '@angular/material/radio';

import { LanguageService } from '@igo2/core/language';
import { IgoLanguageModule } from '@igo2/core/language';

import { TranslateModule } from '@ngx-translate/core';
import { BehaviorSubject } from 'rxjs';

import { SelectValueDialogType } from './select-value-dialog.enums';
Expand All @@ -40,7 +40,7 @@ import { SelectValueData } from './select-value-dialog.interface';
MatDialogActions,
MatButtonModule,
AsyncPipe,
TranslateModule
IgoLanguageModule
]
})
export class SelectValueCheckRadioDialogComponent implements OnInit {
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/lib/table/table.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import { MatInputModule } from '@angular/material/input';
import { MatSort, MatSortModule } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table';

import { IgoLanguageModule } from '@igo2/core/language';
import { ObjectUtils } from '@igo2/utils';

import { TranslateModule } from '@ngx-translate/core';
import { fromEvent } from 'rxjs';
import { debounceTime, distinctUntilChanged } from 'rxjs/operators';

Expand All @@ -46,7 +46,7 @@ import { TableModel } from './table-model.interface';
NgClass,
MatButtonModule,
MatIconModule,
TranslateModule
IgoLanguageModule
]
})
export class TableComponent implements OnChanges, OnInit, AfterViewInit {
Expand Down
Loading

0 comments on commit 3277105

Please sign in to comment.