Skip to content

Commit

Permalink
fix: remove web ui version and keep revision (#2000)
Browse files Browse the repository at this point in the history
* fix: remove web ui version and keep revision
* fix: replace web ui version by revision in status page
* style: simplify UI revision

no need for it to be clickable (kubo version is not)
nor for it to say "revision" (it is UI, and not kubo or desktop
revision)

Co-authored-by: Marcin Rataj <lidel@lidel.org>
  • Loading branch information
hacdias and lidel authored Aug 9, 2022
1 parent 4ff4939 commit 42ed78d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
6 changes: 3 additions & 3 deletions public/locales/en/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
},
"nav": {
"bugsLink": "Report a bug",
"codeLink": "See the code",
"revision": "Revision"
"codeLink": "See the code"
},
"status": {
"connectedToIpfs": "Connected to IPFS",
Expand Down Expand Up @@ -91,7 +90,8 @@
"totalOut": "Total out",
"unknown": "Unknown",
"ui": "UI",
"upSpeed": "Outgoing"
"upSpeed": "Outgoing",
"revision": "Revision"
},
"tour": {
"back": "Back",
Expand Down
7 changes: 1 addition & 6 deletions src/navigation/NavBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ export const NavBar = ({ t }) => {
const bugsUrl = `${codeUrl}/issues`
const gitRevision = process.env.REACT_APP_GIT_REV
const revisionUrl = `${codeUrl}/commit/${gitRevision}`
const webUiVersion = process.env.REACT_APP_VERSION
const webUiVersionUrl = `${codeUrl}/releases/tag/v${webUiVersion}`
return (
<div className='h-100 fixed-l flex flex-column justify-between' style={{ overflowY: 'auto', width: 'inherit' }}>
<div className='flex flex-column'>
Expand All @@ -75,11 +73,8 @@ export const NavBar = ({ t }) => {
</div>
</div>
<div className='dn db-l navbar-footer mb2 tc center f7 o-80 glow'>
{ webUiVersion && <div className='mb1'>
<a className='link white' href={webUiVersionUrl} target='_blank' rel='noopener noreferrer'>{t('app:terms.ui')} v{webUiVersion}</a>
</div> }
{ gitRevision && <div className='mb1'>
<a className='link white' href={revisionUrl} target='_blank' rel='noopener noreferrer'>{t('app:nav.revision')} {gitRevision}</a>
<a className='link white' href={revisionUrl} target='_blank' rel='noopener noreferrer'>{t('app:terms.revision')} {gitRevision}</a>
</div> }
<div className='mb1'>
<a className='link white' href={codeUrl} target='_blank' rel='noopener noreferrer'>{t('app:nav.codeLink')}</a>
Expand Down
2 changes: 1 addition & 1 deletion src/status/NodeInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class NodeInfo extends React.Component {
<DefinitionList>
<Definition term={t('terms.peerId')} desc={this.getField(identity, 'id')} />
<Definition term={t('terms.agent')} desc={<VersionLink agentVersion={this.getField(identity, 'agentVersion')} />} />
<Definition term={t('terms.ui')} desc={<a href={'https://github.com/ipfs-shipyard/ipfs-webui/releases/tag/v' + process.env.REACT_APP_VERSION} className='link blue' target='_blank' rel='noopener noreferrer'>v{process.env.REACT_APP_VERSION}</a>} />
<Definition term={t('terms.ui')} desc={process.env.REACT_APP_GIT_REV} />
</DefinitionList>
)
}
Expand Down

0 comments on commit 42ed78d

Please sign in to comment.