From 1d06a75b1e30a3829b8a4ffc93f57a7113fdc1bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 31 Mar 2022 11:53:23 +0200 Subject: [PATCH 1/2] Add project peacock color --- .vscode/settings.json | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..90ddb20 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,22 @@ +{ + "workbench.colorCustomizations": { + "activityBar.activeBackground": "#826d05", + "activityBar.activeBorder": "#07b89a", + "activityBar.background": "#826d05", + "activityBar.foreground": "#e7e7e7", + "activityBar.inactiveForeground": "#e7e7e799", + "activityBarBadge.background": "#07b89a", + "activityBarBadge.foreground": "#e7e7e7", + "sash.hoverBorder": "#826d05", + "statusBar.background": "#514403", + "statusBar.foreground": "#e7e7e7", + "statusBarItem.hoverBackground": "#826d05", + "statusBarItem.remoteBackground": "#514403", + "statusBarItem.remoteForeground": "#e7e7e7", + "titleBar.activeBackground": "#514403", + "titleBar.activeForeground": "#e7e7e7", + "titleBar.inactiveBackground": "#51440399", + "titleBar.inactiveForeground": "#e7e7e799" + }, + "peacock.remoteColor": "#514403" +} From 26d540a28c7135d2c1ed8c23d74023fea112fecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 31 Mar 2022 12:30:59 +0200 Subject: [PATCH 2/2] Ticket 762 : Session Alert and redirect on ajax + add afterClose to FancyMessage --- resources/js/app.js | 78 ++++++++++++------- .../media-manager/ActionsComponent.vue | 8 ++ .../media-manager/BasketComponent.vue | 24 ++++++ .../media-manager/DisplayComponent.vue | 10 ++- .../media-manager/FolderComponent.vue | 12 +++ .../media-manager/SideHeaderComponent.vue | 4 + .../media-editor/EditComponents.vue | 8 ++ .../media-editor/tabs/EditComponent.vue | 16 ++++ .../media-editor/tabs/HistoryComponent.vue | 4 + .../media-editor/tabs/LinksComponent.vue | 4 + 10 files changed, 136 insertions(+), 32 deletions(-) diff --git a/resources/js/app.js b/resources/js/app.js index 827b648..8a8e67d 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -299,37 +299,57 @@ $.fancyConfirm = function( opts ) { // Message $.fancyMessage = function( opts ) { opts = $.extend( true, { - title : 'Are you sure?', - message : '', - type : '', - }, opts || {} ); + title: 'Are you sure?', + message: '', + type: '', + }, opts || {}) - $.fancybox.open({ - type : 'html', - src : - '
' + - '

' + opts.title + '


' + - '

' + - opts.message + '

' + - '

' + - 'Ok' + - '

' + - '
', - opts : { - animationDuration : 350, - animationEffect : 'material', - modal : false, - baseTpl : - '' - } + return $.fancybox.open({ + type: 'html', + src: + '
' + + '

' + opts.title + '


' + + '

' + + opts.message + '

' + + '

' + + 'Ok' + + '

' + + '
', + opts: { + afterClose: opts.afterClose, + animationDuration: 350, + animationEffect: 'material', + modal: false, + baseTpl: + '' + } }); - } +} + +if (!window.__DAM) { + window.__DAM = {} +} + +if (!window.__DAM.methods) { + window.__DAM.methods = {} +} +// Session TimedOut +window.__DAM.methods.sessionTimedOut = () => { + $.fancyMessage({ + title: 'Session expirée', + message: 'Vous allez devoir vous reconnecter pour continuer à utiliser le DAM', + type: 'error', + afterClose: () => { + location.reload() + } + }); +} // ---- Header : Menu utilisateur $(".userbar").on('click',function(event) { diff --git a/resources/js/components/media-manager/ActionsComponent.vue b/resources/js/components/media-manager/ActionsComponent.vue index f11784c..1381c7f 100644 --- a/resources/js/components/media-manager/ActionsComponent.vue +++ b/resources/js/components/media-manager/ActionsComponent.vue @@ -149,6 +149,10 @@ $.fancyMessage({title: "Dupliquer un média", message: response.data.error, type: "error"}); } }).catch(error => { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } this.$loading.hide(); $.fancyMessage({title: "Dupliquer un média", message: error, type: "error"}); console.log(error); @@ -188,6 +192,10 @@ $.fancybox.close(); }).catch(error => { $.fancybox.close(); + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } $.fancyMessage({ title: "Attention", message: "Erreur lors du changement d'étiquette, merci d'actualiser la page.", diff --git a/resources/js/components/media-manager/BasketComponent.vue b/resources/js/components/media-manager/BasketComponent.vue index 101b8bf..8c60a1f 100644 --- a/resources/js/components/media-manager/BasketComponent.vue +++ b/resources/js/components/media-manager/BasketComponent.vue @@ -103,6 +103,10 @@ } } }).catch(error => { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } console.log(error); }) }, @@ -151,6 +155,10 @@ type: "info" }); }).catch(error => { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } _this2.$loading.hide(); $.fancybox.close(); $.fancyMessage({ @@ -191,6 +199,10 @@ type: "info" }); }).catch(error => { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } _this2.$loading.hide(); $.fancybox.close(); $.fancyMessage({ @@ -224,6 +236,10 @@ type: "info" }); }).catch(error => { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } _this2.$loading.hide(); $.fancybox.close(); $.fancyMessage({ @@ -260,6 +276,10 @@ $.fancyMessage({title : "Attention", message : "Erreur lors de la suppression du média, merci d'actualiser la page.", type : "error"}); } }).catch(error => { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } _this2.$loading.hide(); $.fancybox.close(); $.fancyMessage({title : "Attention", message : "Erreur lors de la suppression du média, merci d'actualiser la page.", type : "error"}); @@ -287,6 +307,10 @@ }); _this2.$loading.hide(); }).catch(error => { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } _this2.$loading.hide(); console.log(error); $.fancybox.close(); diff --git a/resources/js/components/media-manager/DisplayComponent.vue b/resources/js/components/media-manager/DisplayComponent.vue index d2c1a5a..23f3352 100644 --- a/resources/js/components/media-manager/DisplayComponent.vue +++ b/resources/js/components/media-manager/DisplayComponent.vue @@ -188,9 +188,13 @@ this.offset = this.offset + this.limit; }) - .catch(function (error) { - console.log(error); - }); + .catch(function (error) { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } + console.log(error); + }); }, infiniteScroll($state) { this.loadMedias($state); diff --git a/resources/js/components/media-manager/FolderComponent.vue b/resources/js/components/media-manager/FolderComponent.vue index 9f78e65..02b028e 100644 --- a/resources/js/components/media-manager/FolderComponent.vue +++ b/resources/js/components/media-manager/FolderComponent.vue @@ -113,6 +113,10 @@ this.$store.state.folder = -1 } }).catch(function (error) { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } console.log(error); }); }, @@ -165,6 +169,10 @@ }).then(response => { _this2.initFolders(); }).catch(error => { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } $.fancyMessage({ title: "Dossiers", message: "Une erreur est survenue, veuillez recharger la page (Ctrl + F5).", @@ -196,6 +204,10 @@ _this2.$loading.hide(); }, 1000); }).catch(error => { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } _this2.$loading.hide(); console.log(error); $.fancybox.close(); diff --git a/resources/js/components/media-manager/SideHeaderComponent.vue b/resources/js/components/media-manager/SideHeaderComponent.vue index eb81739..f528ca2 100644 --- a/resources/js/components/media-manager/SideHeaderComponent.vue +++ b/resources/js/components/media-manager/SideHeaderComponent.vue @@ -49,6 +49,10 @@ formats: response.data.formats }); }).catch(function (error) { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } console.log(error); }); } diff --git a/resources/js/components/media-manager/media-editor/EditComponents.vue b/resources/js/components/media-manager/media-editor/EditComponents.vue index 0eb7df5..c8b8b6c 100644 --- a/resources/js/components/media-manager/media-editor/EditComponents.vue +++ b/resources/js/components/media-manager/media-editor/EditComponents.vue @@ -197,6 +197,10 @@ } } }).catch(function (error) { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } console.log(error); $.fancybox.close(); $.fancyMessage({ @@ -227,6 +231,10 @@ $.fancyMessage({title: "Sauvegarde d'un média", message: response.data.error, type: "error"}); } }).catch(function (error) { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } this.$loading.hide(); $.fancybox.close(); $.fancyMessage({ diff --git a/resources/js/components/media-manager/media-editor/tabs/EditComponent.vue b/resources/js/components/media-manager/media-editor/tabs/EditComponent.vue index 545a639..c03508b 100644 --- a/resources/js/components/media-manager/media-editor/tabs/EditComponent.vue +++ b/resources/js/components/media-manager/media-editor/tabs/EditComponent.vue @@ -314,6 +314,10 @@ } } }).catch(function (error) { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } console.log(error); $.fancybox.close(); $.fancyMessage({ @@ -345,6 +349,10 @@ } }).catch(function (error) { $.fancybox.close(); + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } $.fancyMessage({ title: "Lier un média à Arcadia", message: "Erreur lors de l'opération, merci d'actualiser la page.", @@ -393,6 +401,10 @@ $.fancyMessage({title: "Sauvegarde d'un média", message: response.data.error, type: "error"}); } }).catch(function (error) { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } this.$loading.hide(); $.fancybox.close(); $.fancyMessage({ @@ -449,6 +461,10 @@ } } }).catch(function (error) { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } $.fancyMessage({ title: "Attention", message: "Erreur lors de l'opération, merci d'actualiser la page.", diff --git a/resources/js/components/media-manager/media-editor/tabs/HistoryComponent.vue b/resources/js/components/media-manager/media-editor/tabs/HistoryComponent.vue index 3cea189..817f4bf 100644 --- a/resources/js/components/media-manager/media-editor/tabs/HistoryComponent.vue +++ b/resources/js/components/media-manager/media-editor/tabs/HistoryComponent.vue @@ -56,6 +56,10 @@ }).then(response => { _this2.history = response.data.history; }).catch(error => { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } console.log(error); }); } diff --git a/resources/js/components/media-manager/media-editor/tabs/LinksComponent.vue b/resources/js/components/media-manager/media-editor/tabs/LinksComponent.vue index 574b478..43c1dba 100644 --- a/resources/js/components/media-manager/media-editor/tabs/LinksComponent.vue +++ b/resources/js/components/media-manager/media-editor/tabs/LinksComponent.vue @@ -63,6 +63,10 @@ }).then(response => { _this2.links = response.data.vignettes; }).catch(error => { + if(error.response.status === 419) { + __DAM.methods.sessionTimedOut() + return; + } console.log(error); }); }else{