diff --git a/.codexdocsrc.sample b/.codexdocsrc.sample index 3fcd2b4..7b2e6f8 100644 --- a/.codexdocsrc.sample +++ b/.codexdocsrc.sample @@ -1,5 +1,6 @@ { "title": "CodeX Docs", + "description": "A block-styled editor with clean JSON output", "menu": [ "Guides", "API", @@ -13,4 +14,5 @@ "title": "What do you think?", "reactions": ["๐Ÿ‘", "๐Ÿ‘Œ", "๐Ÿ‘Ž"] } + "yandexMetrikaId": "" } diff --git a/package.json b/package.json index 3d3bc59..81312e6 100644 --- a/package.json +++ b/package.json @@ -44,13 +44,13 @@ "@babel/preset-env": "^7.1.0", "@codexteam/misprints": "^1.0.0", "@codexteam/reactions": "^1.0.2", - "@editorjs/code": "^2.4.0", + "@editorjs/code": "^2.4.1", "@editorjs/delimiter": "^1.1.0", - "@editorjs/editorjs": "^2.12.0", - "@editorjs/header": "^2.2.2", - "@editorjs/image": "^2.1.2", + "@editorjs/editorjs": "^2.12.4", + "@editorjs/header": "^2.2.3", + "@editorjs/image": "^2.2.0", "@editorjs/inline-code": "^1.3.0", - "@editorjs/list": "^1.3.2", + "@editorjs/list": "^1.3.3", "@editorjs/marker": "^1.2.0", "@editorjs/table": "^1.2.0", "@editorjs/warning": "^1.1.0", diff --git a/public/dist/code-styling.bundle.js b/public/dist/code-styling.bundle.js index 64429a1..c45832f 100644 --- a/public/dist/code-styling.bundle.js +++ b/public/dist/code-styling.bundle.js @@ -1 +1 @@ -(window.webpackJsonp=window.webpackJsonp||[]).push([[0],Array(61).concat([function(e,n,t){var r=t(62),a=t(17);e.exports=function(e){return r(a(e))}},function(e,n,t){var r=t(11);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(e){return"String"==r(e)?e.split(""):Object(e)}},function(e,n,t){var r=t(33)("keys"),a=t(20);e.exports=function(e){return r[e]||(r[e]=a(e))}},function(e,n,t){var r=t(17);e.exports=function(e){return Object(r(e))}},function(e,n,t){var r=t(67),a=t(66);e.exports=Object.keys||function(e){return r(e,a)}},function(e,n){e.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(e,n,t){var r=t(18),a=t(61),i=t(68)(!1),s=t(63)("IE_PROTO");e.exports=function(e,n){var t,o=a(e),c=0,l=[];for(t in o)t!=s&&r(o,t)&&l.push(t);for(;n.length>c;)r(o,t=n[c++])&&(~i(l,t)||l.push(t));return l}},function(e,n,t){var r=t(61),a=t(16),i=t(69);e.exports=function(e){return function(n,t,s){var o,c=r(n),l=a(c.length),u=i(s,l);if(e&&t!=t){for(;l>u;)if((o=c[u++])!=o)return!0}else for(;l>u;u++)if((e||u in c)&&c[u]===t)return e||u||0;return!e&&-1}}},function(e,n,t){var r=t(21),a=Math.max,i=Math.min;e.exports=function(e,n){return(e=r(e))<0?a(e+n,0):i(e,n)}},function(e,n,t){"use strict";var r=t(23),a=t(9),i=t(14),s=t(10),o=t(19),c=t(86),l=t(34),u=t(89),g=t(1)("iterator"),f=!([].keys&&"next"in[].keys()),d=function(){return this};e.exports=function(e,n,t,p,E,v,b){c(t,n,p);var m,h,_,y=function(e){if(!f&&e in R)return R[e];switch(e){case"keys":case"values":return function(){return new t(this,e)}}return function(){return new t(this,e)}},N=n+" Iterator",O="values"==E,M=!1,R=e.prototype,S=R[g]||R["@@iterator"]||E&&R[E],w=S||y(E),x=E?O?y("entries"):w:void 0,A="Array"==n&&R.entries||S;if(A&&(_=u(A.call(new e)))!==Object.prototype&&_.next&&(l(_,N,!0),r||"function"==typeof _[g]||s(_,g,d)),O&&S&&"values"!==S.name&&(M=!0,w=function(){return S.call(this)}),r&&!b||!f&&!M&&R[g]||s(R,g,w),o[n]=w,o[N]=d,E)if(m={values:O?w:y("values"),keys:v?w:y("keys"),entries:x},b)for(h in m)h in R||i(R,h,m[h]);else a(a.P+a.F*(f||M),n,m);return m}},,,,,,,,,,,,,,,function(e,n,t){"use strict";var r=t(40)(!0);t(70)(String,"String",function(e){this._t=String(e),this._i=0},function(){var e,n=this._t,t=this._i;return t>=n.length?{value:void 0,done:!0}:(e=r(n,t),this._i+=e.length,{value:e,done:!1})})},function(e,n,t){"use strict";var r=t(87),a=t(32),i=t(34),s={};t(10)(s,t(1)("iterator"),function(){return this}),e.exports=function(e,n,t){e.prototype=r(s,{next:a(1,t)}),i(e,n+" Iterator")}},function(e,n,t){var r=t(2),a=t(88),i=t(66),s=t(63)("IE_PROTO"),o=function(){},c=function(){var e,n=t(22)("iframe"),r=i.length;for(n.style.display="none",t(38).appendChild(n),n.src="javascript:",(e=n.contentWindow.document).open(),e.write(" + {% if config.yandexMetrikaId is not empty %} + + + {% endif %} diff --git a/src/views/pages/blocks/warning.twig b/src/views/pages/blocks/warning.twig index 9dbbf82..d94bfce 100644 --- a/src/views/pages/blocks/warning.twig +++ b/src/views/pages/blocks/warning.twig @@ -2,9 +2,11 @@
โ˜๏ธ
-
- {{ title }} -
+ {% if title is not empty %} +
+ {{ title }} +
+ {% endif %}
{{ message }}
diff --git a/src/views/pages/form.twig b/src/views/pages/form.twig index f1fdf26..573461e 100644 --- a/src/views/pages/form.twig +++ b/src/views/pages/form.twig @@ -9,7 +9,7 @@
diff --git a/src/views/pages/index.twig b/src/views/pages/index.twig index b88ffd7..5ce66e7 100644 --- a/src/views/pages/index.twig +++ b/src/views/pages/index.twig @@ -4,7 +4,11 @@ {{ config.title }} + + + + {% include "components/header.twig" %} @@ -12,6 +16,21 @@ {{ svg('loader') }} + + {% if config.yandexMetrikaId is not empty %} + + + {% endif %} diff --git a/yarn.lock b/yarn.lock index 2b6435d..bb8348a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -546,40 +546,40 @@ version "1.4.0" resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" -"@editorjs/code@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@editorjs/code/-/code-2.4.0.tgz#91919f30d50fcde221b6f5192590fade938e2df1" - integrity sha512-S9MKHpQrDhXOK2CsU3dmbqfDHS7KlSLb5+gI2u9jYrDf5IcfMxSTsuV+ZM1tWaU9Jbd/Z/OOpt7iyNDZdOcNwA== +"@editorjs/code@^2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@editorjs/code/-/code-2.4.1.tgz#a1851c781c9ead9a84bd921f04df172a2383f550" + integrity sha512-R4UUApkm6FLuxrQoqISg6GL73t0WWOdoPdAmAa36xarmtmBRkxu4AfxIwzW2CtUD1CqG1T7Be6jnv4ZeUoMNYQ== "@editorjs/delimiter@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@editorjs/delimiter/-/delimiter-1.1.0.tgz#f61808ea92e4e289607d54441964f1cb8605410a" integrity sha512-0G36vEvvb94g6nu/qs2rVjC/qjxLnY20OfOgxROKSOOXzS7xnkTij5raeIxRiYueeLL5fMrzrvtFH7wclfxF+g== -"@editorjs/editorjs@^2.12.0": - version "2.12.0" - resolved "https://registry.yarnpkg.com/@editorjs/editorjs/-/editorjs-2.12.0.tgz#e16faf0c1277c5adbca15a7cf661e2783cccada0" - integrity sha512-2FFlf8igXojdWz5SfHIH9fvPZZDr46QXXQZY09gprRN25aqZ43w6eygZlSIntknEmrsqtJXVmvrUrMQYjuo/eA== +"@editorjs/editorjs@^2.12.4": + version "2.12.4" + resolved "https://registry.yarnpkg.com/@editorjs/editorjs/-/editorjs-2.12.4.tgz#3a98c907c0c0ff96bd667e5dd45e109ceb4d6a1a" + integrity sha512-5xevUVL+OvrhnVjaQARW7FlTtJhYPaUbs3Bft6+2PQ7Fvx5SquyrPPJomCdQA7+5uPAWQ8MtjxTVvSDPhujkYw== -"@editorjs/header@^2.2.2": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@editorjs/header/-/header-2.2.2.tgz#47ce654032f7a094c0b40daa4545c61893033002" - integrity sha512-r9lmDVdVSNjnSoYmEMOSLp7BARWEU2O79UJjWPkLWAwV7RIOYO+s9fF3IbTEaPaltANAZvIzOYNmryGOhL8biA== +"@editorjs/header@^2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@editorjs/header/-/header-2.2.3.tgz#801908f2aadda708aa09da544a5683448ca01be1" + integrity sha512-eFPgsT/OJA7HxCl4idrH1ccZEkmVZWfEmwo7DysOAb2DI+5/IcBIVZbPv6EapjL6MOEHKzON8lCI4jQOaBJlLw== -"@editorjs/image@^2.1.2": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@editorjs/image/-/image-2.1.2.tgz#65d1967f3508a46dd1a5b942cac0752fe7d7e044" - integrity sha512-Q+IN04pyJQBFqUtejEUvbJQW26pkIEq6j6ApRqgNbWUjzVLHoBkuiL0eSvEAs+6uW//qt8AhNnnTokomDT7tBA== +"@editorjs/image@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@editorjs/image/-/image-2.2.0.tgz#ede7bb52544cb6fd06a3dae5ed975173bf4f2f25" + integrity sha512-dPtHGOo/0KXwT5PtCLweg1xF719weYorK1sIwmM9y5TYRyHbMBb1mOuh9knkzwc2SEjtRMAgVkzPI6hmRd7JEw== "@editorjs/inline-code@^1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@editorjs/inline-code/-/inline-code-1.3.0.tgz#66b915d2c128ba520ba4b245067d40851d78355a" integrity sha512-pKvBYvPyaNZKiRd+jK8X2HDgAq8kDaOPXxUTB33He2L53OqbAJ8Cmt+8F4EQ3i0EyQYOrtT2uXnDQkjvVg41tg== -"@editorjs/list@^1.3.2": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@editorjs/list/-/list-1.3.2.tgz#2c1939715e91a74fdb8561ba9d7d9ad933497ec2" - integrity sha512-Bv59LHkDG+q9yUtvJKxUTmnlNS+bH6p2KLPxH2W2DD52XIIMdudezmXrUO4Rv8HwLW5GA5hZrEXZyKJ4McG5og== +"@editorjs/list@^1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@editorjs/list/-/list-1.3.3.tgz#26aab3a23d1a022375b16a1ef2130b3615aa5850" + integrity sha512-2kZm0a3bFKbIUDPn8qcS02sIhVx+ipEEGd7g1PaOlSa8Z4XyzBhcDn48NipWx1WSix/0GS4Eu05rl3K/0/3rvg== "@editorjs/marker@^1.2.0": version "1.2.0"