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

[WIP]Jpg test #689

Closed
wants to merge 11 commits into from
Closed
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
11 changes: 8 additions & 3 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,14 @@ import {
BrowserRouter as Router, Switch, withRouter, Route,
} from 'react-router-dom';
import intl from 'react-intl-universal';
import {
AppHeaderMain, AppFooterMain, Messagecontainer, CountProvider, RequisitionListCountProvider, ComplianceSupportModal,
} from './components/src/index';

import AppHeaderMain from './components/src/AppHeader/appheader.main';
import AppFooterMain from './components/src/AppFooterMain/appfooter.main';
import Messagecontainer from './components/src/MessageContainer/messagecontainer';
import { CountProvider } from './components/src/cart-count-context';
import { RequisitionListCountProvider } from './components/src/requisition-list-count-context';
import ComplianceSupportModal from './components/src/ComplianceSupport/compliancesupport.main';

import packageJson from '../package.json';
import RouteWithSubRoutes from './containers/RouteContainers/RouteWithSubRoutes';
import withAnalytics from './utils/Analytics';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { MemoryRouter } from 'react-router';
import { text } from '@storybook/addon-knobs/react';
import Readme from './README.md';
import { textToFunc } from '../../../../storybook/utils/storybookUtils';
import { B2bAddProductsModal } from '../index';
import B2bAddProductsModal from './b2b.add.products.modal';

