[EN-6475] feat(offer form): change wording

ReseauEntourage · Nov 29, 2023 · 5cc3b61 · 5cc3b61
1 parent 1ae825e
commit 5cc3b61
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -154,6 +154,7 @@ ADMIN_COMPANIES_PARIS=
 ADMIN_COMPANIES_RENNES=
 ADRESSE_LOCAUX_PARIS=
 API_URL=
+AIRTABLE_LINK_BECOME_COACH=
 ASSOCIATION_BROCHURE=
 AWSS3_CDN_URL=
 AWSS3_IMAGE_DIRECTORY=
@@ -186,8 +187,6 @@ TUTORIAL_VIDEO_CV=
 TUTORIAL_VIDEO_FIRST_STEPS=
 TUTORIAL_VIDEO_OFFERS=
 TUTORIAL_VIDEO_OFFERS_2=
-WEBINAR_URL=
-WOMENS_DAY=
 ```
 
 ## Styles

diff --git a/cypress/e2e/admin.cy.js b/cypress/e2e/admin.cy.js
@@ -151,62 +151,62 @@ describe('Admin', () => {
       // add an offer
       cy.get('[data-testid="button-admin-create"]').click();
       cy.get('[data-testid="admin-add-offer-main"]').click();
-      cy.get('#form-add-offer-title').scrollIntoView().type('test');
-      cy.get('#form-add-offer-company').scrollIntoView().type('test');
+      cy.get('#form-add-offer-admin-title').scrollIntoView().type('test');
+      cy.get('#form-add-offer-admin-company').scrollIntoView().type('test');
 
-      cy.get('#form-add-offer-department')
+      cy.get('#form-add-offer-admin-department')
         .should('be.visible')
         .scrollIntoView()
         .type('Par');
 
-      cy.get('#form-add-offer-department')
+      cy.get('#form-add-offer-admin-department')
         .find('.Select__menu')
         .scrollIntoView()
         .should('be.visible')
         .find('.Select__option')
         .contains('Paris (75)')
         .click();
-      cy.get('#form-add-offer-address')
+      cy.get('#form-add-offer-admin-address')
         .scrollIntoView()
         .should('be.visible')
         .type('description');
 
-      cy.get('#form-add-offer-companyDescription')
+      cy.get('#form-add-offer-admin-companyDescription')
         .scrollIntoView()
         .should('be.visible')
         .type('description');
 
-      cy.get('#form-add-offer-contract-container')
+      cy.get('#form-add-offer-admin-contract-container')
         .scrollIntoView()
         .should('be.visible')
         .click()
         .find('.option')
         .contains('CDI')
         .click();
 
-      cy.get('#form-add-offer-recruiterFirstName')
+      cy.get('#form-add-offer-admin-recruiterFirstName')
         .scrollIntoView()
         .type('test');
-      cy.get('#form-add-offer-recruiterName').scrollIntoView().type('test');
-      cy.get('#form-add-offer-recruiterPosition').scrollIntoView().type('test');
-      cy.get('#form-add-offer-recruiterMail')
+      cy.get('#form-add-offer-admin-recruiterName').scrollIntoView().type('test');
+      cy.get('#form-add-offer-admin-recruiterPosition').scrollIntoView().type('test');
+      cy.get('#form-add-offer-admin-recruiterMail')
         .scrollIntoView()
         .type('test@gmail.com');
 
-      cy.get('#form-add-offer-businessLines')
+      cy.get('#form-add-offer-admin-businessLines')
         .should('be.visible')
         .scrollIntoView()
         .type('Agr');
 
-      cy.get('#form-add-offer-businessLines')
+      cy.get('#form-add-offer-admin-businessLines')
         .find('.Select__menu')
         .scrollIntoView()
         .should('be.visible')
         .find('.Select__option')
         .contains('Agriculture et espaces verts')
         .click();
 
-      cy.get('#form-add-offer-description').scrollIntoView().type('test');
+      cy.get('#form-add-offer-admin-description').scrollIntoView().type('test');
       cy.get('button').contains('Valider').click();
       cy.wait('@postOpportunity');
 

diff --git a/src/components/backoffice/admin/AdminOpportunities/AdminOpportunities.tsx b/src/components/backoffice/admin/AdminOpportunities/AdminOpportunities.tsx
@@ -15,11 +15,10 @@ import { useOpportunityId } from 'src/components/backoffice/opportunities/useOpp
 import { useQueryParamsOpportunities } from 'src/components/backoffice/opportunities/useQueryParamsOpportunities';
 import { SearchBar } from 'src/components/filters/SearchBar';
 import { formAddExternalOpportunityAsAdmin } from 'src/components/forms/schemas/formAddExternalOpportunity';
-import { formAddOpportunityAsAdmin } from 'src/components/forms/schemas/formAddOpportunity';
 import { HeaderBackoffice } from 'src/components/headers/HeaderBackoffice';
 import { openModal } from 'src/components/modals/Modal';
 import { ModalEdit } from 'src/components/modals/Modal/ModalGeneric/ModalEdit';
-import { PostOpportunityModal } from 'src/components/modals/Modal/ModalGeneric/PostOpportunityModal';
+import { PostAdminOpportunityModal } from 'src/components/modals/Modal/ModalGeneric/PostOpportunityModal';
 import { Button, ButtonMultiple, Section } from 'src/components/utils';
 import { OPPORTUNITY_FILTERS_DATA } from 'src/constants';
 import { HEIGHTS } from 'src/constants/styles';
@@ -163,16 +162,6 @@ export const AdminOpportunities = ({
 
   const opportunityListRef = useRef<{ fetchData: () => Promise<void> }>();
 
-  const opportunityModalProps = {
-    defaultValues: {
-      isPublic: true,
-    },
-    isAdmin: true,
-    callback: opportunityListRef?.current?.fetchData,
-    modalTitle: 'Ajouter une nouvelle offre',
-    formSchema: formAddOpportunityAsAdmin,
-  };
-
   const isDesktop = useIsDesktop();
 
   return (
@@ -193,7 +182,9 @@ export const AdminOpportunities = ({
                 {
                   onClick: () => {
                     openModal(
-                      <PostOpportunityModal {...opportunityModalProps} />
+                      <PostAdminOpportunityModal
+                        callback={opportunityListRef?.current?.fetchData}
+                      />
                     );
                   },
                   label: 'Nouvelle offre',
@@ -246,7 +237,7 @@ export const AdminOpportunities = ({
               ]}
             >
               <PlusIcon />
-              &nbsp; Créer
+              &nbsp;Créer
             </ButtonMultiple>
           </HeaderBackoffice>
           <Section className="custom-primary custom-fixed">

diff --git a/src/components/backoffice/candidate/CandidateOpportunities/CandidateOpportunities.tsx b/src/components/backoffice/candidate/CandidateOpportunities/CandidateOpportunities.tsx
@@ -209,7 +209,7 @@ export const CandidateOpportunities = ({
               }}
             >
               <PlusIcon />
-              &nbsp; Ajouter une offre
+              &nbsp;Ajouter une offre
             </Button>
           </HeaderBackoffice>
           {isPublic ? (

diff --git a/.../OpportunityDetails/CandidateOpportunityDetails/DetailsProgressBar/DetailsProgressBar.tsx b/.../OpportunityDetails/CandidateOpportunityDetails/DetailsProgressBar/DetailsProgressBar.tsx
@@ -17,7 +17,7 @@ export const DetailsProgressBar = ({
     useState<{ text: string; className: string; mobile: string }[]>();
   const renderClassNames = (className, index, array) => {
     for (let i = 0; i <= index; i += 1) {
-      array[i].style = className;
+      array[i].className = className;
     }
     setSteps(array);
   };

diff --git a/...ponents/headers/HeaderConnected/HeaderConnectedContent/HeaderConnectedContent.desktop.tsx b/...ponents/headers/HeaderConnected/HeaderConnectedContent/HeaderConnectedContent.desktop.tsx
@@ -72,8 +72,9 @@ export const HeaderConnectedContentDesktop = ({
         }}
       >
         <ImgProfile user={user} size={40} />
-        <span className="uk-margin-small-left">Bonjour {user.firstName}</span>
-        &nbsp;
+        <span className="uk-margin-small-left uk-margin-small-right">
+          Bonjour {user.firstName}
+        </span>
         <CaretDownIcon />
       </a>
       <Dropdown

diff --git a/...omponents/headers/HeaderConnected/HeaderConnectedContent/HeaderConnectedContent.utils.tsx b/...omponents/headers/HeaderConnected/HeaderConnectedContent/HeaderConnectedContent.utils.tsx
@@ -6,7 +6,6 @@ import ListIcon from 'assets/icons/list.svg';
 import LogOutIcon from 'assets/icons/log-out.svg';
 import QuestionIcon from 'assets/icons/question.svg';
 import SettingsIcon from 'assets/icons/settings.svg';
-import UserEmptyIcon from 'assets/icons/user-empty.svg';
 import UserIcon from 'assets/icons/user.svg';
 import { GA_TAGS } from 'src/constants/tags';
 import { CANDIDATE_USER_ROLES, COACH_USER_ROLES } from 'src/constants/users';
@@ -43,7 +42,7 @@ export const renderLinks = (user, logout, candidateId): AnyToFix => {
               user?.zone ? `zone=${user?.zone}` : ''
             }`,
             name: 'Les candidats',
