diff --git a/dev/user-frontend-ionic/package-lock.json b/dev/user-frontend-ionic/package-lock.json index 215ad7cf..22c11e8f 100644 --- a/dev/user-frontend-ionic/package-lock.json +++ b/dev/user-frontend-ionic/package-lock.json @@ -37,7 +37,7 @@ "@capawesome/capacitor-badge": "6.0.0", "@capawesome/capacitor-screen-orientation": "6.0.1", "@fullcalendar/angular": "^6.0.0", - "@ionic/angular": "^7.3.3", + "@ionic/angular": "^8.2.7", "@larscom/ngx-translate-module-loader": "^3.0.6", "@ngneat/effects-ng": "^2.0.0", "@ngneat/elf": "^2.1.0", @@ -77,7 +77,7 @@ "@angular/language-service": "^16.2.12", "@capacitor/assets": "^3.0.4", "@capacitor/cli": "^6.0.0", - "@ionic/angular-toolkit": "^9.0.0", + "@ionic/angular-toolkit": "^10.1.1", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", "@types/leaflet": "^1.9.0", @@ -4428,132 +4428,34 @@ } }, "node_modules/@ionic/angular": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-7.8.6.tgz", - "integrity": "sha512-3Qe53hXpyjtx6fFcxt/NTAlauIawsGmCZJPauV5sAnSKVuX8C82C1zMAZTeJt6m2dnd71wythc98BXUXsx/UxQ==", - "license": "MIT", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-8.2.7.tgz", + "integrity": "sha512-CwUJwSwGOEQEfHDH2T3m9UgJAcV6H3jlus7+pv8XrMlSkNxfDTK1hUAVWgZJqpr1j/9WG3ydVd54bhPbgUOy/Q==", "dependencies": { - "@ionic/core": "7.8.6", + "@ionic/core": "8.2.7", "ionicons": "^7.0.0", "jsonc-parser": "^3.0.0", "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/core": ">=14.0.0", - "@angular/forms": ">=14.0.0", - "@angular/router": ">=14.0.0", + "@angular/core": ">=16.0.0", + "@angular/forms": ">=16.0.0", + "@angular/router": ">=16.0.0", "rxjs": ">=7.5.0", - "zone.js": ">=0.11.0" + "zone.js": ">=0.13.0" } }, "node_modules/@ionic/angular-toolkit": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-9.0.0.tgz", - "integrity": "sha512-Rh8z+XGQiyEzJ2nMKTAa3nmejgabxY6f/2q+9Jm/B/VnXjpyeSe8bgP008c0EZYBvrKs7MjP1ZrNi+4FM0W3fg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@angular-devkit/core": "^15.0.0", - "@angular-devkit/schematics": "^15.0.0", - "@schematics/angular": "^15.0.0" - } - }, - "node_modules/@ionic/angular-toolkit/node_modules/@angular-devkit/core": { - "version": "15.2.11", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.11.tgz", - "integrity": "sha512-zd6QelJ8pOPvz6TsehR0JqixjDjzgEOkKywBJBuwNXY+Nw3MJGayJeWS0UgC+Gk+LoTkpI21RoyaYELkAmD/tw==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "8.12.0", - "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "6.6.7", - "source-map": "0.7.4" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - }, - "peerDependencies": { - "chokidar": "^3.5.2" - }, - "peerDependenciesMeta": { - "chokidar": { - "optional": true - } - } - }, - "node_modules/@ionic/angular-toolkit/node_modules/@angular-devkit/schematics": { - "version": "15.2.11", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.2.11.tgz", - "integrity": "sha512-Wfj0FO8lcGqOkg7GTYOGUsAHqTS9GMfGXTAGsM/8g0SZI4kaPy/luZSPFtevpFE5PSR6dyWSIC0GgzfavjhJMg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@angular-devkit/core": "15.2.11", - "jsonc-parser": "3.2.0", - "magic-string": "0.29.0", - "ora": "5.4.1", - "rxjs": "6.6.7" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - } - }, - "node_modules/@ionic/angular-toolkit/node_modules/@schematics/angular": { - "version": "15.2.11", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.2.11.tgz", - "integrity": "sha512-z38f9abwfzUGe9TEIggf3igpVf/ylmSlHy1jydAxXbeKv24ejg8m5dYBPH2/MvgUFP6tjHdxjKD56DnOdyKl3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@angular-devkit/core": "15.2.11", - "@angular-devkit/schematics": "15.2.11", - "jsonc-parser": "3.2.0" - }, - "engines": { - "node": "^14.20.0 || ^16.13.0 || >=18.10.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - } - }, - "node_modules/@ionic/angular-toolkit/node_modules/magic-string": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz", - "integrity": "sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.13" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@ionic/angular-toolkit/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-10.1.1.tgz", + "integrity": "sha512-idLaBUY14M7JQmvxAGeDZvk7WcamWEHo1OHGRuLRAn+7uWrKeGxfWbnbZJhvRCLQndr8j7q3WV3Z+0APkPuKaQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" + "@angular-devkit/core": "^16.0.0", + "@angular-devkit/schematics": "^16.0.0", + "@schematics/angular": "^16.0.0" } }, - "node_modules/@ionic/angular-toolkit/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true, - "license": "0BSD" - }, "node_modules/@ionic/cli-framework-output": { "version": "2.2.8", "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.8.tgz", @@ -4569,12 +4471,11 @@ } }, "node_modules/@ionic/core": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.6.tgz", - "integrity": "sha512-HAYZdEmeJgOdo2kDlZkcCGHb+zs/vjU6iv4skbVBL7y+OnSv/oC2u83Yee8S3/aY0YAxkyBgu7hLTYH13Zc2Aw==", - "license": "MIT", + "version": "8.2.7", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-8.2.7.tgz", + "integrity": "sha512-pi7cGjgUcX3dMiku7mO/wh1mQ6yHsHZaUQKKor+fabmoL04YSRJCSJfqf9vImMwmegeon9xU6VPZuiJh2HV8YQ==", "dependencies": { - "@stencil/core": "^4.12.2", + "@stencil/core": "^4.19.2", "ionicons": "^7.2.2", "tslib": "^2.1.0" } diff --git a/dev/user-frontend-ionic/package.json b/dev/user-frontend-ionic/package.json index 9515d68f..d43bfa56 100644 --- a/dev/user-frontend-ionic/package.json +++ b/dev/user-frontend-ionic/package.json @@ -51,7 +51,7 @@ "@capawesome/capacitor-badge": "6.0.0", "@capawesome/capacitor-screen-orientation": "6.0.1", "@fullcalendar/angular": "^6.0.0", - "@ionic/angular": "^7.3.3", + "@ionic/angular": "^8.2.7", "@larscom/ngx-translate-module-loader": "^3.0.6", "@ngneat/effects-ng": "^2.0.0", "@ngneat/elf": "^2.1.0", @@ -91,7 +91,7 @@ "@angular/language-service": "^16.2.12", "@capacitor/assets": "^3.0.4", "@capacitor/cli": "^6.0.0", - "@ionic/angular-toolkit": "^9.0.0", + "@ionic/angular-toolkit": "^10.1.1", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", "@types/leaflet": "^1.9.0", diff --git a/dev/user-frontend-ionic/projects/auth/src/lib/login/login.page.html b/dev/user-frontend-ionic/projects/auth/src/lib/login/login.page.html index 4eee664c..8cab9813 100644 --- a/dev/user-frontend-ionic/projects/auth/src/lib/login/login.page.html +++ b/dev/user-frontend-ionic/projects/auth/src/lib/login/login.page.html @@ -56,32 +56,33 @@
- - {{ 'AUTH.LOGIN.USERNAME' | translate }} - - - {{ 'AUTH.LOGIN.REQUIRED.USERNAME' | translate }} - + + + - - {{ 'AUTH.LOGIN.PASSWORD' | translate }} - - - {{ 'AUTH.LOGIN.REQUIRED.PASSWORD' | translate }} - + + + + {{ 'AUTH.LOGIN.SAVE_CREDENTIALS' | translate }} - {{ 'AUTH.LOGIN.SAVE_CREDENTIALS' | translate }} diff --git a/dev/user-frontend-ionic/projects/auth/src/lib/preferences/preferences.component.html b/dev/user-frontend-ionic/projects/auth/src/lib/preferences/preferences.component.html index 638f9e69..53189d3a 100644 --- a/dev/user-frontend-ionic/projects/auth/src/lib/preferences/preferences.component.html +++ b/dev/user-frontend-ionic/projects/auth/src/lib/preferences/preferences.component.html @@ -41,8 +41,7 @@

