ændre til lora-gateway

Allan Asp Christensen · Allan Asp Christensen · commit 569e34d8873e · 2020-09-24T10:00:24.000+02:00
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule, PreloadAllModules } from '@angular/router';
-import { MineLoraGatewaysComponent } from './views/administration-gateway/mine-lora-gateways/mine-lora-gateways.component';
+import { MineLoraGatewaysComponent } from './views/administration-gateway/lora-gateways/lora-gateways.component';
 import { ListLoraGatewayComponent } from './views/administration-gateway/list-lora-gateway/list-lora-gateway.component';
 import { EditGatewayComponent } from './views/administration-gateway/edit-gateway/edit-gateway.component';
 import { GatewayComponent } from './views/administration-gateway/gateway/gateway.component';
@@ -14,7 +14,7 @@ const routes: Routes = [
     { path: 'dashboard', component: DashboardComponent },
     { path: 'my-applications', loadChildren: () => import('./my-applications/my-applications.module').then(m => m.MyApplicationsModule) },
     {
-        path: 'mine-lora-gateways', component: MineLoraGatewaysComponent,
+        path: 'lora-gateways', component: MineLoraGatewaysComponent,
         children: [
             { path: '', component: ListLoraGatewayComponent },
             { path: 'edit-gateway/:id', component: EditGatewayComponent },
diff --git a/src/app/auth/auth.component.html b/src/app/auth/auth.component.html
@@ -10,13 +10,13 @@
         <div *ngIf="isLoading">
             <app-loading-spinner></app-loading-spinner>
         </div>
-        <form class="p-5 jumbotron" style="" #authForm="ngForm" (ngSubmit)="onSubmit(authForm)" *ngIf="!isLoading">
-            <div class="form-group col-6">
+        <form class="p-5 jumbotron" #authForm="ngForm" (ngSubmit)="onSubmit(authForm)" *ngIf="!isLoading">
+            <div class="form-group col-8">
                 <label for="email">{{'AUTH.EMAIL' | translate}}</label>
                 <input type="username" id="username" class="form-control" ngModel name="username" required email
                     [ngClass]="{'is-invalid' : formFailedSubmit && errorFields.includes('username'), 'is-valid' : formFailedSubmit && !errorFields.includes('username')}">
             </div>
-            <div class="form-group col-6">
+            <div class="form-group col-8">
                 <label for="password">{{'AUTH.PASSWORD' | translate}}</label>
                 <input type="password" id="password" class="form-control" ngModel name="password" required minlength="6"
                     [ngClass]="{'is-invalid' : formFailedSubmit && errorFields.includes('password'), 'is-valid' : formFailedSubmit && !errorFields.includes('password')}">
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
@@ -37,13 +37,13 @@
             <li class="nav-item py-2">
               <a routerLink="/my-applications" routerLinkActive="active" class="nav-link pl-5 position-relative rounded"
                 id="myApplications">
-                {{ 'NAV.MY-APPLICATIONS' | translate }}
+                {{ 'NAV.APPLICATIONS' | translate }}
               </a>
             </li>
             <li class="nav-item py-2">
-              <a routerLink="/mine-lora-gateways" routerLinkActive="active"
-                class="nav-link pl-5 position-relative rounded" id="myLoraGateway">
-                {{ 'NAV.MY-LORA-GATEWAYS' | translate }}
+              <a routerLink="/lora-gateways" routerLinkActive="active" class="nav-link pl-5 position-relative rounded"
+                id="myLoraGateway">
+                {{ 'NAV.LORA-GATEWAYS' | translate }}
               </a>
             </li>
             <li class="nav-item py-2">
diff --git a/src/app/shared/form/form-body-lora-gateway/form-body-lora-gateway.component.ts b/src/app/shared/form/form-body-lora-gateway/form-body-lora-gateway.component.ts
@@ -85,7 +85,7 @@ export class FormBodyLoraGatewayComponent implements OnInit {
   }
 
   routeBack(): void {
-    this.router.navigateByUrl('/mine-lora-gateways');
+    this.router.navigateByUrl('/lora-gateways');
   }
 
   ngOnDestroy() {
@@ -98,7 +98,7 @@ export class FormBodyLoraGatewayComponent implements OnInit {
     console.log(event.target.value);
     console.log(event.target.maxLength);
     if (event.target.value.length > event.target.maxLength) {
-      event.target.value = event.target.value.slice( 0, event.target.maxLength);
+      event.target.value = event.target.value.slice(0, event.target.maxLength);
     }
   }
 
diff --git a/src/app/views/administration-gateway/administration-gateway.module.ts b/src/app/views/administration-gateway/administration-gateway.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { MineLoraGatewaysComponent } from './mine-lora-gateways/mine-lora-gateways.component';
+import { MineLoraGatewaysComponent } from './lora-gateways/lora-gateways.component';
 import { RouterModule } from '@angular/router';
 import { ListLoraGatewayComponent } from './list-lora-gateway/list-lora-gateway.component';
 import { TopBarModule } from 'src/app/shared/top-bar/top-bar.module';
@@ -12,10 +12,10 @@ import { EditGatewayComponent } from './edit-gateway/edit-gateway.component';
 import { GatewayComponent } from './gateway/gateway.component';
 @NgModule({
   declarations: [
-    MineLoraGatewaysComponent, 
-    ListLoraGatewayComponent, 
-    AdminLoraTableComponent, 
-    AdminLoraTableRowComponent, 
+    MineLoraGatewaysComponent,
+    ListLoraGatewayComponent,
+    AdminLoraTableComponent,
+    AdminLoraTableRowComponent,
     EditGatewayComponent, GatewayComponent
   ],
   imports: [
diff --git a/src/app/views/administration-gateway/create-lora-gateway/create-lora-gateway.component.ts b/src/app/views/administration-gateway/create-lora-gateway/create-lora-gateway.component.ts
@@ -9,23 +9,23 @@ import { BackButton } from 'src/app/models/back-button';
 })
 export class CreateLoraGatewayComponent implements OnInit {
 
-  public backButton: BackButton = {label: '', routerLink: '/mine-lora-gateways'};
+  public backButton: BackButton = { label: '', routerLink: '/lora-gateways' };
   public multiPage: boolean = false;
   public title: string = '';
   public sectionTitle: string = '';
   public submitButton: string = '';
 
   constructor(public translate: TranslateService) {
     translate.use('da');
-   }
+  }
 
   ngOnInit(): void {
     this.translate.get(['NAV.MY-LORA-GATEWAYS', 'FORM.CREATE-NEW-LORA-GATEWAY', 'LORA-GATEWAY.CREATE'])
-    .subscribe( translations => {
-      this.backButton.label = translations['NAV.MY-LORA-GATEWAYS']
-      this.title = translations['FORM.CREATE-NEW-LORA-GATEWAY']
-      this.submitButton = translations['LORA-GATEWAY.CREATE']
-    });
+      .subscribe(translations => {
+        this.backButton.label = translations['NAV.MY-LORA-GATEWAYS']
+        this.title = translations['FORM.CREATE-NEW-LORA-GATEWAY']
+        this.submitButton = translations['LORA-GATEWAY.CREATE']
+      });
   }
 
 }
diff --git a/src/app/views/administration-gateway/edit-gateway/edit-gateway.component.ts b/src/app/views/administration-gateway/edit-gateway/edit-gateway.component.ts
@@ -9,25 +9,25 @@ import { BackButton } from 'src/app/models/back-button';
 })
 export class EditGatewayComponent implements OnInit {
 
-  public backButton: BackButton = {label: '', routerLink: '/mine-lora-gateways'};
+  public backButton: BackButton = { label: '', routerLink: '/lora-gateways' };
   public multiPage = false;
   public title = '';
   public sectionTitle = '';
   public submitButton = '';
 
   constructor(
     public translate: TranslateService
-    ) {
+  ) {
     translate.use('da');
   }
 
   ngOnInit(): void {
     this.translate.get(['NAV.MY-LORA-GATEWAYS', 'FORM.EDIT-NEW-GATEWAY', 'GATEWAY.SAVE'])
-    .subscribe(translations => {
-      this.backButton.label = translations['NAV.MY-LORA-GATEWAYS'];
-      this.title = translations['FORM.EDIT-NEW-GATEWAY'];
-      this.submitButton = translations['GATEWAY.SAVE'];
-    });
+      .subscribe(translations => {
+        this.backButton.label = translations['NAV.MY-LORA-GATEWAYS'];
+        this.title = translations['FORM.EDIT-NEW-GATEWAY'];
+        this.submitButton = translations['GATEWAY.SAVE'];
+      });
   }
 
 }
diff --git a/src/app/views/administration-gateway/gateway/gateway.component.ts b/src/app/views/administration-gateway/gateway/gateway.component.ts
@@ -17,7 +17,7 @@ export class GatewayComponent implements OnInit {
 
     public gatewaySubscription: Subscription;
     public gateway: Gateway;
-    public backButton: BackButton = { label: '', routerLink: '/mine-lora-gateways' };
+    public backButton: BackButton = { label: '', routerLink: '/lora-gateways' };
     private id: string;
     public pageLimit: number = 10;
     public pageOffset: number = 0;
diff --git a/src/app/views/administration-gateway/lora-gateways/lora-gateways.component.html b/src/app/views/administration-gateway/lora-gateways/lora-gateways.component.html
diff --git a/src/app/views/administration-gateway/lora-gateways/lora-gateways.component.scss b/src/app/views/administration-gateway/lora-gateways/lora-gateways.component.scss
diff --git a/src/app/views/administration-gateway/lora-gateways/lora-gateways.component.spec.ts b/src/app/views/administration-gateway/lora-gateways/lora-gateways.component.spec.ts
@@ -1,16 +1,16 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MineLoraGatewaysComponent } from './mine-lora-gateways.component';
+import { MineLoraGatewaysComponent } from './lora-gateways.component';
 
 describe('MineLoraGatewaysComponent', () => {
   let component: MineLoraGatewaysComponent;
   let fixture: ComponentFixture<MineLoraGatewaysComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ MineLoraGatewaysComponent ]
+      declarations: [MineLoraGatewaysComponent]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/app/views/administration-gateway/lora-gateways/lora-gateways.component.ts b/src/app/views/administration-gateway/lora-gateways/lora-gateways.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 
 @Component({
-  selector: 'app-mine-lora-gateways',
-  templateUrl: './mine-lora-gateways.component.html',
-  styleUrls: ['./mine-lora-gateways.component.scss']
+  selector: 'app-lora-gateways',
+  templateUrl: './lora-gateways.component.html',
+  styleUrls: ['./lora-gateways.component.scss']
 })
 export class MineLoraGatewaysComponent implements OnInit {
 
diff --git a/src/app/views/datatarget/datatarget-list/datatarget-list.component.ts b/src/app/views/datatarget/datatarget-list/datatarget-list.component.ts
@@ -6,88 +6,88 @@ import { Datatarget } from 'src/app/models/datatarget';
 import { Router, ActivatedRoute } from '@angular/router';
 
 @Component({
-  selector: 'a[app-datatarget-list]',
-  templateUrl: './datatarget-list.component.html',
-  styleUrls: ['./datatarget-list.component.scss']
+    selector: 'a[app-datatarget-list]',
+    templateUrl: './datatarget-list.component.html',
+    styleUrls: ['./datatarget-list.component.scss']
 })
 export class DatatargetListComponent implements OnInit {
 
-  public pageLimit: number = 10;
-  public sort: Sort[] = [
-      {
-          id: 1,
-          dir: 'ASC',
-          col: 'updatedAt',
-          label: 'SORT.UPDATED-ASCENDING',
-      },
-      {
-          id: 2,
-          dir: 'DESC',
-          col: 'updatedAt',
-          label: 'SORT.UPDATED-DESCENDING',
-      },
-      {
-          id: 3,
-          dir: 'ASC',
-          col: 'createdAt',
-          label: 'SORT.CREATED-ASCENDING',
-      },
-      {
-          id: 4,
-          dir: 'DESC',
-          col: 'createdAt',
-          label: 'SORT.CREATED-DESCENDING',
-      },
-      {
-          id: 5,
-          dir: 'ASC',
-          col: 'name',
-          label: 'SORT.NAME-ASCENDING',
-      },
-      {
-          id: 6,
-          dir: 'DESC',
-          col: 'name',
-          label: 'SORT.NAME-DESCENDING',
-      },
-  ];
-  public selectedSortId: number = 1;
-  public selectedSortObject: Sort = {
-      id: 6,
-      dir: 'DESC',
-      col: 'name',
-      label: 'SORT.NAME-DESCENDING',
-  };
-  public title: string;
+    public pageLimit: number = 10;
+    public sort: Sort[] = [
+        {
+            id: 1,
+            dir: 'ASC',
+            col: 'updatedAt',
+            label: 'SORT.UPDATED-ASCENDING',
+        },
+        {
+            id: 2,
+            dir: 'DESC',
+            col: 'updatedAt',
+            label: 'SORT.UPDATED-DESCENDING',
+        },
+        {
+            id: 3,
+            dir: 'ASC',
+            col: 'createdAt',
+            label: 'SORT.CREATED-ASCENDING',
+        },
+        {
+            id: 4,
+            dir: 'DESC',
+            col: 'createdAt',
+            label: 'SORT.CREATED-DESCENDING',
+        },
+        {
+            id: 5,
+            dir: 'ASC',
+            col: 'name',
+            label: 'SORT.NAME-ASCENDING',
+        },
+        {
+            id: 6,
+            dir: 'DESC',
+            col: 'name',
+            label: 'SORT.NAME-DESCENDING',
+        },
+    ];
+    public selectedSortId: number = 1;
+    public selectedSortObject: Sort = {
+        id: 6,
+        dir: 'DESC',
+        col: 'name',
+        label: 'SORT.NAME-DESCENDING',
+    };
+    public title: string;
 
-  public backButton: BackButton = {label: '', routerLink: '/mine-applikationer'};
-  public datatarget: Datatarget;
+    public backButton: BackButton = { label: '', routerLink: '/applikationer' };
+    public datatarget: Datatarget;
 
-  constructor(
-    public translate: TranslateService,
-    private route: ActivatedRoute,) {
-    translate.use('da');
-   }
+    constructor(
+        public translate: TranslateService,
+        private route: ActivatedRoute,) {
+        translate.use('da');
+    }
 
-  ngOnInit(): void {
-    const applikationName: string = this.route.snapshot.paramMap.get('name'); 
-    this.translate.get(["NAV.DATATARGET"])
-        .subscribe((translate) => {
-            this.title = translate['NAV.DATATARGET'] + ' - ' + applikationName
-        })
-  }
+    ngOnInit(): void {
+        const applikationName: string = this.route.snapshot.paramMap.get('name');
+        this.translate.get(["NAV.DATATARGET"])
+            .subscribe((translate) => {
+                this.title = translate['NAV.DATATARGET'] + ' - ' + applikationName
+            })
+    }
 
-  updatePageLimit(limit: any) {
-    console.log(limit);
-  }
+    updatePageLimit(limit: any) {
+        console.log(limit);
+    }
 
-  changeSort(sortId: number) {
-      for (let i = 0; i < this.sort.length; i++) {
-          const elem = this.sort[i];
-          if (elem.id == sortId) {
-              this.selectedSortObject = elem;
-          }
-      }
-  }
+    changeSort(sortId: number) {
+        for (let i = 0; i < this.sort.length; i++) {
+            const elem = this.sort[i];
+            if (elem.id == sortId) {
+                this.selectedSortObject = elem;
+            }
+        }
+    }
 
 }
diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
@@ -10,9 +10,9 @@
   },
   "NAV": {
     "DASHBOARD": "Dashboard",
-    "MY-APPLICATIONS": "Applikationer",
+    "APPLICATIONS": "Applikationer",
     "ALL-IOT-DEVICES": "Alle IoT enheder",
-    "MY-LORA-GATEWAYS": "LoRaWan Gateways",
+    "LORA-GATEWAYS": "LoRaWan Gateways",
     "DATATARGET": "Datatarget",
     "MY-DATATARGET": "Tilbage",
     "DATATARGET-APPLIKATION": "for applikation:",
@@ -306,7 +306,7 @@
       "NETWORKSESSIONKEY": "Netværks session key",
       "APPLICATIONSESSIONKEY": "Applikation session key",
       "SKIPFCNTCHECK": "skipfcntcheck",
-      "OTAAAPPLICATIONKEY":"OTAA Applicationkey"
+      "OTAAAPPLICATIONKEY": "OTAA Applicationkey"
     }
   },
   "MESSAGE": {

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ export class FormBodyLoraGatewayComponent implements OnInit {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`routeBack(): void {`
`88`		`- this.router.navigateByUrl('/mine-lora-gateways');`
	`88`	`+ this.router.navigateByUrl('/lora-gateways');`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`ngOnDestroy() {`
`@@ -98,7 +98,7 @@ export class FormBodyLoraGatewayComponent implements OnInit {`
`98`	`98`	`console.log(event.target.value);`
`99`	`99`	`console.log(event.target.maxLength);`
`100`	`100`	`if (event.target.value.length > event.target.maxLength) {`
`101`		`- event.target.value = event.target.value.slice( 0, event.target.maxLength);`
	`101`	`+ event.target.value = event.target.value.slice(0, event.target.maxLength);`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`