From aa4c96bdfe6f2d6c5a2f4533c2199e0fed70e6b8 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Mon, 4 May 2020 08:40:06 +0300 Subject: [PATCH 1/5] Removed unused config --- traefik.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 traefik.yml diff --git a/traefik.yml b/traefik.yml deleted file mode 100644 index 0253ec154..000000000 --- a/traefik.yml +++ /dev/null @@ -1,13 +0,0 @@ -tls: - certificates: - - certFile: /certs/default.crt - keyFile: /certs/default.key - - certFile: /storage/certificates/fullchain.pem - keyFile: /storage/certificates/privkey.pem - -# tls: -# certificates: -# - certFile: /path/to/domain.cert -# keyFile: /path/to/domain.key -# - certFile: /path/to/other-domain.cert -# keyFile: /path/to/other-domain.key \ No newline at end of file From ca43d162015396e1769828b06d75d2a29f305a03 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Mon, 4 May 2020 08:40:48 +0300 Subject: [PATCH 2/5] Removed unused template --- app/views/layouts/strip.phtml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 app/views/layouts/strip.phtml diff --git a/app/views/layouts/strip.phtml b/app/views/layouts/strip.phtml deleted file mode 100644 index 3d8417d1f..000000000 --- a/app/views/layouts/strip.phtml +++ /dev/null @@ -1 +0,0 @@ -exec($this->getParam('body', [])); ?> \ No newline at end of file From 72a50cc693101e03af504f192c6659d7f0cd6203 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Mon, 4 May 2020 11:29:25 +0300 Subject: [PATCH 3/5] Document preview fix --- app/views/console/database/rules/documentId.phtml | 2 +- gulpfile.js | 1 + public/dist/scripts/app-all.js | 2 +- public/dist/scripts/app.js | 2 +- public/scripts/views/forms/document-preview.js | 14 ++++++++++++++ 5 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 public/scripts/views/forms/document-preview.js diff --git a/app/views/console/database/rules/documentId.phtml b/app/views/console/database/rules/documentId.phtml index 91648c33f..4c65f5ebd 100644 --- a/app/views/console/database/rules/documentId.phtml +++ b/app/views/console/database/rules/documentId.phtml @@ -46,7 +46,7 @@ $list = (is_array($list)) ? $list : []; required> diff --git a/gulpfile.js b/gulpfile.js index ef19a7c14..a0be3a405 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -42,6 +42,7 @@ const configApp = { 'public/scripts/views/forms/color.js', 'public/scripts/views/forms/copy.js', 'public/scripts/views/forms/document.js', + 'public/scripts/views/forms/document-preview.js', 'public/scripts/views/forms/filter.js', 'public/scripts/views/forms/move-down.js', 'public/scripts/views/forms/move-up.js', diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js index 31b504d19..94f262d98 100644 --- a/public/dist/scripts/app-all.js +++ b/public/dist/scripts/app-all.js @@ -2629,7 +2629,7 @@ code.innerHTML=value;Prism.highlightElement(code);div.scrollTop=0;};element.addE function syncA(){element.value=picker.value;update();} function syncB(){picker.value=element.value;} element.parentNode.insertBefore(preview,element);update();syncB();}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-copy",controller:function(element,alerts,document,window){var button=window.document.createElement("i");button.type="button";button.className="icon-docs note copy";button.style.cursor="pointer";element.parentNode.insertBefore(button,element.nextSibling);var copy=function(event){let disabled=element.disabled;element.disabled=false;element.focus();element.select();document.execCommand("Copy");if(document.selection){document.selection.empty();}else if(window.getSelection){window.getSelection().removeAllRanges();} -element.disabled=disabled;element.blur();alerts.add({text:"Copied to clipboard",class:""},3000);};button.addEventListener("click",copy);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document",controller:function(element,container,search){var formsDocument=(element.dataset["formsDocument"]||'');var searchButton=(element.dataset["search"]||0);let path=container.scope(searchButton);element.addEventListener('click',function(){search.selected=element.value;search.path=path;document.dispatchEvent(new CustomEvent(formsDocument,{bubbles:false,cancelable:true}));});}});})(window);(function(window){window.ls.container.get("view").add({selector:"data-forms-filter",controller:function(document,container,expression,element,form,di){let name=element.dataset["formsFilter"]||"";let events=element.dataset["event"]||"";let serialize=function(obj,prefix){let str=[],p;for(p in obj){if(obj.hasOwnProperty(p)){let k=prefix?prefix+"["+p+"]":p,v=obj[p];if(v===""){continue;} +element.disabled=disabled;element.blur();alerts.add({text:"Copied to clipboard",class:""},3000);};button.addEventListener("click",copy);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document",controller:function(element,container,search){var formsDocument=(element.dataset["formsDocument"]||'');var searchButton=(element.dataset["search"]||0);let path=container.scope(searchButton);element.addEventListener('click',function(){search.selected=element.value;search.path=path;document.dispatchEvent(new CustomEvent(formsDocument,{bubbles:false,cancelable:true}));});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document-preview",controller:function(element,container,search){element.addEventListener('change',function(){console.log(element.value);});}});})(window);(function(window){window.ls.container.get("view").add({selector:"data-forms-filter",controller:function(document,container,expression,element,form,di){let name=element.dataset["formsFilter"]||"";let events=element.dataset["event"]||"";let serialize=function(obj,prefix){let str=[],p;for(p in obj){if(obj.hasOwnProperty(p)){let k=prefix?prefix+"["+p+"]":p,v=obj[p];if(v===""){continue;} str.push(v!==null&&typeof v==="object"?serialize(v,k):encodeURIComponent(k)+"="+encodeURIComponent(v));}} return str.join("&");};let parse=function(filter){if(filter===""){return null;} let operatorsMap=["!=",">=","<=","=",">","<"];let operator=null;for(let key=0;key-1){operator=operatorsMap[key];}} diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js index ff88df9ed..f09e4816b 100644 --- a/public/dist/scripts/app.js +++ b/public/dist/scripts/app.js @@ -345,7 +345,7 @@ code.innerHTML=value;Prism.highlightElement(code);div.scrollTop=0;};element.addE function syncA(){element.value=picker.value;update();} function syncB(){picker.value=element.value;} element.parentNode.insertBefore(preview,element);update();syncB();}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-copy",controller:function(element,alerts,document,window){var button=window.document.createElement("i");button.type="button";button.className="icon-docs note copy";button.style.cursor="pointer";element.parentNode.insertBefore(button,element.nextSibling);var copy=function(event){let disabled=element.disabled;element.disabled=false;element.focus();element.select();document.execCommand("Copy");if(document.selection){document.selection.empty();}else if(window.getSelection){window.getSelection().removeAllRanges();} -element.disabled=disabled;element.blur();alerts.add({text:"Copied to clipboard",class:""},3000);};button.addEventListener("click",copy);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document",controller:function(element,container,search){var formsDocument=(element.dataset["formsDocument"]||'');var searchButton=(element.dataset["search"]||0);let path=container.scope(searchButton);element.addEventListener('click',function(){search.selected=element.value;search.path=path;document.dispatchEvent(new CustomEvent(formsDocument,{bubbles:false,cancelable:true}));});}});})(window);(function(window){window.ls.container.get("view").add({selector:"data-forms-filter",controller:function(document,container,expression,element,form,di){let name=element.dataset["formsFilter"]||"";let events=element.dataset["event"]||"";let serialize=function(obj,prefix){let str=[],p;for(p in obj){if(obj.hasOwnProperty(p)){let k=prefix?prefix+"["+p+"]":p,v=obj[p];if(v===""){continue;} +element.disabled=disabled;element.blur();alerts.add({text:"Copied to clipboard",class:""},3000);};button.addEventListener("click",copy);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document",controller:function(element,container,search){var formsDocument=(element.dataset["formsDocument"]||'');var searchButton=(element.dataset["search"]||0);let path=container.scope(searchButton);element.addEventListener('click',function(){search.selected=element.value;search.path=path;document.dispatchEvent(new CustomEvent(formsDocument,{bubbles:false,cancelable:true}));});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document-preview",controller:function(element,container,search){element.addEventListener('change',function(){console.log(element.value);});}});})(window);(function(window){window.ls.container.get("view").add({selector:"data-forms-filter",controller:function(document,container,expression,element,form,di){let name=element.dataset["formsFilter"]||"";let events=element.dataset["event"]||"";let serialize=function(obj,prefix){let str=[],p;for(p in obj){if(obj.hasOwnProperty(p)){let k=prefix?prefix+"["+p+"]":p,v=obj[p];if(v===""){continue;} str.push(v!==null&&typeof v==="object"?serialize(v,k):encodeURIComponent(k)+"="+encodeURIComponent(v));}} return str.join("&");};let parse=function(filter){if(filter===""){return null;} let operatorsMap=["!=",">=","<=","=",">","<"];let operator=null;for(let key=0;key-1){operator=operatorsMap[key];}} diff --git a/public/scripts/views/forms/document-preview.js b/public/scripts/views/forms/document-preview.js new file mode 100644 index 000000000..45ab07500 --- /dev/null +++ b/public/scripts/views/forms/document-preview.js @@ -0,0 +1,14 @@ +(function(window) { + "use strict"; + + window.ls.container.get("view").add({ + selector: "data-forms-document-preview", + controller: function(element, container, search) { + + element.addEventListener('change', function() { + console.log(element.value); + }); + + } + }); +})(window); From 5aa3e768df90bc7842c0f674c0ba19cb9bab161e Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Wed, 6 May 2020 09:33:10 +0300 Subject: [PATCH 4/5] Fixed document selection issue --- app/views/console/database/search/documents.phtml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/console/database/search/documents.phtml b/app/views/console/database/search/documents.phtml index ca525b38b..3a78286f2 100644 --- a/app/views/console/database/search/documents.phtml +++ b/app/views/console/database/search/documents.phtml @@ -43,7 +43,7 @@ $rules = $collection->getAttribute('rules', []);
-
+
@@ -58,7 +58,8 @@ $rules = $collection->getAttribute('rules', []); getAttribute('rules', []);
- + +
-
+
From 6c9bbe27638a18a2fa03c9f0a8deea2fdf2973a8 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Wed, 6 May 2020 09:45:29 +0300 Subject: [PATCH 5/5] Update projects list --- app/views/console/index.phtml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/console/index.phtml b/app/views/console/index.phtml index 4218447be..b8d03bb04 100644 --- a/app/views/console/index.phtml +++ b/app/views/console/index.phtml @@ -34,9 +34,11 @@ $home = $this->getParam('home', '');