Skip to content

Commit

Permalink
chore(*): format all files to sort imports (#1427)
Browse files Browse the repository at this point in the history
* chore(git): adding eol = lf to git attributes

* chore(*): adding a plugin to prettier to sort imports

* chore(*): format all files to sort imports

---------

Co-authored-by: Alexandre Caron <[email protected]>
  • Loading branch information
pelord and alecarn authored Oct 11, 2023
1 parent e6eaa28 commit aadd568
Show file tree
Hide file tree
Showing 647 changed files with 3,430 additions and 3,085 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
text eol=lf
7 changes: 6 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"singleQuote": true,
"trailingComma": "none",
"endOfLine": "lf"
"endOfLine": "lf",
"importOrder": ["^@angular/(.*)$", "^@igo2/(.*)$", "^ol/(.*)$", "<THIRD_PARTY_MODULES>", "^[./]"],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true,
"importOrderParserPlugins": ["typescript", "decorators-legacy"],
"plugins": ["@trivago/prettier-plugin-sort-imports"]
}
7 changes: 3 additions & 4 deletions demo/src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';

import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatIconModule } from '@angular/material/icon';
import { MatIconTestingModule } from '@angular/material/icon/testing';
import { MatListModule } from '@angular/material/list';
import { MatSidenavModule } from '@angular/material/sidenav';
import { MatToolbarModule } from '@angular/material/toolbar';
import { MatIconTestingModule } from '@angular/material/icon/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { RouterTestingModule } from '@angular/router/testing';

import { IgoAuthModule } from '@igo2/auth';

Expand Down
11 changes: 6 additions & 5 deletions demo/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
import { MediaMatcher } from '@angular/cdk/layout';
import { DOCUMENT } from '@angular/common';
import {
OnInit,
ChangeDetectorRef,
Component,
Inject,
OnDestroy
OnDestroy,
OnInit
} from '@angular/core';
import { NavigationEnd, Router } from '@angular/router';

import { userAgent, DomUtils } from '@igo2/utils';
import { version } from '@igo2/core';
import { NavigationEnd, Router } from '@angular/router';
import { DomUtils, userAgent } from '@igo2/utils';

import { delay, first } from 'rxjs';
import { DOCUMENT } from '@angular/common';

