Merge pull request #40 from newfold-labs/feature/press0/1959

Remove Coming Soon Pre publish Modal CSS

bootstrap.php

@@ -17,7 +17,7 @@
 	return;
 }
 
-define( 'NFD_COMING_SOON_MODULE_VERSION', '1.2.5' );
+define( 'NFD_COMING_SOON_MODULE_VERSION', '1.2.6' );
 
 require __DIR__ . '/includes/functions.php';
 

build/1.2.6/coming-soon.asset.php

@@ -0,0 +1 @@
+<?php return array('dependencies' => array('react', 'wp-components', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => '99d786ddc46b8ca5c7b2');

composer.json

@@ -26,7 +26,7 @@
     ]
   },
   "require-dev": {
-    "newfold-labs/wp-php-standards": "^1.2"
+    "newfold-labs/wp-php-standards": "^1.2.4"
   },
   "scripts": {
     "fix": [
@@ -46,7 +46,7 @@
     }
   },
   "require": {
-    "newfold-labs/wp-module-data": ">=2.4.18",
+    "newfold-labs/wp-module-data": ">=2.6.2",
     "wp-forge/wp-upgrade-handler": "^1.0"
   }
 }

package.json

@@ -1,5 +1,5 @@
 {
-	"version": "1.2.5",
+	"version": "1.2.6",
 	"description": "Coming Soon",
 	"license": "GPL-2.0-or-later",
 	"private": true,

src/coming-soon.js

@@ -1,8 +1,3 @@
-/**
- * Styles.
- */
-import './styles/app.scss';
-
 /**
  * WordPress dependencies
  */

src/components/Modal.jsx

@@ -1,63 +1,78 @@
 /**
  * External dependencies
  */
-import { useState } from 'react';
+import { useState } from '@wordpress/element';
 
 /**
  * WordPress dependencies
  */
-import { Modal as WP2Modal, Button, Icon } from '@wordpress/components';
+import { Modal as WP2Modal, Button } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
-import { useEffect } from '@wordpress/element';
-import { store as editPostStore } from '@wordpress/edit-post';
 import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { launch } from './Icons';
 import { store as nfdComingSoonStore } from '../store';
-import { setComingSoon } from '../utils/api/comingSoon';
-
 
 const Modal = () => {
 	const { setIsModalOpen } = useDispatch(nfdComingSoonStore);
-	const [isComingSoonActive, setIsComingSoonActive] = useState(true); 
 
-	const { isModalOpen } = useSelect(
-		(select) => ({
-			isModalOpen: select(nfdComingSoonStore).isModalOpen(),
-		})
-	);
+	const { isModalOpen } = useSelect((select) => ({
+		isModalOpen: select(nfdComingSoonStore).isModalOpen(),
+	}));
 
 	const handlePublishAndLaunch = () => {
-		setComingSoon(false);
-		setIsComingSoonActive(false);
+		window.NewfoldRuntime.comingSoon.disable();
 		setIsModalOpen(false);
 	};
 
-	if (!isModalOpen || !isComingSoonActive) {
+	if (!isModalOpen || !window.NewfoldRuntime.comingSoon.isEnabled) {
 		return null;
 	}
 
 	const title = __('Ready to launch your Site?', 'nfd-coming-soon');
-	const heading = __('Pages and posts you publish will not be visible to the public until you launch your site.', 'nfd-coming-soon');
+	const heading = __(
+		'Pages and posts you publish will not be visible to the public until you launch your site.',
+		'nfd-coming-soon'
+	);
 	const launchButtonText = __('Publish & Launch Site', 'nfd-coming-soon');
-	const withoutLaunchButtonText = __('Publish without launching', 'nfd-coming-soon');
+	const withoutLaunchButtonText = __(
+		'Publish Without Launching',
+		'nfd-coming-soon'
+	);
 
 	return (
-		<WP2Modal
-			title={title}
-			onRequestClose={() => setIsModalOpen(false)}
-		>
+		<WP2Modal title={title} onRequestClose={() => setIsModalOpen(false)}>
 			<div>
 				<p>{heading}</p>
-				<div className="modal-buttons">
+				<br />
+				<div
+					style={ {
+						alignContent: 'space-between',
+						display: 'flex',
+						flexWrap: 'wrap',
+						gap: '16px',
+						boxSizing: 'inherit',
+					} }
+				>
 					<Button
-						icon={<Icon icon={launch} />}
-						variant="primary" onClick={handlePublishAndLaunch}>
+						variant="primary"
+						onClick={handlePublishAndLaunch}
+						style={{
+							flex: 1,
+							justifyContent: 'center',
+						}}
+					>
 						{launchButtonText}
 					</Button>
-					<Button variant="secondary" onClick={() => setIsModalOpen(false)}>
+					<Button
+						variant="link"
+						onClick={() => setIsModalOpen(false)}
+						style={{
+							flex: 1,
+							justifyContent: 'center',
+						}}
+					>
 						{withoutLaunchButtonText}
 					</Button>
 				</div>