Skip to content

Commit aeec53f

Browse files
AugustHA-IteratorAugustHA-Iterator
committed
Merge branch 'stage'
2 parents a70d18b + 6471125 commit aeec53f

File tree

548 files changed

+15525
-15337
lines changed

Some content is hidden

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

548 files changed

+15525
-15337
lines changed

‎.prettierrc.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.prettierrc.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"trailingComma": "es5",
3+
"tabWidth": 2,
4+
"printWidth": 120,
5+
"semi": true,
6+
"singleQuote": false,
7+
"useTabs": false,
8+
"bracketSpacing": true,
9+
"arrowParens": "avoid",
10+
"endOfLine": "auto"
11+
}

‎package-lock.json

Lines changed: 1158 additions & 1143 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
1-
import { NgModule } from '@angular/core';
2-
import { Routes, RouterModule } from '@angular/router';
3-
import { OrganisationDetailComponent } from './organisation/organisation-detail/organisation-detail.component';
4-
import { OrganisationEditComponent } from './organisation/organisation-edit/organisation-edit.component';
5-
import { OrganisationListComponent } from './organisation/organisation-list/organisation-list.component';
6-
import { OrganisationComponent } from './organisation/organisation.component';
7-
import { PermissionDetailComponent } from './permission/permission-detail/permission-detail.component';
8-
import { PermissionEditComponent } from './permission/permission-edit/permission-edit.component';
9-
import { PermissionListComponent } from './permission/permission-list/permission-list.component';
10-
import { PermissionComponent } from './permission/permission.component';
11-
import { UserDetailComponent } from './users/user-detail/user-detail.component';
12-
import { UserEditComponent } from './users/user-edit/user-edit.component';
13-
import { UserListComponent } from './users/user-list/user-list.component';
14-
import { UsersComponent } from './users/users.component';
15-
import { ApiKeyComponent } from './api-key/api-key.component';
16-
import { ApiKeyListComponent } from './api-key/api-key-list/api-key-list.component';
17-
import { ApiKeyEditComponent } from './api-key/api-key-edit/api-key-edit.component';
18-
import { AcceptUserComponent } from './users/accept-user/accept-user.component';
19-
import { UserTableTabComponent } from '@app/admin/users/user-list/user-table-tab/user-table-tab.component';
20-
import { AwaitingUsersTableTabComponent } from '@app/admin/users/user-list/awaiting-user-tab/awaiting-users-table-tab.component';
1+
import { NgModule } from "@angular/core";
2+
import { Routes, RouterModule } from "@angular/router";
3+
import { OrganisationDetailComponent } from "./organisation/organisation-detail/organisation-detail.component";
4+
import { OrganisationEditComponent } from "./organisation/organisation-edit/organisation-edit.component";
5+
import { OrganisationListComponent } from "./organisation/organisation-list/organisation-list.component";
6+
import { OrganisationComponent } from "./organisation/organisation.component";
7+
import { PermissionDetailComponent } from "./permission/permission-detail/permission-detail.component";
8+
import { PermissionEditComponent } from "./permission/permission-edit/permission-edit.component";
9+
import { PermissionListComponent } from "./permission/permission-list/permission-list.component";
10+
import { PermissionComponent } from "./permission/permission.component";
11+
import { UserDetailComponent } from "./users/user-detail/user-detail.component";
12+
import { UserEditComponent } from "./users/user-edit/user-edit.component";
13+
import { UserListComponent } from "./users/user-list/user-list.component";
14+
import { UsersComponent } from "./users/users.component";
15+
import { ApiKeyComponent } from "./api-key/api-key.component";
16+
import { ApiKeyListComponent } from "./api-key/api-key-list/api-key-list.component";
17+
import { ApiKeyEditComponent } from "./api-key/api-key-edit/api-key-edit.component";
18+
import { AcceptUserComponent } from "./users/accept-user/accept-user.component";
19+
import { UserTableTabComponent } from "@app/admin/users/user-list/user-table-tab/user-table-tab.component";
20+
import { AwaitingUsersTableTabComponent } from "@app/admin/users/user-list/awaiting-user-tab/awaiting-users-table-tab.component";
2121

