maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-29 13:06:03 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #261 from sharetribe/fix-sale-loading-error-text

Browse source 
Fix loading/error text style
This commit is contained in:
Kimmo Puputti 2017-06-30 11:45:54 +03:00 • committed by GitHub
commit 99947e4019
4 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/containers/OrderPage/OrderPage.css
View file

@ -1,5 +1,14 @@
.title {
margin: 1rem 1rem 2rem 1rem;
@import '../../marketplace.css';
.loading {
margin-left: 24px;
margin-right: 24px;
}
.error {
margin-left: 24px;
margin-right: 24px;
color: var(--failColor);
}
.tabContent {

4
src/containers/OrderPage/OrderPage.js
View file

@ -36,8 +36,8 @@ export const OrderPageComponent = props => {
});
const loadingOrFaildFetching = fetchOrderError
? <h1 className={css.title}><FormattedMessage id="OrderPage.fetchOrderFailed" /></h1>
: <h1 className={css.title}><FormattedMessage id="OrderPage.loadingData" /></h1>;
? <p className={css.error}><FormattedMessage id="OrderPage.fetchOrderFailed" /></p>
: <p className={css.loading}><FormattedMessage id="OrderPage.loadingData" /></p>;
const panel = isDataAvailable && currentTransaction.id
? <OrderDetailsPanel className={detailsClassName} transaction={currentTransaction} />

13
src/containers/SalePage/SalePage.css
View file

@ -1,9 +1,22 @@
@import '../../marketplace.css';
.root {
display: flex;
flex-direction: column;
flex: 1;
}
.loading {
margin-left: 24px;
margin-right: 24px;
}
.error {
margin-left: 24px;
margin-right: 24px;
color: var(--failColor);
}
.actionButtons {
display: flex;
justify-content: space-between;

8
src/containers/SalePage/SalePage.js
View file

@ -49,13 +49,13 @@ export const SalePageComponent = props => {
[css.tabContentVisible]: props.tab === 'details',
});
const loadingOrFaildFetching = fetchSaleError
? <h1><FormattedMessage id="SalePage.fetchSaleFailed" /></h1>
: <h1><FormattedMessage id="SalePage.loadingData" /></h1>;
const loadingOrFailedFetching = fetchSaleError
? <p className={css.error}><FormattedMessage id="SalePage.fetchSaleFailed" /></p>
: <p className={css.loading}><FormattedMessage id="SalePage.loadingData" /></p>;
const panel = isDataAvailable && currentTransaction.id
? <SaleDetailsPanel className={detailsClassName} transaction={currentTransaction} />
: loadingOrFaildFetching;
: loadingOrFailedFetching;
const isPreauthorizedState = currentTransaction.attributes.state ===
propTypes.TX_STATE_PREAUTHORIZED;