Aw5739 wip

package.json

@@ -12,21 +12,21 @@
   "private": true,
   "dependencies": {
     "@angular-eslint/eslint-plugin": "^15.2.1",
-    "@angular/animations": "^15.2.10",
+    "@angular/animations": "^16.2.12",
-    "@angular/common": "^15.2.10",
+    "@angular/common": "^16.2.12",
-    "@angular/compiler": "^15.2.10",
+    "@angular/compiler": "^16.2.12",
-    "@angular/core": "^15.2.10",
+    "@angular/core": "^16.2.12",
-    "@angular/forms": "^15.2.10",
+    "@angular/forms": "^16.2.12",
-    "@angular/platform-browser": "^15.2.10",
+    "@angular/platform-browser": "^16.2.12",
-    "@angular/platform-browser-dynamic": "^15.2.10",
+    "@angular/platform-browser-dynamic": "^16.2.12",
-    "@angular/router": "^15.2.10",
+    "@angular/router": "^16.2.12",
     "@farmmaps/common": "file:dist/common",
     "@farmmaps/common-map": "file:dist/common-map",
     "@farmmaps/common-map3d": "file:dist/common-map3d",
-    "@microsoft/signalr": "^3.1.16",
+    "@microsoft/signalr": "^8.0.0",
-    "@ng-bootstrap/ng-bootstrap": "^13.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^15.0.0",
-    "@ngrx/effects": "^14",
+    "@ngrx/effects": "^15",
-    "@ngrx/router-store": "^14",
+    "@ngrx/router-store": "^15",
     "@ngrx/store": "^14",
     "@popperjs/core": "^2.11.6",
     "angular-oauth2-oidc": "^13",
@@ -39,10 +39,10 @@
     "https-browserify": "^1.0.0",
     "moment": "^2.29.4",
     "ngrx-store-localstorage": "^14",
-    "ngx-avatar": "^4.1.0",
+    "ngx-avatars": "^1.7.0",
-    "ngx-clipboard": "^14.0.1",
+    "ngx-clipboard": "^15.1.0",
-    "ngx-image-cropper": "^3.3.5",
+    "ngx-image-cropper": "^6.0.2",
-    "ngx-openlayers": "1.0.0-next.19",
+    "ngx-openlayers": "1.0.0-next.21",
     "ngx-uploadx": "^5.2.0",
     "ol": "6.14.1",
     "olcs": "^2.13.1",
@@ -54,15 +54,15 @@
     "tslib": "^2.4.0",
     "url": "^0.11.0",
     "util": "^0.12.4",
-    "zone.js": "~0.11.4"
+    "zone.js": "~0.13.3"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "^14",
+    "@angular-builders/custom-webpack": "^17.0.0",
-    "@angular-devkit/build-angular": "^15.2.10",
+    "@angular-devkit/build-angular": "^17.0.8",
-    "@angular/cli": "^15.2.10",
+    "@angular/cli": "^16.2.11",
-    "@angular/compiler-cli": "^15.2.10",
+    "@angular/compiler-cli": "^16.2.12",
-    "@angular/language-service": "^15.2.10",
+    "@angular/language-service": "^16.2.12",
-    "@angular/localize": "^15.2.10",
+    "@angular/localize": "^16.2.12",
     "@types/arcgis-rest-api": "^10.4.5",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "^2.0.9",
@@ -80,9 +80,9 @@
     "karma-coverage-istanbul-reporter": "^3.0.3",
     "karma-jasmine": "^5.1.0",
     "karma-jasmine-html-reporter": "^2.0.0",
-    "ng-packagr": "^15.2.2",
+    "ng-packagr": "^16.2.3",
-    "protractor": "~7.0.0",
+    "protractor": "^7.0.0",
     "ts-node": "^8.8.1",
-    "typescript": "~4.8.0"
+    "typescript": "~5.1.6"
   }
 }

projects/common-map/package-lock.json

