Merge branch 'dev' of...
Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into features/US158_423_harmonize_buttons_gaz_water
Showing
- src/assets/icons/tabbar/grand-lyon.svg 22 additions, 0 deletionssrc/assets/icons/tabbar/grand-lyon.svg
- src/assets/png/badges/CHA00000003-0.png 0 additions, 0 deletionssrc/assets/png/badges/CHA00000003-0.png
- src/assets/png/badges/CHA00000003-1.png 0 additions, 0 deletionssrc/assets/png/badges/CHA00000003-1.png
- src/assets/png/picto/picto-failure.png 0 additions, 0 deletionssrc/assets/png/picto/picto-failure.png
- src/components/CommonKit/Button/StyledAuthButton.tsx 7 additions, 3 deletionssrc/components/CommonKit/Button/StyledAuthButton.tsx
- src/components/CommonKit/Button/StyledButton.tsx 4 additions, 0 deletionssrc/components/CommonKit/Button/StyledButton.tsx
- src/components/CommonKit/Button/StyledOauthButton.tsx 0 additions, 88 deletionssrc/components/CommonKit/Button/StyledOauthButton.tsx
- src/components/ContainerComponents/Header/Header.tsx 0 additions, 2 deletionssrc/components/ContainerComponents/Header/Header.tsx
- src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx 24 additions, 13 deletions...s/ViewContainer/FinishedChallengeDetailsViewContainer.tsx
- src/components/ContainerComponents/ViewContainer/LockedChallengeDetailsViewContainer.tsx 3 additions, 1 deletion...nts/ViewContainer/LockedChallengeDetailsViewContainer.tsx
- src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx 2 additions, 2 deletions...omponents/WelcomeModalContainer/WelcomeModalContainer.tsx
- src/components/ContentComponents/Challenge/FollowChallengeTimeline.tsx 97 additions, 28 deletions...s/ContentComponents/Challenge/FollowChallengeTimeline.tsx
- src/components/ContentComponents/ChallengeList/ChallengeListItem.tsx 9 additions, 4 deletions...nts/ContentComponents/ChallengeList/ChallengeListItem.tsx
- src/components/ContentComponents/ChallengeList/ChallengesList.tsx 11 additions, 5 deletions...onents/ContentComponents/ChallengeList/ChallengesList.tsx
- src/components/ContentComponents/ChallengeModal/ChallengeModal.tsx 22 additions, 7 deletions...nents/ContentComponents/ChallengeModal/ChallengeModal.tsx
- src/components/ContentComponents/ConsumptionNavigator/ActivateHalfHourLoad.tsx 3 additions, 3 deletions...tComponents/ConsumptionNavigator/ActivateHalfHourLoad.tsx
- src/components/ContentComponents/Konnector/KonnectorForm.tsx 29 additions, 132 deletionssrc/components/ContentComponents/Konnector/KonnectorForm.tsx
- src/components/ContentComponents/Konnector/KonnectorLaunch.tsx 101 additions, 0 deletions...omponents/ContentComponents/Konnector/KonnectorLaunch.tsx
- src/components/ContentComponents/Konnector/KonnectorLoading.tsx 0 additions, 36 deletions...mponents/ContentComponents/Konnector/KonnectorLoading.tsx
- src/components/ContentComponents/Konnector/KonnectorLoginForm.tsx 201 additions, 0 deletions...onents/ContentComponents/Konnector/KonnectorLoginForm.tsx
Loading
Please register or sign in to comment