Merge pull request #696 from gcruchon/fix/new-ds

fix(new-ds): fix broken link to template pugs

storybook/design-system/src/components/form/mixins/mixin-form-field-card.pug

@@ -4,7 +4,7 @@ mixin formFieldCardHeaderCheckbox({ name='', modifier= '', disabled=false, forId
       input.af-form__input-checkbox(name=name type="checkbox" value="on" id=forId disabled= disabled || null checked= checked || null)
       label.af-form__label(for=forId)
         span.af-form__indicator
-          include ../../../pages/style/icons/templates/ok.pug
+          include ../../../pages/guidelines/icones/templates/ok.pug
         span.af-form__description
           p.af-rccard-header__title  Référence
           p.af-rccard-header__subtitle 50 € / mois

storybook/design-system/src/components/form/mixins/mixin-form-field-checkbox.pug

@@ -3,6 +3,6 @@ mixin formFieldCheckbox({ name='defaultname', modifier= '', label= 'default labe
     input.af-form__input-checkbox(name=name type="checkbox" id=`checkbox${id}` disabled= disabled || null checked= checked || null)
     label.af-form__label(for=`checkbox${id}`)
       span.af-form__indicator
-        include ../../../pages/style/icons/templates/ok.pug
+        include ../../../pages/guidelines/icones/templates/ok.pug
       span.af-form__description
         | #{label}

storybook/design-system/src/components/form/mixins/mixin-form-field-select.pug

@@ -9,9 +9,9 @@ mixin formFieldSelect({ className= '', hasInfobulle= false, hasClear=false, modi
         option(value="2") Option 2
         option(value="3") Option 3
         option(value="4") Option 4
-      include ../../../pages/style/icons/templates/menu-down.pug
+      include ../../../pages/guidelines/icones/templates/menu-down.pug
       if(hasInfobulle)
         +formHelp()
       if modifier === "valid"
-        include ../../../pages/style/icons/templates/ok.pug
+        include ../../../pages/guidelines/icones/templates/ok.pug
     +formMessage({modifierMessage, textMessage, iconMessage})

storybook/design-system/src/components/form/mixins/mixin-form-field-text.pug

@@ -6,9 +6,9 @@ mixin formFieldText({ hasInfobulle= false, hasClear=false, modifier= '', textMes
       input.af-form__input-text(class=(hasInfobulle) ? ` af-form__input-text--hasinfobulle` : '' name="inputtextname" type="text" disabled= disabled || null)
       if hasClear
         .af-form__clear(role="button" tabindex="-1")
-          include ../../../pages/style/icons/templates/close.pug
+          include ../../../pages/guidelines/icones/templates/close.pug
       if hasInfobulle
         +formHelp()
       if modifier === "valid"
-        include ../../../pages/style/icons/templates/ok.pug
+        include ../../../pages/guidelines/icones/templates/ok.pug
     +formMessage({modifierMessage, textMessage, iconMessage})

storybook/design-system/src/components/form/mixins/mixin-form-message.pug

@@ -4,7 +4,7 @@ mixin formMessage({modifierMessage= '', textMessage='', iconMessage= ''})
       | #{textMessage}
     else
       if iconMessage === "warning-sign"
-        include ../../../pages/style/icons/templates/warning-sign.pug
+        include ../../../pages/guidelines/icones/templates/warning-sign.pug
       else
-        include ../../../pages/style/icons/templates/exclamation-sign.pug
+        include ../../../pages/guidelines/icones/templates/exclamation-sign.pug
       span.af-form__error-text #{textMessage}

storybook/design-system/src/pages/atoms/badge/templates/infoIcon.pug

@@ -1,2 +1,2 @@
 span.af-badge.af-badge--error.af-badge--hasIcon
-  include ../../../style/icons/templates/bell.pug
+  include ../../../guidelines/icones/templates/bell.pug

storybook/design-system/src/pages/atoms/button/templates/button-icon.pug

@@ -1,24 +1,24 @@
 button.btn.af-btn.af-btn--hasiconLeft
   span.af-btn__text Button with left icon
-  include ../../../style/icons/templates/arrowthin-left.pug
+  include ../../../guidelines/icones/templates/arrowthin-left.pug
 button.btn.af-btn.af-btn--hasiconLeft.af-btn--disabled
   span.af-btn__text Button disabled with left icon
-  include ../../../style/icons/templates/arrowthin-left.pug
+  include ../../../guidelines/icones/templates/arrowthin-left.pug
 button.btn.af-btn.af-btn--hasiconLeft.af-btn--success
   span.af-btn__text Button success with left icon
-  include ../../../style/icons/templates/arrowthin-left.pug
+  include ../../../guidelines/icones/templates/arrowthin-left.pug
 button.btn.af-btn.af-btn--hasiconLeft.af-btn--danger
   span.af-btn__text Button danger with left icon
-  include ../../../style/icons/templates/arrowthin-left.pug
+  include ../../../guidelines/icones/templates/arrowthin-left.pug
 button.btn.af-btn.af-btn--hasiconRight
   span.af-btn__text Button with right icon
-  include ../../../style/icons/templates/arrowthin-right.pug
+  include ../../../guidelines/icones/templates/arrowthin-right.pug
 button.btn.af-btn.af-btn--hasiconRight.af-btn--disabled
   span.af-btn__text Button disabled with right icon
-  include ../../../style/icons/templates/arrowthin-right.pug
+  include ../../../guidelines/icones/templates/arrowthin-right.pug
 button.btn.af-btn.af-btn--hasiconRight.af-btn--success
   span.af-btn__text Button success with right icon
-  include ../../../style/icons/templates/arrowthin-right.pug
+  include ../../../guidelines/icones/templates/arrowthin-right.pug
 button.btn.af-btn.af-btn--hasiconRight.af-btn--danger
   span.af-btn__text Button danger with right icon
-  include ../../../style/icons/templates/arrowthin-right.pug
+  include ../../../guidelines/icones/templates/arrowthin-right.pug

storybook/design-system/src/pages/atoms/button/templates/button-reverse.pug

@@ -2,13 +2,13 @@ button.btn.af-btn.af-btn--reverse(tabindex="-1") Button AF reverse
 button.btn.af-btn.af-btn--reverse.af-btn--disabled(tabindex="-1") Button AF disabled reverse
 button.btn.af-btn.af-btn--reverse.af-btn--hasiconLeft(tabindex="-1")
   span.af-btn__text Button with left icon
-  include ../../../style/icons/templates/arrowthin-left.pug
+  include ../../../guidelines/icones/templates/arrowthin-left.pug
 button.btn.af-btn.af-btn--reverse.af-btn--hasiconRight(tabindex="-1")
   span.af-btn__text Button with right icon
-  include ../../../style/icons/templates/arrowthin-right.pug
+  include ../../../guidelines/icones/templates/arrowthin-right.pug
 button.btn.af-btn.af-btn--reverse.af-btn--hasiconLeft(tabindex="-1")
   span.af-btn__text Button with left icon
-  include ../../../style/icons/templates/globe.pug
+  include ../../../guidelines/icones/templates/globe.pug
 button.btn.af-btn.af-btn--reverse.af-btn--disabled.af-btn--hasiconRight(tabindex="-1")
   span.af-btn__text Button disabled with right icon
-  include ../../../style/icons/templates/arrowthin-right.pug
+  include ../../../guidelines/icones/templates/arrowthin-right.pug

storybook/design-system/src/pages/atoms/button/templates/circle.pug

@@ -4,31 +4,31 @@ each mod in modifier
   .tk-block-demo
     div.fordemo
       a(class=`af-btn--${mod}` href="#" role="button" )
-        include ../../../style/icons/templates/pushpin.pug
+        include ../../../guidelines/icones/templates/pushpin.pug
     div.fordemo
       a(class=`af-btn--${mod}` href="#" role="button" )
-        include ../../../style/icons/templates/print.pug
+        include ../../../guidelines/icones/templates/print.pug
     div.fordemo
       a(class=`af-btn--${mod}` href="#" role="button" )
-        include ../../../style/icons/templates/arrow-xs-down.pug
+        include ../../../guidelines/icones/templates/arrow-xs-down.pug
     div.fordemo
       a(class=`af-btn--${mod}` href="#" role="button" )
-        include ../../../style/icons/templates/heart.pug
+        include ../../../guidelines/icones/templates/heart.pug
     div.fordemo
       a(class=`af-btn--${mod}` href="#" role="button" )
-        include ../../../style/icons/templates/eye-open.pug
+        include ../../../guidelines/icones/templates/eye-open.pug
     div.fordemo
       a(class=`af-btn--${mod}` href="#" role="button" )
-        include ../../../style/icons/templates/menu-hamburger.pug
+        include ../../../guidelines/icones/templates/menu-hamburger.pug
     div.fordemo
       a(class=`af-btn--${mod}` href="#" role="button" )
-        include ../../../style/icons/templates/remove.pug
+        include ../../../guidelines/icones/templates/remove.pug
     div.fordemo
       a(class=`af-btn--${mod}` href="#" role="button" )
-        include ../../../style/icons/templates/filter.pug
+        include ../../../guidelines/icones/templates/filter.pug
     div.fordemo
       a(class=`af-btn--${mod}` href="#" role="button" )
-        include ../../../style/icons/templates/floppy-disk.pug
+        include ../../../guidelines/icones/templates/floppy-disk.pug
     div.fordemo
       a(class=`af-btn--${mod}` href="#" role="button" )
-        include ../../../style/icons/templates/open.pug
+        include ../../../guidelines/icones/templates/open.pug

storybook/design-system/src/pages/atoms/button/templates/ghost.pug

@@ -2,29 +2,29 @@
   a.af-link(href="#") Simple link
 .tk-block-demo
   a.af-link.af-link--hasIconLeft(href="#")
-    include ../../../style/icons/templates/plus.pug
+    include ../../../guidelines/icones/templates/plus.pug
     span.af-link__text Link with icon
 .tk-block-demo
   a.af-link.af-link--hasIconLeft(href="#")
-    include ../../../style/icons/templates/arrowthin-left.pug
+    include ../../../guidelines/icones/templates/arrowthin-left.pug
     span.af-link__text Back Link
 .tk-block-demo
   a.af-link.af-link--hasIconLeft(href="#")
-    include ../../../style/icons/templates/plus-sign.pug
+    include ../../../guidelines/icones/templates/plus-sign.pug
     span.af-link__text Link plus
 .tk-block-demo
   a.af-link.af-link--hasIconLeft(href="#")
-    include ../../../style/icons/templates/pencil.pug
+    include ../../../guidelines/icones/templates/pencil.pug
     span.af-link__text Link edition
 .tk-block-demo
   a.af-link.af-link--hasIconLeft(href="#")
-    include ../../../style/icons/templates/print.pug
+    include ../../../guidelines/icones/templates/print.pug
     span.af-link__text Link print
 .tk-block-demo
   a.af-link.af-link--hasIconLeft(href="#")
-    include ../../../style/icons/templates/question-sign.pug
+    include ../../../guidelines/icones/templates/question-sign.pug
     span.af-link__text Link question
 .tk-block-demo
   a.af-link.af-link--hasIconRight(href="#")
     span.af-link__text Link new window
-    include ../../../style/icons/templates/new-window.pug
+    include ../../../guidelines/icones/templates/new-window.pug

storybook/design-system/src/pages/atoms/list/templates/withIcon.pug

@@ -1,23 +1,23 @@
 .tk-block-demo
   ul.af-list.af-list--check
     li.af-list__item
-      include ../../../style/icons/templates/ok.pug
+      include ../../../guidelines/icones/templates/ok.pug
       |  CSS et SASS
     li.af-list__item
-      include ../../../style/icons/templates/ok.pug
+      include ../../../guidelines/icones/templates/ok.pug
       |  ReactJS
     li.af-list__item
-      include ../../../style/icons/templates/ok.pug
+      include ../../../guidelines/icones/templates/ok.pug
       |  ES6
     li.af-list__item
-      include ../../../style/icons/templates/ok.pug
+      include ../../../guidelines/icones/templates/ok.pug
       |  GIT
     li.af-list__item
-      include ../../../style/icons/templates/ok.pug
+      include ../../../guidelines/icones/templates/ok.pug
       |  Webpack
     li.af-list__item
-      include ../../../style/icons/templates/ok.pug
+      include ../../../guidelines/icones/templates/ok.pug
       |  Typescript
     li.af-list__item
-      include ../../../style/icons/templates/ok.pug
+      include ../../../guidelines/icones/templates/ok.pug
       |  ReasonML

storybook/design-system/src/pages/atoms/popover/templates/classic.pug

@@ -2,28 +2,28 @@
   .af-popover__container
     .af-popover__container-over
       a.btn.af-btn--circle(href="#" role="button" )
-        include ../../../style/icons/templates/pushpin.pug
+        include ../../../guidelines/icones/templates/pushpin.pug
     .af-popover__container-pop(data-placement="top" style=`text-align: center;position: absolute; transform: translate3d(32px, -7px, 0px); top: 0px; left: 0px; will-change: transform;` )
       | pushpin
       span.af-popover__arrow
   .af-popover__container
     .af-popover__container-over
       a.btn.af-btn--circle(href="#" role="button" )
-        include ../../../style/icons/templates/print.pug
+        include ../../../guidelines/icones/templates/print.pug
     .af-popover__container-pop(data-placement="top" style=`text-align: center;position: absolute; transform: translate3d(44px, -7px, 0px); top: 0px; left: 0px; will-change: transform;` )
       | print
       span.af-popover__arrow
   .af-popover__container
     .af-popover__container-over
       a.btn.af-btn--circle(href="#" role="button" )
-        include ../../../style/icons/templates/arrow-xs-down.pug
+        include ../../../guidelines/icones/templates/arrow-xs-down.pug
     .af-popover__container-pop(data-placement="top" style=`text-align: center;position: absolute; transform: translate3d(9px, -7px, 0px); top: 0px; left: 0px; will-change: transform;` )
       | arrow-xs-down
       span.af-popover__arrow
   .af-popover__container
     .af-popover__container-over
       a.btn.af-btn--circle(href="#" role="button" )
-        include ../../../style/icons/templates/heart.pug
+        include ../../../guidelines/icones/templates/heart.pug
     .af-popover__container-pop(data-placement="top" style=`text-align: center;position: absolute; transform: translate3d(42px, -7px, 0px); top: 0px; left: 0px; will-change: transform;` )
       | heart
       span.af-popover__arrow

storybook/design-system/src/pages/get-started/how-to-contribute/markdown/content.md

@@ -1,3 +1,5 @@
+# Contributing to @axa-fr/react-toolkit
+
 ## Installation
 
 To get started with the repository:
@@ -26,12 +28,12 @@ If you want to use these projects, you must:
 
 ```sh
 cd storybook/design-system
-npm i
+npm ci
 ```
 
 ```sh
 cd storybook/storybook
-npm i
+npm ci
 ```
 
 ## How to work on a component
@@ -60,7 +62,7 @@ And then if you want to work on it, in isolation mode, you can run storybook
 npm run storybook
 ```
 
-After all this, if your development affect css, you can run `npx gulp all` to regenerate css
+After all this, if your development affect css, you can run `npm run style` to regenerate css
 
 ## Other usefull commands
 
@@ -74,9 +76,9 @@ By default, `npm test` also runs the linter.
 You can skip this by calling `jest` directly:
 
 ```sh
-$ npx jest
-$ npx jest --watch
-$ npx jest --config jest.config.json
+$ npm jest
+$ npm jest --watch
+$ npm jest --config jest.config.json
 # etc
 ```
 

storybook/design-system/src/pages/molecules/alert/templates/alertComplex.pug

@@ -1,9 +1,9 @@
 .af-alert.af-alert--success
   button.af-alert__icon-close
-    include ../../../style/icons/templates/close.pug
+    include ../../../guidelines/icones/templates/close.pug
   h3.af-alert__title
     .af-alert__title-icon
-      include ../../../style/icons/templates/ok.pug
+      include ../../../guidelines/icones/templates/ok.pug
     .af-alert__title-text
       | Les caves et les garages situés dans le même corps de bâtiment que le logement assuré sont garantis d'office
   .af-alert__content

storybook/design-system/src/pages/molecules/alert/templates/alertComplexDanger.pug

@@ -1,9 +1,9 @@
 .af-alert.af-alert--error
   button.af-alert__icon-close
-    include ../../../style/icons/templates/close.pug
+    include ../../../guidelines/icones/templates/close.pug
   h3.af-alert__title
     .af-alert__title-icon
-      include ../../../style/icons/templates/exclamation-sign.pug
+      include ../../../guidelines/icones/templates/exclamation-sign.pug
     .af-alert__title-text
       | Les caves et les garages situés dans le même corps de bâtiment que le logement assuré sont garantis d'office
   .af-alert__content

storybook/design-system/src/pages/molecules/alert/templates/alertSimpleDanger.pug

@@ -1,8 +1,8 @@
 .af-alert.af-alert--danger
   button.af-alert__icon-close
-    include ../../../style/icons/templates/close.pug
+    include ../../../guidelines/icones/templates/close.pug
   h3.af-alert__title
     .af-alert__title-icon
-      include ../../../style/icons/templates/alert.pug
+      include ../../../guidelines/icones/templates/alert.pug
     .af-alert__title-text
       | Les caves et les garages situés dans le même corps de bâtiment que le logement assuré sont garantis d'office

storybook/design-system/src/pages/molecules/alert/templates/alertSimpleInfo.pug

@@ -1,8 +1,8 @@
 .af-alert.af-alert--info
   button.af-alert__icon-close
-    include ../../../style/icons/templates/close.pug
+    include ../../../guidelines/icones/templates/close.pug
   h3.af-alert__title
     .af-alert__title-icon
-      include ../../../style/icons/templates/info-sign.pug
+      include ../../../guidelines/icones/templates/info-sign.pug
     .af-alert__title-text
       | Les caves et les garages situés dans le même corps de bâtiment que le logement assuré sont garantis d'office

storybook/design-system/src/pages/molecules/alert/templates/alertSimpleSuccess.pug

@@ -1,8 +1,8 @@
 .af-alert.af-alert--success
   button.af-alert__icon-close
-    include ../../../style/icons/templates/close.pug
+    include ../../../guidelines/icones/templates/close.pug
   h3.af-alert__title
     .af-alert__title-icon
-      include ../../../style/icons/templates/ok.pug
+      include ../../../guidelines/icones/templates/ok.pug
     .af-alert__title-text
       | Les caves et les garages situés dans le même corps de bâtiment que le logement assuré sont garantis d'office

storybook/design-system/src/pages/molecules/form-datepicker/templates/form-datepicker.pug

@@ -10,4 +10,4 @@ block input
       .react-datepicker__input-container
         input#uniqueid.af-datepicker.react-datepicker-ignore-onclickoutside(type='text', name='placeName', value='11/26/2017')
     include ./popper
-    include ../../../style/icons/templates/calendar.pug
+    include ../../../guidelines/icones/templates/calendar.pug

storybook/design-system/src/pages/molecules/form-file/templates/form-file-list-error.pug

@@ -10,7 +10,7 @@ block input
       div Glissez/déposez vos fichiers
       input(accept='image/jpeg, image/png, application/*' type='file' style='position: absolute; inset: 0px; opacity: 0.00001; pointer-events: none;' autocomplete='off' name='placeImage')
     button.af-btn.af-btn--file.af-btn--hasiconLeft(type='button')
-      include ../../../style/icons/templates/open.pug
+      include ../../../guidelines/icones/templates/open.pug
       |  Parcourir
   small.af-form__help Enter the place name, ex : Webcenter
   .custom-table-file.af-file-table
@@ -25,7 +25,7 @@ block input
         span
           .af-popover__container
             .af-popover__container-over(role='presentation')
-              include ../../../style/icons/templates/picture.pug
+              include ../../../guidelines/icones/templates/picture.pug
         span error-file.jpg
         span 100Mo
         button.af-link.af-link--delete-file(type='button')
@@ -34,13 +34,13 @@ block input
         span
           .af-popover__container
             .af-popover__container-over(role='presentation')
-              include ../../../style/icons/templates/picture.pug
+              include ../../../guidelines/icones/templates/picture.pug
         span fichier.png
         span 100Mo
         button.af-link.af-link--delete-file(type='button')
           span.af-link__text Supprimer
       li.af-form__file-line
-        include ../../../style/icons/templates/file.pug
+        include ../../../guidelines/icones/templates/file.pug
         span fichier.csv
         span 100ko
         button.af-link.af-link--delete-file(type='button')