diff --git a/.gitignore b/.gitignore index 312d3d56204ef8f861923a4913d741dc479af3d4..d3564bb25c8cd661f80c400e152cde46e108d754 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,6 @@ mobile/Preview.html # Default # /!\ KEEP THIS SECTION THE LAST ONE !.gitkeep + +#Report bundle analyser +public/ \ No newline at end of file diff --git a/public/serviceworker.js b/public/serviceworker.js deleted file mode 100644 index 9ab3c2200326a34a3d73a48ea49f7f63837508b3..0000000000000000000000000000000000000000 --- a/public/serviceworker.js +++ /dev/null @@ -1,44 +0,0 @@ -const CACHE_NAME = "version-1"; -const urlsToCache = [ 'index.html', 'offline.html' ]; - -const self = this; - -// Install SW -self.addEventListener('install', (event) => { - event.waitUntil( - caches.open(CACHE_NAME) - .then((cache) => { - console.log('Opened cache'); - - return cache.addAll(urlsToCache); - }) - ) -}); - -// Listen for requests -self.addEventListener('fetch', (event) => { - event.respondWith( - caches.match(event.request) - .then(() => { - return fetch(event.request) - .catch(() => caches.match('offline.html')) - }) - ) -}); - -// Activate the SW -self.addEventListener('activate', (event) => { - const cacheWhitelist = []; - cacheWhitelist.push(CACHE_NAME); - - event.waitUntil( - caches.keys().then((cacheNames) => Promise.all( - cacheNames.map((cacheName) => { - if(!cacheWhitelist.includes(cacheName)) { - return caches.delete(cacheName); - } - }) - )) - - ) -}); \ No newline at end of file diff --git a/src/components/Challenge/AvailableChallengeDetailsView.tsx b/src/components/Challenge/AvailableChallengeDetailsView.tsx index 897d5d12106e45131022a4a5561e61b3c9ef9a70..4e4357c1ed20291a4e7583166b06947187f0a863 100644 --- a/src/components/Challenge/AvailableChallengeDetailsView.tsx +++ b/src/components/Challenge/AvailableChallengeDetailsView.tsx @@ -205,41 +205,42 @@ const AvailableChallengeDetailsView: React.FC<AvailableChallengeDetailsViewProps <div className="cp-description text-16-bold"> {challenge.description} </div> - <div className="lack-of-data-challenge"> + <div> {lackOfDataForChallenge && isLoaded ? ( - <div className="lack-of-data-content"> - <div className="warning-white"> - <StyledIcon - icon={warningWhite} - size={36} - className="warning-icon" - /> - - <span> - {t('CHALLENGE.LACK_OF_DATA')}{' '} - {DateTime.fromObject( - lackOfDataFluidtype.periode.startDate.c - ).toLocaleString(DateTime.DATE_FULL)}{' '} - {t('CHALLENGE.LACK_OF_DATA_1')}{' '} - {DateTime.fromObject( - lackOfDataFluidtype.periode.endDate.c - ).toLocaleString(DateTime.DATE_FULL)} - {t('CHALLENGE.LACK_OF_DATA_2')} - </span> + <div className="lack-of-data-challenge"> + <div className="lack-of-data-content"> + <div className="warning-white"> + <StyledIcon + icon={warningWhite} + size={36} + className="warning-icon" + /> + <span> + {t('CHALLENGE.LACK_OF_DATA')}{' '} + {DateTime.fromObject( + lackOfDataFluidtype.periode.startDate.c + ).toLocaleString(DateTime.DATE_FULL)}{' '} + {t('CHALLENGE.LACK_OF_DATA_1')}{' '} + {DateTime.fromObject( + lackOfDataFluidtype.periode.endDate.c + ).toLocaleString(DateTime.DATE_FULL)} + {t('CHALLENGE.LACK_OF_DATA_2')} + </span> + </div> + {lackOfDataFluidtype.fluidType.map( + (idFLuid: number) => { + return ( + <div key={idFLuid} className="fluid-enum"> + {' '} + - {t( + 'FLUID.' + FluidType[idFLuid] + '.NAME' + )}{' '} + </div> + ) + } + )} + <span></span> </div> - {lackOfDataFluidtype.fluidType.map( - (idFLuid: number) => { - return ( - <div key={idFLuid} className="fluid-enum"> - {' '} - - {t( - 'FLUID.' + FluidType[idFLuid] + '.NAME' - )}{' '} - </div> - ) - } - )} - <span></span> </div> ) : null} </div> diff --git a/src/styles/components/_challenges.scss b/src/styles/components/_challenges.scss index 957b60ea852aeef88921e0294918132a318a2a28..aa4e5c4fd0ad01fe37c4f2b2a140c4ca646e1a6d 100644 --- a/src/styles/components/_challenges.scss +++ b/src/styles/components/_challenges.scss @@ -514,6 +514,7 @@ } } .lack-of-data-challenge { + margin: auto; padding: 1rem; width: 90%; background-color: $red-primary;