-            icon: <UserEmptyIcon />,
+            // icon: <UserEmptyIcon />,
             badge: 'members',
             tag: GA_TAGS.BACKOFFICE_ADMIN_HEADER_CANDIDATS_CLIC,
           },
@@ -53,7 +52,7 @@ export const renderLinks = (user, logout, candidateId): AnyToFix => {
               user?.zone ? `zone=${user?.zone}` : ''
             }`,
             name: 'Les coachs',
-            icon: <UserEmptyIcon />,
+            // icon: <UserEmptyIcon />,
             badge: '',
             tag: GA_TAGS.BACKOFFICE_ADMIN_HEADER_COACHS_CLIC,
           },

diff --git a/src/components/modals/Modal/ModalGeneric/PostOpportunityModal/PostAdminOpportunityModal.tsx b/src/components/modals/Modal/ModalGeneric/PostOpportunityModal/PostAdminOpportunityModal.tsx
@@ -7,12 +7,12 @@ import { ExtractFormSchemaValidation } from 'src/components/forms/FormSchema';
 import { formAddOpportunityAsAdmin } from 'src/components/forms/schemas/formAddOpportunity';
 import { ModalEdit } from 'src/components/modals/Modal/ModalGeneric/ModalEdit';
 
-interface PostOpportunityModalProps {
+interface PostAdminOpportunityModalProps {
   callback?: () => void;
 }
 export function PostAdminOpportunityModal({
   callback,
-}: PostOpportunityModalProps) {
+}: PostAdminOpportunityModalProps) {
   const [lastFilledForm, setLastFilledForm] = useState<
     ExtractFormSchemaValidation<typeof formAddOpportunityAsAdmin>
   >({} as ExtractFormSchemaValidation<typeof formAddOpportunityAsAdmin>);

diff --git a/...components/modals/Modal/ModalGeneric/PostOpportunityModal/PostPrivateOpportunityModal.tsx b/...components/modals/Modal/ModalGeneric/PostOpportunityModal/PostPrivateOpportunityModal.tsx
@@ -10,7 +10,7 @@ import { FB_TAGS, GA_TAGS } from 'src/constants/tags';
 import { fbEvent } from 'src/lib/fb';
 import { gaEvent } from 'src/lib/gtag';
 
-interface PostOpportunityModalProps {
+interface PostPrivateOpportunityModalProps {
   candidateId: string;
   candidateFirstName: string;
   candidateLastName: string;
@@ -20,7 +20,7 @@ export function PostPrivateOpportunityModal({
   candidateId,
   candidateFirstName,
   candidateLastName,
-}: PostOpportunityModalProps) {
+}: PostPrivateOpportunityModalProps) {
   const [lastFilledForm, setLastFilledForm] = useState<
     ExtractFormSchemaValidation<typeof formAddPrivateOpportunity>
   >({} as ExtractFormSchemaValidation<typeof formAddPrivateOpportunity>);

diff --git a/src/components/modals/Modal/ModalGeneric/PostOpportunityModal/PostPublicOpportunityModal.tsx b/src/components/modals/Modal/ModalGeneric/PostOpportunityModal/PostPublicOpportunityModal.tsx
@@ -79,7 +79,7 @@ export function PostPublicOpportunityModal() {
     return {
       title: 'Proposer une opportunité',
       description:
-        'LinkedOut transmettra cette opportunité aux candidats dont le profil correspond à votre besoin',
+        'LinkedOut transmettra cette opportunité aux candidats dont le profil correspond à votre besoin.',
       formSchema: formAddPublicOpportunity,
       submitText: 'Envoyer',
       defaultValues: {

diff --git a/src/components/partials/SearchCandidates.tsx b/src/components/partials/SearchCandidates.tsx
@@ -32,10 +32,9 @@ export const SearchCandidates = ({ style }: { style?: UIKIT_STYLES }) => {
             Découvrez les <span className="uk-text-primary">candidats</span>
           </h2>
           <div>
-            Découvrez ci-dessous les CV des candidats LinkedOut disponibles.
-            Vous pouvez leur donner un coup de pouce en partageant leur CV, leur
-            transmettre des opportunités, ou leur proposer des offres
-            d&apos;emploi.
+            Découvrez ci-dessous les CV des candidats LinkedOut. Vous pouvez
+            leur donner un coup de pouce en partageant leur CV, leur transmettre
+            des opportunités, ou leur proposer des offres d&apos;emploi.
           </div>
           <p>
             <Button