Skip to content

Commit 8aa2fce

Browse files
pix-service-auto-mergepix-service-auto-merge
authored
[TECH] Passer les FaIcon en PixIcon sur PixOrga (PIX-15064)
 #10426
2 parents 05245fc + 8e1dfc9 commit 8aa2fce

File tree

66 files changed

+158
-1459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+158
-1459
lines changed

‎orga/app/app.js

-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
import Application from '@ember/application';
2-
import { dom, library } from '@fortawesome/fontawesome-svg-core';
32
import loadInitializers from 'ember-load-initializers';
43
import Resolver from 'ember-resolver';
54

65
import config from './config/environment';
7-
import { fapixInboxIn, fapixPersonExport, fapixTachometer, fapixTicket } from './custom-icons';
86

97
export default class App extends Application {
108
modulePrefix = config.modulePrefix;
119
podModulePrefix = config.podModulePrefix;
1210
Resolver = Resolver;
1311
}
1412

15-
library.add(fapixTachometer, fapixPersonExport, fapixInboxIn, fapixTicket);
16-
dom.watch();
17-
1813
loadInitializers(App, config.modulePrefix);
1914

2015
/**

‎orga/app/components/campaign/activity/participants-list.gjs

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { on } from '@ember/modifier';
44
import { action } from '@ember/object';
55
import { LinkTo } from '@ember/routing';
66
import { service } from '@ember/service';
7-
import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
87
import Component from '@glimmer/component';
98
import { tracked } from '@glimmer/tracking';
109
import { t } from 'ember-intl';
@@ -151,9 +150,7 @@ export default class ParticipantsList extends Component {
151150
@triggerAction={{fn this.openModal participation}}
152151
@size="small"
153152
class="campaign-activity-table-actions__button campaign-activity-table-actions__button--delete"
154-
>
155-
<FaIcon />
156-
</PixIconButton>
153+
/>
157154
</td>
158155
{{/if}}
159156
</tr>

‎orga/app/components/campaign/charts/participants-by-status-legend.gjs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import PixIcon from '@1024pix/pix-ui/components/pix-icon';
12
import PixTooltip from '@1024pix/pix-ui/components/pix-tooltip';
23
import { guidFor } from '@ember/object/internals';
34
import { service } from '@ember/service';
4-
import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
55
import Component from '@glimmer/component';
66

77
export default class ParticipantsByStatusLegend extends Component {
@@ -25,8 +25,9 @@ export default class ParticipantsByStatusLegend extends Component {
2525
<span>{{@dataset.legend}}</span>
2626
<PixTooltip @id="legend-tooltip-{{@dataset.key}}" @isWide="true" @position="top-left">
2727
<:triggerElement>
28-
<FaIcon
29-
@icon="circle-question"
28+
<PixIcon
29+
@name="help"
30+
@plainIcon={{true}}
3031
class="participants-by-status__legend-tooltip"
3132
tabindex="0"
3233
aria-describedby="legend-tooltip-{{@dataset.key}}"

‎orga/app/components/campaign/detail/type.gjs

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
import PixIcon from '@1024pix/pix-ui/components/pix-icon';
12
import { service } from '@ember/service';
2-
import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
33
import Component from '@glimmer/component';
44

55
export default class CampaignType extends Component {
66
@service intl;
77

88
get picto() {
99
const { campaignType } = this.args;
10-
return campaignType === 'ASSESSMENT' ? 'tachometer' : 'person-export';
10+
return campaignType === 'ASSESSMENT' ? 'speed' : 'profileShare';
1111
}
1212

1313
get pictoCssClass() {
@@ -38,12 +38,11 @@ export default class CampaignType extends Component {
3838

3939
<template>
4040
<span class="campaign-type">
41-
<FaIcon
42-
class="{{this.pictoCssClass}}"
43-
@icon="{{this.picto}}"
44-
@prefix="fapix"
45-
aria-hidden={{this.pictoAriaHidden}}
46-
@title={{this.pictoTitle}}
41+
<PixIcon
42+
class={{this.pictoCssClass}}
43+
@name={{this.picto}}
44+
aria-hidden="{{this.pictoAriaHidden}}"
45+
aria-label={{this.pictoTitle}}
4746
...attributes
4847
/>
4948
{{#unless @hideLabel}}

‎orga/app/components/campaign/header/archived-banner.gjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import PixButton from '@1024pix/pix-ui/components/pix-button';
2+
import PixIcon from '@1024pix/pix-ui/components/pix-icon';
23
import { action } from '@ember/object';
34
import { service } from '@ember/service';
4-
import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
55
import Component from '@glimmer/component';
66
import { t } from 'ember-intl';
77

@@ -33,7 +33,7 @@ export default class CampaignArchivedBanner extends Component {
3333
{{#if @campaign.isArchived}}
3434
<div class="campaign-archived-banner">
3535
<div class="campaign-archived-banner__text">
36-
<FaIcon class="campaign-archived-banner__icon" @icon="box-archive" />
36+
<PixIcon class="campaign-archived-banner__icon" @name="inventory" @plainIcon={{true}} />
3737
<span>{{t "pages.campaign.archived"}}</span>
3838
</div>
3939
{{#if this.displayUnarchiveButton}}

‎orga/app/components/campaign/settings/target-profile-tooltip.gjs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1+
import PixIcon from '@1024pix/pix-ui/components/pix-icon';
12
import PixTooltip from '@1024pix/pix-ui/components/pix-tooltip';
2-
import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
33
import { t } from 'ember-intl';
44

55
import TargetProfileDetails from '../target-profile-details';
66

77
<template>
88
<PixTooltip @id="target-profile-info-tooltip" @position="top-right" @isWide={{true}}>
99
<:triggerElement>
10-
<FaIcon
10+
<PixIcon
1111
...attributes
12-
@icon="circle-info"
12+
@name="help"
13+
@plainIcon={{true}}
1314
tabindex="0"
1415
aria-label={{t "pages.campaign-settings.target-profile.tooltip"}}
1516
aria-describedby="target-profile-info-tooltip"

‎orga/app/components/campaign/settings/view.gjs

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import PixButton from '@1024pix/pix-ui/components/pix-button';
22
import PixButtonLink from '@1024pix/pix-ui/components/pix-button-link';
3+
import PixIcon from '@1024pix/pix-ui/components/pix-icon';
34
import PixTooltip from '@1024pix/pix-ui/components/pix-tooltip';
45
import { fn } from '@ember/helper';
56
import { action } from '@ember/object';
67
import { service } from '@ember/service';
7-
import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
88
import Component from '@glimmer/component';
99
import { t } from 'ember-intl';
1010

@@ -106,8 +106,9 @@ export default class CampaignView extends Component {
106106
<span>{{t "pages.campaign-settings.multiple-sendings.title"}}</span>
107107
<PixTooltip @id="credit-info-tooltip" @position="top" @isWide={{true}}>
108108
<:triggerElement>
109-
<FaIcon
110-
@icon="circle-info"
109+
<PixIcon
110+
@name="help"
111+
@plainIcon={{true}}
111112
class="campaign-settings-content__tooltip-icon"
112113
tabindex="0"
113114
aria-describedby={{t
@@ -130,8 +131,9 @@ export default class CampaignView extends Component {
130131
<span>{{t "pages.campaign-settings.reset-to-zero.title"}}</span>
131132
<PixTooltip @id="reset-to-zero-info-tooltip" @position="top" @isWide={{true}}>
132133
<:triggerElement>
133-
<FaIcon
134-
@icon="circle-info"
134+
<PixIcon
135+
@name="help"
136+
@plainIcon={{true}}
135137
class="campaign-settings-content__tooltip-icon"
136138
tabindex="0"
137139
aria-describedby={{t "pages.campaign-settings.reset-to-zero.tooltip.aria-label" htmlSafe=true}}

‎orga/app/components/campaign/target-profile-details.gjs

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
1+
import PixIcon from '@1024pix/pix-ui/components/pix-icon';
22
import Component from '@glimmer/component';
33
import { t } from 'ember-intl';
44

@@ -24,24 +24,23 @@ export default class CampaignTargetProfileDetails extends Component {
2424
{{/if}}
2525
<ul class="target-profile-details__specificity">
2626
<li class="target-profile-details__specificity__row">
27-
<FaIcon @fixedWidth={{true}} @icon="book" />
27+
<PixIcon @name="book" />
2828
{{t "common.target-profile-details.subjects" value=@targetProfileTubesCount}}
2929
</li>
3030
{{#if @hasBadges}}
3131
<li class="target-profile-details__specificity__row target-profile-details__specificity__row--add-separator">
32-
<FaIcon @fixedWidth={{true}} @icon="award" />
32+
<PixIcon @name="awards" />
3333
{{t "common.target-profile-details.thematic-results" value=@targetProfileThematicResultCount}}
3434
</li>
3535
{{/if}}
3636
<li class="target-profile-details__specificity__row target-profile-details__specificity__row--break-line">
3737
<span class="target-profile-details__specificity__white-space">
3838
{{t "common.target-profile-details.results.common"}}
3939
</span>
40-
<FaIcon
41-
@fixedWidth={{true}}
40+
<PixIcon
4241
@aria-hidden={{false}}
4342
aria-label={{t this.displayResultInfo.label}}
44-
@icon={{this.displayResultInfo.icon}}
43+
@name={{this.displayResultInfo.icon}}
4544
/>
4645
</li>
4746
</ul>

‎orga/app/components/campaign/update-form.gjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import PixButton from '@1024pix/pix-ui/components/pix-button';
2+
import PixIcon from '@1024pix/pix-ui/components/pix-icon';
23
import PixInput from '@1024pix/pix-ui/components/pix-input';
34
import PixSelect from '@1024pix/pix-ui/components/pix-select';
45
import PixTextarea from '@1024pix/pix-ui/components/pix-textarea';
56
import { fn } from '@ember/helper';
67
import { on } from '@ember/modifier';
78
import { action } from '@ember/object';
89
import { service } from '@ember/service';
9-
import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
1010
import Component from '@glimmer/component';
1111
import { tracked } from '@glimmer/tracking';
1212
import { t } from 'ember-intl';
@@ -133,7 +133,7 @@ export default class UpdateForm extends Component {
133133

134134
<div class="form__field-info">
135135
<span class="form__field-info-title">
136-
<FaIcon @icon="circle-info" class="form__field-info-icon" />
136+
<PixIcon @name="help" @plainIcon={{true}} class="form__field-info-icon" />
137137
<span>{{t "pages.campaign-modification.owner.title"}}</span>
138138
</span>
139139
<span class="form__field-info-message">{{t "pages.campaign-modification.owner.info"}}</span>

‎orga/app/components/certificability/tooltip.hbs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<div class="certificability-tooltip">
22
<PixTooltip @id="column-is-certifiable-informations" @position="top-left" @isWide={{true}}>
33
<:triggerElement>
4-
<FaIcon
5-
@icon="circle-question"
4+
<PixIcon
5+
@name="help"
6+
@plainIcon={{true}}
7+
aria-hidden="true"
68
tabindex="0"
79
aria-label={{t "components.certificability-tooltip.aria-label"}}
810
aria-describedby="column-is-certifiable-informations"

‎orga/app/components/copy-paste-button.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
class="pix-icon-button pix-icon-button--small pix-icon-button--dark-grey copy-paste-button__clipboard"
1616
...attributes
1717
>
18-
<FaIcon @icon="copy" @prefix="far" />
18+
<PixIcon @name="copy" />
1919
</CopyButton>
2020
</:triggerElement>
2121
<:tooltip>

‎orga/app/components/import/banner.gjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import PixIcon from '@1024pix/pix-ui/components/pix-icon';
12
import PixMessage from '@1024pix/pix-ui/components/pix-message';
23
import { service } from '@ember/service';
3-
import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
44
import Component from '@glimmer/component';
55

66
const statusI18nLabel = {
@@ -94,7 +94,7 @@ export default class ImportBanner extends Component {
9494
<template>
9595
{{#if this.displaySuccess}}
9696
<p class="import-banner--success">
97-
<FaIcon @icon="circle-check" class="import-banner__icon" />
97+
<PixIcon @name="circleCheck" @plainIcon={{true}} class="import-banner__icon" />
9898
{{this.successBanner}}
9999
</p>
100100
{{/if}}

‎orga/app/components/layout/organization-places-or-credit-info.gjs

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import PixIcon from '@1024pix/pix-ui/components/pix-icon';
12
import PixTooltip from '@1024pix/pix-ui/components/pix-tooltip';
23
import { LinkTo } from '@ember/routing';
34
import { service } from '@ember/service';
4-
import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
55
import Component from '@glimmer/component';
66
import { t } from 'ember-intl';
77
import { eq } from 'ember-truth-helpers';
@@ -18,7 +18,7 @@ export default class OrganizationPlacesOrCreditInfo extends Component {
1818
<div class="organization-places-or-credit-info hide-on-mobile">
1919
{{#if (eq @placesCount 0)}}
2020
<span class="organization-places-or-credit-info__warning">
21-
<FaIcon @icon="triangle-exclamation" class="warning-icon" />
21+
<PixIcon @name="warning" @plainIcon={{true}} class="warning-icon" />
2222
{{t "navigation.places.number" count=@placesCount}}</span>
2323
{{else}}
2424
<span>{{t "navigation.places.number" count=@placesCount}}</span>
@@ -35,7 +35,13 @@ export default class OrganizationPlacesOrCreditInfo extends Component {
3535

3636
<PixTooltip @id="credit-info-tooltip" @position="bottom-left" @isWide={{true}} @isLight={{true}}>
3737
<:triggerElement>
38-
<FaIcon @icon="circle-info" class="info-icon" tabindex="0" aria-describedby="credit-info-tooltip" />
38+
<PixIcon
39+
@name="help"
40+
@plainIcon={{true}}
41+
class="info-icon"
42+
tabindex="0"
43+
aria-describedby="credit-info-tooltip"
44+
/>
3945
</:triggerElement>
4046
<:tooltip>
4147
{{t "navigation.credits.tooltip-text" htmlSafe=true}}

‎orga/app/components/layout/school-session-management.gjs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import PixButton from '@1024pix/pix-ui/components/pix-button';
2+
import PixIcon from '@1024pix/pix-ui/components/pix-icon';
23
import PixTooltip from '@1024pix/pix-ui/components/pix-tooltip';
34
import { action } from '@ember/object';
45
import { service } from '@ember/service';
5-
import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
66
import Component from '@glimmer/component';
77
import dayjs from 'dayjs';
88
import LocalizedFormat from 'dayjs/plugin/localizedFormat';
@@ -62,8 +62,9 @@ export default class SchoolSessionManagement extends Component {
6262
</p>
6363
<PixTooltip @id="school-session-info-tooltip" @position="bottom" @isWide="true">
6464
<:triggerElement>
65-
<FaIcon
66-
@icon="circle-info"
65+
<PixIcon
66+
@name="help"
67+
@plainIcon={{true}}
6768
tabindex="0"
6869
aria-label={{t "navigation.school-sessions.status.aria-label"}}
6970
aria-describedby="school-session-info-tooltip"

‎orga/app/components/layout/sidebar.hbs

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{{#if this.shouldDisplayCampaignsEntry}}
1010
<LinkTo @route="authenticated.campaigns" class="sidebar-nav__item">
1111
<span class="sidebar-nav__item-icon">
12-
<img src="{{this.rootURL}}/icons/chevron-square-right.svg" alt="" role="none" />
12+
<PixIcon @name="conversionPath" role="none" />
1313
</span>
1414
{{t "navigation.main.campaigns"}}
1515
</LinkTo>
@@ -18,45 +18,45 @@
1818
{{#if this.shouldDisplayCertificationsEntry}}
1919
<LinkTo @route="authenticated.certifications" class="sidebar-nav__item">
2020
<span class="sidebar-nav__item-icon">
21-
<FaIcon @icon="award" />
21+
<PixIcon @name="awards" role="none" />
2222
</span>
2323
{{t "navigation.main.certifications"}}
2424
</LinkTo>
2525
{{/if}}
2626
{{#if this.shouldDisplayMissionsEntry}}
2727
<LinkTo @route="authenticated.missions" class="sidebar-nav__item">
2828
<span class="sidebar-nav__item-icon">
29-
<img src="{{this.rootURL}}/icons/chevron-square-right.svg" alt="" role="none" />
29+
<PixIcon @name="conversionPath" role="none" />
3030
</span>
3131
{{t "navigation.main.missions"}}
3232
</LinkTo>
3333
{{/if}}
3434
{{#if this.shouldDisplayParticipantsEntry}}
3535
<LinkTo @route={{this.organizationLearnersList.route}} class="sidebar-nav__item">
3636
<span class="sidebar-nav__item-icon">
37-
<img src="{{this.rootURL}}/icons/address-book-light.svg" alt="" role="none" />
37+
<PixIcon @name="infoUser" role="none" />
3838
</span>
3939
{{t this.organizationLearnersList.label}}
4040
</LinkTo>
4141
{{/if}}
4242
<LinkTo @route="authenticated.team" class="sidebar-nav__item">
4343
<span class="sidebar-nav__item-icon">
44-
<img src="{{this.rootURL}}/icons/users-light.svg" alt="" role="none" />
44+
<PixIcon @name="users" role="none" />
4545
</span>
4646
{{t "navigation.main.team"}}
4747
</LinkTo>
4848
{{#if this.shouldDisplayPlacesEntry}}
4949
<LinkTo @route="authenticated.places" class="sidebar-nav__item">
5050
<span class="sidebar-nav__item-icon">
51-
<FaIcon @icon="ticket" @prefix="fapix" />
51+
<PixIcon @name="seat" role="none" />
5252
</span>
5353
{{t "navigation.main.places"}}
5454
</LinkTo>
5555
{{/if}}
5656
{{#if this.documentationUrl}}
5757
<a class="sidebar-nav__item" href={{this.documentationUrl}} target="_blank" rel="noopener noreferrer">
5858
<span class="sidebar-nav__item-icon">
59-
<img src="{{this.rootURL}}/icons/book-light.svg" alt="" role="none" />
59+
<PixIcon @name="book" role="none" />
6060
</span>
6161
{{t "navigation.main.documentation"}}
6262
</a>
@@ -69,7 +69,7 @@
6969
rel="noopener noreferrer"
7070
>
7171
<span class="sidebar-nav__item-icon">
72-
<FaIcon @icon="circle-question" alt="{{t 'navigation.main.support'}}-icon" role="none" />
72+
<PixIcon @name="help" role="none" />
7373
</span>
7474
{{t "navigation.main.support"}}
7575
</a>

0 commit comments

Comments
 (0)