Skip to content

Commit 69eed14

Browse files
author
Allan Asp Christensen
committed
issue fix
1 parent a8d6ab8 commit 69eed14

File tree

49 files changed

+316
-490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+316
-490
lines changed

‎src/app/admin/admin-routing.module.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ import { UsersComponent } from './users/users.component';
1515

1616

1717
const adminRoutes: Routes = [
18-
19-
// { path: 'users', loadChildren: () => import('./users/users.module').then(m => m.UsersModule) },
20-
2118
{
2219
path: 'organisations', component: OrganisationComponent, children: [
2320
{ path: '', component: OrganisationListComponent },
@@ -26,8 +23,6 @@ const adminRoutes: Routes = [
2623
{ path: ':org-id/edit-organisation', component: OrganisationEditComponent },
2724
]
2825
},
29-
// { path: 'organisations', loadChildren: () => import('./organisation/organisation.module').then(m => m.OrganisationModule) },
30-
// { path: 'permissions', loadChildren: () => import('./permission/permission.module').then(m => m.PermissionModule) },
3126
{
3227
path: 'users', component: UsersComponent, children: [
3328
{ path: '', component: UserListComponent },

‎src/app/admin/organisation/organisation-detail/organisation-detail.component.html‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,10 @@
11
<app-top-bar-single [data]="organisation" [backButton]="backButton"></app-top-bar-single>
2-
<!-- <div class="p-5 row">
3-
<div class="col-6">
4-
5-
</div>
6-
<div class="col-6">
7-
<div class="card">
8-
<div class="card-header">
9-
{{ 'ORGANISATION.DETAIL.PERMISSIONS' | translate }}
10-
</div>
11-
<div>
12-
<h1 style="color:rebeccapurple">TODO</h1>
13-
</div>
14-
</div>
15-
</div>
16-
<div class="col-6">
17-
<div class="card">
18-
<div class="card-header">
19-
{{ 'ORGANISATION.DETAIL.APPLICATIONS' | translate }}
20-
</div>
21-
<div>
22-
<app-applications-table [applications]="applications" (deleteApplication)="deleteApplication($event)">
23-
</app-applications-table>
24-
</div>
25-
</div>
26-
</div>
27-
</div> -->
282

293
<div class=" jumbotron m-md-4 p-md-3" *ngIf="organisation">
304
<div class="row">
315
<div class="col-xs-12">
326
<div class="float-left">
33-
34-
357
<h2> {{organisation.name}}</h2>
36-
37-
388
</div>
399
<div class="btn-group float-right">
4010
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"

‎src/app/admin/organisation/organisation-list/organisation-list.component.html‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
<div class="px-md-5 py-sm-4">
2-
<div class="row mb-5">
3-
<app-top-bar [sort]="sort" [pageLimit]="pageLimit" [title]="'NAV.ORGANISATIONS' | translate"
4-
[ctaLabel]="'ORGANISATION.FORM.CREATE-NEW-ORGANISATION' | translate" [ctaRouterLink]="'new-organisation'"
5-
(updatePageLimit)="updatePageLimit($event)" (selectedSortChange)="changeSort($event)"></app-top-bar>
6-
</div>
7-
<div class="row">
8-
<app-organisation-tabel></app-organisation-tabel>
9-
</div>
1+
<app-top-bar [sort]="sort" [pageLimit]="pageLimit" [title]="'NAV.ORGANISATIONS' | translate"
2+
[ctaLabel]="'ORGANISATION.FORM.CREATE-NEW-ORGANISATION' | translate" [ctaRouterLink]="'new-organisation'"
3+
(updatePageLimit)="updatePageLimit($event)" (selectedSortChange)="changeSort($event)"></app-top-bar>
4+
5+
<div class="m-md-4 p-md-3">
6+
<app-organisation-tabel></app-organisation-tabel>
107
</div>

‎src/app/admin/organisation/organisation.model.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { Application } from '@applications/application.model';
12
import { PayloadDecoder } from '../../payload-decoder/payload-decoder.model';
2-
import { Application } from '../../applications/application.model';
33

44
export class Organisation {
55
id?: number;

‎src/app/admin/permission/permission-list/permission-list.component.html‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
<div class="px-sm-5 py-sm-4">
2-
<div class="row mb-5">
3-
<app-top-bar [sort]="sort" [pageLimit]="pageLimit" [title]="'NAV.PERMISSIONS' | translate"
4-
[ctaLabel]="'FORM.CREATE-NEW-PERMISSION' | translate" [ctaRouterLink]="'new-permission'"></app-top-bar>
5-
</div>
6-
<div class="row">
7-
<app-permission-tabel [permissions]="permissions" (deletePermission)="deletePermission($event)">
8-
</app-permission-tabel>
9-
</div>
1+
<app-top-bar [sort]="sort" [pageLimit]="pageLimit" [title]="'NAV.PERMISSIONS' | translate"
2+
[ctaLabel]="'FORM.CREATE-NEW-PERMISSION' | translate" [ctaRouterLink]="'new-permission'"></app-top-bar>
3+
4+
<div class="m-md-4 p-md-3">
5+
<app-permission-tabel [permissions]="permissions" (deletePermission)="deletePermission($event)">
6+
</app-permission-tabel>
107
</div>

‎src/app/admin/users/user-list/user-list.component.html‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
<div class="px-sm-5 py-sm-4">
2-
<div class="row mb-5">
3-
<app-top-bar [sort]="sort" [pageLimit]="pageLimit" [title]="'NAV.USERS' | translate"
4-
[ctaLabel]="'USERS.CREATE' | translate" [ctaRouterLink]="'new-user'"
5-
(updatePageLimit)="updatePageLimit($event)" (selectedSortChange)="changeSort($event)"></app-top-bar>
6-
</div>
7-
<div class="row">
8-
<app-user-table></app-user-table>
9-
</div>
1+
<app-top-bar [sort]="sort" [pageLimit]="pageLimit" [title]="'NAV.USERS' | translate"
2+
[ctaLabel]="'USERS.CREATE' | translate" [ctaRouterLink]="'new-user'" (updatePageLimit)="updatePageLimit($event)"
3+
(selectedSortChange)="changeSort($event)"></app-top-bar>
4+
5+
<div class="m-md-4 p-md-3">
6+
<app-user-table></app-user-table>
107
</div>

‎src/app/app-routing.module.ts‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,13 @@ import { NgModule } from '@angular/core';
22
import { Routes, RouterModule, PreloadAllModules } from '@angular/router';
33
import { AuthComponent } from './auth/auth.component';
44
import { DashboardComponent } from './dashboard/dashboard.component';
5-
import { GatewaysComponent } from './gateway/gateways/gateways.component';
6-
import { GatewayEditComponent } from './gateway/gateway-edit/gateway-edit.component';
7-
import { GatewayListComponent } from './gateway/gateway-list/gateway-list.component';
8-
import { GatewayDetailComponent } from './gateway/gateway-detail/gateway-detail.component';
95

106
const routes: Routes = [
117
{ path: 'admin', loadChildren: () => import('./admin/admin.module').then(m => m.AdminModule) },
128
{ path: 'auth', component: AuthComponent },
139
{ path: 'dashboard', component: DashboardComponent },
1410
{ path: 'applications', loadChildren: () => import('./applications/applications.module').then(m => m.ApplicationsModule) },
15-
{
16-
path: 'gateways', component: GatewaysComponent,
17-
children: [
18-
{ path: '', component: GatewayListComponent },
19-
{ path: 'gateway-edit/:id', component: GatewayEditComponent },
20-
{ path: 'gateway-edit', component: GatewayEditComponent },
21-
{ path: 'gateway-detail/:id', component: GatewayDetailComponent }
22-
],
23-
},
11+
{ path: 'gateways', loadChildren: () => import('./gateway/gateway.module').then(m => m.GatewayModule) },
2412
{ path: 'profiles', loadChildren: () => import('./profiles/profiles.module').then(m => m.ProfilesModule) },
2513
{ path: 'payload-decoder', loadChildren: () => import('./payload-decoder/payload-decoder.module').then(m => m.PayloadDecoderModule) },
2614
{ path: '', redirectTo: '/auth', pathMatch: 'full' },

‎src/app/app.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<app-navbar></app-navbar>
22
<div id="content">
3-
<div id="mainBody" class="container-fluid">
3+
<div id="mainBody">
44
<router-outlet></router-outlet>
55
</div>
66
</div>

‎src/app/applications/application-detail/application-detail.component.html‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
<ng-container *ngIf="application">
22
<app-top-bar-single [data]="application" [backButton]="backButton" [buttons]="buttons"></app-top-bar-single>
3-
<div class="px-5">
4-
<div class="application-component">
5-
<div class="col-xs-12 mb-4 py-3 bottom-separator">
6-
<div class="col-xs-12 col-sm-4">
3+
<div class="jumbotron my-4 m-md-4 py-3 p-md-3">
4+
<div class="row">
5+
<div class="col-sm-12 ">
6+
<div class="float-left">
77
<h4>{{ 'APPLICATION.DESCRIPTION' | translate }}</h4>
88
</div>
9-
<div class="col-xs-12 pt-2 col-sm-8">
10-
<p>{{description}}</p>
11-
</div>
12-
<div class="ml-auto d-flex">
9+
<div class="btn-group float-right">
1310
<button class='btn btn-primary' type="button" [routerLink]="['datatarget-list', application.name]"
1411
routerLinkActive="active" class="btn btn-primary">{{ 'APPLICATION.DATATARGET-SHOW' | translate }}</button>
1512
</div>
1613
</div>
17-
<div class="col-xs-12 mb-5 application-table-header">
14+
</div>
15+
<div class="row">
16+
<div class="col-xs-12 pt-2 col-sm-8">
17+
<p>{{description}}</p>
18+
</div>
19+
</div>
20+
</div>
21+
<div class="jumbotron my-4 m-md-4 py-3 p-md-3">
22+
<div class="row">
23+
<div class="col-sm-12">
1824
<app-top-bar [component]="true" [title]="'APPLICATION.ATTACHED-IOT' | translate" [sort]="sort"
1925
[(selectedSortId)]="selectedSortId" [pageLimit]="pageLimit"
2026
[ctaLabel]="'FORM.CREATE-NEW-IOT-DEVICE' | translate" [ctaRouterLink]="'new-iot-device'"
@@ -24,4 +30,5 @@ <h4>{{ 'APPLICATION.DESCRIPTION' | translate }}</h4>
2430
</div>
2531
</div>
2632
</div>
33+
2734
</ng-container>

‎src/app/applications/application-detail/application-detail.component.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
2-
32
import { ApplicationDetailComponent } from './application-detail.component';
43

4+
55
describe('ApplicationComponent', () => {
66
let component: ApplicationDetailComponent;
77
let fixture: ComponentFixture<ApplicationDetailComponent>;

0 commit comments

Comments
 (0)