storiesOf('Components|B2bAddProductsModal', module)
.addParameters({
Expand Down
40 changes: 20 additions & 20 deletions src/components/src/B2cHomePage/b2c.home.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,28 @@ import Config from '../../../ep.config.json';

import './b2c.home.page.scss';

import bannerImage1 from '../../../images/site-images/b2c-banner-1.png';
import bannerImage2 from '../../../images/site-images/b2c-banner-2.png';
import bannerImage3 from '../../../images/site-images/b2c-banner-3.png';
import productImage1 from '../../../images/site-images/b2c-product-1.png';
import productImage2 from '../../../images/site-images/b2c-product-2.png';
import productImage3 from '../../../images/site-images/b2c-product-3.png';
import productImage4 from '../../../images/site-images/b2c-product-4.png';
import productImage5 from '../../../images/site-images/b2c-product-5.png';
import productImage6 from '../../../images/site-images/b2c-product-6.png';
import productImage7 from '../../../images/site-images/b2c-product-7.png';
import bannerImage1 from '../../../images/site-images/b2c-banner-1.jpg';
import bannerImage2 from '../../../images/site-images/b2c-banner-2.jpg';
import bannerImage3 from '../../../images/site-images/b2c-banner-3.jpg';
import productImage1 from '../../../images/site-images/b2c-product-1.jpg';
import productImage2 from '../../../images/site-images/b2c-product-2.jpg';
import productImage3 from '../../../images/site-images/b2c-product-3.jpg';
import productImage4 from '../../../images/site-images/b2c-product-4.jpg';
import productImage5 from '../../../images/site-images/b2c-product-5.jpg';
import productImage6 from '../../../images/site-images/b2c-product-6.jpg';
import productImage7 from '../../../images/site-images/b2c-product-7.jpg';


const bannerFileName1 = 'b2c-banner-1.png';
const bannerFileName2 = 'b2c-banner-2.png';
const bannerFileName3 = 'b2c-banner-3.png';
const productFileName1 = 'b2c-product-1.png';
const productFileName2 = 'b2c-product-2.png';
const productFileName3 = 'b2c-product-3.png';
const productFileName4 = 'b2c-product-4.png';
const productFileName5 = 'b2c-product-5.png';
const productFileName6 = 'b2c-product-6.png';
const productFileName7 = 'b2c-product-7.png';
const bannerFileName1 = 'b2c-banner-1.jpg';
const bannerFileName2 = 'b2c-banner-2.jpg';
const bannerFileName3 = 'b2c-banner-3.jpg';
const productFileName1 = 'b2c-product-1.jpg';
const productFileName2 = 'b2c-product-2.jpg';
const productFileName3 = 'b2c-product-3.jpg';
const productFileName4 = 'b2c-product-4.jpg';
const productFileName5 = 'b2c-product-5.jpg';
const productFileName6 = 'b2c-product-6.jpg';
const productFileName7 = 'b2c-product-7.jpg';

const B2CHomePage: React.FunctionComponent = () => {
// Set the language-specific configuration for indi integration
Expand Down
2 changes: 1 addition & 1 deletion src/components/src/CartPopUp/cartpopup.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import * as React from 'react';
import Readme from './README.md';
import { storiesOf } from '@storybook/react';
import { MemoryRouter } from 'react-router';
import { CountProvider } from '../index';
import { text, object } from "@storybook/addon-knobs/react";
import CartPopUp from './cartpopup';
import { CountProvider } from '../cart-count-context';

const appHeaderLinks = '/';
const cartData = { name: 'Default', count: 5 };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import * as React from 'react';
import Readme from './README.md';
import { storiesOf } from '@storybook/react';
import { MemoryRouter } from 'react-router';
import { CountProvider } from '../index';
import { object } from "@storybook/addon-knobs/react";
import CountInfoPopUpProps from './countinfopopup';
import { CountProvider } from '../cart-count-context';

const countData = {
name: 'Default',
Expand Down
196 changes: 0 additions & 196 deletions src/components/src/index.ts

This file was deleted.

16 changes: 8 additions & 8 deletions src/containers/CartPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
import React from 'react';
import * as intl from 'react-intl-universal';
import { RouteComponentProps } from 'react-router-dom';
import {
CartMain,
CheckoutSummaryList,
AddPromotionContainer,
CartCreate,
CartClear,
AlertContainer,
} from '../components/src/index';

import AlertContainer from '../components/src/AlertContainer/alert.container';
import CartClear from '../components/src/CartClear/cartclear';
import CartCreate from '../components/src/CartCreate/cart.create';
import AddPromotionContainer from '../components/src/AddPromotionContainer/add.promotion.container';
import CheckoutSummaryList from '../components/src/CheckoutSummaryList/checkout.summarylist';
import CartMain from '../components/src/CartMain/cart.main';

import Config from '../ep.config.json';
import { login } from '../utils/AuthService';
import { cortexFetch } from '../utils/Cortex';
Expand Down
2 changes: 1 addition & 1 deletion src/containers/CategoryPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import React from 'react';
import { RouteComponentProps } from 'react-router-dom';
import { CategoryItemsMain } from '../components/src/index';
import CategoryItemsMain from '../components/src/CategoryItems/categoryitems.main';

function CategoryPage(props: RouteComponentProps) {
function handleProductFacetSelection(offerSearch, title) {
Expand Down
14 changes: 11 additions & 3 deletions src/containers/CheckoutPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,17 @@ import React from 'react';
import intl from 'react-intl-universal';
import { RouteComponentProps } from 'react-router-dom';
import Modal from 'react-responsive-modal';
import {
GiftcertificateFormMain, AddressContainer, CheckoutSummaryList, ShippingOptionContainer, PaymentMethodContainer, ProfileemailinfoMain, AddressFormMain, PaymentSelectorMain, PurchaseOrderWidget,
} from '../components/src/index';

import PurchaseOrderWidget from '../components/src/PurchaseOrderWidget/purchase.order.widget';
import PaymentSelectorMain from '../components/src/PaymentSelectorMain/paymentselector.main';
import AddressFormMain from '../components/src/AddressForm/addressform.main';
import ProfileemailinfoMain from '../components/src/ProfileEmailInfo/profileemailinfo.main';
import PaymentMethodContainer from '../components/src/PaymentMethodContainer/paymentmethod.container';
import ShippingOptionContainer from '../components/src/ShippingOption/shippingoption.container';
import GiftcertificateFormMain from '../components/src/GiftCertificateForm/giftcertificateform.main';
import AddressContainer from '../components/src/AddressContainer/address.container';
import CheckoutSummaryList from '../components/src/CheckoutSummaryList/checkout.summarylist';

import { login } from '../utils/AuthService';
import { cortexFetch } from '../utils/Cortex';
import Config from '../ep.config.json';
Expand Down
10 changes: 5 additions & 5 deletions src/containers/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
*
*/

import React, { Suspense } from 'react';
import React, { Suspense, lazy } from 'react';
import { withRouter } from 'react-router';
import {
B2BHomePage,
B2CHomePage,
} from '../components/src/index';

import Config from '../ep.config.json';

import './HomePage.scss';

const B2BHomePage = lazy(() => import(/* webpackChunkName: "b2b.home.page" */ '../components/src/B2bHomePage/b2b.home.page'));
const B2CHomePage = lazy(() => import(/* webpackChunkName: "b2c.home.page" */ '../components/src/B2cHomePage/b2c.home.page'));

const HomePage: React.FunctionComponent = () => (
<Suspense fallback={<div />}>
{Config.b2b.enable
Expand Down
2 changes: 1 addition & 1 deletion src/containers/MyAccountMain.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

import React from 'react';
import { B2bSideMenu } from '../components/src';
import B2bSideMenu from '../components/src/B2bSideMenu/b2b.sidemenu';
import RouteWithSubRoutes from './RouteContainers/RouteWithSubRoutes';
import { adminFetch, cortexFetch } from '../utils/Cortex';
import * as Config from '../ep.config.json';
Expand Down
2 changes: 1 addition & 1 deletion src/containers/OrderHistoryPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import React from 'react';
import intl from 'react-intl-universal';
import { RouteComponentProps } from 'react-router-dom';
import { PurchaseDetailsMain } from '../components/src/index';
import PurchaseDetailsMain from '../components/src/PurchaseDetails/purchasedetails.main';
import { login } from '../utils/AuthService';
import { purchaseLookup, cortexFetchPurchaseLookupForm } from '../utils/CortexLookup';
import { cortexFetch } from '../utils/Cortex';
Expand Down
Loading