{{ 'AUTH.PREFERENCES.TITLE' | translate }}

- - {{ 'AUTH.PREFERENCES.SAVE_CREDENTIALS' | translate }} - - + + {{ 'AUTH.PREFERENCES.SAVE_CREDENTIALS' | translate }} + diff --git a/dev/user-frontend-ionic/projects/contact-us/src/lib/contact-us.page.html b/dev/user-frontend-ionic/projects/contact-us/src/lib/contact-us.page.html index 5cc77219..986176f3 100644 --- a/dev/user-frontend-ionic/projects/contact-us/src/lib/contact-us.page.html +++ b/dev/user-frontend-ionic/projects/contact-us/src/lib/contact-us.page.html @@ -55,16 +55,14 @@
- {{ "CONTACT-US.YOUR_EMAIL" | translate }} - + + - {{ "CONTACT-US.SUBJECT" | translate }} - + - {{ "CONTACT-US.MESSAGE" | translate }} - + diff --git a/dev/user-frontend-ionic/projects/contacts/src/lib/contacts.page.html b/dev/user-frontend-ionic/projects/contacts/src/lib/contacts.page.html index fbdb330d..e1fa78ee 100644 --- a/dev/user-frontend-ionic/projects/contacts/src/lib/contacts.page.html +++ b/dev/user-frontend-ionic/projects/contacts/src/lib/contacts.page.html @@ -47,8 +47,9 @@ - {{ 'CONTACTS.CONTACT_TYPES.' + filter | translate }} - + + {{ 'CONTACTS.CONTACT_TYPES.' + filter | translate }} + diff --git a/dev/user-frontend-ionic/projects/map/src/lib/map.page.html b/dev/user-frontend-ionic/projects/map/src/lib/map.page.html index 141e05dd..c4271601 100644 --- a/dev/user-frontend-ionic/projects/map/src/lib/map.page.html +++ b/dev/user-frontend-ionic/projects/map/src/lib/map.page.html @@ -56,8 +56,9 @@ - {{ getCategoryTranslation(categories[i]) | translate }} - + + {{ getCategoryTranslation(categories[i]) | translate }} +
diff --git a/dev/user-frontend-ionic/projects/notifications/src/lib/notifications.page.html b/dev/user-frontend-ionic/projects/notifications/src/lib/notifications.page.html index b2343f83..3b2d6930 100644 --- a/dev/user-frontend-ionic/projects/notifications/src/lib/notifications.page.html +++ b/dev/user-frontend-ionic/projects/notifications/src/lib/notifications.page.html @@ -60,8 +60,9 @@
- {{filterableChannels[i].label}} - + + {{filterableChannels[i].label}} +
diff --git a/dev/user-frontend-ionic/projects/schedule/src/lib/common/select-planning/select-planning.component.html b/dev/user-frontend-ionic/projects/schedule/src/lib/common/select-planning/select-planning.component.html index 36b678d4..ab451130 100644 --- a/dev/user-frontend-ionic/projects/schedule/src/lib/common/select-planning/select-planning.component.html +++ b/dev/user-frontend-ionic/projects/schedule/src/lib/common/select-planning/select-planning.component.html @@ -74,8 +74,9 @@
- {{availablePlanningList[i].label}} - + + {{availablePlanningList[i].label}} +
diff --git a/dev/user-frontend-ionic/projects/schedule/src/lib/common/select-user/select-user.component.html b/dev/user-frontend-ionic/projects/schedule/src/lib/common/select-user/select-user.component.html index bd63bdbd..67db114f 100644 --- a/dev/user-frontend-ionic/projects/schedule/src/lib/common/select-user/select-user.component.html +++ b/dev/user-frontend-ionic/projects/schedule/src/lib/common/select-user/select-user.component.html @@ -49,8 +49,7 @@
- {{ 'SCHEDULE.MANAGEMENT.USERNAME_FORM_LABEL' | translate }} - + {{ 'SCHEDULE.MANAGEMENT.VALIDATE_FORM_BUTTON' | translate }}
diff --git a/dev/user-frontend-ionic/projects/schedule/src/lib/schedule-calendar/schedule-calendar.component.html b/dev/user-frontend-ionic/projects/schedule/src/lib/schedule-calendar/schedule-calendar.component.html index 90085904..54e566cc 100644 --- a/dev/user-frontend-ionic/projects/schedule/src/lib/schedule-calendar/schedule-calendar.component.html +++ b/dev/user-frontend-ionic/projects/schedule/src/lib/schedule-calendar/schedule-calendar.component.html @@ -49,10 +49,9 @@ completeLocalDate}}.
- + 0 x2 - 1 diff --git a/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/auth/login.page.scss b/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/auth/login.page.scss index c8e47678..63f38848 100644 --- a/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/auth/login.page.scss +++ b/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/auth/login.page.scss @@ -41,19 +41,12 @@ ion-item { --background: transparent; } -.input-label { - padding-bottom: 10px; - color: var(--app-font-color-primary) !important; -} - -.item-has-value .label-floating.sc-ion-label-md-h { - padding-bottom: 10px; +ion-input { + --border-color: var(--ion-color-medium-light-tint); + --highlight-color: var(--app-font-color-primary); + --highlight-color-valid: var(--app-font-color-primary); } ion-title { color: var(--app-font-color-topbar) !important; } - -ion-item { - --border-color: var(--ion-color-medium-light-tint);; -} diff --git a/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/chatbot/chatbot.page.scss b/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/chatbot/chatbot.page.scss index c4414f81..f2068fdd 100644 --- a/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/chatbot/chatbot.page.scss +++ b/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/chatbot/chatbot.page.scss @@ -119,7 +119,8 @@ ion-input.input { border-radius: 0.15rem; --ion-item-background: var(--app-color-component-background-primary); background-color: var(--app-color-component-background-primary); - caret-color: auto; + --highlight-color: var(--app-font-color-primary); + color: var(--app-font-color-primary) !important; } .icon { diff --git a/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/contact-us/contact-us.page.scss b/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/contact-us/contact-us.page.scss index 573e3413..b0cccba5 100644 --- a/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/contact-us/contact-us.page.scss +++ b/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/contact-us/contact-us.page.scss @@ -45,19 +45,6 @@ ion-icon { color: var(--app-font-color-primary); } -ion-item { - --background: transparent; -} - -.input-label { - padding-bottom: 0.2rem; - color: var(--app-font-color-primary) !important; -} - -.item-has-value .label-floating.sc-ion-label-md-h { - padding-bottom: 0.2rem; -} - ion-item { --background: transparent; --border-color: var(--ion-color-medium-light-tint); @@ -67,6 +54,10 @@ ion-list { background: transparent; } +ion-input { + --highlight-color: var(--app-font-color-primary); +} + .contact-form-toolbar { --background: transparent; } diff --git a/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/menu/burger-menu.page.scss b/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/menu/burger-menu.page.scss index 140640b3..acfaa8cd 100644 --- a/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/menu/burger-menu.page.scss +++ b/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/menu/burger-menu.page.scss @@ -64,6 +64,11 @@ color: var(--ion-color-font-primary); } } + + app-custom-icon { + // apply the same style as ion-icon + margin-inline-end: 32px; + } } .menu-footer { diff --git a/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/schedule/select-user.component.scss b/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/schedule/select-user.component.scss index cfbf20b2..88ffa227 100644 --- a/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/schedule/select-user.component.scss +++ b/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/schedule/select-user.component.scss @@ -37,3 +37,6 @@ * termes. */ +ion-input { + --highlight-color: var(--app-font-color-primary); +} diff --git a/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/static-pages/static-pages-widget.component.scss b/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/static-pages/static-pages-widget.component.scss index db31cb1b..995e07ca 100644 --- a/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/static-pages/static-pages-widget.component.scss +++ b/dev/user-frontend-ionic/src/theme/app-theme-dist/styles/static-pages/static-pages-widget.component.scss @@ -40,3 +40,8 @@ ion-item { padding-left: 0.7rem; } + +app-custom-icon { + // apply the same style as ion-icon + margin-inline-end: 32px; +} diff --git a/libraries.md b/libraries.md index f3942ac8..5462434b 100644 --- a/libraries.md +++ b/libraries.md @@ -93,8 +93,8 @@ The `*` next to the license name indicates that the license was *guessed* by [li - [@capawesome/capacitor-badge@6.0.0](https://github.com/capawesome-team/capacitor-plugins) - MIT - [@capawesome/capacitor-screen-orientation@6.0.1](https://github.com/capawesome-team/capacitor-plugins) - MIT - [@fullcalendar/angular@6.1.15](https://github.com/fullcalendar/fullcalendar-angular) - MIT -- [@ionic/angular-toolkit@9.0.0](https://github.com/ionic-team/angular-toolkit) - MIT -- [@ionic/angular@7.8.6](https://github.com/ionic-team/ionic-framework) - MIT +- [@ionic/angular-toolkit@10.1.1](https://github.com/ionic-team/angular-toolkit) - MIT +- [@ionic/angular@8.2.7](https://github.com/ionic-team/ionic-framework) - MIT - [@larscom/ngx-translate-module-loader@3.2.1](https://github.com/larscom/ngx-translate-module-loader) - MIT - [@ngneat/effects-ng@2.0.0](https://github.com/ngneat/effects) - MIT - [@ngneat/elf-entities@4.6.0](https://github.com/ngneat/elf) - MIT diff --git a/package.json b/package.json index 49e4eff8..c5f4857f 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "scripts": { "ci": "npm ci && npm run back:main -- ci && concurrently \"npm run back:*(!main) -- ci\" && npm run mocks -- ci && npm run front -- ci", "build:back": "npm run back:main -- ci && concurrently \"npm run back:*(!main) -- ci\" && concurrently \"npm run back:* -- run build\"", - "build:front": "npm run front -- ci && npm run module:build-all", + "build:front": "npm run front -- ci && npm run front -- run module:build-all", "build:mocks": "npm run mocks -- ci", "start:back": "concurrently \"npm run back:* -- run start\"", "start:back:dev": "concurrently \"npm run back:* -- run start:dev\"",