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.

Sign up for GitHub

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

Jump to bottom

fix: remove web ui version and keep revision #2000

Merged
merged 3 commits into from
Aug 9, 2022
Merged

fix: remove web ui version and keep revision #2000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8511144
fix: remove web ui version and keep revision
hacdias Aug 9, 2022
0b66370
fix: replace web ui version by revision in status page
hacdias Aug 9, 2022
effa23e
style: simplify UI revision
lidel Aug 9, 2022
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 public/locales/en/app.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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