Browse Source

fix(package.json): go back to old webpack versions

renovate/lint-staged-8.x
Jack Mallers 7 years ago
parent
commit
91abe27589
  1. 4
      app/components/Activity/ActivityModal.js
  2. 7
      app/components/Activity/InvoiceModal.js
  3. 71
      app/components/Activity/PaymentModal.js
  4. 143
      app/components/Activity/PaymentModal.scss
  5. 0
      app/components/Activity/TransactionModal.js
  6. 0
      app/components/Activity/TransactionModal.scss
  7. 5
      app/routes/app/containers/AppContainer.js
  8. 66
      yarn.lock

4
app/components/Activity/ActivityModal.js

@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
import Isvg from 'react-inlinesvg'
// import Transaction from './Transaction'
// import Payment from './Payment'
import PaymentModal from './PaymentModal'
import InvoiceModal from './InvoiceModal'
import x from 'icons/x.svg'
@ -20,7 +20,7 @@ const ActivityModal = ({
}) => {
const MODAL_COMPONENTS = {
// TRANSACTION: Transaction,
// PAYMENT: Payment,
PAYMENT: PaymentModal,
INVOICE: InvoiceModal
}

7
app/components/Activity/InvoiceModal.js

@ -26,7 +26,7 @@ const InvoiceModal = ({
showCurrencyFilters,
currencyName,
currentCurrencyFilters,
setCurrency
onCurrencyFilterClick
}
}) => {
const copyPaymentRequest = () => {
@ -34,11 +34,6 @@ const InvoiceModal = ({
showNotification('Noice', 'Successfully copied to clipboard')
}
const onCurrencyFilterClick = (currency) => {
setCurrency(currency)
setActivityModalCurrencyFilters(false)
}
return (
<div className={styles.container}>
<div className={styles.content}>

71
app/components/Activity/PaymentModal.js

@ -0,0 +1,71 @@
import React from 'react'
import PropTypes from 'prop-types'
import Moment from 'react-moment'
import 'moment-timezone'
import { FaAngleDown } from 'react-icons/lib/fa'
import { btc } from 'utils'
import Value from 'components/Value'
import styles from './PaymentModal.scss'
const PaymentModal = ({
payment,
ticker,
currentTicker,
toggleCurrencyProps: {
setActivityModalCurrencyFilters,
showCurrencyFilters,
currencyName,
currentCurrencyFilters,
onCurrencyFilterClick
}
}) => {
return (
<div className={styles.container}>
<div className={styles.content}>
<section className={styles.left}>
</section>
<section className={styles.right}>
<div className={styles.details}>
<section className={styles.amount}>
<h1>
<Value value={payment.value} currency={ticker.currency} currentTicker={currentTicker} />
</h1>
<section className={styles.currentCurrency} onClick={() => setActivityModalCurrencyFilters(!showCurrencyFilters)}>
<span>{currencyName}</span><span><FaAngleDown /></span>
</section>
<ul className={showCurrencyFilters && styles.active}>
{
currentCurrencyFilters.map(filter =>
<li key={filter.key} onClick={() => onCurrencyFilterClick(filter.key)}>{filter.name}</li>
)
}
</ul>
</section>
<section className={styles.date}>
<p>
<Moment format='MM/DD/YYYY'>{payment.creation_date * 1000}</Moment>
</p>
</section>
</div>
</section>
</div>
</div>
)
}
PaymentModal.propTypes = {
payment: PropTypes.object.isRequired,
ticker: PropTypes.object.isRequired,
currentTicker: PropTypes.object.isRequired,
toggleCurrencyProps: PropTypes.object.isRequired
}
export default PaymentModal

143
app/components/Activity/PaymentModal.scss

@ -0,0 +1,143 @@
@import '../../variables.scss';
.container {
color: $white;
}
.content {
display: flex;
flex-direction: row;
align-items: center;
background: $spaceblue;
width: 85%;
margin: 50px auto;
padding: 30px 0;
.left {
width: 25%;
padding: 0 60px;
}
.right {
width: 75%;
min-height: 220px;
border-left: 1px solid $spaceborder;
padding: 10px 60px;
.details {
display: flex;
flex-direction: row;
justify-content: space-between;
margin-bottom: 40px;
.amount {
display: flex;
flex-direction: row;
align-items: center;
position: relative;
h1 {
font-size: 40px;
margin-right: 10px;
}
.currentCurrency {
cursor: pointer;
transition: 0.25s all;
&:hover {
opacity: 0.5;
}
span {
font-size: 14px;
&:nth-child(1) {
font-weight: bold;
}
}
}
ul {
visibility: hidden;
position: absolute;
top: 40px;
right: -50px;
&.active {
visibility: visible;
}
li {
padding: 8px 15px;
background: #191919;
cursor: pointer;
transition: 0.25s hover;
border-bottom: 1px solid #0f0f0f;
&:hover {
background: #0f0f0f;
}
}
}
}
.date {
font-size: 12px;
text-align: right;
.notPaid {
color: #FF8A65;
margin-top: 5px;
}
}
}
.memo, .request {
h4 {
font-size: 10px;
margin-bottom: 10px;
}
p {
word-wrap: break-word;
max-width: 450px;
}
}
.memo {
margin-bottom: 40px;
p {
font-size: 20px;
}
}
.request p {
font-size: 10px;
max-width: 450px;
line-height: 1.5;
}
}
}
.actions {
display: flex;
flex-direction: row;
justify-content: center;
div {
text-align: center;
margin: 35px 10px;
width: 235px;
padding: 20px 10px;
background: #31343f;
cursor: pointer;
transition: 0.25s all;
&:hover {
background: darken(#31343f, 5%);
}
}
}

0
app/components/Activity/TransactionModal.js

0
app/components/Activity/TransactionModal.scss

5
app/routes/app/containers/AppContainer.js

@ -332,7 +332,10 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
setActivityModalCurrencyFilters: dispatchProps.setActivityModalCurrencyFilters,
setCurrencyFilters: dispatchProps.setCurrencyFilters,
setCurrency: dispatchProps.setCurrency,
onCurrencyFilterClick: (currency) => {
dispatchProps.setCurrency(currency)
dispatchProps.setActivityModalCurrencyFilters(false)
}
}
}

66
yarn.lock

@ -456,6 +456,14 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.22.0:
esutils "^2.0.2"
js-tokens "^3.0.0"
babel-code-frame@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
dependencies:
chalk "^1.1.3"
esutils "^2.0.2"
js-tokens "^3.0.2"
babel-core@^6.0.0, babel-core@^6.24.1, babel-core@^6.7.2:
version "6.25.0"
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729"
@ -669,8 +677,8 @@ babel-jest@^20.0.3:
babel-preset-jest "^20.0.3"
babel-loader@^7.1.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.0.tgz#3fbf2581f085774bd9642dca9990e6d6c1491144"
version "7.1.3"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.3.tgz#ff5b440da716e9153abb946251a9ab7670037b16"
dependencies:
find-cache-dir "^1.0.0"
loader-utils "^1.0.2"
@ -1264,8 +1272,8 @@ babel-preset-babili@^0.1.4:
lodash.isplainobject "^4.0.6"
babel-preset-env@^1.5.1:
version "1.5.2"
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.2.tgz#cd4ae90a6e94b709f97374b33e5f8b983556adef"
version "1.6.1"
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48"
dependencies:
babel-plugin-check-es2015-constants "^6.22.0"
babel-plugin-syntax-trailing-function-commas "^6.22.0"
@ -1426,6 +1434,13 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runti
core-js "^2.4.0"
regenerator-runtime "^0.10.0"
babel-runtime@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
dependencies:
core-js "^2.4.0"
regenerator-runtime "^0.11.0"
babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.25.0, babel-template@^6.7.0:
version "6.25.0"
resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"
@ -1436,7 +1451,7 @@ babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.25.0, babel-te
babylon "^6.17.2"
lodash "^4.2.0"
babel-traverse@^6.18.0, babel-traverse@^6.20.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.25.0:
babel-traverse@^6.18.0, babel-traverse@^6.20.0, babel-traverse@^6.24.1, babel-traverse@^6.25.0:
version "6.25.0"
resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.25.0.tgz#2257497e2fcd19b89edc13c4c91381f9512496f1"
dependencies:
@ -1450,7 +1465,21 @@ babel-traverse@^6.18.0, babel-traverse@^6.20.0, babel-traverse@^6.23.1, babel-tr
invariant "^2.2.0"
lodash "^4.2.0"
babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25.0:
babel-traverse@^6.23.1:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
dependencies:
babel-code-frame "^6.26.0"
babel-messages "^6.23.0"
babel-runtime "^6.26.0"
babel-types "^6.26.0"
babylon "^6.18.0"
debug "^2.6.8"
globals "^9.18.0"
invariant "^2.2.2"
lodash "^4.17.4"
babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.25.0:
version "6.25.0"
resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e"
dependencies:
@ -1459,6 +1488,15 @@ babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23
lodash "^4.2.0"
to-fast-properties "^1.0.1"
babel-types@^6.23.0, babel-types@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
dependencies:
babel-runtime "^6.26.0"
esutils "^2.0.2"
lodash "^4.17.4"
to-fast-properties "^1.0.3"
babili-webpack-plugin@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/babili-webpack-plugin/-/babili-webpack-plugin-0.1.2.tgz#164ac03d5932f6a52143e7ffc06f2711c651b6f2"
@ -1467,10 +1505,14 @@ babili-webpack-plugin@^0.1.2:
babel-preset-babili "^0.1.4"
webpack-sources "^1.0.1"
babylon@^6.13.0, babylon@^6.16.1, babylon@^6.17.0, babylon@^6.17.2:
babylon@^6.13.0, babylon@^6.16.1, babylon@^6.17.2:
version "6.17.3"
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.3.tgz#1327d709950b558f204e5352587fd0290f8d8e48"
babylon@^6.17.0, babylon@^6.18.0:
version "6.18.0"
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
balanced-match@^0.4.0, balanced-match@^0.4.2:
version "0.4.2"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
@ -4308,7 +4350,7 @@ global@^4.3.0:
min-document "^2.19.0"
process "~0.5.1"
globals@^9.0.0, globals@^9.17.0:
globals@^9.0.0, globals@^9.17.0, globals@^9.18.0:
version "9.18.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@ -5436,7 +5478,7 @@ js-base64@^2.1.8, js-base64@^2.1.9:
version "2.1.9"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
js-tokens@^3.0.0:
js-tokens@^3.0.0, js-tokens@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@ -7778,6 +7820,10 @@ regenerator-runtime@^0.10.0:
version "0.10.5"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
regenerator-runtime@^0.11.0:
version "0.11.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
regenerator-transform@0.9.11:
version "0.9.11"
resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"
@ -9040,7 +9086,7 @@ to-arraybuffer@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
to-fast-properties@^1.0.1:
to-fast-properties@^1.0.1, to-fast-properties@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"

Loading…
Cancel
Save