fix: Style and test-app imports

hslayers · Feb 13, 2024 · 426bb9a · 426bb9a
1 parent c11254d
commit 426bb9a
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 40 deletions.
diff --git a/projects/hslayers/src/css/hslayers-bootstrap.scss b/projects/hslayers/src/css/hslayers-bootstrap.scss
@@ -980,17 +980,17 @@ $list-group-item-padding-x: 1.25rem;
     }
   }
 
-  @import "../components/layout/layout.component.scss";
-  @import "../components/layer-manager/layer-manager.component.scss";
-  @import "../components/layer-manager/logical-list/layerlist.component.scss";
-  @import "../components/layer-manager/gallery/layer-manager-gallery.component.scss";
-  @import "../components/sidebar/sidebar.component.scss";
-  @import "../components/geolocation/geolocation.component.scss";
-  @import "../components/sidebar/impressum.component.scss";
-  @import "../components/search/search.component.scss";
-  @import "../components/info/info.component.scss";
-  @import "../components/toolbar/toolbar.component.scss";
-  @import "../components/add-data/common/common.component.scss";
+  @import "../../components/layout/layout.component.scss";
+  @import "../../components/layer-manager/layer-manager.component.scss";
+  @import "../../components/layer-manager/logical-list/layerlist.component.scss";
+  @import "../../components/layer-manager/gallery/layer-manager-gallery.component.scss";
+  @import "../../components/sidebar/sidebar.component.scss";
+  @import "../../components/geolocation/geolocation.component.scss";
+  @import "../../components/sidebar/impressum.component.scss";
+  @import "../../components/search/search.component.scss";
+  @import "../../components/info/info.component.scss";
+  @import "../../components/toolbar/toolbar.component.scss";
+  @import "../../components/add-data/common/common.component.scss";
   /* **OPENLAYERS** */
 
   .ol-attribution {
@@ -1205,4 +1205,4 @@ $list-group-item-padding-x: 1.25rem;
   .sketch-picker {
     margin: 7px;
   }
-}
+}
diff --git a/projects/hslayers/src/css/hslayers-wo-bootstrap.scss b/projects/hslayers/src/css/hslayers-wo-bootstrap.scss
@@ -739,17 +739,17 @@ $list-group-item-padding-x: 1.25rem;
     overflow-y: auto;
   }
 
-  @import "../components/layout/layout.component.scss";
-  @import "../components/layer-manager/layer-manager.component.scss";
-  @import "../components/layer-manager/logical-list/layerlist.component.scss";
-  @import "../components/layer-manager/gallery/layer-manager-gallery.component.scss";
-  @import "../components/sidebar/sidebar.component.scss";
-  @import "../components/geolocation/geolocation.component.scss";
-  @import "../components/sidebar/impressum.component.scss";
-  @import "../components/search/search.component.scss";
-  @import "../components/info/info.component.scss";
-  @import "../components/toolbar/toolbar.component.scss";
-  @import "../components/add-data/common/common.component.scss";
+  @import "../../components/layout/layout.component.scss";
+  @import "../../components/layer-manager/layer-manager.component.scss";
+  @import "../../components/layer-manager/logical-list/layerlist.component.scss";
+  @import "../../components/layer-manager/gallery/layer-manager-gallery.component.scss";
+  @import "../../components/sidebar/sidebar.component.scss";
+  @import "../../components/geolocation/geolocation.component.scss";
+  @import "../../components/sidebar/impressum.component.scss";
+  @import "../../components/search/search.component.scss";
+  @import "../../components/info/info.component.scss";
+  @import "../../components/toolbar/toolbar.component.scss";
+  @import "../../components/add-data/common/common.component.scss";
   /* **OPENLAYERS** */
 
   .ol-attribution {
@@ -939,4 +939,4 @@ $list-group-item-padding-x: 1.25rem;
   .sketch-picker {
     margin: 7px;
   }
-}
+}
diff --git a/projects/hslayers/src/hslayers.module.ts b/projects/hslayers/src/hslayers.module.ts
@@ -1,4 +1,4 @@
-import {HTTP_INTERCEPTORS} from '@angular/common/http';
+import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
 import {NgModule} from '@angular/core';
 
 import {HsAddDataModule} from 'hslayers-ng/components/add-data';
