diff --git a/orga/app/components/auth/register-form.hbs b/orga/app/components/auth/register-form.hbs index 82db5e96ca2..57574f316b7 100644 --- a/orga/app/components/auth/register-form.hbs +++ b/orga/app/components/auth/register-form.hbs @@ -100,9 +100,9 @@ {{#if this.errorMessage}} - + {{this.errorMessage}} - + {{/if}}
diff --git a/orga/app/components/banner/certification.gjs b/orga/app/components/banner/certification.gjs index 65128b2e884..44d5c55a697 100644 --- a/orga/app/components/banner/certification.gjs +++ b/orga/app/components/banner/certification.gjs @@ -1,4 +1,4 @@ -import PixBanner from '@1024pix/pix-ui/components/pix-banner'; +import PixBannerAlert from '@1024pix/pix-ui/components/pix-banner-alert'; import { service } from '@ember/service'; import Component from '@glimmer/component'; import { t } from 'ember-intl'; @@ -21,7 +21,7 @@ export default class InformationBanner extends Component { } diff --git a/orga/app/components/banner/communication.gjs b/orga/app/components/banner/communication.gjs index 6d70a217a97..6a2b94d4107 100644 --- a/orga/app/components/banner/communication.gjs +++ b/orga/app/components/banner/communication.gjs @@ -1,4 +1,4 @@ -import PixBanner from '@1024pix/pix-ui/components/pix-banner'; +import PixBannerAlert from '@1024pix/pix-ui/components/pix-banner-alert'; import { htmlSafe } from '@ember/template'; import isEmpty from 'lodash/isEmpty'; import ENV from 'pix-orga/config/environment'; @@ -19,8 +19,8 @@ function bannerContent() { diff --git a/orga/app/components/banner/language-availability.gjs b/orga/app/components/banner/language-availability.gjs index 870820474a3..6d9665f1255 100644 --- a/orga/app/components/banner/language-availability.gjs +++ b/orga/app/components/banner/language-availability.gjs @@ -1,4 +1,4 @@ -import PixBanner from '@1024pix/pix-ui/components/pix-banner'; +import PixBannerAlert from '@1024pix/pix-ui/components/pix-banner-alert'; import { fn } from '@ember/helper'; import { t } from 'ember-intl'; @@ -14,13 +14,13 @@ function shouldDisplayBanner(session) { diff --git a/orga/app/components/banner/sco-communication.gjs b/orga/app/components/banner/sco-communication.gjs index 6389b8b3d43..d94098c6287 100644 --- a/orga/app/components/banner/sco-communication.gjs +++ b/orga/app/components/banner/sco-communication.gjs @@ -1,4 +1,4 @@ -import PixBanner from '@1024pix/pix-ui/components/pix-banner'; +import PixBannerAlert from '@1024pix/pix-ui/components/pix-banner-alert'; import { LinkTo } from '@ember/routing'; import { service } from '@ember/service'; import Component from '@glimmer/component'; @@ -24,7 +24,7 @@ export default class ScommunicationBanner extends Component { } diff --git a/orga/app/components/banner/survey.gjs b/orga/app/components/banner/survey.gjs index 0ba056417a1..67fbd1ae3ae 100644 --- a/orga/app/components/banner/survey.gjs +++ b/orga/app/components/banner/survey.gjs @@ -1,4 +1,4 @@ -import PixBanner from '@1024pix/pix-ui/components/pix-banner'; +import PixBannerAlert from '@1024pix/pix-ui/components/pix-banner-alert'; import { service } from '@ember/service'; import Component from '@glimmer/component'; import { t } from 'ember-intl'; @@ -35,14 +35,14 @@ export default class SurveyBanner extends Component { } diff --git a/orga/app/components/campaign/filter/campaign-filters.gjs b/orga/app/components/campaign/filter/campaign-filters.gjs index 5df4d8da93c..fdb218c6774 100644 --- a/orga/app/components/campaign/filter/campaign-filters.gjs +++ b/orga/app/components/campaign/filter/campaign-filters.gjs @@ -1,5 +1,5 @@ import PixFilterBanner from '@1024pix/pix-ui/components/pix-filter-banner'; -import PixToggle from '@1024pix/pix-ui/components/pix-toggle'; +import PixToggleButton from '@1024pix/pix-ui/components/pix-toggle-button'; import { action } from '@ember/object'; import Component from '@glimmer/component'; import { t } from 'ember-intl'; @@ -52,11 +52,11 @@ export default class CampaignFilters extends Component { /> {{/unless}} - + <:label>{{t "pages.campaigns-list.action.campaign.label"}} <:on>{{t "pages.campaigns-list.action.campaign.ongoing"}} <:off>{{t "pages.campaigns-list.action.campaign.archived"}} - + } diff --git a/orga/app/components/import-information-banner.gjs b/orga/app/components/import-information-banner.gjs index f8da3154664..53195e38809 100644 --- a/orga/app/components/import-information-banner.gjs +++ b/orga/app/components/import-information-banner.gjs @@ -1,4 +1,4 @@ -import PixMessage from '@1024pix/pix-ui/components/pix-message'; +import PixNotificationAlert from '@1024pix/pix-ui/components/pix-notification-alert'; import { LinkTo } from '@ember/routing'; import { service } from '@ember/service'; import Component from '@glimmer/component'; @@ -47,14 +47,14 @@ export default class ImportBanner extends Component { } diff --git a/orga/app/components/import/banner.gjs b/orga/app/components/import/banner.gjs index e50f981eb52..8c2135517fb 100644 --- a/orga/app/components/import/banner.gjs +++ b/orga/app/components/import/banner.gjs @@ -1,5 +1,5 @@ import PixIcon from '@1024pix/pix-ui/components/pix-icon'; -import PixMessage from '@1024pix/pix-ui/components/pix-message'; +import PixNotificationAlert from '@1024pix/pix-ui/components/pix-notification-alert'; import { service } from '@ember/service'; import Component from '@glimmer/component'; @@ -34,9 +34,9 @@ export default class ImportBanner extends Component { get displayBanner() { return Boolean( this.args.isLoading || - this.args.organizationImportDetail?.inProgress || - this.args.organizationImportDetail?.hasError || - this.args.organizationImportDetail?.hasWarning, + this.args.organizationImportDetail?.inProgress || + this.args.organizationImportDetail?.hasError || + this.args.organizationImportDetail?.hasWarning, ); } @@ -99,7 +99,7 @@ export default class ImportBanner extends Component {

{{/if}} {{#if this.displayBanner}} - + {{this.bannerMessage}} {{#if this.anchorMessage}} ({{this.anchorMessage}}) @@ -111,7 +111,7 @@ export default class ImportBanner extends Component { {{this.actionMessage}} {{/if}} - + {{/if}} } diff --git a/orga/app/components/places/capacity-alert.gjs b/orga/app/components/places/capacity-alert.gjs index 896cdef6dea..692c1896403 100644 --- a/orga/app/components/places/capacity-alert.gjs +++ b/orga/app/components/places/capacity-alert.gjs @@ -1,11 +1,11 @@ -import PixBanner from '@1024pix/pix-ui/components/pix-banner'; +import PixBannerAlert from '@1024pix/pix-ui/components/pix-banner-alert'; import { t } from 'ember-intl'; import { gt } from 'ember-truth-helpers'; diff --git a/orga/app/components/places/places-lot-alert.gjs b/orga/app/components/places/places-lot-alert.gjs index c31e37140b8..8fe88c0ea2c 100644 --- a/orga/app/components/places/places-lot-alert.gjs +++ b/orga/app/components/places/places-lot-alert.gjs @@ -1,4 +1,4 @@ -import PixBanner from '@1024pix/pix-ui/components/pix-banner'; +import PixBannerAlert from '@1024pix/pix-ui/components/pix-banner-alert'; import dayjs from 'dayjs'; import { t } from 'ember-intl'; import { STATUSES } from 'pix-orga/models/organization-places-lot.js'; @@ -29,8 +29,8 @@ function isAlertVisible(placesLots) { diff --git a/orga/app/components/sco-organization-participant/generate-username-password-modal.gjs b/orga/app/components/sco-organization-participant/generate-username-password-modal.gjs index f962d3e8655..851003d6265 100644 --- a/orga/app/components/sco-organization-participant/generate-username-password-modal.gjs +++ b/orga/app/components/sco-organization-participant/generate-username-password-modal.gjs @@ -1,5 +1,5 @@ import PixButton from '@1024pix/pix-ui/components/pix-button'; -import PixMessage from '@1024pix/pix-ui/components/pix-message'; +import PixNotificationAlert from '@1024pix/pix-ui/components/pix-notification-alert'; import PixModal from '@1024pix/pix-ui/components/pix-modal'; import Component from '@glimmer/component'; import { t } from 'ember-intl'; @@ -18,9 +18,9 @@ export default class GenerateUsernamePasswordModal extends Component { > <:content>
- {{t - "pages.sco-organization-participants.generate-username-password-modal.warning-message" - }} + {{t + "pages.sco-organization-participants.generate-username-password-modal.warning-message" + }}

{{t "pages.sco-organization-participants.generate-username-password-modal.content-message-1"}}

{{t "pages.sco-organization-participants.generate-username-password-modal.content-message-2"}}

{{t "pages.sco-organization-participants.generate-username-password-modal.content-message-3"}}

diff --git a/orga/app/components/sco-organization-participant/reset-password-modal.hbs b/orga/app/components/sco-organization-participant/reset-password-modal.hbs index 9c3ee3f87c8..165ec06db4e 100644 --- a/orga/app/components/sco-organization-participant/reset-password-modal.hbs +++ b/orga/app/components/sco-organization-participant/reset-password-modal.hbs @@ -5,9 +5,9 @@ > <:content>
- {{t + {{t "pages.sco-organization-participants.reset-password-modal.warning-message" - }} + }}

{{t "pages.sco-organization-participants.reset-password-modal.content-message-1" totalSelectedStudents=@totalSelectedStudents diff --git a/orga/app/components/tube/list.hbs b/orga/app/components/tube/list.hbs index aad656d4cfc..a3eddabd627 100644 --- a/orga/app/components/tube/list.hbs +++ b/orga/app/components/tube/list.hbs @@ -23,7 +23,7 @@ {{/if}}

{{#each this.sortedAreas as |area|}} - + <:title>{{area.code}} ยท {{area.title}} <:content> {{#each area.sortedCompetences as |competence|}} @@ -75,7 +75,7 @@ {{/each}} - + {{/each}} \ No newline at end of file diff --git a/orga/app/templates/authenticated/certifications.hbs b/orga/app/templates/authenticated/certifications.hbs index 6acc23c9d45..64803039448 100644 --- a/orga/app/templates/authenticated/certifications.hbs +++ b/orga/app/templates/authenticated/certifications.hbs @@ -28,12 +28,12 @@ - + {{t "pages.certifications.documentation-link-notice"}} {{t "pages.certifications.documentation-link-label" }} - + {{else}}

{{t "pages.certifications.no-students-imported-yet" htmlSafe=true}} diff --git a/orga/app/templates/authenticated/missions/list.hbs b/orga/app/templates/authenticated/missions/list.hbs index ef578eff9ca..9d3ac2dffb1 100644 --- a/orga/app/templates/authenticated/missions/list.hbs +++ b/orga/app/templates/authenticated/missions/list.hbs @@ -1,6 +1,6 @@ {{page-title (t "pages.missions.title")}} - + {{t "pages.missions.list.banner.welcome"}}

- +

{{t "pages.missions.title"}}

{{#if @model.missions}} diff --git a/orga/app/templates/authenticated/team/new.hbs b/orga/app/templates/authenticated/team/new.hbs index 4e260d2a533..3046ecdee7e 100644 --- a/orga/app/templates/authenticated/team/new.hbs +++ b/orga/app/templates/authenticated/team/new.hbs @@ -5,7 +5,7 @@

{{t "pages.team-new.title"}}

- {{t "pages.team-new.warning"}} + {{t "pages.team-new.warning"}}

{{t "pages.team-new.email-requirement"}}
diff --git a/orga/package-lock.json b/orga/package-lock.json index d31bb05ee39..dd6a9fb6668 100644 --- a/orga/package-lock.json +++ b/orga/package-lock.json @@ -13,7 +13,7 @@ "@1024pix/ember-cli-notifications": "^8.0.2", "@1024pix/ember-testing-library": "^3.0.6", "@1024pix/eslint-config": "^1.3.8", - "@1024pix/pix-ui": "^48.9.0", + "@1024pix/pix-ui": "^49.4.1", "@1024pix/stylelint-config": "^5.1.22", "@babel/eslint-parser": "^7.19.1", "@babel/plugin-proposal-decorators": "^7.20.13", @@ -912,9 +912,9 @@ } }, "node_modules/@1024pix/pix-ui": { - "version": "48.9.0", - "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-48.9.0.tgz", - "integrity": "sha512-YzXZWdw6rdCDl7tfOHxjcUiEw9uhG1gVdK3m83nSlcVh+XOnF5RfkTS38+F95tB29/DGgNb3ePjIL8l3j0FnPg==", + "version": "49.4.1", + "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-49.4.1.tgz", + "integrity": "sha512-/Nx8SD3KgR6xuw+4G72c/zI9KTSY8q3WG6zXmEP9QGDz+w30KNYfjC+ed0fLcSE9eT4iP54VTZYxrPeyLxJcyw==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/orga/package.json b/orga/package.json index d2cc64767a2..d72026ee87a 100644 --- a/orga/package.json +++ b/orga/package.json @@ -54,7 +54,7 @@ "@1024pix/ember-cli-notifications": "^8.0.2", "@1024pix/ember-testing-library": "^3.0.6", "@1024pix/eslint-config": "^1.3.8", - "@1024pix/pix-ui": "^48.9.0", + "@1024pix/pix-ui": "^49.4.1", "@1024pix/stylelint-config": "^5.1.22", "@babel/eslint-parser": "^7.19.1", "@babel/plugin-proposal-decorators": "^7.20.13",