diff --git a/angular.json b/angular.json index 15bf5d53..802f0ca3 100644 --- a/angular.json +++ b/angular.json @@ -29,7 +29,8 @@ "stylenames", "source-map-js" ], - "outputPath": "dist", + "baseHref": "/static/web-ui/", + "outputPath": "dist/static/web-ui/", "index": "src/index.html", "main": "src/main.ts", "tsConfig": "src/tsconfig.app.json", @@ -60,7 +61,13 @@ "type": "anyComponentStyle", "maximumWarning": "6kb" }], - "optimization": true, + "optimization": { + "scripts": false, + "styles": { + "minify": true, + "inlineCritical": false + } + }, "outputHashing": "all", "sourceMap": { "hidden": true, diff --git a/package.json b/package.json index 207c4b07..3ac4eaaf 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "start": "ng serve", "startforelectron": "ng serve --configuration=electronDev", "build": "ng build", - "buildforproduction": "ng build --source-map=false --build-optimizer=false --aot --configuration=production --base-href /static/web-ui/", + "buildforproduction": "ng build --source-map=false --build-optimizer=true --aot --configuration=production --base-href /static/web-ui/", "buildforelectron": "ng build --configuration=electronProd", "buildforgithub": "ng build --configuration=githubProd", "test": "ng test", @@ -131,6 +131,9 @@ "webpack": "^5.72.0", "yarn-upgrade-all": "^0.7.1" }, + "resolutions": { + "autoprefixer": "10.4.5" +}, "greenkeeper": { "ignore": [ "typescript" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 44adba00..8e776b93 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -323,6 +323,7 @@ import { UploadingProcessbarComponent } from './common/uploading-processbar/uplo import { ExportPortableProjectComponent } from './components/export-portable-project/export-portable-project.component'; import { NodesMenuConfirmationDialogComponent } from './components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component'; import { ConfirmationDeleteAllProjectsComponent } from './components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component'; +import { APP_BASE_HREF } from '@angular/common'; @NgModule({ declarations: [ @@ -591,6 +592,7 @@ import { ConfirmationDeleteAllProjectsComponent } from './components/projects/co SettingsService, {provide: ErrorHandler, useClass: ToasterErrorHandler}, {provide: HTTP_INTERCEPTORS, useClass: HttpRequestsInterceptor, multi: true}, + {provide: APP_BASE_HREF, useValue: '/static/web-ui'}, D3Service, VersionService, ProjectService, diff --git a/src/app/components/image-manager/image-manager.component.html b/src/app/components/image-manager/image-manager.component.html index 1dfc888c..76f2428e 100644 --- a/src/app/components/image-manager/image-manager.component.html +++ b/src/app/components/image-manager/image-manager.component.html @@ -20,12 +20,12 @@
- + - + @@ -34,15 +34,15 @@ - File Name - + File Name + {{ row.filename }} - Image Type - {{ row.image_type }} + Image Type + {{ row.image_type }} @@ -51,12 +51,12 @@ - + - + diff --git a/src/app/components/image-manager/image-manager.component.scss b/src/app/components/image-manager/image-manager.component.scss index 047a0ad8..f5a32263 100644 --- a/src/app/components/image-manager/image-manager.component.scss +++ b/src/app/components/image-manager/image-manager.component.scss @@ -14,4 +14,19 @@ mat-header-cell, mat-cell { justify-content: center; } +.mat-cell-width{ + max-width: 60px; + +} +.mat-cell-img-type-width{ + max-width: 110px; + +} + +.mat-cell-file-name-width{ + justify-content: left; + margin-left: 10px; + +} + \ No newline at end of file