From ff781526bff4f10eec50bc727a402fb0446dc5e7 Mon Sep 17 00:00:00 2001
From: Yoan VALLET <ext.sopra.yvallet@grandlyon.com>
Date: Thu, 27 Aug 2020 15:15:32 +0200
Subject: [PATCH] fix svg and link to manifest
---
src/components/CommonKit/Icon/StyledIcon.tsx | 13 ++-----------
src/targets/browser/index.ejs | 2 +-
src/utils/utils.ts | 6 ------
3 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/src/components/CommonKit/Icon/StyledIcon.tsx b/src/components/CommonKit/Icon/StyledIcon.tsx
index 73f0ae167..d543c4412 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/targets/browser/index.ejs b/src/targets/browser/index.ejs
index 7cbebabc6..bfc23cc73 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 cc1851642..cddcb6dcf 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]
-}
--
GitLab