Skip to content

Commit

Permalink
Merge remote-tracking branch origin/next into private_routing
Browse files Browse the repository at this point in the history
  • Loading branch information
LAMM26 committed Mar 11, 2024
2 parents 375addc + 36f99be commit 1e801f6
Show file tree
Hide file tree
Showing 18 changed files with 192 additions and 180 deletions.
286 changes: 149 additions & 137 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "igo",
"version": "16.3.0",
"version": "17.0.0-next.0",
"description": "Infrastructure géomatique ouverte",
"author": "Communauté IGO",
"repository": {
Expand Down Expand Up @@ -55,13 +55,13 @@
"@angular/platform-browser-dynamic": "^17.0.7",
"@angular/router": "^17.0.7",
"@angular/service-worker": "^17.0.7",
"@igo2/auth": "^17.0.0-next.0",
"@igo2/common": "^17.0.0-next.0",
"@igo2/context": "^17.0.0-next.0",
"@igo2/core": "^17.0.0-next.0",
"@igo2/geo": "^17.0.0-next.0",
"@igo2/integration": "^17.0.0-next.0",
"@igo2/utils": "^17.0.0-next.0",
"@igo2/auth": "^17.0.0-next.2",
"@igo2/common": "^17.0.0-next.2",
"@igo2/context": "^17.0.0-next.2",
"@igo2/core": "^17.0.0-next.2",
"@igo2/geo": "^17.0.0-next.2",
"@igo2/integration": "^17.0.0-next.2",
"@igo2/utils": "^17.0.0-next.2",
"core-js": "^3.32.2",
"hammerjs": "^2.0.8",
"ol": "^7.5.2",
Expand Down
4 changes: 3 additions & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import { NavigationEnd, Router } from '@angular/router';

import { AuthFormComponent, AuthOptions } from '@igo2/auth';
import { SpinnerComponent, StopPropagationDirective } from '@igo2/common';
import { ConfigService, LanguageService, MessageService } from '@igo2/core';
import { ConfigService } from '@igo2/core/config';
import { LanguageService } from '@igo2/core/language';
import { MessageService } from '@igo2/core/message';
import { AppOptions } from '@igo2/integration';
import { DomUtils, userAgent } from '@igo2/utils';

Expand Down
2 changes: 1 addition & 1 deletion src/app/app.utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ConfigService, version } from '@igo2/core';
import { ConfigService, version } from '@igo2/core/config';

export function getAppVersion(configService: ConfigService): string {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/footer/footer.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component } from '@angular/core';

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

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

Expand Down
3 changes: 2 additions & 1 deletion src/app/pages/header/header.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Component } from '@angular/core';
import { MatToolbarModule } from '@angular/material/toolbar';

import { ConfigService, LanguageService } from '@igo2/core';
import { ConfigService } from '@igo2/core/config';
import { LanguageService } from '@igo2/core/language';

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { MatTooltipModule } from '@angular/material/tooltip';

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

@Component({
selector: 'app-expansion-panel-button',
Expand Down
3 changes: 2 additions & 1 deletion src/app/pages/portal/map-overlay/map-overlay.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import { NgClass, NgFor, NgIf, NgStyle } from '@angular/common';
import { AfterViewInit, Component, OnDestroy } from '@angular/core';

import { Context, ContextService } from '@igo2/context';
import { ConfigService, MediaService } from '@igo2/core';
import { ConfigService } from '@igo2/core/config';
import { MediaService } from '@igo2/core/media';

import { Subscription } from 'rxjs';

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/portal/map-overlay/map-overlay.interface.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Media } from '@igo2/core';
import { Media } from '@igo2/core/media';

import { MapOverlayCssClass } from './map-overlay.enum';

Expand Down
14 changes: 5 additions & 9 deletions src/app/pages/portal/portal.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,11 @@ import {
MapContextDirective,
UserButtonComponent
} from '@igo2/context';
import {
ConfigService,
LanguageService,
Media,
MediaOrientation,
MediaService,
MessageService,
StorageService
} from '@igo2/core';
import { ConfigService } from '@igo2/core/config';
import { LanguageService } from '@igo2/core/language';
import { Media, MediaOrientation, MediaService } from '@igo2/core/media';
import { MessageService } from '@igo2/core/message';
import { StorageService } from '@igo2/core/storage';
import {
CapabilitiesService,
ConfigFileToGeoDBService,
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/portal/portal.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';

import { IgoGestureModule } from '@igo2/core';
import { IgoGestureModule } from '@igo2/core/gesture';
import {
IgoDirectionsModule,
IgoQueryModule,
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/portal/sidenav/sidenav.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
Toolbox,
ToolboxComponent
} from '@igo2/common';
import { ConfigService } from '@igo2/core';
import { ConfigService } from '@igo2/core/config';
import { IgoMap } from '@igo2/geo';
import { CatalogState, ToolState } from '@igo2/integration';

Expand Down
9 changes: 4 additions & 5 deletions src/app/pages/portal/toast-panel/toast-panel.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,14 @@ import {
StopPropagationDirective,
getEntityTitle
} from '@igo2/common';
import { ConfigService } from '@igo2/core/config';
import { LanguageService } from '@igo2/core/language';
import { Media, MediaService } from '@igo2/core/media';
import {
ConfigService,
LanguageService,
Media,
MediaService,
StorageScope,
StorageService,
StorageServiceEvent
} from '@igo2/core';
} from '@igo2/core/storage';
import {
Feature,
FeatureDetailsComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import {
import { MatToolbarModule } from '@angular/material/toolbar';

import { CustomHtmlComponent, IgoInteractiveTourModule } from '@igo2/common';
import { ConfigService, LanguageService } from '@igo2/core';
import { ConfigService } from '@igo2/core/config';
import { LanguageService } from '@igo2/core/language';

import { TranslateModule } from '@ngx-translate/core';
import { BehaviorSubject, Observable, Subscription, of } from 'rxjs';
Expand All @@ -19,6 +20,8 @@ import { getAppVersion } from 'src/app/app.utils';

import { WelcomeWindowService } from './welcome-window.service';

('@igo2/core');

@Component({
selector: 'app-welcome-window',
templateUrl: './welcome-window.component.html',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Injectable } from '@angular/core';
import { MatDialogConfig } from '@angular/material/dialog';

import { ConfigService, StorageService } from '@igo2/core';
import { ConfigService } from '@igo2/core/config';
import { StorageService } from '@igo2/core/storage';

import { getAppVersion } from 'src/app/app.utils';

Expand Down
2 changes: 1 addition & 1 deletion src/app/services/pwa.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { SwUpdate } from '@angular/service-worker';

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

import { interval } from 'rxjs';
import { skip, tap } from 'rxjs/operators';
Expand Down
2 changes: 1 addition & 1 deletion src/environments/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* DO NOT EDIT THE APP VERSION OR RELEASE DATE
* IF YOU CHANGE ANY KEY NAME BE SURE TO REFLECT THIS CHANGE IN OUR AUTOMATION SCRIPT
*/
import { Version, version as libVersion } from '@igo2/core';
import { Version, version as libVersion } from '@igo2/core/config';

export const version: Version = {
...libVersion,
Expand Down
13 changes: 5 additions & 8 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,11 @@ import { provideRouter } from '@angular/router';
import { ServiceWorkerModule } from '@angular/service-worker';

import { IgoAuthModule } from '@igo2/auth';
import {
ConfigService,
IgoCoreModule,
IgoMessageModule,
RouteService,
provideConfigOptions,
provideRootTranslation
} from '@igo2/core';
import { IgoCoreModule } from '@igo2/core';
import { ConfigService, provideConfigOptions } from '@igo2/core/config';
import { provideRootTranslation } from '@igo2/core/language';
import { IgoMessageModule } from '@igo2/core/message';
import { RouteService } from '@igo2/core/route';
import { loadTheme } from '@igo2/utils';

import 'hammerjs';
Expand Down

0 comments on commit 1e801f6

Please sign in to comment.