Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update/use newfold UI container component #850

Merged
merged 7 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@
"newfold-labs/wp-module-global-ctb": "^1.0.9",
"newfold-labs/wp-module-help-center": "1.0.21",
"newfold-labs/wp-module-loader": "^1.0.10",
"newfold-labs/wp-module-marketplace": "^2.1.0",
"newfold-labs/wp-module-marketplace": "^2.2.0",
"newfold-labs/wp-module-notifications": "^1.2.1",
"newfold-labs/wp-module-onboarding": "^1.11.10",
"newfold-labs/wp-module-patterns": "^0.1.10",
"newfold-labs/wp-module-performance": "^1.2.2",
"newfold-labs/wp-module-performance": "^1.3.0",
"newfold-labs/wp-module-runtime": "^1.0.7",
"newfold-labs/wp-module-secure-passwords": "^1.1",
"newfold-labs/wp-module-sso": "^1.0.4",
"newfold-labs/wp-module-staging": "^1.1.1",
"newfold-labs/wp-module-staging": "^1.2.2",
"wp-forge/wp-update-handler": "^1.0",
"wp-forge/wp-upgrade-handler": "^1.0"
}
Expand Down
38 changes: 19 additions & 19 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@heroicons/react": "^2.0.18",
"@newfold-labs/wp-module-ecommerce": "^1.3.14",
"@newfold-labs/wp-module-runtime": "^1.0.7",
"@newfold/ui-component-library": "^1.0.0",
"@newfold/ui-component-library": "^1.0.1",
"@reduxjs/toolkit": "^1.9.6",
"@wordpress/compose": "^6.24.0",
"@wordpress/dom-ready": "^3.47.0",
Expand Down
15 changes: 0 additions & 15 deletions src/app/components/page/index.js

This file was deleted.

159 changes: 0 additions & 159 deletions src/app/components/section/index.js

This file was deleted.

11 changes: 5 additions & 6 deletions src/app/components/webinars-banner/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { useState, useEffect } from '@wordpress/element';
import { Button, Title } from '@newfold/ui-component-library';
import { Button, Container, Title } from '@newfold/ui-component-library';
import {
ArrowRightIcon,
CalendarIcon,
ClockIcon,
} from '@heroicons/react/24/outline';
import { ReactComponent as WebinarsVector } from 'App/images/webinars-vector.svg';
import { SectionContainer, SectionContent } from 'App/components/section';

/**
* A component that displays the next monthly webinar.
Expand Down Expand Up @@ -106,8 +105,8 @@ const WebinarsBanner = () => {
}

return (
<SectionContainer className="wppbh-webinars-banner-section nfd-bg-[#E5F6FE]">
<SectionContent>
<Container className="wppbh-webinars-banner-section nfd-bg-[#E5F6FE]">
<Container.Block>
<div className="nfd-flex nfd-flex-col nfd-gap-8 xl:nfd-flex-row xl:nfd-items-center">
<div className="max-[1378px]:nfd-hidden">
<WebinarsVector />
Expand Down Expand Up @@ -173,8 +172,8 @@ const WebinarsBanner = () => {
</Button>
</div>
</div>
</SectionContent>
</SectionContainer>
</Container.Block>
</Container>
);
};

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/ecommerce/page.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import './styles.scss';
import { useContext } from '@wordpress/element';
import { useLocation, useNavigate, useSearchParams } from 'react-router-dom';
import { Page } from '@newfold/ui-component-library';
import { NewfoldECommerce } from '@newfold-labs/wp-module-ecommerce';
import '@newfold-labs/wp-module-ecommerce/bluehost.css';
import AppStore from 'App/data/store';
import { bluehostSettingsApiFetch } from 'App/util/helpers';
import { Page } from 'App/components/page';
import { useNotification } from 'App/components/notifications';

const ECommerce = () => {
Expand Down
Loading
Loading