diff --git a/.prettierrc.js b/.prettierrc.js
deleted file mode 100644
index 70761a2dd..000000000
--- a/.prettierrc.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = {
- trailingComma: "es5",
- tabWidth: 4,
- printWidth: 120,
- semi: true,
- singleQuote: false,
- useTabs: false,
- bracketSpacing: true,
- arrowParens: "avoid",
- endOfLine: "auto",
-};
diff --git a/.prettierrc.json b/.prettierrc.json
new file mode 100644
index 000000000..b00b6c8df
--- /dev/null
+++ b/.prettierrc.json
@@ -0,0 +1,11 @@
+{
+ "trailingComma": "es5",
+ "tabWidth": 2,
+ "printWidth": 120,
+ "semi": true,
+ "singleQuote": false,
+ "useTabs": false,
+ "bracketSpacing": true,
+ "arrowParens": "avoid",
+ "endOfLine": "auto"
+}
diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts
index 1e03251c0..b0694dbfe 100644
--- a/src/app/admin/admin-routing.module.ts
+++ b/src/app/admin/admin-routing.module.ts
@@ -1,78 +1,78 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import { OrganisationDetailComponent } from './organisation/organisation-detail/organisation-detail.component';
-import { OrganisationEditComponent } from './organisation/organisation-edit/organisation-edit.component';
-import { OrganisationListComponent } from './organisation/organisation-list/organisation-list.component';
-import { OrganisationComponent } from './organisation/organisation.component';
-import { PermissionDetailComponent } from './permission/permission-detail/permission-detail.component';
-import { PermissionEditComponent } from './permission/permission-edit/permission-edit.component';
-import { PermissionListComponent } from './permission/permission-list/permission-list.component';
-import { PermissionComponent } from './permission/permission.component';
-import { UserDetailComponent } from './users/user-detail/user-detail.component';
-import { UserEditComponent } from './users/user-edit/user-edit.component';
-import { UserListComponent } from './users/user-list/user-list.component';
-import { UsersComponent } from './users/users.component';
-import { ApiKeyComponent } from './api-key/api-key.component';
-import { ApiKeyListComponent } from './api-key/api-key-list/api-key-list.component';
-import { ApiKeyEditComponent } from './api-key/api-key-edit/api-key-edit.component';
-import { AcceptUserComponent } from './users/accept-user/accept-user.component';
-import { UserTableTabComponent } from '@app/admin/users/user-list/user-table-tab/user-table-tab.component';
-import { AwaitingUsersTableTabComponent } from '@app/admin/users/user-list/awaiting-user-tab/awaiting-users-table-tab.component';
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { OrganisationDetailComponent } from "./organisation/organisation-detail/organisation-detail.component";
+import { OrganisationEditComponent } from "./organisation/organisation-edit/organisation-edit.component";
+import { OrganisationListComponent } from "./organisation/organisation-list/organisation-list.component";
+import { OrganisationComponent } from "./organisation/organisation.component";
+import { PermissionDetailComponent } from "./permission/permission-detail/permission-detail.component";
+import { PermissionEditComponent } from "./permission/permission-edit/permission-edit.component";
+import { PermissionListComponent } from "./permission/permission-list/permission-list.component";
+import { PermissionComponent } from "./permission/permission.component";
+import { UserDetailComponent } from "./users/user-detail/user-detail.component";
+import { UserEditComponent } from "./users/user-edit/user-edit.component";
+import { UserListComponent } from "./users/user-list/user-list.component";
+import { UsersComponent } from "./users/users.component";
+import { ApiKeyComponent } from "./api-key/api-key.component";
+import { ApiKeyListComponent } from "./api-key/api-key-list/api-key-list.component";
+import { ApiKeyEditComponent } from "./api-key/api-key-edit/api-key-edit.component";
+import { AcceptUserComponent } from "./users/accept-user/accept-user.component";
+import { UserTableTabComponent } from "@app/admin/users/user-list/user-table-tab/user-table-tab.component";
+import { AwaitingUsersTableTabComponent } from "@app/admin/users/user-list/awaiting-user-tab/awaiting-users-table-tab.component";
const adminRoutes: Routes = [
{
- path: 'organisations',
+ path: "organisations",
component: OrganisationComponent,
children: [
- { path: '', component: OrganisationListComponent },
- { path: 'new-organisation', component: OrganisationEditComponent },
- { path: ':org-id', component: OrganisationDetailComponent },
+ { path: "", component: OrganisationListComponent },
+ { path: "new-organisation", component: OrganisationEditComponent },
+ { path: ":org-id", component: OrganisationDetailComponent },
{
- path: ':org-id/edit-organisation',
+ path: ":org-id/edit-organisation",
component: OrganisationEditComponent,
},
],
},
{
- path: 'users',
+ path: "users",
component: UsersComponent,
children: [
{
- path: '',
+ path: "",
component: UserListComponent,
children: [
- { path: 'existing', component: UserTableTabComponent },
- { path: 'awaiting', component: AwaitingUsersTableTabComponent },
+ { path: "existing", component: UserTableTabComponent },
+ { path: "awaiting", component: AwaitingUsersTableTabComponent },
],
},
- { path: 'organization/:organization-id', component: UserListComponent },
- { path: 'new-user', component: UserEditComponent },
- { path: ':user-id', component: UserDetailComponent },
- { path: ':user-id/edit-user', component: UserEditComponent },
- { path: 'accept-user/:user-id/:org-id', component: AcceptUserComponent },
+ { path: "organization/:organization-id", component: UserListComponent },
+ { path: "new-user", component: UserEditComponent },
+ { path: ":user-id", component: UserDetailComponent },
+ { path: ":user-id/edit-user", component: UserEditComponent },
+ { path: "accept-user/:user-id/:org-id", component: AcceptUserComponent },
],
},
{
- path: 'permissions',
+ path: "permissions",
component: PermissionComponent,
children: [
- { path: '', component: PermissionListComponent },
- { path: 'new-permission', component: PermissionEditComponent },
- { path: ':permission-id', component: PermissionDetailComponent },
+ { path: "", component: PermissionListComponent },
+ { path: "new-permission", component: PermissionEditComponent },
+ { path: ":permission-id", component: PermissionDetailComponent },
{
- path: ':permission-id/edit-permission',
+ path: ":permission-id/edit-permission",
component: PermissionEditComponent,
},
],
},
{
- path: 'api-key',
+ path: "api-key",
component: ApiKeyComponent,
children: [
- { path: '', component: ApiKeyListComponent },
- { path: 'new-api-key', component: ApiKeyEditComponent },
+ { path: "", component: ApiKeyListComponent },
+ { path: "new-api-key", component: ApiKeyEditComponent },
{
- path: ':api-key-id/edit-api-key',
+ path: ":api-key-id/edit-api-key",
component: ApiKeyEditComponent,
},
],
diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html
index 90c6b6463..0680b43f9 100644
--- a/src/app/admin/admin.component.html
+++ b/src/app/admin/admin.component.html
@@ -1 +1 @@
-
| - {{ 'API-KEY.NAME' | translate }} + {{ "API-KEY.NAME" | translate }} |
{{ element.name }}
@@ -23,7 +16,7 @@
|
- {{ 'API-KEY.PERMISSIONS' | translate }}
+ {{ "API-KEY.PERMISSIONS" | translate }}
|
|
- {{ 'API-KEY.KEY' | translate }}
+ {{ "API-KEY.KEY" | translate }}
|
{{ element.key }}
@@ -60,21 +53,14 @@
aria-expanded="false"
[attr.aria-label]="'APPLICATION-TABLE-ROW.SHOW-OPTIONS' | translate"
>
- | |
|---|