Skip to content
This repository has been archived by the owner on Nov 16, 2022. It is now read-only.

Scan: Polish revamp guanyu (Part 1) #2593

Merged
merged 11 commits into from
Sep 1, 2020
1 change: 1 addition & 0 deletions CHANGELOG_UNRELEASED.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

### Scan

- (impv) [\#2593](https://github.com/bandprotocol/bandchain/pull/2593) Polish UI
- (feat) [\#2592](https://github.com/bandprotocol/bandchain/pull/2592) Added new voting overview and results box to proposal index page
- (feat) [\#2591](https://github.com/bandprotocol/bandchain/pull/2591) Implemented the deposit overview, depositors table
- (feat) [\#2578](https://github.com/bandprotocol/bandchain/pull/2578) Implemented the top part for proposal index page, markdown component
Expand Down
1 change: 1 addition & 0 deletions scan/src/Colors.re
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ let gray8 = Css.hex("333333");
let gray9 = Css.hex("EAEAEA");

let white = Css.hex("ffffff");
let black = Css.hex("000000");

let chartBalanceAtStake = Css.hex("ABB6FF");
let chartReward = Css.hex("000C5C");
Expand Down
12 changes: 6 additions & 6 deletions scan/src/components/ChainInfoHighlights.re
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module Styles = {
position(`relative),
backgroundColor(Colors.white),
borderRadius(`px(4)),
boxShadow(Shadow.box(~x=`zero, ~y=`px(4), ~blur=`px(8), Css.rgba(0, 0, 0, 0.1))),
boxShadow(Shadow.box(~x=`zero, ~y=`zero, ~blur=`px(4), Css.rgba(0, 0, 0, 0.08))),
Media.smallMobile([margin2(~v=`zero, ~h=`px(-5))]),
]);

Expand Down Expand Up @@ -55,7 +55,7 @@ module HighlightCard = {
{switch (valueAndExtraComponentSub) {
| Data((valueComponent, extraComponent)) =>
<>
<Text value=label size=Text.Lg color=Colors.gray7 weight=Text.Medium block=true />
<Text value=label size=Text.Lg color=Colors.gray7 weight=Text.Semibold block=true />
valueComponent
extraComponent
</>
Expand Down Expand Up @@ -90,7 +90,7 @@ let make = (~latestBlockSub: Sub.t(BlockSub.t)) => {
(
{
let bandPriceInUSD = "$" ++ (financial.usdPrice |> Format.fPretty(~digits=2));
<Text value=bandPriceInUSD size=Text.Xxxl color=Colors.gray8 code=true />;
<Text value=bandPriceInUSD size=Text.Xxxl color=Colors.gray7 code=true />;
},
{
let bandPriceInBTC = financial.btcPrice;
Expand All @@ -103,7 +103,7 @@ let make = (~latestBlockSub: Sub.t(BlockSub.t)) => {
])}>
<Text
value={bandPriceInBTC->Format.fPretty ++ " BTC"}
color=Colors.gray7
color=Colors.gray6
code=true
spacing={Text.Em(0.01)}
/>
Expand Down Expand Up @@ -135,7 +135,7 @@ let make = (~latestBlockSub: Sub.t(BlockSub.t)) => {
<Text
value={"$" ++ (financial.usdMarketCap |> Format.fCurrency)}
size=Text.Xxxl
color=Colors.gray8
color=Colors.gray7
code=true
/>;
},
Expand Down Expand Up @@ -180,7 +180,7 @@ let make = (~latestBlockSub: Sub.t(BlockSub.t)) => {
(
{
let activeValidators = activeValidatorCount->Format.iPretty ++ " Nodes";
<Text value=activeValidators size=Text.Xxxl color=Colors.gray8 />;
<Text value=activeValidators size=Text.Xxxl color=Colors.gray7 />;
},
<Text
value={
Expand Down
9 changes: 8 additions & 1 deletion scan/src/components/HistoricalBondedGraph.re
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module Styles = {
justifyContent(`center),
alignItems(`center),
backgroundColor(white),
])
]);

let chart = show => style([important(display(show ? `block : `none))]);
};
Expand Down Expand Up @@ -74,10 +74,17 @@ function(data) {
],
yAxes: [
{
gridLines: {
display: true,
color: "#f2f2f2",
drawBorder: false,
zeroLineColor: '#eaeaea'
},
ticks: {
fontFamily: 'Inter',
fontColor: '#888888',
fontSize: 10,
maxTicksLimit: 5,
stepSize: 100000,
callback: function(value) {
var ranges = [
Expand Down
7 changes: 7 additions & 0 deletions scan/src/components/TotalRequestsGraph.re
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,17 @@ function(data) {
],
yAxes: [
{
gridLines: {
display: true,
color: "#f2f2f2",
drawBorder: false,
zeroLineColor: '#eaeaea'
},
ticks: {
fontFamily: 'Inter',
fontColor: '#888888',
fontSize: 10,
maxTicksLimit: 5,
callback: function(value) {
var ranges = [
{ divider: 1e6, suffix: 'M' },
Expand Down
2 changes: 1 addition & 1 deletion scan/src/components/data-source/DataSourceExecute.re
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ let resultRender = result => {
| Error(err) =>
<>
<VSpacing size=Spacing.lg />
<div className=Styles.resultWrapper> <Text value=err /> </div>
<div className=Styles.resultWrapper> <Text value=err breakAll=true /> </div>
</>
| Success({returncode, stdout, stderr}) =>
<div className=Styles.resultContainer>
Expand Down
10 changes: 5 additions & 5 deletions scan/src/components/msgs/Msg.re
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ let make = (~msg: TxSub.Msg.t, ~width: int) => {
</div>
<TypeID.Request id />
<HSpacing size=Spacing.sm />
<Text value={j|➜|j} size=Text.Xxl weight=Text.Bold code=true nowrap=true block=true />
<Icon name="far fa-arrow-right" color=Colors.black />
<HSpacing size=Spacing.sm />
<TypeID.OracleScript id=oracleScriptID />
<HSpacing size=Spacing.sm />
Expand All @@ -242,7 +242,7 @@ let make = (~msg: TxSub.Msg.t, ~width: int) => {
/>
</div>
</div>
<Text value={j|➜|j} size=Text.Xxl weight=Text.Bold code=true nowrap=true block=true />
<Icon name="far fa-arrow-right" color=Colors.black />
<HSpacing size=Spacing.sm />
<TypeID.Request id=requestID />
</div>
Expand Down Expand Up @@ -999,7 +999,7 @@ let make = (~msg: TxSub.Msg.t, ~width: int) => {
</div>
<AmountRender coins=amount />
<HSpacing size=Spacing.sm />
<Text value={j|➜|j} size=Text.Xxl weight=Text.Bold code=true nowrap=true block=true />
<Icon name="far fa-arrow-right" color=Colors.black />
<HSpacing size=Spacing.sm />
<div className={Styles.rowWithWidth(200)}>
<Text
Expand Down Expand Up @@ -1027,7 +1027,7 @@ let make = (~msg: TxSub.Msg.t, ~width: int) => {
</div>
<Text value=option weight=Text.Regular code=true nowrap=true block=true />
<HSpacing size=Spacing.sm />
<Text value={j|➜|j} size=Text.Xxl weight=Text.Bold code=true nowrap=true block=true />
<Icon name="far fa-arrow-right" color=Colors.black />
<HSpacing size=Spacing.sm />
<div className={Styles.rowWithWidth(200)}>
<Text
Expand Down Expand Up @@ -1076,7 +1076,7 @@ let make = (~msg: TxSub.Msg.t, ~width: int) => {
<HSpacing size=Spacing.sm />
<Text value="Inputs" />
<HSpacing size=Spacing.sm />
<Text value={j|➜|j} size=Text.Xxl weight=Text.Bold code=true nowrap=true block=true />
<Icon name="far fa-arrow-right" color=Colors.black />
<HSpacing size=Spacing.sm />
<Text value={outputs |> Belt_List.length |> string_of_int} weight=Text.Semibold />
<HSpacing size=Spacing.sm />
Expand Down
2 changes: 1 addition & 1 deletion scan/src/pages/BlockHomePage.re
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ let make = () => {
<Heading value="All Blocks" size=Heading.H2 marginBottom=40 marginBottomSm=24 />
{switch (allSub) {
| Data((_, blocksCount)) =>
<Heading value={blocksCount->string_of_int ++ " In total"} size=Heading.H3 />
<Heading value={(blocksCount |> Format.iPretty) ++ " In total"} size=Heading.H3 />
| _ => <LoadingCensorBar width=65 height=21 />
}}
</Col.Grid>
Expand Down
7 changes: 5 additions & 2 deletions scan/src/pages/DataSourceHomePage.re
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ let renderBody =
</Col.Grid>
<Col.Grid col=Col.Four>
{switch (dataSourcesSub) {
| Data({description}) => <Text value=description weight=Text.Medium block=true />
| Data({description}) => <Text value=description block=true />
| _ => <LoadingCensorBar width=270 height=15 />
}}
</Col.Grid>
Expand Down Expand Up @@ -166,7 +166,10 @@ let make = () => {
<Heading value="All Data Sources" size=Heading.H2 marginBottom=40 marginBottomSm=24 />
{switch (allSub) {
| Data((_, dataSourcesCount)) =>
<Heading value={dataSourcesCount->string_of_int ++ " In total"} size=Heading.H3 />
<Heading
value={(dataSourcesCount |> Format.iPretty) ++ " In total"}
size=Heading.H3
/>
| _ => <LoadingCensorBar width=65 height=21 />
}}
</Col.Grid>
Expand Down
9 changes: 6 additions & 3 deletions scan/src/pages/OracleScriptHomePage.re
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Styles = {
style([
backgroundColor(Colors.white),
boxShadow(Shadow.box(~x=`zero, ~y=`px(2), ~blur=`px(4), Css.rgba(0, 0, 0, 0.08))),
padding(`px(24)),
padding3(~top=`px(24), ~h=`px(24), ~bottom=`px(16)),
height(`calc((`sub, `percent(100.), `px(24)))),
marginBottom(`px(24)),
]);
Expand Down Expand Up @@ -145,7 +145,7 @@ let renderBody =
{switch (oracleScriptSub) {
| Data({description}) =>
let text = Ellipsis.format(~text=description, ~limit=70, ());
<Text value=text weight=Text.Medium block=true />;
<Text value=text block=true />;
| _ => <LoadingCensorBar width=270 height=15 />
}}
</Col.Grid>
Expand Down Expand Up @@ -299,7 +299,10 @@ let make = () => {
<Col.Grid>
{switch (allSub) {
| Data((_, oracleScriptsCount)) =>
<Heading value={oracleScriptsCount->string_of_int ++ " In total"} size=Heading.H3 />
<Heading
value={(oracleScriptsCount |> Format.iPretty) ++ " In total"}
size=Heading.H3
/>
| _ => <LoadingCensorBar width=65 height=21 />
}}
</Col.Grid>
Expand Down
5 changes: 4 additions & 1 deletion scan/src/pages/RequestHomePage.re
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,10 @@ let make = () => {
<Heading value="All Requests" size=Heading.H2 marginBottom=40 marginBottomSm=24 />
{switch (allSub) {
| Data((_, totalRequestCount)) =>
<Heading value={totalRequestCount->string_of_int ++ " In total"} size=Heading.H3 />
<Heading
value={(totalRequestCount |> Format.iPretty) ++ " In total"}
size=Heading.H3
/>
| _ => <LoadingCensorBar width=65 height=21 />
}}
</Col.Grid>
Expand Down
2 changes: 1 addition & 1 deletion scan/src/pages/TxHomePage.re
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let make = () => {
<Heading value="All Transactions" size=Heading.H2 marginBottom=40 marginBottomSm=24 />
{switch (txsCountSub) {
| Data(txsCountSub) =>
<Heading value={txsCountSub->string_of_int ++ " In total"} size=Heading.H3 />
<Heading value={(txsCountSub |> Format.iPretty) ++ " In total"} size=Heading.H3 />
| _ => <LoadingCensorBar width=65 height=21 />
}}
</Col.Grid>
Expand Down
18 changes: 9 additions & 9 deletions scan/src/pages/ValidatorIndexPage.re
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ let make = (~address, ~hashtag: Route.validator_tab_t) => {
clickable=false
wordBreak=true
/>
| _ => <LoadingCensorBar width=284 height=15 />
| _ => <LoadingCensorBar width=260 height=15 />
}}
</Col.Grid>
<Col.Grid col=Col.Six>
Expand All @@ -302,7 +302,7 @@ let make = (~address, ~hashtag: Route.validator_tab_t) => {
{switch (allSub) {
| Data(({operatorAddress}, _, _)) =>
<AddressRender address=operatorAddress position=AddressRender.Subtitle />
| _ => <LoadingCensorBar width=284 height=15 />
| _ => <LoadingCensorBar width=260 height=15 />
}}
</Col.Grid>
</Row.Grid>
Expand All @@ -324,7 +324,7 @@ let make = (~address, ~hashtag: Route.validator_tab_t) => {
size=Text.Lg
block=true
/>
| _ => <LoadingCensorBar width=284 height=15 />
| _ => <LoadingCensorBar width=260 height=15 />
}}
</Col.Grid>
<Col.Grid col=Col.Six>
Expand All @@ -344,29 +344,29 @@ let make = (~address, ~hashtag: Route.validator_tab_t) => {
size=Text.Lg
block=true
/>
| _ => <LoadingCensorBar width=284 height=15 />
| _ => <LoadingCensorBar width=260 height=15 />
}}
</Col.Grid>
</Row.Grid>
<Row.Grid marginBottom=24>
<Col.Grid>
<Heading value="Website" size=Heading.H5 marginBottom=16 />
<Heading value="Website" size=Heading.H5 marginBottom=8 />
{switch (allSub) {
| Data(({website}, _, _)) =>
<a href=website target="_blank" className=Styles.link>
<Text value=website size=Text.Lg color=Colors.bandBlue block=true />
</a>
| _ => <LoadingCensorBar width=284 height=15 />
| _ => <LoadingCensorBar width=260 height=15 />
}}
</Col.Grid>
</Row.Grid>
<Row.Grid marginBottom=24>
<Row.Grid>
<Col.Grid>
<Heading value="Description" size=Heading.H5 marginBottom=16 />
<Heading value="Description" size=Heading.H5 marginBottom=8 />
{switch (allSub) {
| Data(({details}, _, _)) =>
<p> <Text value=details size=Text.Lg color=Colors.gray7 block=true /> </p>
| _ => <LoadingCensorBar width=284 height=15 />
| _ => <LoadingCensorBar width=260 height=15 />
}}
</Col.Grid>
</Row.Grid>
Expand Down
1 change: 1 addition & 0 deletions scan/src/reusable/THead.re
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ module Styles = {
let containerBase = height_ =>
style([
backgroundColor(Colors.blueGray1),
boxShadow(Shadow.box(~x=`zero, ~y=`px(2), ~blur=`px(2), Css.rgba(0, 0, 0, 0.05))),
padding2(~v=`zero, ~h=`px(24)),
selector("> div", [height(`px(height_))]),
]);
Expand Down