@Component({
selector: 'app-root',
Expand Down
78 changes: 38 additions & 40 deletions demo/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,69 +1,67 @@
import { BrowserModule, DomSanitizer } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { DatePipe } from '@angular/common';
import {
APP_INITIALIZER,
ApplicationRef,
Injector,
NgModule
} from '@angular/core';
import { HammerModule } from '@angular/platform-browser';
import { MatButtonModule } from '@angular/material/button';
import { MatIconRegistry, MatIconModule } from '@angular/material/icon';
import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
import { MatIconModule, MatIconRegistry } from '@angular/material/icon';
import { MatListModule } from '@angular/material/list';
import { MatSidenavModule } from '@angular/material/sidenav';
import { MatToolbarModule } from '@angular/material/toolbar';
import { AppHomeModule } from './core/home/home.module';
import { AppActivityModule } from './core/activity/activity.module';
import { AppConfigModule } from './core/config/config.module';
import { AppLanguageModule } from './core/language/language.module';
import { AppMediaModule } from './core/media/media.module';
import { AppMessageModule } from './core/message/message.module';
import { AppRequestModule } from './core/request/request.module';
import {
MAT_TOOLTIP_DEFAULT_OPTIONS,
MatTooltipDefaultOptions
} from '@angular/material/tooltip';
import { BrowserModule, DomSanitizer } from '@angular/platform-browser';
import { HammerModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';

import { IgoCoreModule, LanguageService } from '@igo2/core';

import { concatMap, first } from 'rxjs';

import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { AppAuthFormModule } from './auth/auth-form/auth-form.module';
import { AppActionModule } from './common/action/action.module';
import { AppDynamicComponentModule } from './common/dynamic-component/dynamic-component.module';
import { AppEntityTableModule } from './common/entity-table/entity-table.module';
import { AppEntitySelectorModule } from './common/entity-selector/entity-selector.module';
import { AppEntityTableModule } from './common/entity-table/entity-table.module';
import { AppFormModule } from './common/form/form.module';
import { AppTableModule } from './common/table/table.module';
import { AppToolModule } from './common/tool/tool.module';
import { AppWidgetModule } from './common/widget/widget.module';

import { AppAuthFormModule } from './auth/auth-form/auth-form.module';

import { AppSimpleMapModule } from './geo/simple-map/simple-map.module';
import { AppLayerModule } from './geo/layer/layer.module';
import { AppLegendModule } from './geo/legend/legend.module';
import { AppOverlayModule } from './geo/overlay/overlay.module';
import { AppGeometryModule } from './geo/geometry/geometry.module';
import { AppContextModule } from './context/context/context.module';
import { AppActivityModule } from './core/activity/activity.module';
import { AppConfigModule } from './core/config/config.module';
import { AppHomeModule } from './core/home/home.module';
import { AppLanguageModule } from './core/language/language.module';
import { AppMediaModule } from './core/media/media.module';
import { AppMessageModule } from './core/message/message.module';
import { AppRequestModule } from './core/request/request.module';
import { AppCatalogModule } from './geo/catalog/catalog.module';
import { AppDirectionsModule } from './geo/directions/directions.module';
import { AppDrawModule } from './geo/draw/draw.module';
import { AppFeatureModule } from './geo/feature/feature.module';
import { AppGeometryModule } from './geo/geometry/geometry.module';
import { AppHoverModule } from './geo/hover/hover.module';
import { AppImportExport } from './geo/import-export/import-export.module';
import { AppLayerModule } from './geo/layer/layer.module';
import { AppLegendModule } from './geo/legend/legend.module';
import { AppMeasureModule } from './geo/measure/measure.module';
import { AppDrawModule } from './geo/draw/draw.module';
import { AppOgcFilterModule } from './geo/ogc-filter/ogc-filter.module';
import { AppOverlayModule } from './geo/overlay/overlay.module';
import { AppPrintModule } from './geo/print/print.module';
import { AppQueryModule } from './geo/query/query.module';
import { AppCatalogModule } from './geo/catalog/catalog.module';
import { AppSearchModule } from './geo/search/search.module';
import { AppPrintModule } from './geo/print/print.module';
import { AppImportExport } from './geo/import-export/import-export.module';
import { AppDirectionsModule } from './geo/directions/directions.module';
import { AppTimeFilterModule } from './geo/time-filter/time-filter.module';
import { AppOgcFilterModule } from './geo/ogc-filter/ogc-filter.module';
import { AppSimpleMapModule } from './geo/simple-map/simple-map.module';
import { AppSpatialFilterModule } from './geo/spatial-filter/spatial-filter.module';
import { AppTimeFilterModule } from './geo/time-filter/time-filter.module';
import { AppWorkspaceModule } from './geo/workspace/workspace.module';

import { AppContextModule } from './context/context/context.module';

import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { IgoCoreModule, LanguageService } from '@igo2/core';
import {
MatTooltipDefaultOptions,
MAT_TOOLTIP_DEFAULT_OPTIONS
} from '@angular/material/tooltip';
import { concatMap, first } from 'rxjs';
import { DatePipe } from '@angular/common';
import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';

export const defaultTooltipOptions: MatTooltipDefaultOptions = {
showDelay: 500,
hideDelay: 0,
Expand Down
2 changes: 1 addition & 1 deletion demo/src/app/auth/auth-form/auth-form-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Routes, RouterModule } from '@angular/router';
import { RouterModule, Routes } from '@angular/router';

import { AppAuthFormComponent } from './auth-form.component';

Expand Down
4 changes: 2 additions & 2 deletions demo/src/app/auth/auth-form/auth-form.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core';

import { IgoAuthModule } from '@igo2/auth';

import { AppAuthFormComponent } from './auth-form.component';
import { AppAuthFormRoutingModule } from './auth-form-routing.module';
import { SharedModule } from '../../shared/shared.module';
import { AppAuthFormRoutingModule } from './auth-form-routing.module';
import { AppAuthFormComponent } from './auth-form.component';

@NgModule({
declarations: [AppAuthFormComponent],
Expand Down
2 changes: 1 addition & 1 deletion demo/src/app/common/action/action-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Routes, RouterModule } from '@angular/router';
import { RouterModule, Routes } from '@angular/router';

import { AppActionComponent } from './action.component';

Expand Down
14 changes: 7 additions & 7 deletions demo/src/app/common/action/action.component.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { Component, OnInit, OnDestroy } from '@angular/core';

import { BehaviorSubject } from 'rxjs';
import { Overlay } from '@angular/cdk/overlay';
import { Component, OnDestroy, OnInit } from '@angular/core';

import { ActionStore, ActionbarMode } from '@igo2/common';
import {
LanguageService,
Media,
MediaOrientation,
MediaService,
LanguageService
MediaService
} from '@igo2/core';
import { ActionStore, ActionbarMode } from '@igo2/common';
import { Overlay } from '@angular/cdk/overlay';

import { BehaviorSubject } from 'rxjs';

@Component({
selector: 'app-action',
Expand Down
4 changes: 2 additions & 2 deletions demo/src/app/common/action/action.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core';

import { IgoActionModule, IgoContextMenuModule } from '@igo2/common';

import { AppActionComponent } from './action.component';
import { AppActionRoutingModule } from './action-routing.module';
import { SharedModule } from '../../shared/shared.module';
import { AppActionRoutingModule } from './action-routing.module';
import { AppActionComponent } from './action.component';

@NgModule({
declarations: [AppActionComponent],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Routes, RouterModule } from '@angular/router';
import { RouterModule, Routes } from '@angular/router';

import { AppDynamicComponentComponent } from './dynamic-component.component';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {
Component,
Input,
ChangeDetectionStrategy,
ChangeDetectorRef
ChangeDetectorRef,
Component,
Input
} from '@angular/core';

import { OnUpdateInputs } from '@igo2/common';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { NgModule } from '@angular/core';

import { IgoDynamicComponentModule } from '@igo2/common';

import { SharedModule } from '../../shared/shared.module';
import { AppDynamicComponentRoutingModule } from './dynamic-component-routing.module';
import {
AppSalutationComponent,
AppDynamicComponentComponent,
AppExplanationComponent,
AppDynamicComponentComponent
AppSalutationComponent
} from './dynamic-component.component';
import { AppDynamicComponentRoutingModule } from './dynamic-component-routing.module';
import { SharedModule } from '../../shared/shared.module';

@NgModule({
declarations: [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Routes, RouterModule } from '@angular/router';
import { RouterModule, Routes } from '@angular/router';

import { AppEntitySelectorComponent } from './entity-selector.component';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Component, OnDestroy, OnInit } from '@angular/core';

import { BehaviorSubject } from 'rxjs';

import { LanguageService } from '@igo2/core';
import { EntityStore } from '@igo2/common';
import { LanguageService } from '@igo2/core';

import { BehaviorSubject } from 'rxjs';

interface DemoEntity {
id: string;
Expand Down
4 changes: 2 additions & 2 deletions demo/src/app/common/entity-selector/entity-selector.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core';

import { IgoEntitySelectorModule } from '@igo2/common';

import { AppEntitySelectorComponent } from './entity-selector.component';
import { AppEntitySelectorRoutingModule } from './entity-selector-routing.module';
import { SharedModule } from '../../shared/shared.module';
import { AppEntitySelectorRoutingModule } from './entity-selector-routing.module';
import { AppEntitySelectorComponent } from './entity-selector.component';

@NgModule({
declarations: [AppEntitySelectorComponent],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Routes, RouterModule } from '@angular/router';
import { RouterModule, Routes } from '@angular/router';

import { AppEntityTableComponent } from './entity-table.component';

Expand Down
11 changes: 6 additions & 5 deletions demo/src/app/common/entity-table/entity-table.component.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Component, OnDestroy, OnInit } from '@angular/core';
import { MatPaginator } from '@angular/material/paginator';

import { LanguageService } from '@igo2/core';
import {
EntityStore,
EntityTableButton,
getEntityProperty,
EntityTableColumnRenderer,
EntityTablePaginatorOptions
EntityTablePaginatorOptions,
getEntityProperty
} from '@igo2/common';
import { MatPaginator } from '@angular/material/paginator';
import { LanguageService } from '@igo2/core';

import { BehaviorSubject } from 'rxjs';

@Component({
Expand Down
4 changes: 2 additions & 2 deletions demo/src/app/common/entity-table/entity-table.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import {
IgoEntityTablePaginatorModule
} from '@igo2/common';

import { AppEntityTableComponent } from './entity-table.component';
import { AppEntityTableRoutingModule } from './entity-table-routing.module';
import { SharedModule } from '../../shared/shared.module';
import { AppEntityTableRoutingModule } from './entity-table-routing.module';
import { AppEntityTableComponent } from './entity-table.component';

@NgModule({
declarations: [AppEntityTableComponent],
Expand Down
2 changes: 1 addition & 1 deletion demo/src/app/common/form/form-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Routes, RouterModule } from '@angular/router';
import { RouterModule, Routes } from '@angular/router';

import { AppFormComponent } from './form.component';

Expand Down
7 changes: 4 additions & 3 deletions demo/src/app/common/form/form.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Component, OnDestroy, OnInit } from '@angular/core';
import { Validators } from '@angular/forms';
import { BehaviorSubject, Subscription } from 'rxjs';

import { LanguageService } from '@igo2/core';
import { Form, FormService } from '@igo2/common';
import { LanguageService } from '@igo2/core';

import { BehaviorSubject, Subscription } from 'rxjs';

@Component({
selector: 'app-form',
Expand Down
4 changes: 2 additions & 2 deletions demo/src/app/common/form/form.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core';

import { IgoFormModule } from '@igo2/common';

import { AppFormComponent } from './form.component';
import { AppFormRoutingModule } from './form-routing.module';
import { SharedModule } from '../../shared/shared.module';
import { AppFormRoutingModule } from './form-routing.module';
import { AppFormComponent } from './form.component';

@NgModule({
declarations: [AppFormComponent],
Expand Down
2 changes: 1 addition & 1 deletion demo/src/app/common/table/table-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Routes, RouterModule } from '@angular/router';
import { RouterModule, Routes } from '@angular/router';

import { AppTableComponent } from './table.component';

Expand Down
2 changes: 1 addition & 1 deletion demo/src/app/common/table/table.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';

import { TableActionColor, TableDatabase } from '@igo2/common';
import { LanguageService } from '@igo2/core';
import { TableDatabase, TableActionColor } from '@igo2/common';

@Component({
selector: 'app-table',
Expand Down
4 changes: 2 additions & 2 deletions demo/src/app/common/table/table.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core';

import { IgoTableModule } from '@igo2/common';

import { AppTableComponent } from './table.component';
import { AppTableRoutingModule } from './table-routing.module';
import { SharedModule } from '../../shared/shared.module';
import { AppTableRoutingModule } from './table-routing.module';
import { AppTableComponent } from './table.component';

@NgModule({
declarations: [AppTableComponent],
Expand Down
2 changes: 1 addition & 1 deletion demo/src/app/common/tool/tool-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Routes, RouterModule } from '@angular/router';
import { RouterModule, Routes } from '@angular/router';

import { AppToolComponent } from './tool.component';

Expand Down
Loading

0 comments on commit aadd568

Please sign in to comment.