Skip to content

Commit

Permalink
Merge pull request #965 from chronologic/develop
Browse files Browse the repository at this point in the history
v1.3.0
  • Loading branch information
josipbagaric authored Jan 18, 2019
2 parents 6ab0769 + 40136ac commit bf00865
Show file tree
Hide file tree
Showing 20 changed files with 1,450 additions and 244 deletions.
3 changes: 2 additions & 1 deletion .env.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
KEEN_PROJECT_ID="5b6d8594c9e77c0001e7c578"
KEEN_WRITE_KEY="07C0249B9640D2DD31A8BBB7281D319122C4A5AB37E7731EA6090C43526EC76CB79000C7CC2E5420B6AFB9B00444C21FE91C35932BAEA53DF02A84C1B0BA30E477192920F03DE51F116861313700BDF9323E0C16B3A74933A4B04D24A78EEBCA"
KEEN_READ_KEY="86A450B303F3E14661589C48EAD1D54997D0166F8B5F9D9774034BE6165FCB5FB69D6A62D739E1B5F57AAA42FC83E8832549C738268612C90A228124D31E5F406E0E8CF73B770ED120132D422031466F2AB25965A437D61D7275499C0EEA67A6"
NOMICS_API_KEY="c13b3d7a7c837cab121a749c7824b162"
NOMICS_API_KEY="c13b3d7a7c837cab121a749c7824b162"
CRYPTO_KITTIES_API_KEY="jM7HYCDKABweBJlWNE29QSkDyD4-HK4ypx__2Qw7xzg"
3 changes: 2 additions & 1 deletion .env.prod
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
KEEN_PROJECT_ID="5b6d8594c9e77c0001e7c578"
KEEN_WRITE_KEY="07C0249B9640D2DD31A8BBB7281D319122C4A5AB37E7731EA6090C43526EC76CB79000C7CC2E5420B6AFB9B00444C21FE91C35932BAEA53DF02A84C1B0BA30E477192920F03DE51F116861313700BDF9323E0C16B3A74933A4B04D24A78EEBCA"
KEEN_READ_KEY="86A450B303F3E14661589C48EAD1D54997D0166F8B5F9D9774034BE6165FCB5FB69D6A62D739E1B5F57AAA42FC83E8832549C738268612C90A228124D31E5F406E0E8CF73B770ED120132D422031466F2AB25965A437D61D7275499C0EEA67A6"
NOMICS_API_KEY="c13b3d7a7c837cab121a749c7824b162"
NOMICS_API_KEY="c13b3d7a7c837cab121a749c7824b162"
CRYPTO_KITTIES_API_KEY="jM7HYCDKABweBJlWNE29QSkDyD4-HK4ypx__2Qw7xzg"
56 changes: 55 additions & 1 deletion __tests__/__snapshots__/SidePanel.unit.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,46 @@ exports[`SidePanel is correctly rendered 1`] = `
</span>
</a>
</li>
<li>
<a
href="https://automate.chronologic.network"
rel="noopener noreferrer"
target="_blank"
>
<span
className="title"
>
Automate
</span>
<span
className="icon-thumbnail"
>
<i
className="fas fa-font"
/>
</span>
</a>
</li>
<li>
<a
href="https://blog.chronologic.network/automate-meets-zapier-acd09d31c166"
rel="noopener noreferrer"
target="_blank"
>
<span
className="title"
>
Automate Zapier
</span>
<span
className="icon-thumbnail"
>
<i
className="fas fa-bolt"
/>
</span>
</a>
</li>
<li>
<a
href="https://alpha.chronologic.network/debt/"
Expand Down Expand Up @@ -235,7 +275,6 @@ exports[`SidePanel is correctly rendered 1`] = `
</div>
<div
className="sidebar-additional-item--display"
title="Some or all data provided by Nomics.com Cryptocurrency Market Data API."
>
<div
className=""
Expand Down Expand Up @@ -332,6 +371,21 @@ exports[`SidePanel is correctly rendered 1`] = `
 %
</div>
</li>
<li
className="sidebar-bottom-item"
>
<small>
* Some data provided by Nomics.com
<a
href="https://p.nomics.com/cryptocurrency-bitcoin-api"
rel="noopener noreferrer"
target="_blank"
>
Cryptocurrency Market Data API
</a>
</small>
</li>
</ul>
<div
className="clearfix"
Expand Down
Loading

0 comments on commit bf00865

Please sign in to comment.