Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix small ui issues #19

Merged
merged 5 commits into from
Jul 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/api/test/feeds.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ describe('feeds', function () {
lastResult
network
label
requests (feedId: $id, page: $page, size: $pageSize){
requests(feedId: $id, page: $page, size: $pageSize) {
id
feedId
result
Expand All @@ -164,7 +164,7 @@ describe('feeds', function () {
variables: {
page: 1,
pageSize: 6,
id: feedResponse.ops[0]._id.toString(),
id: feedResponse.ops[0]._id.toString()
}
})
expect(feeds.length).toBe(1)
Expand Down Expand Up @@ -222,7 +222,7 @@ describe('feeds', function () {
variables: {
id: _id.toString(),
page: 1,
size: 3,
size: 3
}
})

Expand Down
12 changes: 12 additions & 0 deletions packages/ui/assets/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@
--icon-color: #fdfdfd;
--icon-background: #37414c94;

//Transaction

--witnet-transaction: #41BEA5;

//ContractAddress

--contract-address: #41BEA5;
Expand Down Expand Up @@ -144,6 +148,10 @@
--icon-color: #fdfdfd;
--icon-background: #37414c94;

//Transaction

--witnet-transaction: #41BEA5;

//ContractAddress

--contract-address: #41BEA5;
Expand Down Expand Up @@ -225,6 +233,10 @@
--icon-color: #2D2C39;
--icon-background: #ffffffd3;

//Transaction

--witnet-transaction: #41BEA5;

//ContractAddress

--contract-address: #41BEA5;
Expand Down
8 changes: 7 additions & 1 deletion packages/ui/components/DataFeedDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
class="contract-address"
>
{{ feedAddress }}
<font-awesome-icon class="icon" icon="external-link-alt" />
</a>
</Fieldset>
<TransactionsList
Expand Down Expand Up @@ -133,12 +134,17 @@ export default {
.contract-container {
margin-top: 150px;
.contract-address {
display: flex;
align-items: center;
line-break: loose;
word-break: break-all;
font-size: 24px;
padding: 24px;
display: block;
cursor: pointer;
color: var(--contract-address);
.icon {
margin-left: 16px;
}
}
}
.pagination {
Expand Down
5 changes: 3 additions & 2 deletions packages/ui/components/DataTooltip.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
>
{{ value }}
</div>
<div :ref="label" class="truncate" @mousemove="show()">
<div :ref="label" class="value truncate" @mousemove="show()">
{{ value }}
</div>
<div
Expand Down Expand Up @@ -96,6 +96,8 @@ export default {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin-right: 0;
margin-right: 8px;
}
.tooltip,
.copy-tooltip {
Expand All @@ -109,7 +111,6 @@ export default {
}
.container {
display: flex;
justify-content: space-between;
}
.copy {
padding: 16px;
Expand Down
12 changes: 11 additions & 1 deletion packages/ui/components/Transaction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<div class="attribute-container links">
<a :href="witnetLink" target="_blank" class="link truncate">
{{ drTxHash }}
<font-awesome-icon class="icon" icon="external-link-alt" />
</a>
</div>
<div class="attribute-container values-time">
Expand Down Expand Up @@ -50,8 +51,17 @@ export default {
</script>

<style lang="scss" scoped>
.link {
.links {
text-decoration: none;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.link {
color: var(--witnet-transaction);
.icon {
margin-left: 16px;
}
}
.truncate {
white-space: nowrap;
Expand Down
4 changes: 3 additions & 1 deletion packages/ui/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
"etherscan": "Etherscan",
"value": "Value",
"time": "Time"
}
},
"copied": "Copied",
"copy": "Copy"
}
4 changes: 3 additions & 1 deletion packages/ui/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
"etherscan": "Etherscan",
"value": "Resultado",
"time": "Tiempo"
}
},
"copied": "Copiado",
"copy": "Copiar"
}
10 changes: 8 additions & 2 deletions packages/ui/nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default {
},
// Global page headers: https://go.nuxtjs.dev/config-head
head: {
title: 'new-website',
title: 'Witnet data feeds',
htmlAttrs: {
lang: 'en',
},
Expand Down Expand Up @@ -140,7 +140,13 @@ export default {

fontawesome: {
icons: {
solid: ['faMoon', 'faSun', 'faArrowAltCircleLeft', 'faCopy'],
solid: [
'faMoon',
'faSun',
'faArrowAltCircleLeft',
'faCopy',
'faExternalLinkAlt',
],
},
},

Expand Down
10 changes: 5 additions & 5 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
"test": "yarn jest"
},
"dependencies": {
"@fortawesome/free-brands-svg-icons": "^5.15.3",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@nuxtjs/apollo": "^4.0.1-rc.5",
"@nuxtjs/color-mode": "^2.0.9",
"@nuxtjs/date-fns": "^1.5.0",
"@nuxtjs/style-resources": "^1.0.0",
"big.js": "^6.1.1",
"core-js": "^3.8.3",
Expand All @@ -27,17 +31,13 @@
"vue-select": "^3.11.2"
},
"devDependencies": {
"@fortawesome/free-brands-svg-icons": "^5.15.3",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@nuxt/test-utils": "^0.2.2",
"@nuxtjs/color-mode": "^2.0.9",
"@nuxtjs/date-fns": "^1.5.0",
"@nuxtjs/eslint-config": "^5.0.0",
"@nuxtjs/eslint-module": "^3.0.2",
"@nuxtjs/fontawesome": "^1.1.2",
"@nuxtjs/stylelint-module": "^4.0.0",
"@nuxtjs/svg": "^0.1.12",
"jest": "^27.0.4",
"jest": "^27.0.6",
"vue-i18n-extract": "^1.2.3"
}
}
Loading