Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
xavier506 committed Sep 4, 2021
2 parents f66c7d2 + 00be0d1 commit ac9acfa
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 59 deletions.
78 changes: 39 additions & 39 deletions hapi/src/libs/add-bps-info.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion webapp/src/components/main-footer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const MainFooter = () => {
{t('legend')}
</Typography>
<IconButton
href='https://github.com/eoscostarica'
href='https://github.com/eoscostarica/eos-rate'
target='_blank'
color='inherit'
>
Expand Down
6 changes: 3 additions & 3 deletions webapp/src/components/main-footer/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ export default (theme) => ({
},
legend: {
display: 'flex',
width: 148,
lineHeight: 1.33,
width: 150,
lineHeight: 1.4,
fontSize: 8,
fontWeight: 500,
fontStretch: 'normal',
letterSpacing: 1,
letterSpacing: 1.1,
textAlign: 'right',
color: 'rgba(255, 255, 255, 0.6)',
paddingRight: theme.spacing(2)
Expand Down
8 changes: 4 additions & 4 deletions webapp/src/language/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -187,19 +187,19 @@
"rateWithoutLogin": "You need to login to rate this block producer",
"noBlockProducer": "This BP Does Not Exist.",
"success" : "Success!",
"title": "Rate EOS Block Producer Infrastructure and Community Reputation ",
"title": "Rate EOS Block Producer Infrastructure and Community Reputation",
"infoMessage": "Support the network by voting for your favorite BPs or proxy, once you have voted for 21 BPs you can start rating."
},

"footer": {
"legend": "Want to contribute? Come learn with us"
"legend": "Want to contribute ? This dApp is open-source"
},

"profile": {
"generalInformation": "General Information",
"eosRates": "General Rating",
"edenRates": "Eden Rating",
"tatolRates": "Total Rating",
"totalRates": "Total Rating",
"rankings": "Rankings",
"social": "Social",
"account": "Account",
Expand Down Expand Up @@ -229,7 +229,7 @@
"title": "Block Producer Community Ratings for",
"proxyProfile": "Reviews on EOS proxy account",
"interview": "BP interview:",
"scorecardFactors:": "Scorecard Factors:"
"additionalResources": "Additional Resources:"
},

"about": {
Expand Down
6 changes: 3 additions & 3 deletions webapp/src/language/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,14 @@
},

"footer": {
"legend": "¿Quieres contribuir? Ven a aprender con nosotros"
"legend": "¿Quieres contribuir? Este dApp es código abierto."
},

"profile": {
"generalInformation": "Información General",
"eosRates": "Calificación General",
"edenRates": "Calificación Eden",
"tatolRates": "Calificación Total",
"totalRates": "Calificación Total",
"rankings": "Clasificaciones",
"social": "Social",
"account": "Cuenta",
Expand Down Expand Up @@ -229,7 +229,7 @@
"title": "Calificaciones de productor de bloques EOS",
"proxyProfile": "Reseñas sobre EOS proxy",
"interview": "Entrevista al PB:",
"scorecardFactors:": "Datos estadísticos:"
"additionalResources": "Recursos Adicionales:"
},

"about": {
Expand Down
18 changes: 9 additions & 9 deletions webapp/src/routes/block-producers/general-information-profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const SocialNetworks = ({ classes, producer }) => {
const telegram = _get(producer, 'bpjson.org.social.telegram')
const instagram = _get(producer, 'bpjson.org.social.instagram')
const edenInterview = _get(producer, 'general_info.edenInterview')
const scorecardFactors = _get(producer, 'general_info.scorecardFactors')
const additionalResources = _get(producer, 'general_info.additionalResources')
const isDesktop = useMediaQuery('(min-width:767px)')

return (
Expand Down Expand Up @@ -169,39 +169,39 @@ const SocialNetworks = ({ classes, producer }) => {
</Typography>
</Grid>
)}
{scorecardFactors && (
{additionalResources && (
<Grid container direction='row' style={{ display: 'block' }}>
<Typography variant='subtitle1' className={classes.subTitle}>
{t('scorecardFactors')}
{t('additionalResources')}
</Typography>
{scorecardFactors.alohaEOS && (
{additionalResources.alohaEOS && (
<Typography
variant='subtitle1'
className={classNames(classes.value, classes.subTitle)}
>
<a
href={scorecardFactors.alohaEOS}
href={additionalResources.alohaEOS}
className={classNames(classes.links, classes.noWrap)}
target='_blank'
rel='noopener noreferrer'
>
- {scorecardFactors.alohaEOS}
- {additionalResources.alohaEOS}
</a>
</Typography>
)}
{scorecardFactors.eosNation && (
{additionalResources.eosNation && (
<Typography
variant='subtitle1'
className={classNames(classes.value, classes.subTitle)}
noWrap
>
<a
href={scorecardFactors.eosNation}
href={additionalResources.eosNation}
className={classNames(classes.links, classes.noWrap)}
target='_blank'
rel='noopener noreferrer'
>
- {scorecardFactors.eosNation}
- {additionalResources.eosNation}
</a>
</Typography>
)}
Expand Down

0 comments on commit ac9acfa

Please sign in to comment.