2222
const adminRoutes: Routes = [
2323
{
24-
path: 'organisations',
24+
path: "organisations",
2525
component: OrganisationComponent,
2626
children: [
27-
{ path: '', component: OrganisationListComponent },
28-
{ path: 'new-organisation', component: OrganisationEditComponent },
29-
{ path: ':org-id', component: OrganisationDetailComponent },
27+
{ path: "", component: OrganisationListComponent },
28+
{ path: "new-organisation", component: OrganisationEditComponent },
29+
{ path: ":org-id", component: OrganisationDetailComponent },
3030
{
31-
path: ':org-id/edit-organisation',
31+
path: ":org-id/edit-organisation",
3232
component: OrganisationEditComponent,
3333
},
3434
],
3535
},
3636
{
37-
path: 'users',
37+
path: "users",
3838
component: UsersComponent,
3939
children: [
4040
{
41-
path: '',
41+
path: "",
4242
component: UserListComponent,
4343
children: [
44-
{ path: 'existing', component: UserTableTabComponent },
45-
{ path: 'awaiting', component: AwaitingUsersTableTabComponent },
44+
{ path: "existing", component: UserTableTabComponent },
45+
{ path: "awaiting", component: AwaitingUsersTableTabComponent },
4646
],
4747
},
48-
{ path: 'organization/:organization-id', component: UserListComponent },
49-
{ path: 'new-user', component: UserEditComponent },
50-
{ path: ':user-id', component: UserDetailComponent },
51-
{ path: ':user-id/edit-user', component: UserEditComponent },
52-
{ path: 'accept-user/:user-id/:org-id', component: AcceptUserComponent },
48+
{ path: "organization/:organization-id", component: UserListComponent },
49+
{ path: "new-user", component: UserEditComponent },
50+
{ path: ":user-id", component: UserDetailComponent },
51+
{ path: ":user-id/edit-user", component: UserEditComponent },
52+
{ path: "accept-user/:user-id/:org-id", component: AcceptUserComponent },
5353
],
5454
},
5555
{
56-
path: 'permissions',
56+
path: "permissions",
5757
component: PermissionComponent,
5858
children: [
59-
{ path: '', component: PermissionListComponent },
60-
{ path: 'new-permission', component: PermissionEditComponent },
61-
{ path: ':permission-id', component: PermissionDetailComponent },
59+
{ path: "", component: PermissionListComponent },
60+
{ path: "new-permission", component: PermissionEditComponent },
61+
{ path: ":permission-id", component: PermissionDetailComponent },
6262
{
63-
path: ':permission-id/edit-permission',
63+
path: ":permission-id/edit-permission",
6464
component: PermissionEditComponent,
6565
},
6666
],
6767
},
6868
{
69-
path: 'api-key',
69+
path: "api-key",
7070
component: ApiKeyComponent,
7171
children: [
72-
{ path: '', component: ApiKeyListComponent },
73-
{ path: 'new-api-key', component: ApiKeyEditComponent },
72+
{ path: "", component: ApiKeyListComponent },
73+
{ path: "new-api-key", component: ApiKeyEditComponent },
7474
{
75-
path: ':api-key-id/edit-api-key',
75+
path: ":api-key-id/edit-api-key",
7676
component: ApiKeyEditComponent,
7777
},
7878
],

‎src/app/admin/admin.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<router-outlet></router-outlet>
1+
<router-outlet></router-outlet>

‎src/app/admin/admin.component.ts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
import { Component, OnInit } from '@angular/core';
1+
import { Component, OnInit } from "@angular/core";
22

33
@Component({
4-
selector: 'app-admin',
5-
templateUrl: './admin.component.html',
6-
styleUrls: ['./admin.component.scss']
4+
selector: "app-admin",
5+
templateUrl: "./admin.component.html",
6+
styleUrls: ["./admin.component.scss"],
77
})
88
export class AdminComponent implements OnInit {
9+
constructor() {}
910

10-
constructor() { }
11-
12-
ngOnInit(): void {
13-
}
14-
11+
ngOnInit(): void {}
1512
}

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

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
import { NgModule } from '@angular/core';
2-
import { CommonModule } from '@angular/common';
1+
import { NgModule } from "@angular/core";
2+
import { CommonModule } from "@angular/common";
33

4-
import { AdminRoutingModule } from './admin-routing.module';
5-
import { ApplicationsModule } from '@applications/applications.module';
6-
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
7-
import { RouterModule } from '@angular/router';
8-
import { TranslateModule } from '@ngx-translate/core';
9-
import { FormModule } from '@shared/components/forms/form.module';
10-
import { NGMaterialModule } from '@shared/Modules/materiale.module';
11-
import { PipesModule } from '@shared/pipes/pipes.module';
12-
import { SharedModule } from '@shared/shared.module';
13-
import { PermissionDetailComponent } from './permission/permission-detail/permission-detail.component';
14-
import { PermissionEditComponent } from './permission/permission-edit/permission-edit.component';
15-
import { PermissionListComponent } from './permission/permission-list/permission-list.component';
16-
import { PermissionTabelComponent } from './permission/permission-list/permission-tabel/permission-tabel.component';
17-
import { PermissionComponent } from './permission/permission.component';
18-
import { OrganisationDetailComponent } from './organisation/organisation-detail/organisation-detail.component';
19-
import { OrganisationEditComponent } from './organisation/organisation-edit/organisation-edit.component';
20-
import { OrganisationListComponent } from './organisation/organisation-list/organisation-list.component';
21-
import { OrganisationTabelComponent } from './organisation/organisation-list/organisation-tabel/organisation-tabel.component';
22-
import { OrganisationComponent } from './organisation/organisation.component';
23-
import { UserDetailComponent } from './users/user-detail/user-detail.component';
24-
import { UserEditComponent } from './users/user-edit/user-edit.component';
25-
import { UserListComponent } from './users/user-list/user-list.component';
26-
import { UserTableComponent } from './users/user-list/user-table/user-table.component';
27-
import { UsersComponent } from './users/users.component';
28-
import { MatSelectModule } from '@angular/material/select';
29-
import { MatFormFieldModule } from '@angular/material/form-field';
30-
import { MatSelectSearchModule } from '@shared/components/mat-select-search/mat-select-search.module';
31-
import { ApiKeyComponent } from './api-key/api-key.component';
32-
import { ApiKeyListComponent } from './api-key/api-key-list/api-key-list.component';
33-
import { ApiKeyTableComponent } from './api-key/api-key-list/api-key-table/api-key-table.component';
34-
import { ApiKeyEditComponent } from './api-key/api-key-edit/api-key-edit.component';
35-
import { AwaitingUsersTableComponent } from './users/user-list/awaiting-users-table/awaiting-users-table.component';
36-
import { AcceptUserComponent } from './users/accept-user/accept-user.component';
37-
import { UserTableTabComponent } from './users/user-list/user-table-tab/user-table-tab.component';
38-
import { AwaitingUsersTableTabComponent } from './users/user-list/awaiting-user-tab/awaiting-users-table-tab.component';
4+
import { AdminRoutingModule } from "./admin-routing.module";
5+
import { ApplicationsModule } from "@applications/applications.module";
6+
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
7+
import { RouterModule } from "@angular/router";
8+
import { TranslateModule } from "@ngx-translate/core";
9+
import { FormModule } from "@shared/components/forms/form.module";
10+
import { NGMaterialModule } from "@shared/Modules/materiale.module";
11+
import { PipesModule } from "@shared/pipes/pipes.module";
12+
import { SharedModule } from "@shared/shared.module";
13+
import { PermissionDetailComponent } from "./permission/permission-detail/permission-detail.component";
14+
import { PermissionEditComponent } from "./permission/permission-edit/permission-edit.component";
15+
import { PermissionListComponent } from "./permission/permission-list/permission-list.component";
16+
import { PermissionTabelComponent } from "./permission/permission-list/permission-tabel/permission-tabel.component";
17+
import { PermissionComponent } from "./permission/permission.component";
18+
import { OrganisationDetailComponent } from "./organisation/organisation-detail/organisation-detail.component";
19+
import { OrganisationEditComponent } from "./organisation/organisation-edit/organisation-edit.component";
20+
import { OrganisationListComponent } from "./organisation/organisation-list/organisation-list.component";
21+
import { OrganisationTabelComponent } from "./organisation/organisation-list/organisation-tabel/organisation-tabel.component";
22+
import { OrganisationComponent } from "./organisation/organisation.component";
23+
import { UserDetailComponent } from "./users/user-detail/user-detail.component";
24+
import { UserEditComponent } from "./users/user-edit/user-edit.component";
25+
import { UserListComponent } from "./users/user-list/user-list.component";
26+
import { UserTableComponent } from "./users/user-list/user-table/user-table.component";
27+
import { UsersComponent } from "./users/users.component";
28+
import { MatSelectModule } from "@angular/material/select";
29+
import { MatFormFieldModule } from "@angular/material/form-field";
30+
import { MatSelectSearchModule } from "@shared/components/mat-select-search/mat-select-search.module";
31+
import { ApiKeyComponent } from "./api-key/api-key.component";
32+
import { ApiKeyListComponent } from "./api-key/api-key-list/api-key-list.component";
33+
import { ApiKeyTableComponent } from "./api-key/api-key-list/api-key-table/api-key-table.component";
34+
import { ApiKeyEditComponent } from "./api-key/api-key-edit/api-key-edit.component";
35+
import { AwaitingUsersTableComponent } from "./users/user-list/awaiting-users-table/awaiting-users-table.component";
36+
import { AcceptUserComponent } from "./users/accept-user/accept-user.component";
37+
import { UserTableTabComponent } from "./users/user-list/user-table-tab/user-table-tab.component";
38+
import { AwaitingUsersTableTabComponent } from "./users/user-list/awaiting-user-tab/awaiting-users-table-tab.component";
3939

4040
@NgModule({
4141
declarations: [

‎src/app/admin/api-key/api-key-edit/api-key-edit.component.html

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111

1212
<div class="row mb-5">
1313
<div class="form-group mt-3 col-12">
14-
<label class="form-label" for="name">{{
15-
'API-KEY.EDIT.NAME' | translate
16-
}}</label
14+
<label class="form-label" for="name">{{ "API-KEY.EDIT.NAME" | translate }}</label
1715
>*
1816
<input
1917
type="text"
@@ -34,9 +32,7 @@
3432

3533
<div class="row mb-5">
3634
<div class="form-group mt-3 col-12">
37-
<label class="form-label" for="permissions">{{
38-
'QUESTION.PERMISSION.SELECT-PERMISSION' | translate
39-
}}</label
35+
<label class="form-label" for="permissions">{{ "QUESTION.PERMISSION.SELECT-PERMISSION" | translate }}</label
4036
>*
4137
<mat-select
4238
class="form-control"
@@ -45,10 +41,7 @@
4541
[(ngModel)]="apiKeyRequest.permissionIds"
4642
[multiple]="true"
4743
>
48-
<mat-option
49-
*ngFor="let permission of permissions"
50-
[value]="permission.id"
51-
>
44+
<mat-option *ngFor="let permission of permissions" [value]="permission.id">
5245
{{ permission.name }}
5346
</mat-option>
5447
</mat-select>
@@ -57,10 +50,10 @@
5750

5851
<div class="form-group mt-5">
5952
<button (click)="routeBack()" class="btn btn-secondary" type="button">
60-
{{ 'GEN.CANCEL' | translate }}
53+
{{ "GEN.CANCEL" | translate }}
6154
</button>
6255
<button class="btn btn-primary ml-2" type="submit">
63-
{{ 'GEN.SAVE' | translate }}
56+
{{ "GEN.SAVE" | translate }}
6457
</button>
6558
</div>
6659
</form>

0 commit comments

Comments
 (0)