Skip to content

Commit

Permalink
feat(case-details-card): support markdown in meta evidence descriptions
Browse files Browse the repository at this point in the history
  • Loading branch information
@epiqueras
epiqueras committed Feb 14, 2019
1 parent 877e505 commit 046f38e
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 99 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"standard-version": "^4.4.0"
},
"dependencies": {
"@kleros/archon": "^0.5.4",
"@kleros/archon": "^0.5.6",
"@loadable/component": "^5.5.0",
"antd": "^3.10.8",
"dataloader": "^1.4.0",
Expand Down
5 changes: 4 additions & 1 deletion src/components/case-details-card.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import CourtDrawer from '../components/court-drawer'
import { ReactComponent as Document } from '../assets/images/document.svg'
import Identicon from '../components/identicon'
import PropTypes from 'prop-types'
import ReactMarkdown from 'react-markdown'
import styled from 'styled-components/macro'
import { useDataloader } from '../bootstrap/dataloader'

Expand Down Expand Up @@ -368,7 +369,9 @@ const CaseDetailsCard = ({ ID }) => {
<Row>
<Col span={24}>
<StyledInnerCard actions={metaEvidenceActions} hoverable>
{metaEvidence.metaEvidenceJSON.description}
<ReactMarkdown
source={metaEvidence.metaEvidenceJSON.description}
/>
</StyledInnerCard>
</Col>
</Row>
Expand Down
123 changes: 26 additions & 97 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1055,20 +1055,18 @@
log-update "^2.3.0"
strip-ansi "^3.0.1"

"@kleros/archon@^0.5.4":
version "0.5.4"
resolved "https://registry.yarnpkg.com/@kleros/archon/-/archon-0.5.4.tgz#02c24f4317a9a083bf617e694b6ed46fc7992a5b"
integrity sha512-ytlue1bpYmJtxna0fBETeSE1Fi83SQqrVpG5ZSn5clf09rPxH1c9D8+umQEGfkF+FaGBUWEAGpHKzz+ZBwcydA==
"@kleros/archon@^0.5.6":
version "0.5.6"
resolved "https://registry.yarnpkg.com/@kleros/archon/-/archon-0.5.6.tgz#323794ef6e28a839036a2d5d3bc8d0ae1e01fa00"
integrity sha512-RVrDvTSfLWAZFOI63IOr7aI8ETud6tUQlLNOVGkrl/GmsN8XZaAM/LX1p1FPtSPP5NlIGAvMSu7iAbb3+0bgCg==
dependencies:
"@kleros/kleros-interaction" "^0.4.2"
"@kleros/kleros-interaction" "^0.5.0"
axios "^0.18.0"
babel-runtime "^6.26.0"
js-sha3 "^0.8.0"
lodash "^4.17.4"
multihashes "^0.4.14"
nock "^10.0.0"
solc "^0.4.25"
web3 "^1.0.0-beta.36"
web3 "1.0.0-beta.36"

"@kleros/kathari@^0.20.0":
version "0.20.0"
Expand Down Expand Up @@ -1109,10 +1107,10 @@
stylelint-scss "^3.4.0"
stylelint-selector-bem-pattern "^2.0.0"

"@kleros/kleros-interaction@^0.4.2":
version "0.4.2"
resolved "https://registry.yarnpkg.com/@kleros/kleros-interaction/-/kleros-interaction-0.4.2.tgz#6360caa6ac0fcb75a2c3eeade42b48b21c1fd19f"
integrity sha512-o42H0zgay+s0Wmmeo4e/bHLtuJ2ndNaSP/OuvXsk5MTXUi41mxe9qs9iAIWQevPodF8mz3mDAFSYQyonFThXsQ==
"@kleros/kleros-interaction@^0.5.0":
version "0.5.0"
resolved "https://registry.yarnpkg.com/@kleros/kleros-interaction/-/kleros-interaction-0.5.0.tgz#b27fd8eea2c037853673977a1249accca670de0f"
integrity sha512-i4RusXPK1NY2wzsGnW4fwJ5cHmToCKa7m5c6I03odTNBX/gTy8WqAhhdOtSJqNNDZUt8EzEJ0azI9rOrmmt4mg==
dependencies:
minimetoken "^0.2.0"
openzeppelin-solidity "^1.12.0"
Expand Down Expand Up @@ -1784,11 +1782,6 @@ assert@^1.1.1:
dependencies:
util "0.10.3"

assertion-error@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==

assign-symbols@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
Expand Down Expand Up @@ -3164,18 +3157,6 @@ ccount@^1.0.0:
resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.3.tgz#f1cec43f332e2ea5a569fd46f9f5bde4e6102aff"
integrity sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==

chai@^4.1.2:
version "4.2.0"
resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5"
integrity sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==
dependencies:
assertion-error "^1.1.0"
check-error "^1.0.2"
deep-eql "^3.0.1"
get-func-name "^2.0.0"
pathval "^1.1.0"
type-detect "^4.0.5"

chalk@2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
Expand Down Expand Up @@ -3235,11 +3216,6 @@ chardet@^0.7.0:
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==

check-error@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=

check-types@^7.3.0:
version "7.4.0"
resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4"
Expand Down Expand Up @@ -4433,14 +4409,7 @@ dedent@0.7.0, dedent@^0.7.0:
resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=

deep-eql@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
dependencies:
type-detect "^4.0.0"

deep-equal@^1.0.0, deep-equal@^1.0.1, deep-equal@~1.0.1:
deep-equal@^1.0.1, deep-equal@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
Expand Down Expand Up @@ -6325,11 +6294,6 @@ get-caller-file@^1.0.1:
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==

get-func-name@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=

get-own-enumerable-property-symbols@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
Expand Down Expand Up @@ -9773,21 +9737,6 @@ no-case@^2.2.0:
dependencies:
lower-case "^1.1.1"

nock@^10.0.0:
version "10.0.6"
resolved "https://registry.yarnpkg.com/nock/-/nock-10.0.6.tgz#e6d90ee7a68b8cfc2ab7f6127e7d99aa7d13d111"
integrity sha512-b47OWj1qf/LqSQYnmokNWM8D88KvUl2y7jT0567NB3ZBAZFz2bWp2PC81Xn7u8F2/vJxzkzNZybnemeFa7AZ2w==
dependencies:
chai "^4.1.2"
debug "^4.1.0"
deep-equal "^1.0.0"
json-stringify-safe "^5.0.1"
lodash "^4.17.5"
mkdirp "^0.5.0"
propagate "^1.0.0"
qs "^6.5.1"
semver "^5.5.0"

node-fetch@^1.0.1:
version "1.7.3"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
Expand Down Expand Up @@ -10487,11 +10436,6 @@ path-type@^3.0.0:
dependencies:
pify "^3.0.0"

pathval@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=

pbkdf2@^3.0.3, pbkdf2@^3.0.9:
version "3.0.17"
resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
Expand Down Expand Up @@ -11454,11 +11398,6 @@ prop-types@15.x, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, pr
loose-envify "^1.3.1"
object-assign "^4.1.1"

propagate@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/propagate/-/propagate-1.0.0.tgz#00c2daeedda20e87e3782b344adba1cddd6ad709"
integrity sha1-AMLa7t2iDofjeCs0Stuhzd1q1wk=

proxy-addr@~2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
Expand Down Expand Up @@ -11549,11 +11488,6 @@ qs@6.5.2, qs@~6.5.2:
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==

qs@^6.5.1:
version "6.6.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
integrity sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==

query-string@^5.0.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
Expand Down Expand Up @@ -13520,7 +13454,7 @@ sol-explore@1.6.1:
resolved "https://registry.yarnpkg.com/sol-explore/-/sol-explore-1.6.1.tgz#b59f073c69fe332560d5a10c32ba8ca7f2986cfb"
integrity sha1-tZ8HPGn+MyVg1aEMMrqMp/KYbPs=

solc@^0.4.2, solc@^0.4.25:
solc@^0.4.2:
version "0.4.25"
resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.25.tgz#06b8321f7112d95b4b903639b1138a4d292f5faa"
integrity sha512-jU1YygRVy6zatgXrLY2rRm7HW1d7a8CkkEgNJwvH2VLpWhMFsMdWcJn6kUqZwcSz/Vm+w89dy7Z/aB5p6AFTrg==
Expand Down Expand Up @@ -14613,11 +14547,6 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"

type-detect@^4.0.0, type-detect@^4.0.5:
version "4.0.8"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==

type-is@~1.6.16:
version "1.6.16"
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
Expand Down Expand Up @@ -15582,6 +15511,19 @@ web3-utils@1.0.0-beta.37:
underscore "1.8.3"
utf8 "2.1.1"

web3@1.0.0-beta.36, web3@^1.0.0-beta.35:
version "1.0.0-beta.36"
resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.36.tgz#2954da9e431124c88396025510d840ba731c8373"
integrity sha512-fZDunw1V0AQS27r5pUN3eOVP7u8YAvyo6vOapdgVRolAu5LgaweP7jncYyLINqIX9ZgWdS5A090bt+ymgaYHsw==
dependencies:
web3-bzz "1.0.0-beta.36"
web3-core "1.0.0-beta.36"
web3-eth "1.0.0-beta.36"
web3-eth-personal "1.0.0-beta.36"
web3-net "1.0.0-beta.36"
web3-shh "1.0.0-beta.36"
web3-utils "1.0.0-beta.36"

web3@^0.16.0:
version "0.16.0"
resolved "https://registry.yarnpkg.com/web3/-/web3-0.16.0.tgz#a4554175cd462943035b1f1d39432f741c6b6019"
Expand All @@ -15603,20 +15545,7 @@ web3@^0.18.2:
xhr2 "*"
xmlhttprequest "*"

web3@^1.0.0-beta.35:
version "1.0.0-beta.36"
resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.36.tgz#2954da9e431124c88396025510d840ba731c8373"
integrity sha512-fZDunw1V0AQS27r5pUN3eOVP7u8YAvyo6vOapdgVRolAu5LgaweP7jncYyLINqIX9ZgWdS5A090bt+ymgaYHsw==
dependencies:
web3-bzz "1.0.0-beta.36"
web3-core "1.0.0-beta.36"
web3-eth "1.0.0-beta.36"
web3-eth-personal "1.0.0-beta.36"
web3-net "1.0.0-beta.36"
web3-shh "1.0.0-beta.36"
web3-utils "1.0.0-beta.36"

web3@^1.0.0-beta.36, web3@^1.0.0-beta.37:
web3@^1.0.0-beta.37:
version "1.0.0-beta.37"
resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.37.tgz#b42c30e67195f816cd19d048fda872f70eca7083"
integrity sha512-8XLgUspdzicC/xHG82TLrcF/Fxzj2XYNJ1KTYnepOI77bj5rvpsxxwHYBWQ6/JOjk0HkZqoBfnXWgcIHCDhZhQ==
Expand Down

0 comments on commit 046f38e

Please sign in to comment.