@@ -1,22 +1,22 @@
 {
   "name": "@farmmaps/common-map",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@farmmaps/common-map",
-      "version": "2.0.0",
+      "version": "2.1.0",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=14.0.0",
+        "@angular/core": ">=16.0.0",
-        "@ngrx/effects": ">=14.0.0",
+        "@ngrx/effects": ">=16.0.0",
-        "@ngrx/router-store": ">=14.0.0",
+        "@ngrx/router-store": ">=16.0.0",
-        "@ngrx/store": ">=14.0.0",
+        "@ngrx/store": ">=16.0.0",
-        "ngrx-store-localstorage": ">=14.0.0",
+        "ngrx-store-localstorage": ">=16.0.0",
-        "ngx-openlayers": ">=1.0.0-next.19",
+        "ngx-openlayers": ">=1.0.0-next.21",
         "ol": ">=6.8.1",
         "tassign": ">=1.0.0"
       }

projects/common-map/package.json

@@ -8,13 +8,13 @@
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/core": ">=15.0.0",
+    "@angular/core": ">=16.0.0",
-    "ngrx-store-localstorage": ">=15.0.0",
+    "ngrx-store-localstorage": ">=16.0.0",
-    "@ngrx/effects": ">=15.0.0",
+    "@ngrx/effects": ">=16.0.0",
-    "@ngrx/router-store":">=15.0.0",
+    "@ngrx/router-store":">=16.0.0",
-    "@ngrx/store":">=15.0.0",
+    "@ngrx/store":">=16.0.0",
     "tassign": ">=1.0.0",
-    "ngx-openlayers": ">=1.0.0-next.19",
+    "ngx-openlayers": ">=1.0.0-next.21",
     "ol": ">=6.8.1"
   }
 }

projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.scss

@@ -1,6 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
 .gps-location {
   display:none; 
 }
@@ -14,7 +11,7 @@
 }
 
 .tolerance {
-  fill: $primary;
+  fill: var(--bs-primary);
   fill-opacity:0.4;
 }
 
@@ -23,20 +20,20 @@
 }
 
 .border {
-  fill: $white;
+  fill: var(--bs-white);
 }
 
 .center {
-  fill: $primary;
+  fill: var(--bs-primary);
 }
 
 .stop1 {
-  stop-color: $primary;
+  stop-color: var(--bs-primary);
   stop-opacity:1;
 }
 
 .stop2 {
-  stop-color:$primary;
+  stop-color: var(--bs-primary);
   stop-opacity: 0;
 }
 

projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.scss

@@ -1,11 +1,8 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
 .gps-location {
   display:block; 
   width:2.5em;
   height:2.5em;
-  background-color: $body-bg;
+  background-color: var(--bs-body-bg);
   background-size: contain;
   margin-top:0.5em;
   border-radius: 1.75em;
@@ -17,15 +14,15 @@
 }
 
 .pan-to {
-  fill: $secondary;
+  fill: var(--bs-secondary);
 }
 
 div.gps-location:hover .pan-to {
-  fill: $white;
+  fill: var(--bs-white);
 }
 
 .pan-to-centered {
-  fill: $primary;
+  fill: var(--bs-primary);
 }
 
 div.gps-location:hover .pan-to-centered {
@@ -33,5 +30,5 @@ div.gps-location:hover .pan-to-centered {
 }
 
 .pan-to.pan-to-disabled {
-  fill: $gray-300;
+  fill: var(--bs-gray-300);
 }

projects/common-map/src/fm-map/components/aol/rotation-reset/rotation-reset.component.scss

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .compass {
   width:2.5em;
   height:2.5em;
@@ -13,7 +11,7 @@
 
 #north {
   display: none;
-  fill:$black;
+  fill: var(--bs-black);
 }
 
 #top-l {
@@ -33,23 +31,23 @@
 }
 
 div.compass:hover #top-l {
-  fill:$white;
+  fill: var(--bs-white);
 }
 
 div.compass:hover #top-r {
-  fill:$gray-300;
+  fill: var(--bs-gray-300);
 }
 
 div.compass:hover #bottom-l {
-  fill:$gray-300;
+  fill: var(--bs-gray-300);
 }
 
 div.compass:hover #bottom-r {
-  fill:$white;
+  fill: var(--bs-white);
 }
 
 div.compass:hover #north {
