Skip to content
Open
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
2 changes: 1 addition & 1 deletion ashes/src/components/activity-notifications/panel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';

// components
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';
import NotificationItem from '../activity-notifications/item';
import { PrimaryButton } from 'components/core/button';

Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/channels/amazon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { bindActionCreators } from 'redux';
// components
import { PageTitle } from 'components/section-title';
import { PrimaryButton } from 'components/core/button';
import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import FormField from 'components/forms/formfield';
import Spinner from 'components/core/spinner';

Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/common/totals.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import _ from 'lodash';
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';
import Currency from './currency';

const TotalsFooter = props => {
Expand Down
32 changes: 32 additions & 0 deletions ashes/src/components/core/content-box/content-box.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
.box {
color: #484848;
position: relative;
border: 1px solid #d9d9d9;
margin-bottom: 20px;
}

.header {
display: flex;
align-items: center;
padding: 22px 20px 21px;

background-color: #f7f7f7;
border-bottom: 1px solid #d9d9d9;

font-size: 16px;
font-weight: 600;
line-height: 1;
}

.title {
flex: 1;
}

.controls {

}

.body {
padding: 20px;
background-color: #fff;
}
47 changes: 47 additions & 0 deletions ashes/src/components/core/content-box/content-box.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/* @flow */

// libs
import { isEmpty } from 'lodash';
import classNames from 'classnames';
import React, { Element } from 'react';

// styles
import s from './content-box.css';

type Props = {
id: string,
title: string | Element<any>,
className: string,
bodyClassName: string,
actionBlock: Element<any>,
children: Element<any>,
footer: Element<any>,
indentContent: boolean,
renderContent: Function,
viewContent: Element<any>,
}

export default (props: Props) => {
let body = props.children;

if (isEmpty(body)) {
if (props.renderContent) {
body = props.renderContent();
} else if (props.viewContent) {
body = props.viewContent;
}
}

return (
<div id={props.id} className={classNames(s.box, props.className)}>
<header className={s.header}>
<div className={s.title}>{props.title}</div>
<div className={s.controls}>{props.actionBlock}</div>
</header>
<div className={classNames(s.body, props.bodyClassName)}>
{body}
</div>
{props.footer}
</div>
);
};
1 change: 1 addition & 0 deletions ashes/src/components/core/content-box/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default from './content-box';
2 changes: 1 addition & 1 deletion ashes/src/components/coupons/form/coupon-codes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { autobind } from 'core-decorators';
import { connect } from 'react-redux';

// components
import ContentBox from '../../content-box/content-box';
import ContentBox from 'components/core/content-box';
import RadioButton from 'components/core/radio-button';
import Counter from 'components/core/counter';
import FormField from '../../forms/formfield';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/coupons/form/usage-rules.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import React, { Component, Element } from 'react';
import { autobind } from 'core-decorators';

// components
import ContentBox from '../../content-box/content-box';
import ContentBox from 'components/core/content-box';
import RadioButton from 'components/core/radio-button';
import Counter from 'components/core/counter';

Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/customers-groups/group-details.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import BulkMessages from 'components/bulk-actions/bulk-messages';
import { SelectableSearchList, makeTotalCounter } from 'components/list-page';
import { PrimaryButton, Button } from 'components/core/button';
import MultiSelectRow from 'components/table/multi-select-row';
import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import Criterion from './editor/criterion-view';
import CustomerGroupStats from './stats';
import SearchCustomersModal from './customers/search-modal';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/customers/account-password.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';

export default class CustomerAccountPassword extends React.Component {

Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/customers/account-status.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';
import { SliderCheckbox } from 'components/core/checkbox';
import { connect } from 'react-redux';
import * as CustomersActions from '../../modules/customers/details';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/customers/address-book.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import _ from 'lodash';
import React from 'react';
import PropTypes from 'prop-types';
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';
import Addresses, { createAddressBox } from '../addresses/addresses';
import AddressBox from '../addresses/address-box';
import AddressForm from '../addresses/address-form';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/customers/contacts.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { connect } from 'react-redux';
import * as CustomerContactActions from '../../modules/customers/contacts';

// components
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';
import FormField from '../forms/formfield';
import Form from '../forms/form';
import { ApiErrors } from 'components/utils/errors';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/customers/credit-cards.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { autobind } from 'core-decorators';

import * as CustomerCreditCardActions from '../../modules/customers/credit-cards';

import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';
import EmptyText from '../content-box/empty-text';
import CreditCardBox from '../credit-cards/card-box';
import ConfirmationModal from 'components/core/confirmation-modal';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/customers/groups/groups.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import classNames from 'classnames';

import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import { AddButton, DeleteButton } from 'components/core/button';
import SearchGroupModal from './search-group-modal';

Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/customers/notification-settings.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';
import { SliderCheckbox } from 'components/core/checkbox';

export default class CustomerNotificationSettings extends React.Component {
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/customers/roles.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';

export default class CustomerRoles extends React.Component {

Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/customers/suggest-products.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';

import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';
import { Button } from 'components/core/button';

import Api from 'lib/api';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/discounts-panel/discounts-panel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import React, { Component } from 'react';
import _ from 'lodash';

import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import PanelHeader from 'components/panel-header/panel-header';
import DiscountRow from './discount-row';
import TableView from 'components/table/tableview';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/merchant-applications/details.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import _ from 'lodash';
import { Dropdown } from 'components/dropdown';
import { PageTitle } from 'components/section-title';
import { PrimaryButton } from 'components/core/button';
import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import Spinner from 'components/core/spinner';

// redux
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/object-form/object-form.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import React from 'react';

import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';
import ObjectFormInner from './object-form-inner';

type Props = {
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/object-page/object-details-deux.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { addKeys } from 'lib/react-utils';

// components
import { Form } from 'components/forms';
import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import ObjectFormInner from 'components/object-form/object-form-inner';
import ObjectScheduler from 'components/object-scheduler/object-scheduler';
import Tags from 'components/tags/tags';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/object-page/object-details.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { expandRefs } from 'lib/object-schema';
import { addKeys } from 'lib/react-utils';

// components
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';
import ObjectFormInner from '../object-form/object-form-inner';
import ObjectScheduler from '../object-scheduler/object-scheduler';
import { Form } from '../forms';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/orders/order-coupons.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import React, { Component, Element } from 'react';
import _ from 'lodash';

import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import CouponsPanel from 'components/coupons-panel/coupons-panel';
import PanelHeader from 'components/panel-header/panel-header';

Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/orders/order-line-items.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import React from 'react';

import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import SkuLineItems from 'components/sku-line-items/sku-line-items';

import OrderParagon from 'paragons/order';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/orders/payments.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import React, { Element } from 'react';

import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import PanelHeader from 'components/panel-header/panel-header';
import PaymentsPanel from 'components/payments-panel/payments-panel';

Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/orders/shipments/shipment.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import React, { Component, Element } from 'react';
import { autobind } from 'core-decorators';

// components
import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import TableView from 'components/table/tableview';
import ShipmentRow from './shipment-row';

Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/orders/shipments/unshipped-items.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { autobind } from 'core-decorators';
import { itemStateTitles, itemReasonsTitles } from 'paragons/shipment';

// components
import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import TableView from 'components/table/tableview';
import TableRow from 'components/table/row';
import TableCell from 'components/table/cell';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/orders/shipping-address.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';

import AddressDetails from '../addresses/address-details';
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';

type Props = {
order: Object,
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/origin-integrations/details.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { getUserId } from 'lib/claims';
// components
import { PageTitle } from 'components/section-title';
import { PrimaryButton } from 'components/core/button';
import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import FormField from 'components/forms/formfield';
import Spinner from 'components/core/spinner';

Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/payment/payment.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import _ from 'lodash';
import React from 'react';
import PropTypes from 'prop-types';
import TableView from '../table/tableview';
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';

export default class RmaPayment extends React.Component {
render() {
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/products/options/option-entry.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { autobind } from 'core-decorators';
import { assoc } from 'sprout-data';

// components
import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import ValueEntry from './value-entry';
import ValueEditDialog from './value-edit-dialog';

Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/products/options/option-list.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { autoAssignVariants } from 'paragons/variants';
import { skuId } from 'paragons/product';

// components
import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import ConfirmationModal from 'components/core/confirmation-modal';
import OptionEntry from './option-entry';
import OptionEditDialog from './option-edit-dialog';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/products/product-amazon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import * as schemaActions from 'modules/object-schema';

// components
import Spinner from 'components/core/spinner';
import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import SaveCancel from 'components/core/save-cancel';
import Form from 'components/forms/form';
import ProductAmazonMain from './product-amazon-main';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/products/skus/sku-content-box.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import _ from 'lodash';
import { assoc, dissoc } from 'sprout-data';

// components
import ContentBox from 'components/content-box/content-box';
import ContentBox from 'components/core/content-box';
import SkuList from './sku-list';
import ConfirmationModal from 'components/core/confirmation-modal';
import { Checkbox } from 'components/core/checkbox';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/rmas/payment.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import _ from 'lodash';
import React from 'react';
import PropTypes from 'prop-types';
import TableView from '../table/tableview';
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';

export default class RmaPayment extends React.Component {
render() {
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/rmas/rma.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { PageTitle } from '../section-title';
import { PrimaryButton } from 'components/core/button';
import PageNav from 'components/core/page-nav';
import { PanelList, PanelListItem } from '../panel/panel-list';
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';
import State from '../common/state';

import * as rmaActions from '../../modules/rmas/details';
Expand Down
2 changes: 1 addition & 1 deletion ashes/src/components/shipping/shipping-method.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import _ from 'lodash';
import React from 'react';
import PropTypes from 'prop-types';
import EditableContentBox from '../content-box/editable-content-box';
import ContentBox from '../content-box/content-box';
import ContentBox from 'components/core/content-box';
import TableView from '../table/tableview';
import ShippingMethodRow from './shipping-method-row';

Expand Down
Loading