Loading js/Client/flashMessenger.js +60 −43 Changes for js/Client/flashMessenger.js: 60 added lines, 43 removed lines. Original line number Diff line number Diff line function alerts(messages) function toasts(messages) { for (let s in messages) { for (let m in messages[s]) { alert(messages[s][m], s); toast(messages[s][m], s); } } } function alert(message, severity) function toast(message, severity) { const alertClasses = { info: 'info', success: 'success', warning: 'warning', error: 'danger' const bgClasses = { info: 'bg-info', success: 'bg-success', warning: 'bg-warning', error: 'bg-danger' }; const iconClasses = { info: 'info-circle', Loading @@ -22,50 +24,65 @@ function alert(message, severity) warning: 'exclamation-circle', error: 'exclamation-triangle' }; const alertClass = 'alert-' + alertClasses[severity]; const divId = "alert-div-" + Math.floor((Math.random() * 100000) + 1); const alertDiv = document.createElement('div'); alertDiv.setAttribute('id', divId); alertDiv.classList.add('alert', 'navbar-fixed-bottom', alertClass); alertDiv.setAttribute('role', 'alert'); alertDiv.style.display = 'none'; const button = document.createElement('button'); button.setAttribute('type', 'button'); button.classList.add('btn-close', 'float-md-end'); button.setAttribute('data-bs-dismiss', 'alert'); button.setAttribute('aria-label', 'Close'); alertDiv.appendChild(button); const container = document.createElement('div'); container.classList.add('container'); alertDiv.appendChild(container); const p = document.createElement('p'); p.classList.add('text-center'); container.appendChild(p); let toastContainer = document.getElementById('unicaen-vue-toast-container'); if (!toastContainer) { toastContainer = document.createElement('div'); toastContainer.id = 'unicaen-vue-toast-container'; toastContainer.classList.add('toast-container', 'position-fixed', 'top-0', 'end-0', 'p-3'); document.body.appendChild(toastContainer); } // Création de l'élément HTML pour le toast const toast = document.createElement('div'); toast.classList.add('toast', 'show', 'text-white', bgClasses[severity] ? bgClasses[severity] : 'bg-secondary'); toast.setAttribute('role', 'alert'); toast.setAttribute('aria-live', 'assertive'); toast.setAttribute('aria-atomic', 'true'); const toastFlex = document.createElement('div'); toastFlex.classList.add('d-flex'); // Création de l'élément HTML pour le bouton "close" const closeBtn = document.createElement('button'); closeBtn.type = 'button'; closeBtn.classList.add('btn-close', 'btn-close-white', 'me-2', 'm-auto'); closeBtn.setAttribute('data-bs-dismiss', 'toast'); closeBtn.setAttribute('aria-label', 'Close'); // Création d'une icône const icon = document.createElement('span'); icon.classList.add('icon', 'fas', 'fa-' + iconClasses[severity]); p.appendChild(icon); icon.style = "font-size: 25pt;margin-right:1rem;margin-bottom:.2rem"; // Création de l'élément HTML pour le corps du toast const toastBody = document.createElement('div'); toastBody.classList.add('toast-body'); toastBody.appendChild(icon); toastBody.innerHTML = toastBody.innerHTML + message; const messageSpan = document.createElement('span'); messageSpan.classList.add('message'); messageSpan.innerHTML = message; p.appendChild(messageSpan); // Ajout du bouton "close", du titre et du corps du toast à l'élément du toast toast.appendChild(toastFlex); toastFlex.appendChild(toastBody); toastFlex.appendChild(closeBtn); document.body.appendChild(alertDiv); // Ajout du toast à l'élément du conteneur de toasts toastContainer.appendChild(toast); alertDiv.style.display = 'block'; // Affichage du toast //const bsToast = new bootstrap.Toast(toast); //bsToast.show(); // Masquage du toast si ce n'est pas une erreur if (severity !== 'error') { setTimeout(() => { alertDiv.style.display = 'none'; alertDiv.classList.remove(alertClass); }, severity !== 'error' ? 3000 : 0); toast.classList.remove('show'); }, 3000); } } export default { alert, alerts toast, toasts } No newline at end of file js/Client/unicaenVue.js +3 −3 Changes for js/Client/unicaenVue.js: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ import flashMessenger from './flashMessenger'; const unicaenVue = { axios: axios, flashMessenger: flashMessenger, /** * Crée une URL à partie d'une route, de paramètres de route (params) et de paramètres GET (query) Loading Loading @@ -77,7 +78,7 @@ unicaenVue.axios.interceptors.response.use(response => { } } if (response.messages) { flashMessenger.alerts(response.messages); flashMessenger.toasts(response.messages); } return response; Loading @@ -86,13 +87,12 @@ unicaenVue.axios.interceptors.response.use(response => { text.find('i.fas').hide(); flashMessenger.alert(text.find('.alert').html(), 'error'); flashMessenger.toast(text.find('.alert').html(), 'error'); }); unicaenVue.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; console.log('test'); // workaround pour rendre unicaenVue disponible de partout window.unicaenVue = unicaenVue; Loading Loading
js/Client/flashMessenger.js +60 −43 Changes for js/Client/flashMessenger.js: 60 added lines, 43 removed lines. Original line number Diff line number Diff line function alerts(messages) function toasts(messages) { for (let s in messages) { for (let m in messages[s]) { alert(messages[s][m], s); toast(messages[s][m], s); } } } function alert(message, severity) function toast(message, severity) { const alertClasses = { info: 'info', success: 'success', warning: 'warning', error: 'danger' const bgClasses = { info: 'bg-info', success: 'bg-success', warning: 'bg-warning', error: 'bg-danger' }; const iconClasses = { info: 'info-circle', Loading @@ -22,50 +24,65 @@ function alert(message, severity) warning: 'exclamation-circle', error: 'exclamation-triangle' }; const alertClass = 'alert-' + alertClasses[severity]; const divId = "alert-div-" + Math.floor((Math.random() * 100000) + 1); const alertDiv = document.createElement('div'); alertDiv.setAttribute('id', divId); alertDiv.classList.add('alert', 'navbar-fixed-bottom', alertClass); alertDiv.setAttribute('role', 'alert'); alertDiv.style.display = 'none'; const button = document.createElement('button'); button.setAttribute('type', 'button'); button.classList.add('btn-close', 'float-md-end'); button.setAttribute('data-bs-dismiss', 'alert'); button.setAttribute('aria-label', 'Close'); alertDiv.appendChild(button); const container = document.createElement('div'); container.classList.add('container'); alertDiv.appendChild(container); const p = document.createElement('p'); p.classList.add('text-center'); container.appendChild(p); let toastContainer = document.getElementById('unicaen-vue-toast-container'); if (!toastContainer) { toastContainer = document.createElement('div'); toastContainer.id = 'unicaen-vue-toast-container'; toastContainer.classList.add('toast-container', 'position-fixed', 'top-0', 'end-0', 'p-3'); document.body.appendChild(toastContainer); } // Création de l'élément HTML pour le toast const toast = document.createElement('div'); toast.classList.add('toast', 'show', 'text-white', bgClasses[severity] ? bgClasses[severity] : 'bg-secondary'); toast.setAttribute('role', 'alert'); toast.setAttribute('aria-live', 'assertive'); toast.setAttribute('aria-atomic', 'true'); const toastFlex = document.createElement('div'); toastFlex.classList.add('d-flex'); // Création de l'élément HTML pour le bouton "close" const closeBtn = document.createElement('button'); closeBtn.type = 'button'; closeBtn.classList.add('btn-close', 'btn-close-white', 'me-2', 'm-auto'); closeBtn.setAttribute('data-bs-dismiss', 'toast'); closeBtn.setAttribute('aria-label', 'Close'); // Création d'une icône const icon = document.createElement('span'); icon.classList.add('icon', 'fas', 'fa-' + iconClasses[severity]); p.appendChild(icon); icon.style = "font-size: 25pt;margin-right:1rem;margin-bottom:.2rem"; // Création de l'élément HTML pour le corps du toast const toastBody = document.createElement('div'); toastBody.classList.add('toast-body'); toastBody.appendChild(icon); toastBody.innerHTML = toastBody.innerHTML + message; const messageSpan = document.createElement('span'); messageSpan.classList.add('message'); messageSpan.innerHTML = message; p.appendChild(messageSpan); // Ajout du bouton "close", du titre et du corps du toast à l'élément du toast toast.appendChild(toastFlex); toastFlex.appendChild(toastBody); toastFlex.appendChild(closeBtn); document.body.appendChild(alertDiv); // Ajout du toast à l'élément du conteneur de toasts toastContainer.appendChild(toast); alertDiv.style.display = 'block'; // Affichage du toast //const bsToast = new bootstrap.Toast(toast); //bsToast.show(); // Masquage du toast si ce n'est pas une erreur if (severity !== 'error') { setTimeout(() => { alertDiv.style.display = 'none'; alertDiv.classList.remove(alertClass); }, severity !== 'error' ? 3000 : 0); toast.classList.remove('show'); }, 3000); } } export default { alert, alerts toast, toasts } No newline at end of file
js/Client/unicaenVue.js +3 −3 Changes for js/Client/unicaenVue.js: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ import flashMessenger from './flashMessenger'; const unicaenVue = { axios: axios, flashMessenger: flashMessenger, /** * Crée une URL à partie d'une route, de paramètres de route (params) et de paramètres GET (query) Loading Loading @@ -77,7 +78,7 @@ unicaenVue.axios.interceptors.response.use(response => { } } if (response.messages) { flashMessenger.alerts(response.messages); flashMessenger.toasts(response.messages); } return response; Loading @@ -86,13 +87,12 @@ unicaenVue.axios.interceptors.response.use(response => { text.find('i.fas').hide(); flashMessenger.alert(text.find('.alert').html(), 'error'); flashMessenger.toast(text.find('.alert').html(), 'error'); }); unicaenVue.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; console.log('test'); // workaround pour rendre unicaenVue disponible de partout window.unicaenVue = unicaenVue; Loading