Skip to content
Snippets Groups Projects
Commit b2d3eb29 authored by Yoan VALLET's avatar Yoan VALLET
Browse files

Merge branch 'dev' of...

Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into features/113-bilan-mensuel
parents 090d17b0 1d4ec3cc
No related branches found
No related tags found
3 merge requests!103Support,!102Dev,!83Features/113 bilan mensuel
...@@ -23,7 +23,7 @@ const stackProvidedLibsConfig = { ...@@ -23,7 +23,7 @@ const stackProvidedLibsConfig = {
module: { module: {
rules: [ 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. // Automatically import the CSS if the JS is imported.
// imports-loader@0.8.0 works but imports-loader@1.0.0 does not // imports-loader@0.8.0 works but imports-loader@1.0.0 does not
loader: 'imports-loader?css=./cozy-bar.min.css', loader: 'imports-loader?css=./cozy-bar.min.css',
......
...@@ -24,7 +24,7 @@ const configs = [ ...@@ -24,7 +24,7 @@ const configs = [
require('cozy-scripts/config/webpack.config.intents'), require('cozy-scripts/config/webpack.config.intents'),
require('cozy-scripts/config/webpack.config.public'), require('cozy-scripts/config/webpack.config.public'),
require('cozy-scripts/config/webpack.config.pictures'), 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.manifest'),
require('cozy-scripts/config/webpack.config.progress'), require('cozy-scripts/config/webpack.config.progress'),
addAnalyzer ? require('cozy-scripts/config/webpack.config.analyzer') : null, addAnalyzer ? require('cozy-scripts/config/webpack.config.analyzer') : null,
......
...@@ -22,7 +22,7 @@ module.exports = { ...@@ -22,7 +22,7 @@ module.exports = {
rules: [ rules: [
{ {
test: /\.(ts|js)x?$/, // Add TS extensions 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 loader: require.resolve('cozy-scripts/node_modules/babel-loader'), // Add full path
options: { options: {
cacheDirectory: 'node_modules/.cache/babel-loader/react', cacheDirectory: 'node_modules/.cache/babel-loader/react',
......
import React from 'react' import React from 'react'
import { createAlt } from 'utils/utils' import Icon from 'cozy-ui/transpiled/react/Icon'
interface StyledIconProps { interface StyledIconProps {
className?: string className?: string
...@@ -12,16 +12,7 @@ const StyledIcon: React.ComponentType<StyledIconProps> = ({ ...@@ -12,16 +12,7 @@ const StyledIcon: React.ComponentType<StyledIconProps> = ({
icon, icon,
size = 16, size = 16,
}: StyledIconProps) => { }: StyledIconProps) => {
return ( return <Icon className={className} icon={icon} size={size} />
<img
className={className}
src={icon}
alt={createAlt(icon)}
width={size}
height={size}
/>
)
// return <Icon className={className} icon={icon} size={size} />
} }
export default StyledIcon export default StyledIcon
...@@ -143,9 +143,9 @@ ...@@ -143,9 +143,9 @@
"ERROR_ACCOUNT_CREATION": "Une erreur est survenue, veuillez essayer de nouveau.", "ERROR_ACCOUNT_CREATION": "Une erreur est survenue, veuillez essayer de nouveau.",
"ERROR_LOGIN_FAILED": "Identifiants invalides", "ERROR_LOGIN_FAILED": "Identifiants invalides",
"SUCCESS_TXT": "Félicitations !", "SUCCESS_TXT": "Félicitations !",
"SUCCESS_DATA_ELECTRICITY": "Vos données de consommation d'électricité 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 conntecté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 conntectées à Ecolyo.", "SUCCESS_DATA_GAS": "Vos données de consommation de gaz sont maintenant connectées à Ecolyo.",
"ERROR_TXT": "Aïe !", "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_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.", "ERROR_DATA_WATER": "Un problème a empêché vos données de consommation d'eau se connecter à Ecolyo.",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"> <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-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16"> <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"> <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2">
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, viewport-fit=cover"> <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, viewport-fit=cover">
......
...@@ -12,7 +12,6 @@ import WaterParamIcon from 'assets/icons/visu/water-param.svg' ...@@ -12,7 +12,6 @@ import WaterParamIcon from 'assets/icons/visu/water-param.svg'
import GasParamIcon from 'assets/icons/visu/gas-param.svg' import GasParamIcon from 'assets/icons/visu/gas-param.svg'
import { FluidType } from '../enum/fluid.enum' import { FluidType } from '../enum/fluid.enum'
import { DateTime } from 'luxon' import { DateTime } from 'luxon'
import { ENEDIS_DAY_DOCTYPE } from 'doctypes'
import { ITimePeriod, TimeStep } from '../services/dataConsumptionContracts' import { ITimePeriod, TimeStep } from '../services/dataConsumptionContracts'
import { UserChallenge } from 'services/dataChallengeContracts' import { UserChallenge } from 'services/dataChallengeContracts'
...@@ -134,8 +133,3 @@ export const convertDateByTimeStep = ( ...@@ -134,8 +133,3 @@ export const convertDateByTimeStep = (
return '' return ''
} }
} }
export const createAlt = (path: string) => {
const arr = path.split('/')
return arr[arr.length - 1].split('.')[0]
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment