Add device service migrate, use back-button

2021-01-27 08:11:37 +01:00 · 2021-01-27 08:11:37 +01:00 · dda82c8b09
commit dda82c8b09
parent 3e14157e87
15 changed files with 43 additions and 25 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1773,25 +1773,23 @@
      }
    },
    "@farmmaps/common": {
-      "version": "0.0.1-prerelease.487",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.487.tgz",
-      "integrity": "sha512-Yd7G/UlOVZfdYFsp7RRd9Lxa5AbQ8GHkf25Gjs3gCc7Le+Y78zge033Wo8e5n6vIQ45T/5WG/gABAFXP75NgUA==",
+      "version": "file:dist/common",
      "requires": {
        "tslib": "^2.0.0"
      }
    },
    "@farmmaps/common-map": {
-      "version": "0.0.1-prerelease.487",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.487.tgz",
-      "integrity": "sha512-r+Uj5kUvyyz80k9BDVEjYYmZk99yJB/f+iIjxdyFPGFv58ZTErQyFJjEd8Z6OoT6pIDMhdh/rdNYbwHzXSe1UQ==",
+      "version": "0.0.1-prerelease.504",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.504.tgz",
+      "integrity": "sha512-TPtuBP7BDuGkw+CRZaqw6P6i6nNgh2a+OEfTGUg9yKuRUj0YYkPNE1f1oBwqkpgCgg2RNboea/66fDbo1EbzqQ==",
      "requires": {
        "tslib": "^2.0.0"
      }
    },
    "@farmmaps/common-map3d": {
-      "version": "0.0.1-prerelease.487",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.487.tgz",
-      "integrity": "sha512-La1qj3d2jzTTRUyCSGbS5plGrLkg4pA4RZb4WkuS+piRwcT0OukhSAnfRESR4yTtOWb20YwI842y6gF6kUg3Jw==",
+      "version": "0.0.1-prerelease.504",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.504.tgz",
+      "integrity": "sha512-4qx8EeLg8+XayBalIKW8R8P1iuF2WfpdBDU0tfr8QKyydypCyt2EM/q0/wGBSBv1Tc4kTU/H04zI5T2M5BxILw==",
      "requires": {
        "tslib": "^2.0.0"
      }
--- a/package.json
+++ b/package.json
@ -19,9 +19,9 @@
    "@angular/platform-browser": "~10.1.3",
    "@angular/platform-browser-dynamic": "~10.1.3",
    "@angular/router": "~10.1.3",
-    "@farmmaps/common": ">=0.0.1-prerelease.487 <0.0.1",
-    "@farmmaps/common-map": ">=0.0.1-prerelease.487 <0.0.1",
-    "@farmmaps/common-map3d": ">=0.0.1-prerelease.487 <0.0.1",
+    "@farmmaps/common": "file:dist/common",
+    "@farmmaps/common-map": ">=0.0.1-prerelease.504 <0.0.1",
+    "@farmmaps/common-map3d": ">=0.0.1-prerelease.504 <0.0.1",
    "@microsoft/signalr": "^3.1.3",
    "@ng-bootstrap/ng-bootstrap": "^7.0",
    "@ngrx/effects": "^10.0",
--- a/projects/common-map/package.json
+++ b/projects/common-map/package.json
@ -14,8 +14,8 @@
    "@ngrx/router-store": "^10.0",
    "@ngrx/store": "^10.0",
    "tassign": "^1.0.0",
-    "@farmmaps/common": ">=0.0.1-prerelease.420 <0.0.1",
-    "ngx-openlayers": "1.0.0-next.16",
+    "@farmmaps/common": ">=0.0.1-prerelease.502 <0.0.1",
+    "ngx-openlayers": "1.0.0-next.17",
    "ol": "6.1.1"
  }
 }
--- a/projects/common-map/src/fm-map/components/feature-list-cropfield/feature-list-cropfield.component.html
+++ b/projects/common-map/src/fm-map/components/feature-list-cropfield/feature-list-cropfield.component.html
@ -1,6 +1,6 @@
 <div class="card border-0">
  <div class="card-body" *ngIf="(schemeItem|async);let schemeItem">
-    <div><a href="#" (click)="handleBackClick($event)" i18n>back</a></div>
+    <fm-back-button></fm-back-button>
    <h4 i18n>Farm</h4>
    <h3>{{schemeItem.name}}</h3>
    <div *ngIf="features;let features">
--- a/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html
+++ b/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html
@ -1,6 +1,6 @@
 <div class="card border-0">
  <div class="card-body">
