Skip to content

Commit

Permalink
feat(App): Add link to changelog in app update notification
Browse files Browse the repository at this point in the history
  • Loading branch information
adlk committed Nov 20, 2017
1 parent 9d9e285 commit 2cbd938
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
8 changes: 7 additions & 1 deletion src/components/layout/AppLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ const messages = defineMessages({
id: 'infobar.buttonReloadServices',
defaultMessage: '!!!Reload services',
},
changelog: {
id: 'infobar.buttonChangelog',
defaultMessage: '!!!Changelog',
},
buttonInstallUpdate: {
id: 'infobar.buttonInstallUpdate',
defaultMessage: '!!!Restart & install update',
Expand Down Expand Up @@ -135,7 +139,9 @@ export default class AppLayout extends Component {
sticky
>
<span className="mdi mdi-information" />
{intl.formatMessage(messages.updateAvailable)}
{intl.formatMessage(messages.updateAvailable)} <a href="https://meetfranz.com/changelog" target="_blank">
<u>{intl.formatMessage(messages.changelog)}</u>
</a>
</InfoBar>
)}
{services}
Expand Down
7 changes: 5 additions & 2 deletions src/components/ui/InfoBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,13 @@ export default class InfoBar extends Component {
[`${className}`]: true,
})}
>
<div onClick={onClick} className="info-bar__content">
<div className="info-bar__content">
{children}
{ctaLabel && (
<button className="info-bar__cta">
<button
className="info-bar__cta"
onClick={onClick}
>
<Loader
loaded={!ctaLoading}
lines={10}
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"infobar.updateAvailable": "A new update for Franz is available.",
"infobar.buttonReloadServices": "Reload services",
"infobar.buttonInstallUpdate": "Restart & install update",
"infobar.buttonChangelog": "What is new?",
"infobar.requiredRequestsFailed": "Could not load services and user information",
"sidebar.settings": "Settings",
"sidebar.addNewService": "Add new service",
Expand Down
4 changes: 4 additions & 0 deletions src/styles/info-bar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
}
}

a {
// text-decoration: underline;
}

&.info-bar--bottom {
order: 10;
}
Expand Down

0 comments on commit 2cbd938

Please sign in to comment.