diff --git a/.browserslistrc b/.browserslistrc index b20a01d4..165d2962 100644 --- a/.browserslistrc +++ b/.browserslistrc @@ -3,8 +3,6 @@ # https://github.com/browserslist/browserslist#queries # adjust as needed > 0.5% -last 2 versions +last 2 versions and supports es6-module Firefox ESR -not dead -not IE 9-10 -not IE 11 +not dead \ No newline at end of file diff --git a/angular.json b/angular.json index 1f55a1ce..df47512b 100644 --- a/angular.json +++ b/angular.json @@ -30,7 +30,7 @@ "src/assets", "src/config", "src/contexts", - "src/locale" + "src/locale", { "glob": "**/*", "input": "./node_modules/@igo2/common/assets/", diff --git a/e2e/tsconfig.e2e.json b/e2e/tsconfig.e2e.json index 5f664a98..e8861be6 100644 --- a/e2e/tsconfig.e2e.json +++ b/e2e/tsconfig.e2e.json @@ -1,5 +1,5 @@ { - "extends": "../tsconfig.base.json", + "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/e2e", "module": "commonjs", diff --git a/package-lock.json b/package-lock.json index 1e823084..49dd3e4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,7 @@ "@igo2/geo": "1.15.0", "@igo2/integration": "1.15.0", "@igo2/utils": "1.15.0", - "@mat-datetimepicker/core": "~10.0.0", + "@mat-datetimepicker/core": "~11.0.0", "@turf/buffer": "^6.5.0", "@turf/point-on-feature": "^6.5.0", "ajv": "^6.9.1", @@ -42,6 +42,7 @@ "hammerjs": "^2.0.8", "html2canvas": "^1.4.1", "jspdf": "^2.5.1", + "jspdf-autotable": "^3.5.31", "jszip": "^3.10.1", "jwt-decode": "^2.2.0", "moment": "^2.29.4", @@ -4726,17 +4727,17 @@ "integrity": "sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA==" }, "node_modules/@mat-datetimepicker/core": { - "version": "10.0.10", - "resolved": "https://registry.npmjs.org/@mat-datetimepicker/core/-/core-10.0.10.tgz", - "integrity": "sha512-nVlNlSXPBPVwe+N6dBt3hXYEVPBka/8ttasjWHIzYswqSYILDpp1cqR1R7SkK5iSBRMbJhlTIaF/DLp4/wKWwQ==", + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/@mat-datetimepicker/core/-/core-11.0.3.tgz", + "integrity": "sha512-1M9sPoB3TfRb8hREDnv5R6uTi0iMlaY6oskxew0a+HVNTzZOBhwWWdKnlect8u+pXCmRBZI0QdMwx8nazeBdnA==", "dependencies": { "tslib": "^2.4.0" }, "peerDependencies": { - "@angular/cdk": "^14.0.4", - "@angular/common": "^14.0.5", - "@angular/core": "^14.0.5", - "@angular/material": "^14.0.4" + "@angular/cdk": "^15.0.0", + "@angular/common": "^15.0.0", + "@angular/core": "^15.0.0", + "@angular/material": "^15.0.0" } }, "node_modules/@material/animation": { @@ -16353,6 +16354,14 @@ "html2canvas": "^1.0.0-rc.5" } }, + "node_modules/jspdf-autotable": { + "version": "3.5.31", + "resolved": "https://registry.npmjs.org/jspdf-autotable/-/jspdf-autotable-3.5.31.tgz", + "integrity": "sha512-Lc1KuLGDQWW/5t57Z/+c2E94XQV3jV2QVU3xMRiwvcm/nMx79aCkpPCsxLzJZVFneZvz4XoA8+egQR1QajYiWw==", + "peerDependencies": { + "jspdf": "^2.5.1" + } + }, "node_modules/jsprim": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", @@ -33894,9 +33903,9 @@ "integrity": "sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA==" }, "@mat-datetimepicker/core": { - "version": "10.0.10", - "resolved": "https://registry.npmjs.org/@mat-datetimepicker/core/-/core-10.0.10.tgz", - "integrity": "sha512-nVlNlSXPBPVwe+N6dBt3hXYEVPBka/8ttasjWHIzYswqSYILDpp1cqR1R7SkK5iSBRMbJhlTIaF/DLp4/wKWwQ==", + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/@mat-datetimepicker/core/-/core-11.0.3.tgz", + "integrity": "sha512-1M9sPoB3TfRb8hREDnv5R6uTi0iMlaY6oskxew0a+HVNTzZOBhwWWdKnlect8u+pXCmRBZI0QdMwx8nazeBdnA==", "requires": { "tslib": "^2.4.0" } @@ -43066,6 +43075,12 @@ "html2canvas": "^1.0.0-rc.5" } }, + "jspdf-autotable": { + "version": "3.5.31", + "resolved": "https://registry.npmjs.org/jspdf-autotable/-/jspdf-autotable-3.5.31.tgz", + "integrity": "sha512-Lc1KuLGDQWW/5t57Z/+c2E94XQV3jV2QVU3xMRiwvcm/nMx79aCkpPCsxLzJZVFneZvz4XoA8+egQR1QajYiWw==", + "requires": {} + }, "jsprim": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", diff --git a/package.json b/package.json index 51742a28..d04fe458 100644 --- a/package.json +++ b/package.json @@ -78,6 +78,7 @@ "hammerjs": "^2.0.8", "html2canvas": "^1.4.1", "jspdf": "^2.5.1", + "jspdf-autotable": "^3.5.31", "jszip": "^3.10.1", "jwt-decode": "^2.2.0", "moment": "^2.29.4", @@ -104,9 +105,9 @@ "@angular-eslint/eslint-plugin-template": "^15.2.1", "@angular-eslint/schematics": "^15.2.1", "@angular-eslint/template-parser": "^15.2.1", - "@angular/platform-browser-dynamic": "^15.2.9", "@angular/cli": "^15.2.9", "@angular/compiler-cli": "^15.2.9", + "@angular/platform-browser-dynamic": "^15.2.9", "@babel/core": "^7.18.10", "@babel/preset-env": "^7.18.10", "@compodoc/compodoc": "^1.1.19", @@ -145,4 +146,4 @@ "engines": { "node": ">=16.19.0" } -} \ No newline at end of file +} diff --git a/src/app/app.component.scss b/src/app/app.component.scss index b94cafb3..490c14c9 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -1,53 +1,38 @@ -@import '../../node_modules/@igo2/core/style/partial/core.variables'; +@import '@igo2/core/style/partial/core.variables'; @import './pages/portal/portal.variables.scss'; -:host { - font-family: Roboto, 'Helvetica Neue', sans-serif; -} - -/*** Message-center ***/ -igo-message-center ::ng-deep simple-notifications ::ng-deep div.simple-notification-wrapper { - right: 10px; -} - -/*** header-menu overlay adjustment ***/ - $header-height: 72px; $header-height-mobile: 72px; $footer-height: 29px; -::ng-deep .portal-hasHeader { - height: $portal-height-hasHeader-mobile !important; - display: block; -} - -::ng-deep .portal { - height: 100%; -} - -@media (min-width: 768px){ - +:host { + igo-message-center + ::ng-deep + simple-notifications + ::ng-deep + div.simple-notification-wrapper { + right: 10px; + } ::ng-deep .portal-hasHeader { - height: $portal-height-hasHeader !important; + height: $portal-height-hasHeader-mobile !important; display: block; } -} - -igo-spinner { - position: absolute; - top: 50% !important; - right: 50% ; - z-index: 100; -} + ::ng-deep .portal { + height: 100%; + } -/*TODO(mdc-migration): The following rule targets internal classes of tooltip that may no longer apply for the MDC version.*/ -::ng-deep .mat-tooltip-hide { display: none!important; } // temporary fix (https://github.com/angular/components/issues/24614) + @media (min-width: 768px) { + ::ng-deep .portal-hasHeader { + height: $portal-height-hasHeader !important; + display: block; + } + } -/*TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version.*/ -::ng-deep .mat-form-field-suffix { - ::ng-deep mat-icon { - width: auto !important; - height: -webkit-fill-available !important; + igo-spinner { + position: absolute; + top: 50% !important; + right: 50%; + z-index: 100; } } diff --git a/src/app/app.theming.scss b/src/app/app.theming.scss index cd795089..75b48e9e 100644 --- a/src/app/app.theming.scss +++ b/src/app/app.theming.scss @@ -1,3 +1,5 @@ -@mixin app-theming($theme) { - @include app-portal-theming($theme); +@use './pages/portal/portal.theming' as portal; + +@mixin themes($theme) { + @include portal.themes($theme); } diff --git a/src/app/pages/footer/footer.component.scss b/src/app/pages/footer/footer.component.scss index 55f0d0ff..1368c809 100644 --- a/src/app/pages/footer/footer.component.scss +++ b/src/app/pages/footer/footer.component.scss @@ -1,6 +1,7 @@ @import '../portal/portal.variables.scss'; -.order2 { +:host { + .order2 { order: 2; margin-right: 0.5%; margin-left: 140px; @@ -10,9 +11,9 @@ margin-left: 140px; text-align: right !important; width: 100%; -} + } -.footer-right { + .footer-right { z-index: 666; background: #ffffffa3; font-size: 0.7rem; @@ -20,41 +21,40 @@ height: $footer-height; display: flex; margin-left: auto; -} + } -span.footer-text { + span.footer-text { color: #095797; align-self: center; margin-left: 0.5rem; -} + } -span.footer-text a{ + span.footer-text a { color: #095797; text-decoration: none; -} - -::ng-deep .map-hasFooter { - height: calc( 100% - #{$footer-height} ) !important; -} + } -// scale + ::ng-deep .map-hasFooter { + height: calc(100% - #{$footer-height}) !important; + } -::ng-deep .ol-scale-line-inner { + ::ng-deep .ol-scale-line-inner { border: 1px solid black; color: black; border-top: none; order: 1; } - + ::ng-deep div.ol-scale-line { - position: fixed!important; + position: fixed !important; display: flex; flex-direction: row; - top: unset!important; - left: 10px!important; - bottom: 3px!important; - background: unset!important; + top: unset !important; + left: 10px !important; + bottom: 3px !important; + background: unset !important; color: black; - z-index: 5!important; - transform: unset!important; - } \ No newline at end of file + z-index: 5 !important; + transform: unset !important; + } +} diff --git a/src/app/pages/header/header.component.html b/src/app/pages/header/header.component.html index c46efcc4..71fbc221 100644 --- a/src/app/pages/header/header.component.html +++ b/src/app/pages/header/header.component.html @@ -1,7 +1,7 @@