-  fill:$white;
+  fill: var(--bs-white);
 }
 
 .compass-n {    

projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.scss

@@ -1,14 +1,10 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
 .row {
-  border-bottom: 1px solid $gray-500;
+  border-bottom: 1px solid var(--bs-gray-500);
   user-select: none;
 }
 
 .row.selected {
-  background-color: $gray-100;
+  background-color: var(--bs-gray-100);
 }
 
 @media screen and (min-width: 44rem)  {

projects/common-map/src/fm-map/components/feature-list-cropfield/feature-list-cropfield.component.scss

@@ -1,22 +1,20 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 fm-map-feature-list-feature-container {
   width:100%;
   pointer-events:none;
 }
 
 .row {
-  border-bottom: 1px solid $gray-500;
+  border-bottom: 1px solid var(--bs-gray-500);
   user-select: none;
   padding-left:1.5rem;
 }
 
 .row.selected {
-  background-color: $gray-100;
+  background-color: var(--bs-gray-100);
 }
 
 .cropfields {
-  border-top: 1px solid $gray-500;
+  border-top: 1px solid var(--bs-gray-500);
   margin-left: -1.25rem;
   margin-right: -1.25rem;
 }

projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.scss

@@ -1,22 +1,20 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 fm-map-feature-list-feature-container {
   width:100%;
   pointer-events:none;
 }
 
 .row {
-  border-bottom: 1px solid $gray-500;
+  border-bottom: 1px solid var(--bs-gray-500);
   user-select: none;
   padding-left:1.5rem;
 }
 
 .row.selected {
-  background-color: $gray-100;
+  background-color: var(--bs-gray-100);
 }
 
 .farms {
-  border-top: 1px solid $gray-500;
+  border-top: 1px solid var(--bs-gray-500);
   margin-left: -1.25rem;
   margin-right: -1.25rem;
 }

projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.scss

@@ -1,7 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
 .card-title {
   font-size: 1rem;
   white-space: nowrap;

projects/common-map/src/fm-map/components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component.scss

@@ -1,7 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
 .card-title {
   font-size: 1rem;
   white-space: nowrap;

projects/common-map/src/fm-map/components/feature-list-feature/feature-list-feature.component.scss

@@ -1,7 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
 .card-title {
   font-size: 1rem;
   white-space: nowrap;

projects/common-map/src/fm-map/components/feature-list/feature-list.component.scss

@@ -1,15 +1,13 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 fm-map-feature-list-feature-container {
   width: 100%;
   pointer-events: none;
 }
 
 .row {
-  border-bottom: 1px solid $gray-500;
+  border-bottom: 1px solid var(--bs-gray-500);
   user-select: none;
 }
 
 .row.selected {
-  background-color: $gray-100;
+  background-color: var(--bs-gray-100);
 }

projects/common-map/src/fm-map/components/item-list-item/item-list-item.component.scss

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .widget {
   padding:0.8rem;
   height:100%;

projects/common-map/src/fm-map/components/item-list/item-list.component.scss

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .widget-container {
   overflow:auto;
   margin-bottom:1rem;
@@ -7,7 +5,7 @@
 
 .widget {
   position:relative;
-  border: 1px solid $gray-500;
+  border: 1px solid var(--bs-gray-500);
   user-select: none;
   display:inline-block;
   width:50%;
@@ -28,7 +26,7 @@
 }
 
 .widget:hover {
-  background-color: $gray-100;
+  background-color: var(--bs-gray-100);
 }
 
 .widget-container {

projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.scss

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .widget-container {
   overflow:auto;
   margin-bottom:1rem;
@@ -7,7 +5,7 @@
 
 .widget {
   position:relative;
-  border: 1px solid $gray-500;
+  border: 1px solid var(--bs-gray-500);
   user-select: none;
   display:inline-block;
   width:50%;
@@ -28,7 +26,7 @@
 }
 
 .widget:hover {
-  background-color: $gray-100;
+  background-color: var(--bs-gray-100);
 }
 
 .widget-container {

projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.scss

@@ -1,18 +1,15 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
 .layer-switcher {  
   display:block; 
   width:2.5em;
   height:2.5em;
-  background-color: $body-bg;
+  background-color: var(--bs-body-bg);
   background-size: contain;
   margin-top:0.5em;
   text-align: center;
   line-height: 2.5em; 
   border-radius: 1.75em;
   padding: 0;
-  color: $secondary;
+  color: var(--bs-secondary);
 }
 
 .layer-switcher i {
@@ -24,7 +21,7 @@
 }
 
 .layers {
-  color:$secondary;
+  color: var(--bs-secondary);
   position: absolute;
   overflow: hidden;
   bottom: -1em;

projects/common-map/src/fm-map/components/map-search/map-search.component.scss

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 div.map-search {
   position: absolute;
   top: 0.5rem;
@@ -106,7 +104,7 @@ div.map-search.searchcollapsed button[type="submit"] {
 }
 
 .form-control, .form-control:focus {
-  border-color: $secondary;
+  border-color: var(--bs-secondary);
 }
 
 

projects/common-map/src/fm-map/components/map/map.component.scss

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 aol-map { position:absolute;width:100%;height:calc( 100vh );}
 
 .arrow {
@@ -195,7 +193,7 @@ timespan.menuVisible {
   width: 4rem;
   overflow: hidden;
   text-overflow: ellipsis;
-  color: $primary;
+  color: var(--bs-primary);
 }
 
 .shortcut-icon > .farm-icon {

projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.scss

@@ -1,13 +1,9 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
 .row {
-  border-bottom: 1px solid $gray-500;
+  border-bottom: 1px solid var(--bs-gray-500);
   user-select: none;
 }
 
 .row:hover {
-  background-color: $gray-100;
+  background-color: var(--bs-gray-100);
 }
 

projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .big-icon {
   width: 100%;
   color: white;

projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.scss

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .big-icon {
   width: 100%;
   color: white;

projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.scss

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .big-icon {
   width: 100%;
   color: white;

projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.scss

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .big-icon {
   width: 100%;
   color: white;

projects/common-map/src/fm-map/components/selected-item/selected-item.component.scss

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .big-icon {
   width: 100%;
   color: white;

projects/common-map3d/package-lock.json

@@ -1,20 +1,20 @@
 {
   "name": "@farmmaps/common-map3d",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@farmmaps/common-map3d",
-      "version": "2.0.0",
+      "version": "2.1.0",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": ">=14.0.0",
+        "@angular/common": ">=16.0.0",
-        "@angular/core": ">=14.0.0",
+        "@angular/core": ">=16.0.0",
         "cesium": ">=1.82.1",
-        "ngx-openlayers": "1.0.0-next.19",
+        "ngx-openlayers": "1.0.0-next.21",
         "ol-cesium": ">=2.13.0"
       }
     },

projects/common-map3d/package.json

@@ -5,9 +5,9 @@
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
   "peerDependencies": {
-    "@angular/common":  ">=15.0.0",
+    "@angular/common":  ">=16.0.0",
-    "@angular/core":  ">=15.0.0",
+    "@angular/core":  ">=16.0.0",
-    "ngx-openlayers": "1.0.0-next.19",
+    "ngx-openlayers": "1.0.0-next.21",
     "cesium": ">=1.82.1",
     "ol-cesium": ">=2.13.0"
   },

projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.scss

@@ -1,17 +1,15 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .twotreed {
   display:block; 
   width:2.5em;
   height:2.5em;
-  background-color: $body-bg;
+  background-color: var(--bs-body-bg);
   background-size: contain;
   margin-top:0.5em;
   text-align: center;
   line-height: 2.5em; 
   border-radius: 1.75em;
   padding: 0;
-  color: $secondary;
+  color: var(--bs-secondary);
 }
 
 .fa-spinner {

projects/common/package-lock.json

@@ -1,27 +1,27 @@
 {
   "name": "@farmmaps/common",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@farmmaps/common",
-      "version": "2.0.0",
+      "version": "2.1.0",
       "peerDependencies": {
-        "@angular/common": ">=14.0.0",
+        "@angular/common": ">=16.0.0",
-        "@angular/core": ">=14.0.0",
+        "@angular/core": ">=16.0.0",
-        "@angular/forms": ">=14.0.0",
+        "@angular/forms": ">=16.0.0",
         "@microsoft/signalr": ">=3.1.3",
-        "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
+        "@ng-bootstrap/ng-bootstrap": ">=16.0.0",
-        "@ngrx/effects": ">=14.0.0",
+        "@ngrx/effects": ">=16.0.0",
-        "@ngrx/router-store": ">=14.0.0",
+        "@ngrx/router-store": ">=16.0.0",
-        "@ngrx/store": ">=14.0.0",
+        "@ngrx/store": ">=16.0.0",
         "angular-oauth2-oidc": ">=13.0.0",
         "bootstrap": ">=4.4.1",
         "moment": ">=2.27.0",
         "ngx-avatar": ">=4.1.0",
-        "ngx-clipboard": ">=14.0.1",
+        "ngx-clipboard": ">=15.1.0",
-        "ngx-image-cropper": ">=3.3.5",
+        "ngx-image-cropper": ">=6.0.2",
         "ngx-uploadx": ">=5.1.0",
         "tassign": ">=1.0.0"
       }

projects/common/package.json

@@ -5,13 +5,13 @@
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
   "peerDependencies": {
-    "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
+    "@ng-bootstrap/ng-bootstrap": ">=16.0.0",
-    "@angular/common": ">=15.0.0",
+    "@angular/common": ">=16.0.0",
-    "@angular/core": ">=15.0.0",
+    "@angular/core": ">=16.0.0",
-    "@angular/forms": ">=15.0.0",
+    "@angular/forms": ">=16.0.0",
-    "@ngrx/effects": ">=14.0.0",
+    "@ngrx/effects": ">=16.0.0",
-    "@ngrx/router-store": ">=15.0.0",
+    "@ngrx/router-store": ">=16.0.0",
-    "@ngrx/store": ">=15.0.0",
+    "@ngrx/store": ">=16.0.0",
     "tassign": ">=1.0.0",
     "bootstrap": ">=4.4.1",
     "@microsoft/signalr": ">=3.1.3",
@@ -19,7 +19,7 @@
     "angular-oauth2-oidc": ">=13.0.0",
     "moment": ">=2.27.0",
     "ngx-avatar": ">=4.1.0",
-    "ngx-image-cropper": ">=3.3.5",
+    "ngx-image-cropper": ">=6.0.2",
-    "ngx-clipboard": ">=14.0.1"
+    "ngx-clipboard": ">=15.1.0"
   }
 }

projects/common/src/fm/common.module.ts

@@ -9,8 +9,8 @@ import { OAuthModule, AuthConfig, OAuthService, OAuthStorage } from 'angular-oau
 import { StoreModule, Store } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { UploadxModule } from 'ngx-uploadx';
+import { UploadxModule } from 'ngx-uploadx/ngx-uploadx';
-import { ClipboardModule } from 'ngx-clipboard';
+import { ClipboardModule } from 'ngx-clipboard/ngx-clipboard';
 
 
 // routing module
@@ -68,7 +68,7 @@ import { BackButtonComponent } from './components/back-button/back-button.compon
 import { EditImageModalComponent } from './components/edit-image-modal/edit-image-modal.component';
 import { AvatarComponent } from './components/avatar/avatar.component';
 import { ItemLinkComponent } from './components/item-link/item-link.component';
-import { AvatarModule } from 'ngx-avatar';
+import { AvatarModule } from 'ngx-avatars';
 import { ImageCropperModule } from 'ngx-image-cropper';
 
 export const FM_COMMON_STARTPAGE = new InjectionToken<string>('fm-common-startpage');

projects/common/src/fm/components/app/app.component.scss

@@ -1,9 +1,3 @@
-/* Import Bootstrap & Fonts */
-
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
 // custom styles
 
 .btn:focus {
@@ -16,7 +10,7 @@
 
 .form-control:focus {
   box-shadow: none;
-  border-color: $input-border-color;
+  border-color: var(--bs-input-border-color);
 }
 
 

projects/common/src/fm/components/auth-callback/auth-callback.guard.ts

@@ -1,4 +1,4 @@
-import { Router, CanActivate } from '@angular/router';
+import { Router } from '@angular/router';
 import { Injectable } from '@angular/core';
 import { OAuthService } from 'angular-oauth2-oidc';
 import {  } from '@angular/router';
@@ -6,7 +6,7 @@ import {  } from '@angular/router';
 @Injectable({
   providedIn: 'root',
 })
-export class AuthCallbackGuard implements CanActivate {
+export class AuthCallbackGuard  {
 
   constructor(private router$: Router,private oauthService$:OAuthService) {}
 

projects/common/src/fm/components/avatar/avatar.component.html

@@ -1,10 +1,10 @@
 <span class="avatar-container" [title]="name">
-	<ngx-avatar 
+	<ngx-avatars 
 		class="farmmaps-avatar"
 		[src]="src" 
 		[name]="name" 
 		[size]="size"
 		[round]='true'
 		>
-	</ngx-avatar>
+	</ngx-avatars>
 </span>

projects/common/src/fm/components/back-button/back-button.component.scss

@@ -1,12 +1,10 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .back-button {
   cursor: default;
-  color: $primary;
+  color: var(--bs-primary);
   display: block;  
 }
 
 .back-button:hover {
   cursor: pointer;
-  color: $secondary;
+  color: var(--bs-secondary);
 }

projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss

@@ -1,7 +1,3 @@
-/* Import Bootstrap & Fonts */
-
-@import "~bootstrap/scss/bootstrap.scss";
-
 div.resumable-file-upload {
   position: fixed;
   right: 0px;
@@ -76,7 +72,7 @@ div.card-header span.fa {
   }
 
 .upload-file.busy > div > span.fa-times {
-  color: $danger;
+  color: var(--bs-danger);
   width: 20px;
   display: inline-block;
   vertical-align: middle;
@@ -94,7 +90,7 @@ div.card-header span.fa {
   }
 
   .upload-file > div.errormessage {
-    color: $danger;
+    color: var(--bs-danger);
     display: none;
   }
 

projects/common/src/fm/services/auth-guard.service.ts

@@ -1,11 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
+import { Router, Route, ActivatedRouteSnapshot, RouterStateSnapshot, UrlSegment, UrlTree } from '@angular/router';
-  CanActivate, Router, CanLoad, Route, CanActivateChild ,
-  ActivatedRouteSnapshot,
-  RouterStateSnapshot,
-  UrlSegment,
-  UrlTree
-} from '@angular/router';
 
 
 import { Store } from '@ngrx/store';
@@ -19,7 +13,7 @@ import * as appCommonReducer from '../reducers/app-common.reducer';
 @Injectable({
   providedIn: 'root',
 })
-export class AuthGuard implements CanActivate, CanLoad, CanActivateChild  { 
+export class AuthGuard   { 
  
   constructor(private oauthService: OAuthService, private router: Router, private store: Store<appCommonReducer.State>) { }
   

projects/common/src/fm/services/full-screen-guard.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CanActivate, CanActivateChild, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
+import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 
 import { Store } from '@ngrx/store';
 
@@ -10,7 +10,7 @@ import * as appCommonActions from '../actions/app-common.actions';
 @Injectable({
   providedIn: 'root',
 })
-export class FullScreenGuard implements CanActivate,CanActivateChild { 
+export class FullScreenGuard  { 
  
   private loginDispatched = false;
   constructor(private store: Store<appCommonReducer.State> ) { }

projects/common/src/fm/services/nav-bar-guard.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CanLoad, Route, CanActivate, CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Route, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 
 import { Store } from '@ngrx/store';
 
@@ -10,7 +10,7 @@ import * as appCommonActions from '../actions/app-common.actions';
 @Injectable({
   providedIn: 'root',
 })
-export class NavBarGuard implements CanActivate {
+export class NavBarGuard  {
 
   private loginDispatched = false;
   constructor(private store: Store<appCommonReducer.State>) { }

projects/common/src/fm/services/package-guard.service.ts

@@ -1,11 +1,11 @@
 import {Injectable} from '@angular/core';
-import {ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot} from '@angular/router';
+import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 import {PackageService} from './package.service';
 
 @Injectable({
   providedIn: 'root',
 })
-export class PackageGuard implements CanActivate {
+export class PackageGuard  {
 
   constructor(private packageService: PackageService) { }
 

src/app/landingpage/landingpage.component.scss

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 /*!
  * Start Bootstrap - Landing Page v5.0.8 (https://startbootstrap.com/themes/landing-page)
  * Copyright 2013-2020 Start Bootstrap

src/app/menu/menu.component.scss

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .menu-card {
     padding-left:7px;
     padding-right:7px;
@@ -29,7 +27,7 @@
     width: 4rem;
     overflow: hidden;
     text-overflow: ellipsis;
-    color: $primary;
+    color: var(--bs-primary);
   }
   
   .shortcut-icon > .farm-icon {