Merge pull request #618 from newfold-labs/fix/classnames

Fix/classnames

composer.json

@@ -83,16 +83,16 @@
         "newfold-labs/wp-module-global-ctb": "^1.0.13",
         "newfold-labs/wp-module-help-center": "^2.0.0",
         "newfold-labs/wp-module-loader": "^1.0.10",
-        "newfold-labs/wp-module-marketplace": "^2.3.1",
+        "newfold-labs/wp-module-marketplace": "^2.4.0",
         "newfold-labs/wp-module-migration": "^1.0.8",
-        "newfold-labs/wp-module-notifications": "^1.3.0",
+        "newfold-labs/wp-module-notifications": "^1.4.0",
         "newfold-labs/wp-module-onboarding": "^2.3.5",
         "newfold-labs/wp-module-patterns": "2.0.0 as 1.9.9",
         "newfold-labs/wp-module-performance": "2.0.0 as 1.9.9",
         "newfold-labs/wp-module-runtime": "^1.0.11",
         "newfold-labs/wp-module-secure-passwords": "^1.1.1",
         "newfold-labs/wp-module-sso": "^1.0.5",
-        "newfold-labs/wp-module-staging": "^2.0.0",
+        "newfold-labs/wp-module-staging": "^2.1.0",
         "wp-forge/wp-update-handler": "^1.0.2",
         "wp-forge/wp-upgrade-handler": "^1.0"
     }

src/app/components/action-field/index.js

@@ -1,5 +1,4 @@
 import { Button, Label } from '@newfold/ui-component-library';
-import classNames from 'classnames';
 
 const ActionField = ( {
 	label,

src/app/components/app-nav/index.js

@@ -2,7 +2,6 @@ import { useEffect, useState } from '@wordpress/element';
 import apiFetch from '@wordpress/api-fetch';
 import { useViewportMatch } from '@wordpress/compose';
 import { addQueryArgs } from '@wordpress/url';
-import classnames from 'classnames';
 import { filter } from 'lodash';
 import { Modal, SidebarNavigation } from '@newfold/ui-component-library';
 import { default as NewfoldNotifications } from '@modules/wp-module-notifications/assets/js/components/notifications/';
@@ -171,7 +170,6 @@ export const SideNav = () => {
 				methods={ {
 					apiFetch,
 					addQueryArgs,
-					classnames,
 					filter,
 					useState,
 					useEffect,

src/app/components/app-nav/logo.js

@@ -1,5 +1,5 @@
 import { Button } from '@wordpress/components';
-import { Heading } from '..';
+import { Title } from '@newfold/ui-component-library';
 import { ReactComponent as Brand } from '../../../../assets/svg/nav-for-light.svg';
 import { delay } from 'lodash';
 
@@ -27,9 +27,9 @@ const Logo = () => {
 	return (
 		<div className="hgwp-logo-wrap">
 			<Mark />
-			<Heading level="2" className="screen-reader-text">
+			<Title as="h2" className="screen-reader-text">
 				{ __( 'Hostgator WordPress Plugin', 'wp-plugin-hostgator' ) }
-			</Heading>
+			</Title>
 		</div>
 	);
 };

src/app/components/errorCard/index.js

@@ -1,5 +1,5 @@
 import './stylesheet.scss';
-import { Heading } from '../../components';
+import { Title } from '@newfold/ui-component-library';
 import { dispatchUpdateSnackbar } from '../../util/helpers';
 import {
 	Card,
@@ -15,7 +15,7 @@ const ErrorCard = ( { error, className, notice = 'Error!' } ) => {
 	return (
 		<Card className={ classNames( 'error-card', className ) }>
 			<CardHeader>
-				<Heading level="3">
+				<Title as="h3">
 					<Dashicon
 						icon="warning"
 						style={ {
@@ -25,7 +25,7 @@ const ErrorCard = ( { error, className, notice = 'Error!' } ) => {
 						} }
 					/>{ ' ' }
 					{ __( 'Oh No, An Error!', 'wp-plugin-hostgator' ) }
-				</Heading>
+				</Title>
 			</CardHeader>
 			<CardBody>
 				<p>

src/app/components/index.js

@@ -1,3 +1 @@
-export { default as Accordion } from './accordion';
 export { default as ErrorCard } from './errorCard';
-export { default as Heading } from './heading';

src/app/pages/admin/index.js

@@ -1,9 +1,8 @@
-import classNames from 'classnames';
+import { Container, Page } from '@newfold/ui-component-library';
 import HelpCenterSettings from '../settings/helpCenterSettings';
 import WonderBlocksSettings from '../settings/wonderBlocksSettings';
 import StagingFeatureSettings from '../settings/stagingFeatureSettings';
 import PerformanceFeatureSettings from '../settings/performanceFeatureSettings';
-import { Container, Page } from '@newfold/ui-component-library';
 
 const Admin = () => {
 	return (

src/app/pages/marketplace/index.js

@@ -1,7 +1,6 @@
 import apiFetch from '@wordpress/api-fetch';
 import { useState, useEffect } from '@wordpress/element';
 import { useLocation, useMatch, useNavigate } from 'react-router-dom';
-import classnames from 'classnames';
 import { Container, Page } from '@newfold/ui-component-library';
 import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime';
 // component sourced from marketplace module
@@ -43,7 +42,7 @@ const MarketplacePage = () => {
 	// methods to pass to module
 	const moduleMethods = {
 		apiFetch,
-		classnames,
+		classNames,
 		useState,
 		useEffect,
 		useLocation,

src/app/pages/performance/index.js

@@ -2,7 +2,6 @@ import AppStore from '../../data/store';
 import { Container, Page } from '@newfold/ui-component-library';
 import { useState, useEffect, useContext, Fragment } from '@wordpress/element';
 import apiFetch from '@wordpress/api-fetch';
-import classnames from 'classnames';
 import { useUpdateEffect } from 'react-use';
 import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime';
 import { useNotification } from 'App/components/notifications';
@@ -101,7 +100,6 @@ const PerformancePage = () => {
 	// methods to pass to module
 	const moduleMethods = {
 		apiFetch,
-		classnames,
 		useState,
 		useEffect,
 		useContext,

src/app/pages/staging/index.js

@@ -1,7 +1,6 @@
 import './stylesheet.scss';
 import { useState, useEffect } from '@wordpress/element';
 import apiFetch from '@wordpress/api-fetch';
-import classnames from 'classnames';
 import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime';
 import { useNotification } from 'App/components/notifications';
 // component sourced from staging module
@@ -127,7 +126,7 @@ const Staging = () => {
 	// methods to pass to module
 	const moduleMethods = {
 		apiFetch,
-		classnames,
+		classNames,
 		useState,
 		useEffect,
 		NewfoldRuntime,