diff --git a/src/Turnierplan.App/Client/.prettierrc b/src/Turnierplan.App/Client/.prettierrc index f1a87bfa..402e2b74 100644 --- a/src/Turnierplan.App/Client/.prettierrc +++ b/src/Turnierplan.App/Client/.prettierrc @@ -1,7 +1,10 @@ { "tabWidth": 2, "useTabs": false, - "endOfLine": "auto", + "singleQuote": true, + "endOfLine": "lf", + "arrowParens": "always", "trailingComma": "none", + "bracketSameLine": true, "printWidth": 140 } diff --git a/src/Turnierplan.App/Client/package.json b/src/Turnierplan.App/Client/package.json index ddb46f1e..374e8e5d 100644 --- a/src/Turnierplan.App/Client/package.json +++ b/src/Turnierplan.App/Client/package.json @@ -12,7 +12,7 @@ "gen:api": "ng-openapi-gen --input ../obj/Turnierplan.App_turnierplan.json --output src/app/api --indexFile true --endOfLineStyle lf && replace-in-file \"PublicId = any\" \"PublicId = string\" src/app/api/**/*", "build:prod": "npm run gen:api && npm run ng -- build --configuration production", "start": "npm run gen:api && npm run ng -- serve --port 45001", - "prettier": "prettier \"**/*.*css\" \"**/*.*js\" \"**/*.ts\" \"**/*.json\"", + "prettier": "prettier \"**/*.*css\" \"**/*.*js\" \"**/*.ts\" \"**/*.json\" \"**/*.html\"", "lint": "npm run prettier -- --write", "lint:ci": "npm run prettier -- --check", "test": "ng test", diff --git a/src/Turnierplan.App/Client/src/app/identity/identity.component.scss b/src/Turnierplan.App/Client/src/app/identity/identity.component.scss index b108d1b6..35b11bd3 100644 --- a/src/Turnierplan.App/Client/src/app/identity/identity.component.scss +++ b/src/Turnierplan.App/Client/src/app/identity/identity.component.scss @@ -5,7 +5,7 @@ } .identity-header { - background: url("/assets/identity-background.jpg") center; + background: url('/assets/identity-background.jpg') center; background-size: cover; height: 8em; } diff --git a/src/Turnierplan.App/Client/src/app/identity/pages/change-password/change-password.component.html b/src/Turnierplan.App/Client/src/app/identity/pages/change-password/change-password.component.html index 0fbfdb13..62401906 100644 --- a/src/Turnierplan.App/Client/src/app/identity/pages/change-password/change-password.component.html +++ b/src/Turnierplan.App/Client/src/app/identity/pages/change-password/change-password.component.html @@ -21,9 +21,13 @@ @if (isLoading) { } - + -@if(!isLoading && failedReason) { -
+@if (!isLoading && failedReason) { +
} diff --git a/src/Turnierplan.App/Client/src/app/identity/pages/change-user-info/change-user-info.component.html b/src/Turnierplan.App/Client/src/app/identity/pages/change-user-info/change-user-info.component.html index 3f0a92b2..74066c29 100644 --- a/src/Turnierplan.App/Client/src/app/identity/pages/change-user-info/change-user-info.component.html +++ b/src/Turnierplan.App/Client/src/app/identity/pages/change-user-info/change-user-info.component.html @@ -23,9 +23,13 @@ @if (isLoading) { } - + -@if(!isLoading && isRequestFailed) { +@if (!isLoading && isRequestFailed) {
} diff --git a/src/Turnierplan.App/Client/src/app/identity/pages/login/login.component.html b/src/Turnierplan.App/Client/src/app/identity/pages/login/login.component.html index 1c5423c1..368db767 100644 --- a/src/Turnierplan.App/Client/src/app/identity/pages/login/login.component.html +++ b/src/Turnierplan.App/Client/src/app/identity/pages/login/login.component.html @@ -21,9 +21,9 @@ @if (isLoading) { } - + -@if(!isLoading && loginFailed) { +@if (!isLoading && loginFailed) {
} diff --git a/src/Turnierplan.App/Client/src/app/portal/components/action-button/action-button.component.html b/src/Turnierplan.App/Client/src/app/portal/components/action-button/action-button.component.html index c8bf9779..e194cdb2 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/action-button/action-button.component.html +++ b/src/Turnierplan.App/Client/src/app/portal/components/action-button/action-button.component.html @@ -1,19 +1,19 @@ @if (mode === 'IconLeftAndText') { - } @else if (mode === 'IconRightAndText') { - } @else if (mode === 'IconOnly' && icon) { - } diff --git a/src/Turnierplan.App/Client/src/app/portal/components/alert/alert.component.html b/src/Turnierplan.App/Client/src/app/portal/components/alert/alert.component.html index 003fd3b7..8445ff5f 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/alert/alert.component.html +++ b/src/Turnierplan.App/Client/src/app/portal/components/alert/alert.component.html @@ -1,4 +1,6 @@ -
+
@if (icon !== undefined) { } diff --git a/src/Turnierplan.App/Client/src/app/portal/components/api-key-usage/api-key-usage.component.html b/src/Turnierplan.App/Client/src/app/portal/components/api-key-usage/api-key-usage.component.html index ce2c0c46..dd3fcc47 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/api-key-usage/api-key-usage.component.html +++ b/src/Turnierplan.App/Client/src/app/portal/components/api-key-usage/api-key-usage.component.html @@ -1,15 +1,23 @@ -
-
+
+
- - +
- +
@if (showNoRequestsNotification) { @@ -23,9 +31,8 @@
} @else { -
- - +
+
{{ totalCount }} diff --git a/src/Turnierplan.App/Client/src/app/portal/components/computation-configuration/computation-configuration.component.html b/src/Turnierplan.App/Client/src/app/portal/components/computation-configuration/computation-configuration.component.html index 070e4554..744b03a1 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/computation-configuration/computation-configuration.component.html +++ b/src/Turnierplan.App/Client/src/app/portal/components/computation-configuration/computation-configuration.component.html @@ -5,49 +5,97 @@