diff --git a/app.config.environment.dev.js b/app.config.environment.dev.js index d07de287b9b83752197bfcc456b21c107a15a323..89351061569e9cdffa4006144c6bf1dcb23f1a31 100644 --- a/app.config.environment.dev.js +++ b/app.config.environment.dev.js @@ -23,7 +23,7 @@ const stackProvidedLibsConfig = { module: { rules: [ { - test: /cozy-bar\/dist\/cozy-bar\.min\.js$/, + test: /cozy-bar(\/|\\)dist(\/|\\)cozy-bar\.min\.js$/, // Automatically import the CSS if the JS is imported. // imports-loader@0.8.0 works but imports-loader@1.0.0 does not loader: 'imports-loader?css=./cozy-bar.min.css', diff --git a/app.config.js b/app.config.js index 84c539a61cba7725e9de4a8b509e842029ec3cd8..ab21d2835e48b5b0fed0889f79e3ab55bcb8ccab 100644 --- a/app.config.js +++ b/app.config.js @@ -24,7 +24,7 @@ const configs = [ require('cozy-scripts/config/webpack.config.intents'), require('cozy-scripts/config/webpack.config.public'), require('cozy-scripts/config/webpack.config.pictures'), - // require('cozy-scripts/config/webpack.config.assets'), + require('cozy-scripts/config/webpack.config.vendors'), require('cozy-scripts/config/webpack.config.manifest'), require('cozy-scripts/config/webpack.config.progress'), addAnalyzer ? require('cozy-scripts/config/webpack.config.analyzer') : null, diff --git a/app.config.react.js b/app.config.react.js index ad7fba4510f43342feff1f3f6e372cb289dc701d..5fc8e0046410637bb222b1c733ef0081c523004a 100644 --- a/app.config.react.js +++ b/app.config.react.js @@ -22,7 +22,7 @@ module.exports = { rules: [ { test: /\.(ts|js)x?$/, // Add TS extensions - exclude: /node_modules\/(?!(cozy-ui))/, + exclude: /node_modules(\/|\\)(?!(cozy-ui))/, loader: require.resolve('cozy-scripts/node_modules/babel-loader'), // Add full path options: { cacheDirectory: 'node_modules/.cache/babel-loader/react', diff --git a/src/components/CommonKit/Icon/StyledIcon.tsx b/src/components/CommonKit/Icon/StyledIcon.tsx index 73f0ae1672e4fe6345ca398d8ac1f04c553db1a1..d543c44124011a1574d9e61e6c32b3b830df921e 100644 --- a/src/components/CommonKit/Icon/StyledIcon.tsx +++ b/src/components/CommonKit/Icon/StyledIcon.tsx @@ -1,5 +1,5 @@ import React from 'react' -import { createAlt } from 'utils/utils' +import Icon from 'cozy-ui/transpiled/react/Icon' interface StyledIconProps { className?: string @@ -12,16 +12,7 @@ const StyledIcon: React.ComponentType<StyledIconProps> = ({ icon, size = 16, }: StyledIconProps) => { - return ( - <img - className={className} - src={icon} - alt={createAlt(icon)} - width={size} - height={size} - /> - ) - // return <Icon className={className} icon={icon} size={size} /> + return <Icon className={className} icon={icon} size={size} /> } export default StyledIcon diff --git a/src/locales/fr.json b/src/locales/fr.json index 2469c9cfbeb901aaefba94cc6463c55d341b28bc..a701dcf970aeba8d376435c42d15119148b3ed38 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -143,9 +143,9 @@ "ERROR_ACCOUNT_CREATION": "Une erreur est survenue, veuillez essayer de nouveau.", "ERROR_LOGIN_FAILED": "Identifiants invalides", "SUCCESS_TXT": "Félicitations !", - "SUCCESS_DATA_ELECTRICITY": "Vos données de consommation d'électricité sont maintenant conntectées à Ecolyo.", - "SUCCESS_DATA_WATER": "Vos données de consommation d'eau sont maintenant conntectées à Ecolyo.", - "SUCCESS_DATA_GAS": "Vos données de consommation de gaz sont maintenant conntectées à Ecolyo.", + "SUCCESS_DATA_ELECTRICITY": "Vos données de consommation d'électricité sont maintenant connectées à Ecolyo.", + "SUCCESS_DATA_WATER": "Vos données de consommation d'eau sont maintenant connectées à Ecolyo.", + "SUCCESS_DATA_GAS": "Vos données de consommation de gaz sont maintenant connectées à Ecolyo.", "ERROR_TXT": "Aïe !", "ERROR_DATA_ELECTRICITY": "Un problème a empêché vos données de consommation d'électricité de se connecter à Ecolyo.", "ERROR_DATA_WATER": "Un problème a empêché vos données de consommation d'eau se connecter à Ecolyo.", diff --git a/src/targets/browser/index.ejs b/src/targets/browser/index.ejs index 7cbebabc6d9372c6be6a21f0c6375504b385d13b..bfc23cc73c5da1e239d26607eb8e64159742b302 100644 --- a/src/targets/browser/index.ejs +++ b/src/targets/browser/index.ejs @@ -6,7 +6,7 @@ <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"> <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32"> <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16"> - <link rel="manifest" href="/site.webmanifest" crossOrigin="use-credentials"> + <link rel="manifest" href="/manifest.json" crossOrigin="use-credentials"> <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"> <meta name="theme-color" content="#ffffff"> <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, viewport-fit=cover"> diff --git a/src/utils/utils.ts b/src/utils/utils.ts index cc18516422651bc5818e17cd016088fc1685c82a..cddcb6dcfd63e535ea7182a9abe69e79ca606e66 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -12,7 +12,6 @@ import WaterParamIcon from 'assets/icons/visu/water-param.svg' import GasParamIcon from 'assets/icons/visu/gas-param.svg' import { FluidType } from '../enum/fluid.enum' import { DateTime } from 'luxon' -import { ENEDIS_DAY_DOCTYPE } from 'doctypes' import { ITimePeriod, TimeStep } from '../services/dataConsumptionContracts' import { UserChallenge } from 'services/dataChallengeContracts' @@ -134,8 +133,3 @@ export const convertDateByTimeStep = ( return '' } } - -export const createAlt = (path: string) => { - const arr = path.split('/') - return arr[arr.length - 1].split('.')[0] -}