diff --git a/.vscode/launch.json b/.vscode/launch.json index 2a7ff155fb13631186d65a308b0cf2187e5ded2d..ca1d0905e1674e2415e7f23bce41e2a9ad8ffd6b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,7 +12,7 @@ "type": "msedge", "request": "launch", "name": "Debug with Edge", - "url": "http://localhost:4200", + "url": "http://localhost:4200/nshmp/", "preLaunchTask": "Start applications", "webRoot": "${workspaceFolder}" }, @@ -21,7 +21,7 @@ "type": "chrome", "request": "launch", "name": "Debug with Chrome", - "url": "http://localhost:4200", + "url": "http://localhost:4200/nshmp/", "preLaunchTask": "Start applications", "webRoot": "${workspaceFolder}" } diff --git a/angular.json b/angular.json index 7202a70f6f1e64f120c51858664bbc7332c6342a..c629ff3b03e9638828cb3f8ece608b2fd4d4bc40 100644 --- a/angular.json +++ b/angular.json @@ -17,6 +17,7 @@ "build": { "builder": "@angular-devkit/build-angular:application", "options": { + "baseHref": "/nshmp/", "outputPath": { "base": "dist/nshmp-apps" }, @@ -88,18 +89,12 @@ "configurations": { "development": { "stylePreprocessorOptions": { - "includePaths": [ - "projects/nshmp-apps/src/environments/scss", - "node_modules" - ] + "includePaths": ["node_modules"] } }, "production": { "stylePreprocessorOptions": { - "includePaths": [ - "projects/nshmp-apps/src/environments/scss-prod", - "node_modules" - ] + "includePaths": ["node_modules"] }, "fileReplacements": [ { diff --git a/docs/development.md b/docs/development.md index f419f3f0a32ec6f17a191e5e17b9df98aefff97f..4a3a729032d2351d83fa079165127e0808bc585a 100644 --- a/docs/development.md +++ b/docs/development.md @@ -71,7 +71,7 @@ For a development server, run: npm run start ``` -Applications run on <http://localhost:4200>. +Applications run on <http://localhost:4200/nshmp/>. When running the development server any changes to the source code automatically will rebuild the application. @@ -122,7 +122,7 @@ npm run build:prod npm run start:prod ``` -Applications run on <http://localhost:4200>. +Applications run on <http://localhost:4200/nshmp/>. ### Context Path @@ -134,7 +134,7 @@ npm run start:prod ``` Where `some/path` is the new context path. <br> -Applications would then run on <http://localhost:4200/some/path/> +Applications would then run on <http://localhost:4200/nshmp/some/path/> <br> <div align="center"> diff --git a/package.json b/package.json index 534dd34e682355c360a6360d68959a2f199ef317..cfed77f039d6c46d8e123912f98d4094e7f353fc 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "scripts": { "analyze": "npm run build:stats && webpack-bundle-analyzer dist/nshmp-apps/stats.json", "build": "ng build nshmp-apps", - "build:prod": "ng build nshmp-apps --configuration production --base-href /nshmp/", + "build:prod": "ng build nshmp-apps --configuration production", "build:stats": "npm run build:prod -- --stats-json", "compodoc": "compodoc", "compodoc:build": "bash scripts/build-docs.sh", diff --git a/projects/nshmp-apps/src/environments/scss-prod/environment.scss b/projects/nshmp-apps/src/environments/scss-prod/environment.scss deleted file mode 100644 index d6ebca784f14f5eb69084fe4003197b181763e5a..0000000000000000000000000000000000000000 --- a/projects/nshmp-apps/src/environments/scss-prod/environment.scss +++ /dev/null @@ -1 +0,0 @@ -$base-href: '/nshmp/'; diff --git a/projects/nshmp-apps/src/environments/scss/environment.scss b/projects/nshmp-apps/src/environments/scss/environment.scss deleted file mode 100644 index 639ba1c2c144d32190e40545b8ccd6ad215014b0..0000000000000000000000000000000000000000 --- a/projects/nshmp-apps/src/environments/scss/environment.scss +++ /dev/null @@ -1 +0,0 @@ -$base-href: '/'; diff --git a/projects/nshmp-apps/src/styles/_uswds-theme.scss b/projects/nshmp-apps/src/styles/_uswds-theme.scss index 58f6dddff1f2e1a70b26c00e397272ad40db978c..5079f570469c6a4928772642711de510f6b3cd77 100644 --- a/projects/nshmp-apps/src/styles/_uswds-theme.scss +++ b/projects/nshmp-apps/src/styles/_uswds-theme.scss @@ -1,5 +1,4 @@ -@import 'environment.scss'; - +$base-href: '/nshmp/'; $theme-font-path: $base-href + 'assets/fonts'; $theme-image-path: $base-href + 'assets/img'; $theme-show-notifications: false;