Tech: encore du fun avec les modules ES6

chaibax · Sep 11, 2020 · d25df62 · d25df62
1 parent d706fc8
commit d25df62
Show file tree

Hide file tree

Showing 44 changed files with 454 additions and 595 deletions.
diff --git a/incidence.py b/incidence.py
@@ -49,9 +49,7 @@ def generate():
     data = retrieve_data(DATA_URL)
     by_departement = aggregate_by_departement(data)
     by_week = aggregate_by_week(by_departement)
-    open(DATA_DIR / "incidence.js", "w").write(
-        f"const incidence = {by_week}\nmodule.exports = {{incidence}}"
-    )
+    open(DATA_DIR / "incidence.js", "w").write(f"export default {by_week}\n")
 
 
 @wrap

diff --git a/prefectures.py b/prefectures.py
@@ -29,9 +29,7 @@ def retrieve_data(url):
 def generate():
     data = retrieve_data(DATA_URL)
     prefectures = {item["codeDepartement"]: item["pagePrefecture"] for item in data}
-    open(DATA_DIR / "prefectures.js", "w").write(
-        f"const prefectures = {prefectures}\nmodule.exports = {{prefectures}}"
-    )
+    open(DATA_DIR / "prefectures.js", "w").write(f"export default {prefectures}\n")
 
 
 @wrap

diff --git a/src/scripts/actions.js b/src/scripts/actions.js
@@ -1,8 +1,8 @@
-import { ICS } from './ics'
-import affichage from './affichage'
-import pagination from './pagination'
+import ICS from './ics.js'
+import { hideElement, showElement } from './affichage.js'
+import { getCurrentPageName } from './pagination.js'
 
-function bindCalendar(element, profil) {
+export function bindCalendar(element, profil) {
     const ics = new ICS(navigator.appVersion)
     const duration = 1 // heures bloquées sur le calendrier.
     const urlSuivi = 'https://mesconseilscovid.sante.gouv.fr/#suiviintroduction'
@@ -42,7 +42,7 @@ function bindCalendar(element, profil) {
     })
 }
 