-    <div><a href="#" (click)="handleBackClick($event)" i18n>Back</a></div>
+      <fm-back-button></fm-back-button>
      <h3><i class="fm fm-farm"></i>&nbsp;<span i18n>Farms</span></h3>
      <div *ngIf="features;let features">
      <div class="farms">
--- a/projects/common-map/src/fm-map/components/feature-list/feature-list.component.html
+++ b/projects/common-map/src/fm-map/components/feature-list/feature-list.component.html
@ -1,5 +1,5 @@
 <div *ngIf="features;let features">
-  <a href="#" (click)="handleBackClick($event)">Go back</a>
+  <fm-back-button></fm-back-button>>
  <div class="row m-0 pl-3 pr-3" *ngFor="let feature of features" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
    <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
  </div>
--- a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.html
@ -2,7 +2,7 @@
 <div *ngIf="item;let item">
  <div class="card border-0">
    <div class="card-body">
-      <div><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
+      <fm-back-button></fm-back-button>
      <div class="card menu-card">
        <h1>Cropfield</h1>
        <h4>{{item.name}}</h4>
--- a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html
@ -2,7 +2,7 @@
 <div *ngIf="item;let item">
  <div class="card border-0">
    <div class="card-body">
-      <div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
+      <fm-back-button></fm-back-button>
      <div class="card menu-card">
        <h2 *ngIf="parentItem">{{parentItem.name}}</h2>
        <h1>{{item.name}}</h1>
--- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html
@ -2,7 +2,7 @@
 <div *ngIf="item;let item">
  <div class="card border-0">
    <div class="card-body">
-      <div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
+      <fm-back-button></fm-back-button>
      <div class="card menu-card">
        <h2 *ngIf="parentItem">{{parentItem.name}}</h2>
        <h1>{{item.name}}</h1>
--- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html
@ -2,7 +2,7 @@
 <div *ngIf="selectedItem();let item">
  <div class="card border-0">
    <div class="card-body">
-      <div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
+      <fm-back-button></fm-back-button>
      <div class="card menu-card">
        <h2 *ngIf="parentItem">{{parentItem.name}}</h2>
        <h1>{{item.name}}</h1>
--- a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html
@ -7,7 +7,7 @@
  </div>
  <div class="card">
    <div class="card-body">
-      <div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
+      <fm-back-button></fm-back-button>
      <h1 class="card-title">{{item.name}}</h1>
      <div class="card menu-card">
        <ul class="p-0 mt-2">
--- a/projects/common/src/fm/common-service.module.ts
+++ b/projects/common/src/fm/common-service.module.ts
@ -31,6 +31,7 @@ import { StateSerializerService } from './services/state-serializer.service';
 import { PackageService } from './services/package.service';
 import { PackagePreloadStrategy } from './services/package-preload-strategy.service';
 import { SenmlService } from './services/senml-service';
+import { DeviceService } from './services/device.service';

 export {
  FolderService,
@ -53,7 +54,8 @@ export {
  SchemaService,
  PackageService,
  SenmlService,
-  PackagePreloadStrategy
+  PackagePreloadStrategy,
+  DeviceService
 };

@NgModule({
--- a/projects/common/src/fm/components/back-button/back-button.component.html
+++ b/projects/common/src/fm/components/back-button/back-button.component.html
@ -1,4 +1,4 @@
-<div class="back-button mb-2">
+<div *ngIf="show()" class="back-button mb-2">
    <i class="fal fa-arrow-left"></i>&nbsp;<span i18n="@FmBackButton">Back</span>
 </div>
  
--- a/projects/common/src/fm/components/back-button/back-button.component.ts
+++ b/projects/common/src/fm/components/back-button/back-button.component.ts
@ -1,5 +1,6 @@
 import {Component, HostListener} from '@angular/core';
 import {Location} from "@angular/common";
+import { DeviceService} from '../../services/device.service';

@Component({
  selector: 'fm-back-button',
@ -13,6 +14,10 @@ export class BackButtonComponent {
    this.location.back();
  }

-  constructor(private location: Location) { }
+  constructor(private location: Location,private deviceService:DeviceService) { }
+
+  public show() {
+    return !this.deviceService.IsMobile();
+  }

 }
--- a/projects/common/src/fm/services/device.service.ts
+++ b/projects/common/src/fm/services/device.service.ts
@ -0,0 +1,13 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+    providedIn: 'root',
+  })
+  export class DeviceService {
+    public IsMobile() {
+        let w = window as any;
+        let check = false;
+        (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||w.opera);
+        return check;
+      };
+  }