diff --git a/build/um-account/block.json b/blocks-src/um-account/block.json
similarity index 99%
rename from build/um-account/block.json
rename to blocks-src/um-account/block.json
index b95c89b9..8a5c803d 100644
--- a/build/um-account/block.json
+++ b/blocks-src/um-account/block.json
@@ -12,4 +12,4 @@
},
"editorScript": "file:./src/index.js",
"textdomain": "ultimate-member"
-}
\ No newline at end of file
+}
diff --git a/blocks-src/um-account/src/index.js b/blocks-src/um-account/src/index.js
new file mode 100644
index 00000000..18345342
--- /dev/null
+++ b/blocks-src/um-account/src/index.js
@@ -0,0 +1,81 @@
+import { registerBlockType } from '@wordpress/blocks';
+import ServerSideRender from '@wordpress/server-side-render';
+import { InspectorControls, useBlockProps } from '@wordpress/block-editor';
+import { PanelBody, SelectControl } from "@wordpress/components";
+import { useMemo, useCallback } from '@wordpress/element';
+
+registerBlockType('um-block/um-account', {
+ edit: function (props) {
+ const { attributes, setAttributes } = props;
+ const { tab } = attributes;
+ const blockProps = useBlockProps();
+
+ const options = useMemo(() => {
+ const option = [{ label: wp.i18n.__('All', 'ultimate-member'), value: 'all' }];
+ for (const key in um_account_settings) {
+ if (um_account_settings.hasOwnProperty(key) && um_account_settings[key]['enabled']) {
+ option.push({
+ label: um_account_settings[key]['label'],
+ value: key
+ });
+ }
+ }
+ return option;
+ }, []);
+
+ const onTabChange = useCallback((value) => {
+ setAttributes({ tab: value });
+ const shortcode = `[ultimatemember_account${value !== 'all' ? ` tab="${value}"` : ''}]`;
+ setAttributes({ content: shortcode });
+ }, [setAttributes]);
+
+ return (
+
+ );
+ },
+
+ save: () => null
+});
+
+jQuery(window).on( 'load', function($) {
+ let observer = new MutationObserver(function(mutations) {
+ mutations.forEach(function(mutation) {
+
+ jQuery(mutation.addedNodes).find('.um.um-account').each(function() {
+ let current_tab = jQuery(this).find('.um-account-main').attr('data-current_tab');
+ let wrapper = document.querySelector('.um-form');
+
+ if ( current_tab ) {
+ jQuery(this).find('.um-account-tab[data-tab="'+current_tab+'"]').show();
+ jQuery(this).find('.um-account-tab:not(:visible)').find( 'input, select, textarea' ).not( ':disabled' ).addClass('um_account_inactive').prop( 'disabled', true ).attr( 'disabled', true );
+ um_responsive();
+ }
+
+ if (wrapper) {
+ wrapper.addEventListener('click', (event) => {
+ if (event.target !== wrapper) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ });
+ }
+ });
+ });
+ });
+
+ observer.observe(document, {attributes: false, childList: true, characterData: false, subtree:true});
+});
diff --git a/build/um-forms/block.json b/blocks-src/um-forms/block.json
similarity index 99%
rename from build/um-forms/block.json
rename to blocks-src/um-forms/block.json
index b6acee9f..2d5dce4a 100644
--- a/build/um-forms/block.json
+++ b/blocks-src/um-forms/block.json
@@ -12,4 +12,4 @@
},
"editorScript": "file:./src/index.js",
"textdomain": "ultimate-member"
-}
\ No newline at end of file
+}
diff --git a/blocks-src/um-forms/src/index.js b/blocks-src/um-forms/src/index.js
new file mode 100644
index 00000000..5c7852e2
--- /dev/null
+++ b/blocks-src/um-forms/src/index.js
@@ -0,0 +1,74 @@
+import { useSelect } from '@wordpress/data';
+import { PanelBody, SelectControl, Spinner } from '@wordpress/components';
+import { InspectorControls, useBlockProps } from '@wordpress/block-editor';
+import ServerSideRender from '@wordpress/server-side-render';
+import { registerBlockType } from '@wordpress/blocks';
+import { useMemo } from '@wordpress/element';
+
+registerBlockType('um-block/um-forms', {
+ edit: function (props) {
+ const blockProps = useBlockProps();
+ const { attributes, setAttributes } = props;
+ const { form_id } = attributes;
+
+ const posts = useSelect(
+ (select) => select('core').getEntityRecords('postType', 'um_form', { per_page: -1, _fields: ['id', 'title'] }),
+ []
+ );
+
+ const options = useMemo(() => {
+ if (!posts) {
+ return [{ label: wp.i18n.__('Loading...', 'ultimate-member'), value: '' }];
+ }
+ if (posts.length === 0) {
+ return [{ label: wp.i18n.__('No forms found.', 'ultimate-member'), value: '' }];
+ }
+ return [{ label: wp.i18n.__('Select Form', 'ultimate-member'), value: '' }].concat(
+ posts.map((post) => ({ label: post.title.rendered, value: post.id }))
+ );
+ }, [posts]);
+
+ const onFormChange = (value) => setAttributes({ form_id: value });
+
+ return (
+
+ );
+ },
+
+ save: () => null
+});
+
+jQuery(window).on( 'load', function($) {
+ let observer = new MutationObserver(function(mutations) {
+ mutations.forEach(function(mutation) {
+
+ jQuery(mutation.addedNodes).find('.um-form').each(function() {
+ let wrapper = document.querySelector('.um-form');
+
+ if (wrapper) {
+ wrapper.addEventListener('click', (event) => {
+ if (event.target !== wrapper) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ });
+ }
+ });
+ });
+ });
+
+ observer.observe(document, {attributes: false, childList: true, characterData: false, subtree:true});
+});
diff --git a/build/um-member-directories/block.json b/blocks-src/um-member-directories/block.json
similarity index 99%
rename from build/um-member-directories/block.json
rename to blocks-src/um-member-directories/block.json
index 46492735..cdffceea 100644
--- a/build/um-member-directories/block.json
+++ b/blocks-src/um-member-directories/block.json
@@ -12,4 +12,4 @@
},
"editorScript": "file:./src/index.js",
"textdomain": "ultimate-member"
-}
\ No newline at end of file
+}
diff --git a/blocks-src/um-member-directories/src/index.js b/blocks-src/um-member-directories/src/index.js
new file mode 100644
index 00000000..c5415fff
--- /dev/null
+++ b/blocks-src/um-member-directories/src/index.js
@@ -0,0 +1,107 @@
+import { useSelect } from '@wordpress/data';
+import { PanelBody, SelectControl, Spinner } from '@wordpress/components';
+import { InspectorControls, useBlockProps } from '@wordpress/block-editor';
+import ServerSideRender from '@wordpress/server-side-render';
+import { registerBlockType } from "@wordpress/blocks";
+import { useMemo } from '@wordpress/element';
+
+registerBlockType('um-block/um-member-directories', {
+ edit: function (props) {
+ const blockProps = useBlockProps();
+ const { attributes, setAttributes } = props;
+ const { member_id } = attributes;
+
+ const posts = useSelect((select) => {
+ return select('core').getEntityRecords('postType', 'um_directory', {
+ per_page: -1,
+ _fields: ['id', 'title']
+ });
+ }, []);
+
+ const options = useMemo(() => {
+ if (!posts) {
+ return [{ label: wp.i18n.__('Loading...', 'ultimate-member'), value: '' }];
+ }
+ if (posts.length === 0) {
+ return [{ label: wp.i18n.__('No posts found.', 'ultimate-member'), value: '' }];
+ }
+ return [{ label: wp.i18n.__('Select Directory', 'ultimate-member'), value: '' }].concat(
+ posts.map((post) => ({
+ label: post.title.rendered,
+ value: post.id
+ }))
+ );
+ }, [posts]);
+
+ const onMemberIdChange = (value) => setAttributes({ member_id: value });
+
+ if (!posts) {
+ return (
+
+
+ {wp.i18n.__('Loading...', 'ultimate-member')}
+
+ );
+ }
+
+ return (
+
+ );
+ },
+
+ save: () => null
+});
+
+jQuery(window).on( 'load', function($) {
+ let observer = new MutationObserver(function(mutations) {
+ mutations.forEach(function(mutation) {
+
+ jQuery(mutation.addedNodes).find('.um.um-directory').each(function() {
+ let wrapper = document.querySelector('.um-directory');
+ let directory = jQuery(this);
+ um_ajax_get_members( directory );
+ um_slider_filter_init( directory );
+ um_datepicker_filter_init( directory );
+ um_timepicker_filter_init( directory );
+
+ if (wrapper) {
+ wrapper.addEventListener('click', (event) => {
+ if (event.target !== wrapper) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ });
+ }
+ });
+ jQuery(mutation.addedNodes).find('.um-member').each(function() {
+ let wrapper = document.querySelector('.um-member');
+ let directory = jQuery(this).parent();
+ UM_Member_Grid(directory);
+
+ if (wrapper) {
+ wrapper.addEventListener('click', (event) => {
+ if (event.target !== wrapper) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ });
+ }
+ });
+ });
+ });
+
+ observer.observe(document, {attributes: false, childList: true, characterData: false, subtree:true});
+});
diff --git a/build/um-password-reset/block.json b/blocks-src/um-password-reset/block.json
similarity index 99%
rename from build/um-password-reset/block.json
rename to blocks-src/um-password-reset/block.json
index e9ba86f6..2e1548c2 100644
--- a/build/um-password-reset/block.json
+++ b/blocks-src/um-password-reset/block.json
@@ -7,4 +7,4 @@
"category": "um-blocks",
"editorScript": "file:./src/index.js",
"textdomain": "ultimate-member"
-}
\ No newline at end of file
+}
diff --git a/blocks-src/um-password-reset/src/index.js b/blocks-src/um-password-reset/src/index.js
new file mode 100644
index 00000000..74e89369
--- /dev/null
+++ b/blocks-src/um-password-reset/src/index.js
@@ -0,0 +1,17 @@
+import { registerBlockType } from '@wordpress/blocks';
+import ServerSideRender from '@wordpress/server-side-render';
+import { useBlockProps } from '@wordpress/block-editor';
+
+registerBlockType('um-block/um-password-reset', {
+ edit: function () {
+ const blockProps = useBlockProps();
+
+ return (
+
+
+
+ );
+ },
+
+ save: () => null
+});
diff --git a/build/um-account/src/index.js b/build/um-account/src/index.js
deleted file mode 100644
index bab6a5f8..00000000
--- a/build/um-account/src/index.js
+++ /dev/null
@@ -1 +0,0 @@
-(()=>{"use strict";var t={n:e=>{var n=e&&e.__esModule?()=>e.default:()=>e;return t.d(n,{a:n}),n},d:(e,n)=>{for(var a in n)t.o(n,a)&&!t.o(e,a)&&Object.defineProperty(e,a,{enumerable:!0,get:n[a]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)};const e=window.wp.blocks,n=window.wp.serverSideRender;var a=t.n(n);const o=window.wp.blockEditor,c=window.wp.components,u=window.wp.element,i=window.ReactJSXRuntime;(0,e.registerBlockType)("um-block/um-account",{edit:function(t){const{attributes:e,setAttributes:n}=t,{tab:r}=e,s=(0,o.useBlockProps)(),l=(0,u.useMemo)((()=>{const t=[{label:wp.i18n.__("All","ultimate-member"),value:"all"}];for(const e in um_account_settings)um_account_settings.hasOwnProperty(e)&&um_account_settings[e].enabled&&t.push({label:um_account_settings[e].label,value:e});return t}),[]),d=(0,u.useCallback)((t=>{n({tab:t}),n({content:`[ultimatemember_account${"all"!==t?` tab="${t}"`:""}]`})}),[n]);return(0,i.jsxs)("div",{...s,children:[(0,i.jsx)(a(),{block:"um-block/um-account",attributes:e}),(0,i.jsx)(o.InspectorControls,{children:(0,i.jsx)(c.PanelBody,{title:wp.i18n.__("Account Tab","ultimate-member"),children:(0,i.jsx)(c.SelectControl,{label:wp.i18n.__("Select Tab","ultimate-member"),className:"um_select_account_tab",value:r,options:l,style:{height:"35px",lineHeight:"20px",padding:"0 7px"},onChange:d})})})]})},save:()=>null}),jQuery(window).on("load",(function(t){new MutationObserver((function(t){t.forEach((function(t){jQuery(t.addedNodes).find(".um.um-account").each((function(){let t=jQuery(this).find(".um-account-main").attr("data-current_tab"),e=document.querySelector(".um-form");t&&(jQuery(this).find('.um-account-tab[data-tab="'+t+'"]').show(),jQuery(this).find(".um-account-tab:not(:visible)").find("input, select, textarea").not(":disabled").addClass("um_account_inactive").prop("disabled",!0).attr("disabled",!0),um_responsive()),e&&e.addEventListener("click",(t=>{t.target!==e&&(t.preventDefault(),t.stopPropagation())}))}))}))})).observe(document,{attributes:!1,childList:!0,characterData:!1,subtree:!0})}))})();
\ No newline at end of file
diff --git a/build/um-forms/src/index.js b/build/um-forms/src/index.js
deleted file mode 100644
index 285e5656..00000000
--- a/build/um-forms/src/index.js
+++ /dev/null
@@ -1 +0,0 @@
-(()=>{"use strict";var e={n:t=>{var o=t&&t.__esModule?()=>t.default:()=>t;return e.d(o,{a:o}),o},d:(t,o)=>{for(var r in o)e.o(o,r)&&!e.o(t,r)&&Object.defineProperty(t,r,{enumerable:!0,get:o[r]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)};const t=window.wp.data,o=window.wp.components,r=window.wp.blockEditor,n=window.wp.serverSideRender;var l=e.n(n);const i=window.wp.blocks,a=window.wp.element,s=window.ReactJSXRuntime;(0,i.registerBlockType)("um-block/um-forms",{edit:function(e){const n=(0,r.useBlockProps)(),{attributes:i,setAttributes:u}=e,{form_id:c}=i,d=(0,t.useSelect)((e=>e("core").getEntityRecords("postType","um_form",{per_page:-1,_fields:["id","title"]})),[]),m=(0,a.useMemo)((()=>d?0===d.length?[{label:wp.i18n.__("No forms found.","ultimate-member"),value:""}]:[{label:wp.i18n.__("Select Form","ultimate-member"),value:""}].concat(d.map((e=>({label:e.title.rendered,value:e.id})))):[{label:wp.i18n.__("Loading...","ultimate-member"),value:""}]),[d]);return(0,s.jsxs)("div",{...n,children:[(0,s.jsx)(l(),{block:"um-block/um-forms",attributes:i}),(0,s.jsx)(r.InspectorControls,{children:(0,s.jsx)(o.PanelBody,{title:wp.i18n.__("Select Forms","ultimate-member"),children:(0,s.jsx)(o.SelectControl,{label:wp.i18n.__("Select Forms","ultimate-member"),className:"um_select_forms",value:c,options:m,onChange:e=>u({form_id:e})})})})]})},save:()=>null}),jQuery(window).on("load",(function(e){new MutationObserver((function(e){e.forEach((function(e){jQuery(e.addedNodes).find(".um-form").each((function(){let e=document.querySelector(".um-form");e&&e.addEventListener("click",(t=>{t.target!==e&&(t.preventDefault(),t.stopPropagation())}))}))}))})).observe(document,{attributes:!1,childList:!0,characterData:!1,subtree:!0})}))})();
\ No newline at end of file
diff --git a/build/um-member-directories/src/index.js b/build/um-member-directories/src/index.js
deleted file mode 100644
index 38fffc0c..00000000
--- a/build/um-member-directories/src/index.js
+++ /dev/null
@@ -1 +0,0 @@
-(()=>{"use strict";var e={n:t=>{var r=t&&t.__esModule?()=>t.default:()=>t;return e.d(r,{a:r}),r},d:(t,r)=>{for(var i in r)e.o(r,i)&&!e.o(t,i)&&Object.defineProperty(t,i,{enumerable:!0,get:r[i]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)};const t=window.wp.data,r=window.wp.components,i=window.wp.blockEditor,n=window.wp.serverSideRender;var o=e.n(n);const l=window.wp.blocks,a=window.wp.element,c=window.ReactJSXRuntime;(0,l.registerBlockType)("um-block/um-member-directories",{edit:function(e){const n=(0,i.useBlockProps)(),{attributes:l,setAttributes:d}=e,{member_id:u}=l,m=(0,t.useSelect)((e=>e("core").getEntityRecords("postType","um_directory",{per_page:-1,_fields:["id","title"]})),[]),s=(0,a.useMemo)((()=>m?0===m.length?[{label:wp.i18n.__("No posts found.","ultimate-member"),value:""}]:[{label:wp.i18n.__("Select Directory","ultimate-member"),value:""}].concat(m.map((e=>({label:e.title.rendered,value:e.id})))):[{label:wp.i18n.__("Loading...","ultimate-member"),value:""}]),[m]);return m?(0,c.jsxs)("div",{...n,children:[(0,c.jsx)(o(),{block:"um-block/um-member-directories",attributes:l}),(0,c.jsx)(i.InspectorControls,{children:(0,c.jsx)(r.PanelBody,{title:wp.i18n.__("Select Directories","ultimate-member"),children:(0,c.jsx)(r.SelectControl,{label:wp.i18n.__("Select Directories","ultimate-member"),className:"um_select_directory",value:u,options:s,onChange:e=>d({member_id:e})})})})]}):(0,c.jsxs)("p",{children:[(0,c.jsx)(r.Spinner,{}),wp.i18n.__("Loading...","ultimate-member")]})},save:()=>null}),jQuery(window).on("load",(function(e){new MutationObserver((function(e){e.forEach((function(e){jQuery(e.addedNodes).find(".um.um-directory").each((function(){let e=document.querySelector(".um-directory"),t=jQuery(this);um_ajax_get_members(t),um_slider_filter_init(t),um_datepicker_filter_init(t),um_timepicker_filter_init(t),e&&e.addEventListener("click",(t=>{t.target!==e&&(t.preventDefault(),t.stopPropagation())}))})),jQuery(e.addedNodes).find(".um-member").each((function(){let e=document.querySelector(".um-member"),t=jQuery(this).parent();UM_Member_Grid(t),e&&e.addEventListener("click",(t=>{t.target!==e&&(t.preventDefault(),t.stopPropagation())}))}))}))})).observe(document,{attributes:!1,childList:!0,characterData:!1,subtree:!0})}))})();
\ No newline at end of file
diff --git a/build/um-password-reset/src/index.js b/build/um-password-reset/src/index.js
deleted file mode 100644
index 32865158..00000000
--- a/build/um-password-reset/src/index.js
+++ /dev/null
@@ -1 +0,0 @@
-(()=>{"use strict";var e={n:o=>{var r=o&&o.__esModule?()=>o.default:()=>o;return e.d(r,{a:r}),r},d:(o,r)=>{for(var t in r)e.o(r,t)&&!e.o(o,t)&&Object.defineProperty(o,t,{enumerable:!0,get:r[t]})},o:(e,o)=>Object.prototype.hasOwnProperty.call(e,o)};const o=window.wp.blocks,r=window.wp.serverSideRender;var t=e.n(r);const n=window.wp.blockEditor,s=window.ReactJSXRuntime;(0,o.registerBlockType)("um-block/um-password-reset",{edit:function(){const e=(0,n.useBlockProps)();return(0,s.jsx)("div",{...e,children:(0,s.jsx)(t(),{block:"um-block/um-password-reset"})})},save:()=>null})})();
\ No newline at end of file
diff --git a/build/blocks-manifest.php b/includes/blocks/blocks-manifest.php
similarity index 100%
rename from build/blocks-manifest.php
rename to includes/blocks/blocks-manifest.php
diff --git a/includes/blocks/um-account/block.json b/includes/blocks/um-account/block.json
index 8a5c803d..b95c89b9 100644
--- a/includes/blocks/um-account/block.json
+++ b/includes/blocks/um-account/block.json
@@ -12,4 +12,4 @@
},
"editorScript": "file:./src/index.js",
"textdomain": "ultimate-member"
-}
+}
\ No newline at end of file
diff --git a/build/um-account/src/index.asset.php b/includes/blocks/um-account/src/index.asset.php
similarity index 100%
rename from build/um-account/src/index.asset.php
rename to includes/blocks/um-account/src/index.asset.php
diff --git a/includes/blocks/um-account/src/index.js b/includes/blocks/um-account/src/index.js
index 18345342..bab6a5f8 100644
--- a/includes/blocks/um-account/src/index.js
+++ b/includes/blocks/um-account/src/index.js
@@ -1,81 +1 @@
-import { registerBlockType } from '@wordpress/blocks';
-import ServerSideRender from '@wordpress/server-side-render';
-import { InspectorControls, useBlockProps } from '@wordpress/block-editor';
-import { PanelBody, SelectControl } from "@wordpress/components";
-import { useMemo, useCallback } from '@wordpress/element';
-
-registerBlockType('um-block/um-account', {
- edit: function (props) {
- const { attributes, setAttributes } = props;
- const { tab } = attributes;
- const blockProps = useBlockProps();
-
- const options = useMemo(() => {
- const option = [{ label: wp.i18n.__('All', 'ultimate-member'), value: 'all' }];
- for (const key in um_account_settings) {
- if (um_account_settings.hasOwnProperty(key) && um_account_settings[key]['enabled']) {
- option.push({
- label: um_account_settings[key]['label'],
- value: key
- });
- }
- }
- return option;
- }, []);
-
- const onTabChange = useCallback((value) => {
- setAttributes({ tab: value });
- const shortcode = `[ultimatemember_account${value !== 'all' ? ` tab="${value}"` : ''}]`;
- setAttributes({ content: shortcode });
- }, [setAttributes]);
-
- return (
-
- );
- },
-
- save: () => null
-});
-
-jQuery(window).on( 'load', function($) {
- let observer = new MutationObserver(function(mutations) {
- mutations.forEach(function(mutation) {
-
- jQuery(mutation.addedNodes).find('.um.um-account').each(function() {
- let current_tab = jQuery(this).find('.um-account-main').attr('data-current_tab');
- let wrapper = document.querySelector('.um-form');
-
- if ( current_tab ) {
- jQuery(this).find('.um-account-tab[data-tab="'+current_tab+'"]').show();
- jQuery(this).find('.um-account-tab:not(:visible)').find( 'input, select, textarea' ).not( ':disabled' ).addClass('um_account_inactive').prop( 'disabled', true ).attr( 'disabled', true );
- um_responsive();
- }
-
- if (wrapper) {
- wrapper.addEventListener('click', (event) => {
- if (event.target !== wrapper) {
- event.preventDefault();
- event.stopPropagation();
- }
- });
- }
- });
- });
- });
-
- observer.observe(document, {attributes: false, childList: true, characterData: false, subtree:true});
-});
+(()=>{"use strict";var t={n:e=>{var n=e&&e.__esModule?()=>e.default:()=>e;return t.d(n,{a:n}),n},d:(e,n)=>{for(var a in n)t.o(n,a)&&!t.o(e,a)&&Object.defineProperty(e,a,{enumerable:!0,get:n[a]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)};const e=window.wp.blocks,n=window.wp.serverSideRender;var a=t.n(n);const o=window.wp.blockEditor,c=window.wp.components,u=window.wp.element,i=window.ReactJSXRuntime;(0,e.registerBlockType)("um-block/um-account",{edit:function(t){const{attributes:e,setAttributes:n}=t,{tab:r}=e,s=(0,o.useBlockProps)(),l=(0,u.useMemo)((()=>{const t=[{label:wp.i18n.__("All","ultimate-member"),value:"all"}];for(const e in um_account_settings)um_account_settings.hasOwnProperty(e)&&um_account_settings[e].enabled&&t.push({label:um_account_settings[e].label,value:e});return t}),[]),d=(0,u.useCallback)((t=>{n({tab:t}),n({content:`[ultimatemember_account${"all"!==t?` tab="${t}"`:""}]`})}),[n]);return(0,i.jsxs)("div",{...s,children:[(0,i.jsx)(a(),{block:"um-block/um-account",attributes:e}),(0,i.jsx)(o.InspectorControls,{children:(0,i.jsx)(c.PanelBody,{title:wp.i18n.__("Account Tab","ultimate-member"),children:(0,i.jsx)(c.SelectControl,{label:wp.i18n.__("Select Tab","ultimate-member"),className:"um_select_account_tab",value:r,options:l,style:{height:"35px",lineHeight:"20px",padding:"0 7px"},onChange:d})})})]})},save:()=>null}),jQuery(window).on("load",(function(t){new MutationObserver((function(t){t.forEach((function(t){jQuery(t.addedNodes).find(".um.um-account").each((function(){let t=jQuery(this).find(".um-account-main").attr("data-current_tab"),e=document.querySelector(".um-form");t&&(jQuery(this).find('.um-account-tab[data-tab="'+t+'"]').show(),jQuery(this).find(".um-account-tab:not(:visible)").find("input, select, textarea").not(":disabled").addClass("um_account_inactive").prop("disabled",!0).attr("disabled",!0),um_responsive()),e&&e.addEventListener("click",(t=>{t.target!==e&&(t.preventDefault(),t.stopPropagation())}))}))}))})).observe(document,{attributes:!1,childList:!0,characterData:!1,subtree:!0})}))})();
\ No newline at end of file
diff --git a/includes/blocks/um-forms/block.json b/includes/blocks/um-forms/block.json
index 2d5dce4a..b6acee9f 100644
--- a/includes/blocks/um-forms/block.json
+++ b/includes/blocks/um-forms/block.json
@@ -12,4 +12,4 @@
},
"editorScript": "file:./src/index.js",
"textdomain": "ultimate-member"
-}
+}
\ No newline at end of file
diff --git a/build/um-forms/src/index.asset.php b/includes/blocks/um-forms/src/index.asset.php
similarity index 100%
rename from build/um-forms/src/index.asset.php
rename to includes/blocks/um-forms/src/index.asset.php
diff --git a/includes/blocks/um-forms/src/index.js b/includes/blocks/um-forms/src/index.js
index 5c7852e2..285e5656 100644
--- a/includes/blocks/um-forms/src/index.js
+++ b/includes/blocks/um-forms/src/index.js
@@ -1,74 +1 @@
-import { useSelect } from '@wordpress/data';
-import { PanelBody, SelectControl, Spinner } from '@wordpress/components';
-import { InspectorControls, useBlockProps } from '@wordpress/block-editor';
-import ServerSideRender from '@wordpress/server-side-render';
-import { registerBlockType } from '@wordpress/blocks';
-import { useMemo } from '@wordpress/element';
-
-registerBlockType('um-block/um-forms', {
- edit: function (props) {
- const blockProps = useBlockProps();
- const { attributes, setAttributes } = props;
- const { form_id } = attributes;
-
- const posts = useSelect(
- (select) => select('core').getEntityRecords('postType', 'um_form', { per_page: -1, _fields: ['id', 'title'] }),
- []
- );
-
- const options = useMemo(() => {
- if (!posts) {
- return [{ label: wp.i18n.__('Loading...', 'ultimate-member'), value: '' }];
- }
- if (posts.length === 0) {
- return [{ label: wp.i18n.__('No forms found.', 'ultimate-member'), value: '' }];
- }
- return [{ label: wp.i18n.__('Select Form', 'ultimate-member'), value: '' }].concat(
- posts.map((post) => ({ label: post.title.rendered, value: post.id }))
- );
- }, [posts]);
-
- const onFormChange = (value) => setAttributes({ form_id: value });
-
- return (
-
- );
- },
-
- save: () => null
-});
-
-jQuery(window).on( 'load', function($) {
- let observer = new MutationObserver(function(mutations) {
- mutations.forEach(function(mutation) {
-
- jQuery(mutation.addedNodes).find('.um-form').each(function() {
- let wrapper = document.querySelector('.um-form');
-
- if (wrapper) {
- wrapper.addEventListener('click', (event) => {
- if (event.target !== wrapper) {
- event.preventDefault();
- event.stopPropagation();
- }
- });
- }
- });
- });
- });
-
- observer.observe(document, {attributes: false, childList: true, characterData: false, subtree:true});
-});
+(()=>{"use strict";var e={n:t=>{var o=t&&t.__esModule?()=>t.default:()=>t;return e.d(o,{a:o}),o},d:(t,o)=>{for(var r in o)e.o(o,r)&&!e.o(t,r)&&Object.defineProperty(t,r,{enumerable:!0,get:o[r]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)};const t=window.wp.data,o=window.wp.components,r=window.wp.blockEditor,n=window.wp.serverSideRender;var l=e.n(n);const i=window.wp.blocks,a=window.wp.element,s=window.ReactJSXRuntime;(0,i.registerBlockType)("um-block/um-forms",{edit:function(e){const n=(0,r.useBlockProps)(),{attributes:i,setAttributes:u}=e,{form_id:c}=i,d=(0,t.useSelect)((e=>e("core").getEntityRecords("postType","um_form",{per_page:-1,_fields:["id","title"]})),[]),m=(0,a.useMemo)((()=>d?0===d.length?[{label:wp.i18n.__("No forms found.","ultimate-member"),value:""}]:[{label:wp.i18n.__("Select Form","ultimate-member"),value:""}].concat(d.map((e=>({label:e.title.rendered,value:e.id})))):[{label:wp.i18n.__("Loading...","ultimate-member"),value:""}]),[d]);return(0,s.jsxs)("div",{...n,children:[(0,s.jsx)(l(),{block:"um-block/um-forms",attributes:i}),(0,s.jsx)(r.InspectorControls,{children:(0,s.jsx)(o.PanelBody,{title:wp.i18n.__("Select Forms","ultimate-member"),children:(0,s.jsx)(o.SelectControl,{label:wp.i18n.__("Select Forms","ultimate-member"),className:"um_select_forms",value:c,options:m,onChange:e=>u({form_id:e})})})})]})},save:()=>null}),jQuery(window).on("load",(function(e){new MutationObserver((function(e){e.forEach((function(e){jQuery(e.addedNodes).find(".um-form").each((function(){let e=document.querySelector(".um-form");e&&e.addEventListener("click",(t=>{t.target!==e&&(t.preventDefault(),t.stopPropagation())}))}))}))})).observe(document,{attributes:!1,childList:!0,characterData:!1,subtree:!0})}))})();
\ No newline at end of file
diff --git a/includes/blocks/um-member-directories/block.json b/includes/blocks/um-member-directories/block.json
index cdffceea..46492735 100644
--- a/includes/blocks/um-member-directories/block.json
+++ b/includes/blocks/um-member-directories/block.json
@@ -12,4 +12,4 @@
},
"editorScript": "file:./src/index.js",
"textdomain": "ultimate-member"
-}
+}
\ No newline at end of file
diff --git a/build/um-member-directories/src/index.asset.php b/includes/blocks/um-member-directories/src/index.asset.php
similarity index 100%
rename from build/um-member-directories/src/index.asset.php
rename to includes/blocks/um-member-directories/src/index.asset.php
diff --git a/includes/blocks/um-member-directories/src/index.js b/includes/blocks/um-member-directories/src/index.js
index c5415fff..38fffc0c 100644
--- a/includes/blocks/um-member-directories/src/index.js
+++ b/includes/blocks/um-member-directories/src/index.js
@@ -1,107 +1 @@
-import { useSelect } from '@wordpress/data';
-import { PanelBody, SelectControl, Spinner } from '@wordpress/components';
-import { InspectorControls, useBlockProps } from '@wordpress/block-editor';
-import ServerSideRender from '@wordpress/server-side-render';
-import { registerBlockType } from "@wordpress/blocks";
-import { useMemo } from '@wordpress/element';
-
-registerBlockType('um-block/um-member-directories', {
- edit: function (props) {
- const blockProps = useBlockProps();
- const { attributes, setAttributes } = props;
- const { member_id } = attributes;
-
- const posts = useSelect((select) => {
- return select('core').getEntityRecords('postType', 'um_directory', {
- per_page: -1,
- _fields: ['id', 'title']
- });
- }, []);
-
- const options = useMemo(() => {
- if (!posts) {
- return [{ label: wp.i18n.__('Loading...', 'ultimate-member'), value: '' }];
- }
- if (posts.length === 0) {
- return [{ label: wp.i18n.__('No posts found.', 'ultimate-member'), value: '' }];
- }
- return [{ label: wp.i18n.__('Select Directory', 'ultimate-member'), value: '' }].concat(
- posts.map((post) => ({
- label: post.title.rendered,
- value: post.id
- }))
- );
- }, [posts]);
-
- const onMemberIdChange = (value) => setAttributes({ member_id: value });
-
- if (!posts) {
- return (
-
-
- {wp.i18n.__('Loading...', 'ultimate-member')}
-
- );
- }
-
- return (
-
- );
- },
-
- save: () => null
-});
-
-jQuery(window).on( 'load', function($) {
- let observer = new MutationObserver(function(mutations) {
- mutations.forEach(function(mutation) {
-
- jQuery(mutation.addedNodes).find('.um.um-directory').each(function() {
- let wrapper = document.querySelector('.um-directory');
- let directory = jQuery(this);
- um_ajax_get_members( directory );
- um_slider_filter_init( directory );
- um_datepicker_filter_init( directory );
- um_timepicker_filter_init( directory );
-
- if (wrapper) {
- wrapper.addEventListener('click', (event) => {
- if (event.target !== wrapper) {
- event.preventDefault();
- event.stopPropagation();
- }
- });
- }
- });
- jQuery(mutation.addedNodes).find('.um-member').each(function() {
- let wrapper = document.querySelector('.um-member');
- let directory = jQuery(this).parent();
- UM_Member_Grid(directory);
-
- if (wrapper) {
- wrapper.addEventListener('click', (event) => {
- if (event.target !== wrapper) {
- event.preventDefault();
- event.stopPropagation();
- }
- });
- }
- });
- });
- });
-
- observer.observe(document, {attributes: false, childList: true, characterData: false, subtree:true});
-});
+(()=>{"use strict";var e={n:t=>{var r=t&&t.__esModule?()=>t.default:()=>t;return e.d(r,{a:r}),r},d:(t,r)=>{for(var i in r)e.o(r,i)&&!e.o(t,i)&&Object.defineProperty(t,i,{enumerable:!0,get:r[i]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)};const t=window.wp.data,r=window.wp.components,i=window.wp.blockEditor,n=window.wp.serverSideRender;var o=e.n(n);const l=window.wp.blocks,a=window.wp.element,c=window.ReactJSXRuntime;(0,l.registerBlockType)("um-block/um-member-directories",{edit:function(e){const n=(0,i.useBlockProps)(),{attributes:l,setAttributes:d}=e,{member_id:u}=l,m=(0,t.useSelect)((e=>e("core").getEntityRecords("postType","um_directory",{per_page:-1,_fields:["id","title"]})),[]),s=(0,a.useMemo)((()=>m?0===m.length?[{label:wp.i18n.__("No posts found.","ultimate-member"),value:""}]:[{label:wp.i18n.__("Select Directory","ultimate-member"),value:""}].concat(m.map((e=>({label:e.title.rendered,value:e.id})))):[{label:wp.i18n.__("Loading...","ultimate-member"),value:""}]),[m]);return m?(0,c.jsxs)("div",{...n,children:[(0,c.jsx)(o(),{block:"um-block/um-member-directories",attributes:l}),(0,c.jsx)(i.InspectorControls,{children:(0,c.jsx)(r.PanelBody,{title:wp.i18n.__("Select Directories","ultimate-member"),children:(0,c.jsx)(r.SelectControl,{label:wp.i18n.__("Select Directories","ultimate-member"),className:"um_select_directory",value:u,options:s,onChange:e=>d({member_id:e})})})})]}):(0,c.jsxs)("p",{children:[(0,c.jsx)(r.Spinner,{}),wp.i18n.__("Loading...","ultimate-member")]})},save:()=>null}),jQuery(window).on("load",(function(e){new MutationObserver((function(e){e.forEach((function(e){jQuery(e.addedNodes).find(".um.um-directory").each((function(){let e=document.querySelector(".um-directory"),t=jQuery(this);um_ajax_get_members(t),um_slider_filter_init(t),um_datepicker_filter_init(t),um_timepicker_filter_init(t),e&&e.addEventListener("click",(t=>{t.target!==e&&(t.preventDefault(),t.stopPropagation())}))})),jQuery(e.addedNodes).find(".um-member").each((function(){let e=document.querySelector(".um-member"),t=jQuery(this).parent();UM_Member_Grid(t),e&&e.addEventListener("click",(t=>{t.target!==e&&(t.preventDefault(),t.stopPropagation())}))}))}))})).observe(document,{attributes:!1,childList:!0,characterData:!1,subtree:!0})}))})();
\ No newline at end of file
diff --git a/includes/blocks/um-password-reset/block.json b/includes/blocks/um-password-reset/block.json
index 2e1548c2..e9ba86f6 100644
--- a/includes/blocks/um-password-reset/block.json
+++ b/includes/blocks/um-password-reset/block.json
@@ -7,4 +7,4 @@
"category": "um-blocks",
"editorScript": "file:./src/index.js",
"textdomain": "ultimate-member"
-}
+}
\ No newline at end of file
diff --git a/build/um-password-reset/src/index.asset.php b/includes/blocks/um-password-reset/src/index.asset.php
similarity index 100%
rename from build/um-password-reset/src/index.asset.php
rename to includes/blocks/um-password-reset/src/index.asset.php
diff --git a/includes/blocks/um-password-reset/src/index.js b/includes/blocks/um-password-reset/src/index.js
index 74e89369..32865158 100644
--- a/includes/blocks/um-password-reset/src/index.js
+++ b/includes/blocks/um-password-reset/src/index.js
@@ -1,17 +1 @@
-import { registerBlockType } from '@wordpress/blocks';
-import ServerSideRender from '@wordpress/server-side-render';
-import { useBlockProps } from '@wordpress/block-editor';
-
-registerBlockType('um-block/um-password-reset', {
- edit: function () {
- const blockProps = useBlockProps();
-
- return (
-
-
-
- );
- },
-
- save: () => null
-});
+(()=>{"use strict";var e={n:o=>{var r=o&&o.__esModule?()=>o.default:()=>o;return e.d(r,{a:r}),r},d:(o,r)=>{for(var t in r)e.o(r,t)&&!e.o(o,t)&&Object.defineProperty(o,t,{enumerable:!0,get:r[t]})},o:(e,o)=>Object.prototype.hasOwnProperty.call(e,o)};const o=window.wp.blocks,r=window.wp.serverSideRender;var t=e.n(r);const n=window.wp.blockEditor,s=window.ReactJSXRuntime;(0,o.registerBlockType)("um-block/um-password-reset",{edit:function(){const e=(0,n.useBlockProps)();return(0,s.jsx)("div",{...e,children:(0,s.jsx)(t(),{block:"um-block/um-password-reset"})})},save:()=>null})})();
\ No newline at end of file
diff --git a/includes/core/class-blocks.php b/includes/core/class-blocks.php
index fa2795fe..25b2cf9d 100644
--- a/includes/core/class-blocks.php
+++ b/includes/core/class-blocks.php
@@ -101,7 +101,7 @@ if ( ! class_exists( 'um\core\Blocks' ) ) {
}
if ( function_exists( 'wp_register_block_metadata_collection' ) ) {
- wp_register_block_metadata_collection( UM_PATH . 'build', UM_PATH . 'build/blocks-manifest.php' );
+ wp_register_block_metadata_collection( UM_PATH . 'includes/blocks', UM_PATH . 'includes/blocks/blocks-manifest.php' );
}
$blocks = array(
@@ -136,7 +136,7 @@ if ( ! class_exists( 'um\core\Blocks' ) ) {
foreach ( $blocks as $k => $block_data ) {
$block_type = str_replace( 'um-block/', '', $k );
- register_block_type_from_metadata( UM_PATH . 'build/' . $block_type, $block_data );
+ register_block_type_from_metadata( UM_PATH . 'includes/blocks/' . $block_type, $block_data );
}
}
diff --git a/package.json b/package.json
index bd4de023..a7c73a87 100644
--- a/package.json
+++ b/package.json
@@ -23,8 +23,8 @@
"scripts": {
"build:docs": "rm -rf docs/hooks/ && jsdoc -c hookdoc-conf.json",
"build": "npm-run-all build:*",
- "build-blocks": "wp-scripts build --webpack-src-dir=includes/blocks --output-path=build",
- "build-manifest": "wp-scripts build-blocks-manifest",
+ "build-blocks": "wp-scripts build --webpack-src-dir=blocks-src --output-path=includes/blocks",
+ "build-manifest": "wp-scripts build-blocks-manifest --input=includes/blocks --output=includes/blocks/blocks-manifest.php",
"build:all-blocks": "npm-run-all build-blocks build-manifest"
},
"engines": {
diff --git a/phpcs.xml b/phpcs.xml
index 7e29e70d..1c5669a2 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -15,6 +15,8 @@
node_modules/*
documentor/*
\.idea/*
+ blocks-src/*
+ build/*