-function bindFeedback(component) {
+export function bindFeedback(component) {
     function opacityTransition(component, delay, callback) {
         component.style.transition = `opacity ${delay / 1000}s`
         component.style.opacity = '0'
@@ -56,8 +56,8 @@ function bindFeedback(component) {
         const transitionDelay = component.dataset.feedbackTransitionDelay
 
         opacityTransition(component, transitionDelay, (component) => {
-            affichage.hideElement(component.querySelector('.feedback-question'))
-            affichage.showElement(component.querySelector('.feedback-form'))
+            hideElement(component.querySelector('.feedback-question'))
+            showElement(component.querySelector('.feedback-form'))
             component.parentElement.classList.add('js-feedback-submitted')
             const form = component.querySelector('.feedback-form form')
             form.addEventListener('submit', (event) => {
@@ -66,16 +66,16 @@ function bindFeedback(component) {
                 const payload = {
                     kind: feedback,
                     message: event.target.elements.message.value,
-                    page: pagination.getCurrentPageName(),
+                    page: getCurrentPageName(),
                 }
                 const request = new XMLHttpRequest()
                 request.open('POST', feedbackHost + '/feedback', true)
                 request.setRequestHeader('Content-Type', 'application/json')
                 request.send(JSON.stringify(payload))
 
                 opacityTransition(component, transitionDelay, (component) => {
-                    affichage.hideElement(component.querySelector('.feedback-form'))
-                    affichage.showElement(component.querySelector('.feedback-thankyou'))
+                    hideElement(component.querySelector('.feedback-form'))
+                    showElement(component.querySelector('.feedback-thankyou'))
                 })
             })
         })
@@ -91,13 +91,13 @@ function bindFeedback(component) {
     })
     document.addEventListener('pageChanged', () => {
         // Display again the question if the user change page.
-        affichage.hideElement(component.querySelector('.feedback-form'))
-        affichage.hideElement(component.querySelector('.feedback-thankyou'))
-        affichage.showElement(component.querySelector('.feedback-question'))
+        hideElement(component.querySelector('.feedback-form'))
+        hideElement(component.querySelector('.feedback-thankyou'))
+        showElement(component.querySelector('.feedback-question'))
     })
 }
 
-function bindImpression(element) {
+export function bindImpression(element) {
     const printButton = element.querySelector('.js-impression')
     printButton.addEventListener('click', (event) => {
         event.preventDefault()
@@ -109,7 +109,7 @@ function bindImpression(element) {
     })
 }
 
-function bindSuppressionTotale(element, app) {
+export function bindSuppressionTotale(element, app) {
     element.addEventListener('click', (event) => {
         event.preventDefault()
         if (confirm('Êtes-vous sûr·e de vouloir supprimer tous les profils ?')) {
@@ -123,10 +123,3 @@ function bindSuppressionTotale(element, app) {
         }
     })
 }
-
-export default {
-    bindImpression,
-    bindFeedback,
-    bindCalendar,
-    bindSuppressionTotale,
-}
diff --git a/src/scripts/affichage.js b/src/scripts/affichage.js
@@ -1,4 +1,4 @@
-function showMeOrThem(element, profil) {
+export function showMeOrThem(element, profil) {
     // eslint-disable-next-line no-extra-semi
     ;[].forEach.call(
         element.querySelectorAll('.me'),
@@ -16,40 +16,40 @@ function showThem(themElement) {
     showElement(themElement.nextSibling)
 }
 
-function hideElement(element) {
+export function hideElement(element) {
     element.setAttribute('hidden', '')
     element.classList.remove('visible')
 }
 
-function showElement(element) {
+export function showElement(element) {
     element.removeAttribute('hidden')
     element.classList.add('visible')
 }
 
-function hideSelector(element, selector) {
+export function hideSelector(element, selector) {
     // eslint-disable-next-line no-extra-semi
     ;[].forEach.call(element.querySelectorAll(selector), hideElement)
 }
 
-function displayElementById(element, id) {
+export function displayElementById(element, id) {
     var block = element.querySelector('#' + id)
     if (!block) return
     showElement(block)
 }
 
-function displayBlocks(element, blockNames) {
+export function displayBlocks(element, blockNames) {
     blockNames.forEach(function (block) {
         displayElementById(element, block)
     })
 }
 
-function createElementFromHTML(htmlString) {
+export function createElementFromHTML(htmlString) {
     var div = document.createElement('div')
     div.innerHTML = htmlString.trim()
     return div.firstElementChild
 }
 
-function escapeHtml(str) {
+export function escapeHtml(str) {
     return str
         .replace(/&/g, '&amp;')
         .replace(/</g, '&lt;')
@@ -59,7 +59,7 @@ function escapeHtml(str) {
         .replace(/`/g, '&#x60;')
 }
 
-function safeHtml(literals, ...substitutions) {
+export function safeHtml(literals, ...substitutions) {
     let result = ''
 
     for (let i = 0; i < substitutions.length; i++) {
@@ -70,15 +70,3 @@ function safeHtml(literals, ...substitutions) {
     result += literals[literals.length - 1]
     return result
 }
-
-export default {
-    showMeOrThem,
-    hideElement,
-    showElement,
-    hideSelector,
-    displayElementById,
-    displayBlocks,
-    createElementFromHTML,
-    safeHtml,
-    escapeHtml,
-}
diff --git a/src/scripts/algorithme/deconfinement.js b/src/scripts/algorithme/deconfinement.js
@@ -1,6 +1,6 @@
-var utils = require('../utils.js')
+import { joursApres, joursAvant } from '../utils.js'
 
-class AlgorithmeDeconfinement {
+export default class AlgorithmeDeconfinement {
     constructor(profil, algoOrientation) {
         this.profil = profil
         this.algoOrientation = algoOrientation
@@ -12,18 +12,15 @@ class AlgorithmeDeconfinement {
             delta = 10
         }
         const now = new Date()
-        const finDeQuarantaine = utils.joursApres(
-            delta,
-            this.profil.symptomes_start_date
-        )
+        const finDeQuarantaine = joursApres(delta, this.profil.symptomes_start_date)
         return now > finDeQuarantaine
     }
 
     isSuiviRegulier() {
         // Au moins une entrée ces dernières 24h + une entrée ces dernières 48h.
-        const maintenant = utils.joursAvant(0)
-        const ilYA24h = utils.joursAvant(1)
-        const ilYA48h = utils.joursAvant(2)
+        const maintenant = joursAvant(0)
+        const ilYA24h = joursAvant(1)
+        const ilYA48h = joursAvant(2)
         return (
             this.profil.suiviEntre(ilYA24h, maintenant).length >= 1 &&
             this.profil.suiviEntre(ilYA48h, ilYA24h).length >= 1
@@ -63,7 +60,3 @@ class AlgorithmeDeconfinement {
         )
     }
 }
-
-module.exports = {
-    AlgorithmeDeconfinement,
-}
diff --git a/src/scripts/algorithme/orientation.js b/src/scripts/algorithme/orientation.js
@@ -1,6 +1,6 @@
-const incidence = require('../data/incidence.js').incidence
+import incidence from '../data/incidence.js'
 
-class AlgorithmeOrientation {
+export default class AlgorithmeOrientation {
     constructor(profil) {
         this.profil = profil
     }
@@ -298,7 +298,3 @@ class AlgorithmeOrientation {
         return blockNames
     }
 }
-
-module.exports = {
-    AlgorithmeOrientation,
-}
diff --git a/src/scripts/algorithme/suivi.js b/src/scripts/algorithme/suivi.js
@@ -1,4 +1,4 @@
-class AlgorithmeSuivi {
+export default class AlgorithmeSuivi {
     constructor(profil) {
         this.profil = profil
         this.dernierEtat = profil.dernierEtat()
@@ -87,7 +87,3 @@ class AlgorithmeSuivi {
         return evolutions
     }
 }
-
-module.exports = {
-    AlgorithmeSuivi,
-}
diff --git a/src/scripts/app.js b/src/scripts/app.js
@@ -1,17 +1,17 @@
-import Profil from './profil'
-import { StockageLocal } from './stockage.js'
+import Profil from './profil.js'
+import StockageLocal from './stockage.js'
 import { joursAvant } from './utils.js'
 
-var Router = require('./router.js')
-var Updater = require('./updater.js').Updater
+import { initRouter } from './router.js'
+import Updater from './updater.js'
 
-class App {
+export default class App {
     constructor() {
         this.profil = new Profil()
         this.stockage = new StockageLocal()
     }
     init() {
-        this.router = Router.initRouter(this)
+        this.router = initRouter(this)
         this.updater = new Updater(this.router)
         return this.chargerProfilActuel()
     }
@@ -79,7 +79,3 @@ class App {
         this.enregistrerProfilActuel()
     }
 }
-
-module.exports = {
-    App,
-}
diff --git a/src/scripts/data/departements.js b/src/scripts/data/departements.js
@@ -1,4 +1,4 @@
-const departements = {
+export default {
     '01': 'Ain',
     '02': 'Aisne',
     '03': 'Allier',
@@ -104,5 +104,3 @@ const departements = {
     '977': 'Saint-Barthélemy',
     '978': 'Saint-Martin',
 }
-
-module.exports = { departements }