Skip to content

Commit

Permalink
refactor: Move css and assets out of the src folder
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Changed CSS and ASSETS location, update your import paths

NOTE: Update your i18n-ally.localesPaths value
  • Loading branch information
FilipLeitner authored and jmacura committed Apr 22, 2024
1 parent c2490b0 commit 9f38f37
Show file tree
Hide file tree
Showing 89 changed files with 43 additions and 43 deletions.
20 changes: 10 additions & 10 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"assets": [
{
"glob": "**/*",
"input": "projects/hslayers/src/assets",
"input": "projects/hslayers/assets",
"output": "./assets"
},
{
Expand All @@ -41,7 +41,7 @@
}
],
"styles": [
"projects/hslayers/src/css/hslayers-bootstrap.scss"
"projects/hslayers/css/hslayers-bootstrap.scss"
],
"scripts": [],
"customWebpackConfig": {
Expand Down Expand Up @@ -183,7 +183,7 @@
"assets": [
{
"glob": "**/*",
"input": "projects/hslayers/src/assets",
"input": "projects/hslayers/assets",
"output": "./assets"
},
{
Expand All @@ -203,7 +203,7 @@
}
],
"styles": [
"projects/hslayers/src/css/hslayers-bootstrap.scss"
"projects/hslayers/css/hslayers-bootstrap.scss"
],
"scripts": [],
"customWebpackConfig": {
Expand Down Expand Up @@ -332,7 +332,7 @@
"assets": [
{
"glob": "**/*",
"input": "projects/hslayers/src/assets",
"input": "projects/hslayers/assets",
"output": "./assets"
},
{
Expand All @@ -352,7 +352,7 @@
}
],
"styles": [
"projects/hslayers/src/css/hslayers-bootstrap.scss"
"projects/hslayers/css/hslayers-bootstrap.scss"
],
"scripts": [],
"customWebpackConfig": {
Expand Down Expand Up @@ -446,7 +446,7 @@
},
{
"glob": "**/*",
"input": "projects/hslayers/src/assets",
"input": "projects/hslayers/assets",
"output": "./assets"
},
{
Expand Down Expand Up @@ -490,7 +490,7 @@
],
"styles": [
"node_modules/cesium/Build/Cesium/Widgets/widgets.css",
"projects/hslayers/src/css/hslayers-bootstrap.scss"
"projects/hslayers/css/hslayers-bootstrap.scss"
],
"scripts": [],
"customWebpackConfig": {
Expand Down Expand Up @@ -606,7 +606,7 @@
},
{
"glob": "**/*",
"input": "projects/hslayers/src/assets",
"input": "projects/hslayers/assets",
"output": "./assets"
},
{
Expand Down Expand Up @@ -637,7 +637,7 @@
],
"styles": [
"node_modules/cesium/Build/Cesium/Widgets/widgets.css",
"projects/hslayers/src/css/hslayers-bootstrap.scss"
"projects/hslayers/css/hslayers-bootstrap.scss"
],
"scripts": [],
"customWebpackConfig": {
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"build-sensors": "ng build hslayers-sensors --configuration production",
"prebuild-watch": "node projects/hslayers/prebuild.js",
"postbuild": "npm run build-css && npm run build-css-colors && npm run build-css-wo-bootstrap",
"build-css": "npx sass --load-path=node_modules projects/hslayers/src/css/hslayers-bootstrap.scss dist/hslayers/css/hslayers-ng.css",
"build-css-wo-bootstrap": "npx sass --load-path=node_modules projects/hslayers/src/css/hslayers-wo-bootstrap.scss dist/hslayers/css/hslayers-ng-wo-bootstrap.css",
"build-css-colors": "npx sass --load-path=node_modules projects/hslayers/src/css/hslayers-colors.scss dist/hslayers/css/hslayers-ng-colors.css",
"build-css": "npx sass --load-path=node_modules projects/hslayers/css/hslayers-bootstrap.scss dist/hslayers/css/hslayers-ng.css",
"build-css-wo-bootstrap": "npx sass --load-path=node_modules projects/hslayers/css/hslayers-wo-bootstrap.scss dist/hslayers/css/hslayers-ng-wo-bootstrap.css",
"build-css-colors": "npx sass --load-path=node_modules projects/hslayers/css/hslayers-colors.scss dist/hslayers/css/hslayers-ng-colors.css",
"start-test-app": "ng serve test-app --hmr",
"start-decoupling-test-app": "ng serve decoupling-test-app --hmr",
"start-cesium-test-app": "ng serve cesium-test-app --hmr",
Expand Down
6 changes: 3 additions & 3 deletions projects/hslayers-cesium/.compodocrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"output": "../../docs/hslayers-cesium",
"name": "HSLayers-NG Cesium module documentation",
"theme": "material",
"customFavicon": "../../projects/hslayers/src/assets/img/hslayers-ng-favicon_32x32.jpg",
"customLogo": "../../projects/hslayers/src/assets/img/hslayers-ng-logo.png"
}
"customFavicon": "../../projects/hslayers/assets/img/hslayers-ng-favicon_32x32.jpg",
"customLogo": "../../projects/hslayers/assets/img/hslayers-ng-logo.png"
}
6 changes: 3 additions & 3 deletions projects/hslayers-sensors/.compodocrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"output": "../../docs/hslayers-sensors",
"name": "HSLayers-NG Sensors module documentation",
"theme": "material",
"customFavicon": "../../projects/hslayers/src/assets/img/hslayers-ng-favicon_32x32.jpg",
"customLogo": "../../projects/hslayers/src/assets/img/hslayers-ng-logo.png"
}
"customFavicon": "../../projects/hslayers/assets/img/hslayers-ng-favicon_32x32.jpg",
"customLogo": "../../projects/hslayers/assets/img/hslayers-ng-logo.png"
}
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -980,17 +980,17 @@ $list-group-item-padding-x: 1.25rem;
}
}

@import "../hslayers.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 "../src/hslayers.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 {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -739,17 +739,17 @@ $list-group-item-padding-x: 1.25rem;
overflow-y: auto;
}

@import "../hslayers.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 "../src/hslayers.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 {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Empty file removed projects/hslayers/src/lib/.gitkeep
Empty file.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion projects/hslayers/test/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from '@angular/platform-browser-dynamic/testing';
import {getTestBed} from '@angular/core/testing';

import {patchConsoleToFailOnError} from '../src/testing-utils';
import {patchConsoleToFailOnError} from './testing-utils';

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {TestBed, waitForAsync} from '@angular/core/testing';

import {HsConfig} from 'hslayers-ng/config';
import {HsConfigMock} from '../../../hslayers/src/testing/config.service.mock';
import {HsConfigMock} from '../../../hslayers/test/config.service.mock';
import {HslayersAppComponent} from './hslayers-app.component';

describe('AppComponent', () => {
Expand Down

0 comments on commit 9f38f37

Please sign in to comment.