@@ -27,6 +27,7 @@ import {PrintModule} from 'hslayers-ng/components/print';
 @NgModule({
   declarations: [HslayersComponent],
   imports: [
+    HttpClientModule,
     HsLayoutModule,
     HsLayerManagerModule,
     HsMeasureModule,

diff --git a/projects/test-app/src/hslayers-app/hslayers-app.component.ts b/projects/test-app/src/hslayers-app/hslayers-app.component.ts
@@ -11,16 +11,16 @@ import {Tile} from 'ol/layer';
 import {catchError, lastValueFrom, takeUntil} from 'rxjs';
 import {transformExtent} from 'ol/proj';
 
-import {HsConfig} from 'hslayers-ng/config.service';
-import {HsEventBusService} from 'hslayers-ng/components/core/event-bus.service';
-import {HsLayoutService} from 'hslayers-ng/components/layout/layout.service';
-import {HsPanelConstructorService} from 'hslayers-ng/components/layout/panels/panel-constructor.service';
-import {HsQueryPopupWidgetContainerService} from 'hslayers-ng/components/query/query-popup-widget-container.service';
-import {HsSidebarService} from 'hslayers-ng/components/sidebar/sidebar.service';
-import {HsUtilsService} from 'hslayers-ng/components/utils/utils.service';
-import {InterpolatedSource} from 'hslayers-ng/common/layers/hs.source.interpolated';
-import {SPOI} from 'hslayers-ng/common/layers/hs.source.SPOI';
-import {SparqlJson} from 'hslayers-ng/common/layers/hs.source.SparqlJson';
+import {HsConfig} from 'hslayers-ng/config';
+import {HsEventBusService} from 'hslayers-ng/shared/event-bus';
+import {HsLayoutService} from 'hslayers-ng/shared/layout';
+import {HsPanelConstructorService} from 'hslayers-ng/shared/panels';
+import {HsQueryPopupWidgetContainerService} from 'hslayers-ng/components/query';
+import {HsSidebarService} from 'hslayers-ng/components/sidebar';
+import {HsUtilsService} from 'hslayers-ng/shared/utils';
+import {InterpolatedSource} from 'hslayers-ng/common/layers';
+import {SPOI} from 'hslayers-ng/common/layers';
+import {SparqlJson} from 'hslayers-ng/common/layers';
 
 import {PopupWidgetComponent} from './popup-widget.component';
 import {SomeComponent} from './some-panel/some-panel.component';

diff --git a/projects/test-app/src/hslayers-app/hslayers-app.module.ts b/projects/test-app/src/hslayers-app/hslayers-app.module.ts
@@ -2,7 +2,7 @@ import {BrowserModule} from '@angular/platform-browser';
 import {NgModule} from '@angular/core';
 
 import {HslayersAppComponent} from './hslayers-app.component';
-import {HslayersModule} from '../../../hslayers/src/public-api';
+import {HslayersModule} from 'hslayers-ng';
 import {SomeModule} from './some-panel/some-panel.module';
 
 @NgModule({

diff --git a/projects/test-app/src/hslayers-app/some-panel/some-panel.component.ts b/projects/test-app/src/hslayers-app/some-panel/some-panel.component.ts
@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 
-import {HsLayoutService} from 'hslayers-ng/components/layout/layout.service';
-import {HsPanelBaseComponent} from 'hslayers-ng/components/layout/panels/panel-base.component';
+import {HsLayoutService} from 'hslayers-ng/shared/layout';
+import {HsPanelBaseComponent} from 'hslayers-ng/common/panels';
 
 @Component({
   selector: 'hs-some-panel',

diff --git a/projects/test-app/src/hslayers-app/some-panel/some-panel.module.ts b/projects/test-app/src/hslayers-app/some-panel/some-panel.module.ts
@@ -3,10 +3,10 @@ import {CommonModule} from '@angular/common';
 import {FormsModule} from '@angular/forms';
 import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
-import {HsPanelHelpersModule} from 'hslayers-ng/components/layout/panels/panel-helpers.module';
+import {HsPanelHelpersModule} from 'hslayers-ng/common/panels';
 import {TranslateCustomPipe} from 'hslayers-ng/shared/language';
 
-import {HsPanelHeaderComponent} from 'hslayers-ng/components/layout/panels/panel-header/panel-header.component';
+import {HsPanelHeaderComponent} from 'hslayers-ng/common/panels';
 import {SomeComponent} from './some-panel.component';
 
 @NgModule({