diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c8a05bd67..91d2c50da5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,6 +37,12 @@ jobs: - name: Run eslint run: npx ng lint + - name: Run stylelint + run: npx stylelint "src/**/*.scss" + + - name: Run prettier + run: npx prettier . --check + - name: Run build run: npm run build:prod diff --git a/README.md b/README.md index a66bf99c58..7231116009 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Mifos X Web App ![build](https://github.com/openMF/web-app/actions/workflows/build.yml/badge.svg) [Slack](https://app.slack.com/client/T0F5GHE8Y/CJJGJLN10) +# Mifos X Web App ![build](https://github.com/openMF/web-app/actions/workflows/build.yml/badge.svg) [Slack](https://app.slack.com/client/T0F5GHE8Y/CJJGJLN10) Mifos X Web App is the revamped version of the Mifos X Community App, an effective financial inclusion solution and the default web application built on top of the Mifos X platform for the Mifos User Community. @@ -16,7 +16,7 @@ The latest code is continuously deployed at https://openmf.github.io/web-app/ wh [`nodeJs`](https://nodejs.org/en/download/) -3. Install [angular-cli](https://github.com/angular/angular-cli) globally. +2. Install [angular-cli](https://github.com/angular/angular-cli) globally. ``` npm install -g @angular/cli@16.0.2 diff --git a/docker-compose.yml b/docker-compose.yml index ec8553398e..fc3e14a8fd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,4 +24,3 @@ services: - MIFOS_SUPPORTED_LANGUAGES=cs-CS,de-DE,en-US,es-MX,fr-FR,it-IT,ko-KO,lt-LT,lv-LV,ne-NE,pt-PT,sw-SW - MIFOS_SESSION_IDLE_TIMEOUT=300000 - MIFOS_OAUTH_SERVER_ENABLED=false - \ No newline at end of file diff --git a/src/app/loans/loans-view/loan-account-actions/add-interest-pause/add-interest-pause.component.html b/src/app/loans/loans-view/loan-account-actions/add-interest-pause/add-interest-pause.component.html index 5fcbc771e9..1bec0af779 100644 --- a/src/app/loans/loans-view/loan-account-actions/add-interest-pause/add-interest-pause.component.html +++ b/src/app/loans/loans-view/loan-account-actions/add-interest-pause/add-interest-pause.component.html @@ -1,47 +1,60 @@
- -
- {{'Maturity Date' | translateKey:'inputs'}} : {{ maturityDate | dateFormat}} -
-
- -
- - {{ 'labels.inputs.Start Date' | translate }} - - - - - {{ 'labels.inputs.Start Date' | translate - }}{{ 'labels.commons.required' | translate }} - - - - - {{ 'labels.inputs.End Date' | translate }} - - - - - {{ 'labels.inputs.End Date' | translate - }}{{ 'labels.commons.required' | translate }} - - + +
+ {{ 'Maturity Date' | translateKey: 'inputs' }} : {{ maturityDate | dateFormat }} +
+ + +
+ + {{ 'labels.inputs.Start Date' | translate }} + + + + + {{ 'labels.inputs.Start Date' | translate }}{{ 'labels.commons.required' | translate }} + + -
+ + {{ 'labels.inputs.End Date' | translate }} + + + + + {{ 'labels.inputs.End Date' | translate }}{{ 'labels.commons.required' | translate }} + + +
- - - - -
-
-
-
\ No newline at end of file + + + + + + + + diff --git a/src/app/loans/loans-view/loan-account-actions/add-interest-pause/add-interest-pause.component.scss b/src/app/loans/loans-view/loan-account-actions/add-interest-pause/add-interest-pause.component.scss index d9fcadfce1..f6b89f7e9f 100644 --- a/src/app/loans/loans-view/loan-account-actions/add-interest-pause/add-interest-pause.component.scss +++ b/src/app/loans/loans-view/loan-account-actions/add-interest-pause/add-interest-pause.component.scss @@ -1,8 +1,7 @@ .expandcollapsebutton { - margin-top: -7px; - } - - .container { - max-width: 37rem; - } - \ No newline at end of file + margin-top: -7px; +} + +.container { + max-width: 37rem; +} diff --git a/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.html b/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.html index 2ea093c316..c2e19b9e5c 100644 --- a/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.html +++ b/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.html @@ -57,4 +57,7 @@ - + diff --git a/src/app/loans/loans-view/loan-term-variations-tab/loan-term-variations-tab.component.html b/src/app/loans/loans-view/loan-term-variations-tab/loan-term-variations-tab.component.html index 9831ad7292..867f0433a9 100644 --- a/src/app/loans/loans-view/loan-term-variations-tab/loan-term-variations-tab.component.html +++ b/src/app/loans/loans-view/loan-term-variations-tab/loan-term-variations-tab.component.html @@ -1,26 +1,26 @@

{{ 'labels.heading.Term Variations' | translate }}

- +
- + - + - + - + - +
{{"labels.inputs.Type" | translate}} {{ 'labels.inputs.Type' | translate }} {{ item.termType.value | translate }} {{"labels.inputs.Added On" | translate}} {{ 'labels.inputs.Added On' | translate }} {{ item.termVariationApplicableFrom | dateFormat }} {{"labels.inputs.Value" | translate}} {{ 'labels.inputs.Value' | translate }} {{ item.decimalValue | formatNumber }} {{"labels.inputs.Specific to Installment" | translate}} {{ 'labels.inputs.Specific to Installment' | translate }} {{ item.isSpecificToInstallment | yesNo }}

{{ 'labels.heading.Interest Pauses' | translate }}

@@ -48,16 +48,26 @@

{{ 'labels.heading.Int {{ 'labels.inputs.Actions' | translate }} - - + @@ -71,4 +81,4 @@

{{ 'labels.heading.Int {{ 'labels.text.No data found' | translate }}

- \ No newline at end of file + diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.html index 00ffe51155..ad99a60cd9 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.html +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.html @@ -302,7 +302,11 @@

> - @@ -467,7 +471,11 @@

> - diff --git a/src/app/shared/long-text/long-text.component.html b/src/app/shared/long-text/long-text.component.html index a8de75c1d3..47ff2f21b4 100644 --- a/src/app/shared/long-text/long-text.component.html +++ b/src/app/shared/long-text/long-text.component.html @@ -1,5 +1,7 @@ - + {{ textValue | truncateText: printChars }}... {{ textValue }} diff --git a/src/assets/env.template.js b/src/assets/env.template.js index 26d31b70f3..36c9e8b80a 100644 --- a/src/assets/env.template.js +++ b/src/assets/env.template.js @@ -35,13 +35,12 @@ // Time in milliseconds for Session idle timeout, default 300000 seconds window['env']['sessionIdleTimeout'] = '$MIFOS_SESSION_IDLE_TIMEOUT'; - // OAuth Server Enabled + // OAuth Server Enabled window['env']['oauthServerEnabled'] = '$MIFOS_OAUTH_SERVER_ENABLED'; - // OAuth Server URL + // OAuth Server URL window['env']['oauthServerUrl'] = '$MIFOS_OAUTH_SERVER_URL'; - // OAuth Client Id + // OAuth Client Id window['env']['oauthAppId'] = '$MIFOS_OAUTH_CLIENT_ID'; - })(this);