Merge pull request #303 from newfold-labs/PRESS0-1194

update naming conventions
newfold-labs · Jul 10, 2024 · 9e85f65 · 9e85f65
2 parents 31bf53d + 5e30e16
commit 9e85f65
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/includes/ECommerce.php b/includes/ECommerce.php
@@ -164,7 +164,7 @@ function ( $classes ) {
 				'single'       => true,
 			)
 		);
-		add_filter( 'newfold-runtime', array( $this, 'add_to_runtime' ) );
+		add_filter( 'newfold_runtime', array( $this, 'add_to_runtime' ) );
 		$this->add_filters(
 			array( 'postbox_classes_page_wpseo_meta', 'postbox_classes_post_wpseo_meta', 'postbox_classes_product_wpseo_meta' ),
 			function ( $classes ) {

diff --git a/src/components/OnboardingScreen.js b/src/components/OnboardingScreen.js
@@ -165,7 +165,7 @@ export function OnboardingScreen({
                     }}
                     as="a"
                     className="nfd-bg-canvas "
-                    href={NewfoldRuntime.siteDetails.url}
+                    href={NewfoldRuntime.siteUrl}
                     target="_blank"
                     variant="secondary"
                     data-cy="view-site"

diff --git a/src/components/SiteStatus.js b/src/components/SiteStatus.js
@@ -85,7 +85,7 @@ export function SiteStatus({ comingSoon, toggleComingSoon, notify }) {
         <Button
           as="a"
           className="nfd-bg-canvas"
-          href={NewfoldRuntime.hasCapability("isEcommerce") && window.location.href.includes('store') ? `${NewfoldRuntime.siteDetails.url}/shop` : NewfoldRuntime.siteDetails.url}
+          href={NewfoldRuntime.hasCapability("isEcommerce") && window.location.href.includes('store') ? `${NewfoldRuntime.siteUrl}/shop` : NewfoldRuntime.siteUrl}
           target="_blank"
           variant="secondary"
           id="view-site"

diff --git a/src/sdk/NewfoldRuntime.js b/src/sdk/NewfoldRuntime.js
@@ -6,33 +6,33 @@ export const NewfoldRuntime = {
     return window.NewfoldRuntime?.capabilities[name] === true;
   },
   adminUrl(path) {
-    return window.NewfoldRuntime?.admin_url + path;
+    return window.NewfoldRuntime?.adminUrl + path;
   },
   createApiUrl(url, qs = {}) {
-    return addQueryArgs(window.NewfoldRuntime?.base_url, {
+    return addQueryArgs(window.NewfoldRuntime?.homeUrl, {
       rest_route: url,
       ...qs,
     });
   },
-  get siteDetails() {
-    return window.NewfoldRuntime?.site;
+  get siteUrl() {
+    return window.NewfoldRuntime?.siteUrl;
   },
-  get sdk() {
-    return window.NewfoldRuntime?.sdk;
-  },
-  get isWoo(){
+  get isWoo() {
     return window.NewfoldRuntime?.isWoocommerceActive
   },
-  get isJet(){
+  get isJet() {
     return window.NewfoldRuntime?.isJetpackBoostActive
   },
-  get homeUrl(){
+  get homeUrl() {
     return window.NewfoldRuntime?.homeUrl
   },
-  get currentTheme(){
+  get currentTheme() {
     return (window.NewfoldRuntime?.currentTheme);
   },
-  get plugin(){
+  get plugin() {
     return (window.NewfoldRuntime?.plugin);
+  },
+  get ecommerce() {
+    return (window.NewfoldRuntime?.ecommerce);
   }
 };
diff --git a/src/sdk/plugins.js b/src/sdk/plugins.js
@@ -9,7 +9,7 @@ const Endpoints = {
   PLUGIN_INSTALL: NewfoldRuntime.createApiUrl("/newfold-installer/v1/plugins/install"),
 };
 
-const INSTALL_TOKEN = NewfoldRuntime.sdk.ecommerce.install_token;
+const INSTALL_TOKEN = NewfoldRuntime.ecommerce.install_token;
 
 export const PluginsSdk = {
   queries: {

diff --git a/src/sdk/runtime.js b/src/sdk/runtime.js
@@ -1,7 +1,7 @@
 import { NewfoldRuntime } from "./NewfoldRuntime";
 
 export const RuntimeSdk = {
-  brandSettings: NewfoldRuntime.sdk.ecommerce?.brand_settings,
+  brandSettings: NewfoldRuntime.ecommerce?.brand_settings,
   adminUrl(path, backToNfd = false) {
     let href = NewfoldRuntime.adminUrl(path);
     if (backToNfd === false) {
@@ -13,6 +13,6 @@ export const RuntimeSdk = {
     return `${page}?${query}`;
   },
   nonce(name) {
-    return NewfoldRuntime.sdk.ecommerce.nonces?.[name];
+    return NewfoldRuntime.ecommerce.nonces?.[name];
   },
 };