From 2e5897c2799882c34941da1f3ee9e6455ee12b1b Mon Sep 17 00:00:00 2001 From: Imran Date: Sun, 11 Oct 2020 11:31:02 +0530 Subject: [PATCH] Run precommit --- assets/.stylelintrc.json | 5 +- assets/build/assets.php | 2 +- assets/build/js/blocks.js | 2 +- assets/src/js/clock/index.js | 47 ++++++++++++----- .../js/gutenberg/blocks/dos-and-donts/edit.js | 8 ++- .../gutenberg/blocks/dos-and-donts/index.js | 11 ++-- .../blocks/dos-and-donts/templates.js | 20 ++++---- .../blocks/heading-with-icon/edit.js | 50 +++++++++---------- .../blocks/heading-with-icon/icons-map.js | 13 ++++- .../blocks/heading-with-icon/index.js | 30 +++++++---- assets/src/js/icons/Check.js | 9 +++- assets/src/js/icons/Cross.js | 14 +++++- assets/src/sass/1-tools/_mixins.scss | 8 ++- assets/src/sass/2-generic/_elements.scss | 6 +-- assets/src/sass/2-generic/_gutenberg.scss | 6 +-- assets/src/sass/3-utilities/_animations.scss | 3 ++ assets/src/sass/7-blocks/_dos-and-donts.scss | 2 + .../src/sass/7-blocks/_heading-with-icon.scss | 2 + 18 files changed, 152 insertions(+), 86 deletions(-) diff --git a/assets/.stylelintrc.json b/assets/.stylelintrc.json index 8360e87..c056880 100644 --- a/assets/.stylelintrc.json +++ b/assets/.stylelintrc.json @@ -1,5 +1,5 @@ { - "extends": "stylelint-config-wordpress", + "extends": "stylelint-config-wordpress/scss", "ignoreFiles": "", "rules": { "at-rule-empty-line-before": null, @@ -17,14 +17,11 @@ "max-empty-lines": 1, "no-missing-end-of-source-newline": true, "number-leading-zero": "always", - "property-case": "lower", "rule-empty-line-before": null, "selector-combinator-space-after": "always", "selector-list-comma-newline-after": null, "selector-max-specificity": "0,3,1", - "selector-pseudo-element-case": "lower", "selector-pseudo-element-colon-notation": "double", - "unit-case": "lower", "unit-no-unknown": true } } diff --git a/assets/build/assets.php b/assets/build/assets.php index 5af730c..6dd2e74 100644 --- a/assets/build/assets.php +++ b/assets/build/assets.php @@ -1 +1 @@ - array('dependencies' => array('wp-polyfill'), 'version' => '73fb28ff703d908abc937ac7acfe42fa'), 'js/single.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'c189330732d608ff3f48cf8c50f11401'), 'js/editor.js' => array('dependencies' => array('wp-polyfill'), 'version' => '3c891e7ba6513ceb778c1ed337bc2952'), 'js/blocks.js' => array('dependencies' => array('lodash', 'react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-i18n', 'wp-polyfill'), 'version' => 'c001b0eb0e00ad82a5f5f4ede2bbc8a9')); \ No newline at end of file + array('dependencies' => array('wp-polyfill'), 'version' => '4698e5181087a60922655b73ad40a101'), 'js/single.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'c189330732d608ff3f48cf8c50f11401'), 'js/editor.js' => array('dependencies' => array('wp-polyfill'), 'version' => '12ab3e60bdb8114ca8c19cb2ab3fe043'), 'js/blocks.js' => array('dependencies' => array('lodash', 'react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-i18n', 'wp-polyfill'), 'version' => '08397384479650a051a6ec0cb1127672')); \ No newline at end of file diff --git a/assets/build/js/blocks.js b/assets/build/js/blocks.js index 3b81a11..830bab1 100644 --- a/assets/build/js/blocks.js +++ b/assets/build/js/blocks.js @@ -1 +1 @@ -!function(n){var a={};function o(e){if(a[e])return a[e].exports;var t=a[e]={i:e,l:!1,exports:{}};return n[e].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.m=n,o.c=a,o.d=function(e,t,n){o.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.t=function(t,e){if(1&e&&(t=o(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var n=Object.create(null);if(o.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var a in t)o.d(n,a,function(e){return t[e]}.bind(null,a));return n},o.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(t,"a",t),t},o.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},o.p="",o(o.s=13)}([function(e,t){!function(){e.exports=this.wp.i18n}()},function(e,t){!function(){e.exports=this.wp.blockEditor}()},function(e,t){!function(){e.exports=this.React}()},function(e,t){!function(){e.exports=this.wp.blocks}()},function(e,t){!function(){e.exports=this.wp.components}()},function(e,t){!function(){e.exports=this.lodash}()},,,,,,,function(e,t,n){},function(e,t,n){"use strict";n.r(t);n(12);var a=n(2);function o(){return(o=Object.assign||function(e){for(var t=1;t".concat(n,"")}],["core/list",{className:"aquila-dos-and-donts__list"}]]]}function h(){return React.createElement("div",{className:"aquila-dos-and-donts"},React.createElement(d.InnerBlocks,{template:b,allowedBlocks:_,templateLock:!0}))}var b=[["core/group",{className:"aquila-dos-and-donts__group",backgroundColor:"pale-cyan-blue"},[["core/columns",{className:"aquila-dos-and-donts__cols",width:49},[g("dos","aquila-dos-and-donts__col-one","Dos"),g("donts","aquila-dos-and-donts__col-two","Dont's")]]]]],_=["core/group"];Object(m.registerBlockType)("aquila-blocks/dos-and-donts",{title:Object(f.__)("Dos and dont's","aquila"),icon:"editor-table",description:Object(f.__)("Add headings and text","aquila"),category:"aquila",edit:h,save:function(){return React.createElement("div",{className:"aquila-dos-and-donts"},React.createElement(d.InnerBlocks.Content,null))}})}]); \ No newline at end of file +!function(n){var a={};function o(e){if(a[e])return a[e].exports;var t=a[e]={i:e,l:!1,exports:{}};return n[e].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.m=n,o.c=a,o.d=function(e,t,n){o.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.t=function(t,e){if(1&e&&(t=o(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var n=Object.create(null);if(o.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var a in t)o.d(n,a,function(e){return t[e]}.bind(null,a));return n},o.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(t,"a",t),t},o.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},o.p="",o(o.s=13)}([function(e,t){!function(){e.exports=this.wp.i18n}()},function(e,t){!function(){e.exports=this.wp.blockEditor}()},function(e,t){!function(){e.exports=this.React}()},function(e,t){!function(){e.exports=this.wp.blocks}()},function(e,t){!function(){e.exports=this.wp.components}()},function(e,t){!function(){e.exports=this.lodash}()},,,,,,,function(e,t,n){},function(e,t,n){"use strict";n.r(t);n(12);var a=n(2);function o(){return(o=Object.assign||function(e){for(var t=1;t".concat(n,"")}],["core/list",{className:"aquila-dos-and-donts__list"}]]]}function h(){return React.createElement("div",{className:"aquila-dos-and-donts"},React.createElement(f.InnerBlocks,{template:b,allowedBlocks:_,templateLock:!0}))}var b=[["core/group",{className:"aquila-dos-and-donts__group",backgroundColor:"pale-cyan-blue"},[["core/columns",{className:"aquila-dos-and-donts__cols"},[g("dos","aquila-dos-and-donts__col-one","Dos"),g("donts","aquila-dos-and-donts__col-two","Dont's")]]]]],_=["core/group"];Object(m.registerBlockType)("aquila-blocks/dos-and-donts",{title:Object(p.__)("Dos and dont's","aquila"),icon:"editor-table",description:Object(p.__)("Add headings and text","aquila"),category:"aquila",edit:h,save:function(){return React.createElement("div",{className:"aquila-dos-and-donts"},React.createElement(f.InnerBlocks.Content,null))}})}]); \ No newline at end of file diff --git a/assets/src/js/clock/index.js b/assets/src/js/clock/index.js index 49fd76d..221bacf 100644 --- a/assets/src/js/clock/index.js +++ b/assets/src/js/clock/index.js @@ -1,31 +1,55 @@ ( function ( $ ) { + /** + * Clock Class. + */ class Clock { + /** + * Constructor + */ constructor() { this.initializeClock(); } + /** + * initializeClock + */ initializeClock() { - let t = setInterval( () => this.time(), 1000 ); + setInterval( () => this.time(), 1000 ); } + /** + * Numpad + * + * @param {String} str String + * + * @return {string} String + */ numPad( str ) { - let cStr = str.toString(); + const cStr = str.toString(); if ( 2 > cStr.length ) { str = 0 + cStr; } return str; } + /** + * Time + */ time() { - let currDate = new Date(); - let currSec = currDate.getSeconds(); - let currMin = currDate.getMinutes(); - let curr24Hr = currDate.getHours(); - let ampm = 12 <= curr24Hr ? 'pm' : 'am'; - let currHr = curr24Hr % 12; - currHr = currHr ? currHr : 12; + const currDate = new Date(); + const currSec = currDate.getSeconds(); + const currMin = currDate.getMinutes(); + const curr24Hr = currDate.getHours(); + const ampm = 12 <= curr24Hr ? 'pm' : 'am'; + let currHr = curr24Hr % 12; + currHr = currHr ? currHr : 12; - let stringTime = currHr + ':' + this.numPad( currMin ) + ':' + this.numPad( currSec ); + const stringTime = + currHr + + ':' + + this.numPad( currMin ) + + ':' + + this.numPad( currSec ); const timeEmojiEl = $( '#time-emoji' ); if ( 5 <= curr24Hr && 17 >= curr24Hr ) { @@ -40,5 +64,4 @@ } new Clock(); - -} ( jQuery ) ); +} )( jQuery ); diff --git a/assets/src/js/gutenberg/blocks/dos-and-donts/edit.js b/assets/src/js/gutenberg/blocks/dos-and-donts/edit.js index c4fd56a..ba36f68 100644 --- a/assets/src/js/gutenberg/blocks/dos-and-donts/edit.js +++ b/assets/src/js/gutenberg/blocks/dos-and-donts/edit.js @@ -9,7 +9,7 @@ const INNER_BLOCKS_TEMPLATE = [ 'core/group', { className: 'aquila-dos-and-donts__group', - backgroundColor: 'pale-cyan-blue' + backgroundColor: 'pale-cyan-blue', }, blockColumns, ], @@ -17,8 +17,12 @@ const INNER_BLOCKS_TEMPLATE = [ const ALLOWED_BLOCKS = [ 'core/group' ]; +/** + * Edit function. + * + * @return {Object} Content. + */ const Edit = () => { - return (
- +
); }, diff --git a/assets/src/js/gutenberg/blocks/dos-and-donts/templates.js b/assets/src/js/gutenberg/blocks/dos-and-donts/templates.js index fee489c..3d66370 100644 --- a/assets/src/js/gutenberg/blocks/dos-and-donts/templates.js +++ b/assets/src/js/gutenberg/blocks/dos-and-donts/templates.js @@ -4,7 +4,7 @@ * @param {String} optionVal Option * @param {String} colClassName ClassName * @param {String} heading Heading - * @returns {Array} Block column. + * @return {Array} Block column. */ const getBlockColumn = ( optionVal, colClassName, heading ) => { return [ @@ -16,14 +16,11 @@ const getBlockColumn = ( optionVal, colClassName, heading ) => { { className: 'aquila-dos-and-donts__heading', option: optionVal, - content: `${heading}` + content: `${ heading }`, }, ], - [ - 'core/list', - { className: 'aquila-dos-and-donts__list' }, - ] - ] + [ 'core/list', { className: 'aquila-dos-and-donts__list' } ], + ], ]; }; @@ -32,11 +29,14 @@ export const blockColumns = [ 'core/columns', { className: 'aquila-dos-and-donts__cols', - width: 49 }, [ getBlockColumn( 'dos', 'aquila-dos-and-donts__col-one', 'Dos' ), - getBlockColumn( 'donts', 'aquila-dos-and-donts__col-two', 'Dont\'s' ) - ] + getBlockColumn( + 'donts', + 'aquila-dos-and-donts__col-two', + "Dont's" + ), + ], ], ]; diff --git a/assets/src/js/gutenberg/blocks/heading-with-icon/edit.js b/assets/src/js/gutenberg/blocks/heading-with-icon/edit.js index 2ad07dc..498e3ec 100644 --- a/assets/src/js/gutenberg/blocks/heading-with-icon/edit.js +++ b/assets/src/js/gutenberg/blocks/heading-with-icon/edit.js @@ -2,56 +2,52 @@ * Internal Dependencies. */ import { getIconComponent } from './icons-map'; -import { RichText } from '@wordpress/block-editor'; /** * WordPress Dependencies. */ -import { - PanelBody, - RadioControl, -} from '@wordpress/components'; +import { PanelBody, RadioControl } from '@wordpress/components'; import { __ } from '@wordpress/i18n'; -import { InspectorControls } from '@wordpress/block-editor'; +import { RichText, InspectorControls } from '@wordpress/block-editor'; -const Edit = ( { className, attributes, setAttributes } ) => { +/** + * Edit + * + * @param {Object} props Props. + * + * @return {Object} Content. + */ +const Edit = ( props ) => { + const { className, attributes, setAttributes } = props; const { option, content } = attributes; const HeadingIcon = getIconComponent( option ); return (
- - - - {/* You can also pass formattingControls={ [ 'bold', 'italic' ] } to allow the content to be made bold or italic, but do not allow other formatting options */} + + + + { /* You can also pass formattingControls={ [ 'bold', 'italic' ] } to allow the content to be made bold or italic, but do not allow other formatting options */ } setAttributes( { content } ) } // Store updated content as a block attribute - placeholder={ __( 'Heading...', 'aquila' ) } // Display this text before any content has been added by the user + onChange={ ( contentVal ) => setAttributes( { contentVal } ) } // Store updated content as a block attribute + placeholder={ __( 'Heading…', 'aquila' ) } // Display this text before any content has been added by the user /> - + { - setAttributes( { option } ); + onChange={ ( optionVal ) => { + setAttributes( { optionVal } ); } } /> diff --git a/assets/src/js/gutenberg/blocks/heading-with-icon/icons-map.js b/assets/src/js/gutenberg/blocks/heading-with-icon/icons-map.js index ccc1623..09998df 100644 --- a/assets/src/js/gutenberg/blocks/heading-with-icon/icons-map.js +++ b/assets/src/js/gutenberg/blocks/heading-with-icon/icons-map.js @@ -1,11 +1,20 @@ import * as SvgIcons from '../../../icons'; import { isEmpty } from 'lodash'; +/** + * Get icon component. + * + * @param {String} option Option. + * + * @return {*|SvgCheck} SVG Component. + */ export const getIconComponent = ( option ) => { const IconsMap = { dos: SvgIcons.Check, - donts: SvgIcons.Cross + donts: SvgIcons.Cross, }; - return ( ! isEmpty( option ) && ( option in IconsMap ) ) ? IconsMap[option] : IconsMap.dos; + return ! isEmpty( option ) && option in IconsMap + ? IconsMap[ option ] + : IconsMap.dos; }; diff --git a/assets/src/js/gutenberg/blocks/heading-with-icon/index.js b/assets/src/js/gutenberg/blocks/heading-with-icon/index.js index e4f5472..5859c75 100644 --- a/assets/src/js/gutenberg/blocks/heading-with-icon/index.js +++ b/assets/src/js/gutenberg/blocks/heading-with-icon/index.js @@ -1,8 +1,7 @@ - /** * Heading with Icon block. * - * @package Aquila + * @package */ import { getIconComponent } from './icons-map'; @@ -57,28 +56,37 @@ registerBlockType( 'aquila-blocks/heading', { attributes: { option: { type: 'string', - default: 'dos' + default: 'dos', }, content: { type: 'string', source: 'html', selector: 'h4', - default: __( 'Dos', 'aquila' ) - } + default: __( 'Dos', 'aquila' ), + }, }, edit: Edit, - save( { attributes: { option, content } } ) { - + /** + * Save function. + * + * @param {Object} props Props + * + * @return {Object} Content. + */ + save( props ) { + const { + attributes: { option, content }, + } = props; const HeadingIcon = getIconComponent( option ); return (
- - - - {/* Saves

Content added in the editor...

to the database for frontend display */} + + + + { /* Saves

Content added in the editor...

to the database for frontend display */ }
); diff --git a/assets/src/js/icons/Check.js b/assets/src/js/icons/Check.js index 1583540..6e92c59 100644 --- a/assets/src/js/icons/Check.js +++ b/assets/src/js/icons/Check.js @@ -1,8 +1,15 @@ import * as React from 'react'; +/** + * SVG check. + * + * @param {Object} props Props. + * + * @return {Object} SVG content. + */ function SvgCheck( props ) { return ( - + + * { + > * { margin: $margin-top auto $margin-bottom auto; } - & > *:not(.alignfull) { + > *:not(.alignfull) { max-width: $site_width; padding: 0 $padding-right 0 $padding-left; } - & > .alignwide { + > .alignwide { max-width: $wide_width; } } diff --git a/assets/src/sass/3-utilities/_animations.scss b/assets/src/sass/3-utilities/_animations.scss index cbcfa6c..9731a4e 100644 --- a/assets/src/sass/3-utilities/_animations.scss +++ b/assets/src/sass/3-utilities/_animations.scss @@ -4,6 +4,7 @@ animation-timing-function: ease-out; } +/* stylelint-disable */ @keyframes fadeInLeft { 0% { opacity: 0; @@ -60,3 +61,5 @@ opacity: 1; } } + +/* stylelint-enable */ diff --git a/assets/src/sass/7-blocks/_dos-and-donts.scss b/assets/src/sass/7-blocks/_dos-and-donts.scss index 03b7e95..d7fb38b 100644 --- a/assets/src/sass/7-blocks/_dos-and-donts.scss +++ b/assets/src/sass/7-blocks/_dos-and-donts.scss @@ -1,5 +1,7 @@ +/* stylelint-disable */ .aquila-dos-and-donts { .aquila-dos-and-donts__list { margin-left: 20px; } } +/* stylelint-enable */ diff --git a/assets/src/sass/7-blocks/_heading-with-icon.scss b/assets/src/sass/7-blocks/_heading-with-icon.scss index 9f94248..c4c9d54 100644 --- a/assets/src/sass/7-blocks/_heading-with-icon.scss +++ b/assets/src/sass/7-blocks/_heading-with-icon.scss @@ -1,3 +1,4 @@ +/* stylelint-disable */ .aquila-icon-heading { display: flex; @@ -7,3 +8,4 @@ margin-right: 16px; } } +/* stylelint-enable */