Skip to content

Commit

Permalink
Merge pull request #430 from input-output-hk/feature/daef-418-about-p…
Browse files Browse the repository at this point in the history
…age-available-from-the-system-menu

Feature/daef 418 About page, available from the system menu
  • Loading branch information
Darko Mijić authored Aug 24, 2017
2 parents ee5e09f + 773bd35 commit e7b5207
Show file tree
Hide file tree
Showing 21 changed files with 442 additions and 14 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Changelog
- Setup environment variable for testnet/mainnet mode ([PR 400](https://github.com/input-output-hk/daedalus/pull/400))
- Export wallet to file ([PR 426](https://github.com/input-output-hk/daedalus/pull/426))
- Add theming options in settings ([PR 370](https://github.com/input-output-hk/daedalus/pull/398))
- About page, available from the system menu ([PR 430](https://github.com/input-output-hk/daedalus/pull/430))

### Fixes

Expand Down
36 changes: 36 additions & 0 deletions app/About.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// @flow
import React, { Component } from 'react';
import { observer } from 'mobx-react';
import { ThemeProvider } from 'react-css-themr';
import { IntlProvider } from 'react-intl';
import AboutPage from './containers/static/AboutPage';
import { daedalusTheme } from './themes/daedalus';
import translations from './i18n/translations';
import type { StoresMap } from './stores/index';
import ThemeManager from './ThemeManager';

@observer
export default class About extends Component {

props: {
stores: StoresMap,
};

render() {
const { stores } = this.props;
const locale = stores.app.currentLocale;
const currentTheme = stores.app.currentTheme;
const theme = require(`./themes/daedalus/${currentTheme}.js`); // eslint-disable-line

return (
<div>
<ThemeManager variables={theme} />
<ThemeProvider theme={daedalusTheme}>
<IntlProvider {...{ locale, key: locale, messages: translations[locale] }}>
<AboutPage />
</IntlProvider>
</ThemeProvider>
</div>
);
}
}
Binary file added app/assets/fonts/Montserrat-Medium.ttf
Binary file not shown.
78 changes: 78 additions & 0 deletions app/components/static/About.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
// @flow
import React, {Component} from 'react';
import SvgInline from 'react-svg-inline';
import { ipcRenderer } from 'electron';
import { defineMessages, intlShape } from 'react-intl';
import styles from './About.scss';
import daedalusIcon from '../../assets/images/daedalus-logo-loading-grey.inline.svg';
import cardanoIcon from '../../assets/images/cardano-logo.inline.svg';

const messages = defineMessages({
aboutWindowTitle: {
id: 'window.about.title',
defaultMessage: '!!!About Daedalus',
description: 'About Window "title"',
},
aboutTitle: {
id: 'static.about.title',
defaultMessage: '!!!Daedalus',
description: 'About "title"',
},
aboutReleaseVersion: {
id: 'static.about.release.version',
defaultMessage: '!!!2017.0.1 x64 Release',
description: 'Label for "App Release Version"',
},
aboutContentText: {
id: 'static.about.content.text',
defaultMessage: '!!!Charles Hoskinson, Jeremy Wood, Aggelos Kiayias, Eileen Fitzgerald, Philip Wadler, Elias Koutsoupias, Mario Larangeira, Bernardo David, Peter Gaži, Rafael Dowsley, Roman Oliynykov, Dmitry Shtukenberg, Duncan Coutts, Lars Brünjes, Philipp Kant, Peter Thompson, Darryl McAdams, Ante Kegalj, Jens Krause, Kristijan Šarić, Denis Shevchenko, Alfredo Di Napoli, Jonn Mostovoy, Arseniy Seroka, Alexander Vieth, Mikhail Volkhov, George Agapov, Ivan Gromakovskii, Alexandre Baldé, Artyom Kazak, Dmitry Kovanikov, Alan McSherry, Alan Verbner, Nicolas Tallar, Lukasz Gasior, Adam Smolarek, Radek Tkaczyk, Alexander Chepurnoy, Dmitry Meshkov, Jan Kotek, Darko Mijić, Dominik Guzei, Nikola Glumac, Tomislav Horaček, Domen Kožar, Jacob Mitchell, Serge Kosyrev, Michael Bishop, Christian Lindgren, Reslav Hollos, Daniel Friedman, Alejandro Garcia, Dmytro Kaidalov, Andrii Nastenko, Mariia Rodinko, Oleksiy Shevtsov, Richard Wild, Tomas Vrana, Alexander Rukin, Jonny Smillie, Jane Wild, Carlo Vicari, Christian Seberino, Laurie Wang, Leonidas Tsagkalias, Costas Saragkas, Tamara Haasen, Naho Nagahara',
description: 'About page main text',
},
aboutCopyright: {
id: 'static.about.copyright',
defaultMessage: '!!!2016–2017 IOHK. All rights reserved.',
description: 'About "copyright"',
},
});

export default class About extends Component {

static contextTypes = {
intl: intlShape.isRequired,
};

componentWillMount() {
ipcRenderer.send('about-window-title', this.context.intl.formatMessage(messages.aboutWindowTitle));
}

render() {
const { intl } = this.context;

return (
<div className={styles.container}>

<div className={styles.headerWrapper}>

<SvgInline svg={daedalusIcon} className={styles.daedalusIcon} />

<div className={styles.daedalusTitleVersion}>
<div className={styles.daedalusTitle}>{intl.formatMessage(messages.aboutTitle)}</div>
<div className={styles.daedalusVersion}>{intl.formatMessage(messages.aboutReleaseVersion)}</div>
</div>

<SvgInline svg={cardanoIcon} className={styles.cardanoIcon} />
</div>

<div className={styles.contentText}>
{intl.formatMessage(messages.aboutContentText)}
</div>

<div className={styles.footerWrapper}>
<a href='http://daedaluswallet.io'>http://daedaluswallet.io</a>
<div className={styles.copyright}>{intl.formatMessage(messages.aboutCopyright)}</div>
</div>

</div>
);
}
}
83 changes: 83 additions & 0 deletions app/components/static/About.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
.container {
background-color: var(--theme-about-window-background-color);
display: flex;
flex-direction: column;
height: 100%;
padding: 30px 30px 20px;

.headerWrapper {
border-bottom: 1px solid var(--theme-about-window-header-bottom-border-color);
display: flex;
padding-bottom: 20px;

.daedalusIcon {
svg {
height: 58px;
width: 74px;
path {
fill: var(--theme-about-window-daedalus-icon-color);
}
}
}

.daedalusTitleVersion {
color: var(--theme-about-window-title-varsion-color);
flex: 1;
margin-left: 30px;

.daedalusTitle {
font-family: 'Montserrat-Medium';
font-size: 24px;
letter-spacing: 6px;
line-height: 1.33;
-webkit-text-stroke: 0.5px var(--theme-about-window-title-stroke-color);
}

.daedalusVersion {
font-family: var(--font-regular);
font-size: 16px;
font-weight: 300;
line-height: 1.38;
margin-top: 4px;
}
}

.cardanoIcon {
margin-top: 7.5px;
svg {
height: 43px;
width: 47px;
path {
fill: var(--theme-about-window-cardano-icon-color);
}
}
}
}

.contentText {
border-bottom: 1px solid var(--theme-about-window-content-bottom-border-color);
color: var(--theme-about-window-content-text-color);
flex: 1;
font-family: var(--font-regular);
font-size: 12px;
line-height: 1.25;
margin-top: 20px;
padding-bottom: 20px;
}

.footerWrapper {
margin-top: 20px;

a,
.copyright {
color: var(--theme-about-window-copyright-color);
font-family: var(--font-regular);
font-size: 12px;
line-height: 1.25;
}

.copyright {
margin-top: 6px;
}
}
}
12 changes: 12 additions & 0 deletions app/containers/static/AboutPage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// @flow
import React, {Component} from 'react';
import About from '../../components/static/About';

export default class AboutPage extends Component {

render() {
return (
<About />
);
}
}
7 changes: 6 additions & 1 deletion app/i18n/locales/de-DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@
"settings.support.sendLogs.switchLabel": "!!!Send logs to the central server",
"settings.support.sendLogs.switchPlaceholder": "!!!Do you want to help diagnose issues by opting in to send logs to our central logging server? Logs will not include any sensitive data.",
"sidebar.wallets.addWallet": "!!!Add wallet",
"static.about.content.text": "!!!Charles Hoskinson, Jeremy Wood, Aggelos Kiayias, Eileen Fitzgerald, Philip Wadler, Elias Koutsoupias, Mario Larangeira, Bernardo David, Peter Gaži, Rafael Dowsley, Roman Oliynykov, Dmitry Shtukenberg, Duncan Coutts, Lars Brünjes, Philipp Kant, Peter Thompson, Darryl McAdams, Ante Kegalj, Jens Krause, Kristijan Šarić, Denis Shevchenko, Alfredo Di Napoli, Jonn Mostovoy, Arseniy Seroka, Alexander Vieth, Mikhail Volkhov, George Agapov, Ivan Gromakovskii, Alexandre Baldé, Artyom Kazak, Dmitry Kovanikov, Alan McSherry, Alan Verbner, Nicolas Tallar, Lukasz Gasior, Adam Smolarek, Radek Tkaczyk, Alexander Chepurnoy, Dmitry Meshkov, Jan Kotek, Darko Mijić, Dominik Guzei, Nikola Glumac, Tomislav Horaček, Domen Kožar, Jacob Mitchell, Serge Kosyrev, Michael Bishop, Christian Lindgren, Reslav Hollos, Daniel Friedman, Alejandro Garcia, Dmytro Kaidalov, Andrii Nastenko, Mariia Rodinko, Oleksiy Shevtsov, Richard Wild, Tomas Vrana, Alexander Rukin, Jonny Smillie, Jane Wild, Carlo Vicari, Christian Seberino, Laurie Wang, Leonidas Tsagkalias, Costas Saragkas, Tamara Haasen, Naho Nagahara",
"static.about.copyright": "!!!2016–2017 IOHK. All rights reserved.",
"static.about.release.version": "!!!2017.0.1 x64 Release",
"static.about.title": "!!!Daedalus",
"wallet.add.dialog.create.description": "!!!Create a new wallet",
"wallet.add.dialog.create.label": "!!!Create",
"wallet.add.dialog.import.description": "!!!Import wallet from a key",
Expand Down Expand Up @@ -237,5 +241,6 @@
"wallet.transaction.type.card": "Kreditkartenzahlung",
"wallet.transaction.type.exchange": "Währungsumtausch",
"wallet.transactions.no.transactions": "Keine Transaktionen vorhanden",
"wallet.transactions.no.transactions.found": "Keine Transaktionen gefunden"
"wallet.transactions.no.transactions.found": "Keine Transaktionen gefunden",
"window.about.title": "!!!About Daedalus"
}
75 changes: 75 additions & 0 deletions app/i18n/locales/defaultMessages.json
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,81 @@
],
"path": "app/components/sidebar/wallets/SidebarWalletsMenu.json"
},
{
"descriptors": [
{
"defaultMessage": "!!!About Daedalus",
"description": "About Window \"title\"",
"end": {
"column": 3,
"line": 14
},
"file": "app/components/static/About.js",
"id": "window.about.title",
"start": {
"column": 20,
"line": 10
}
},
{
"defaultMessage": "!!!Daedalus",
"description": "About \"title\"",
"end": {
"column": 3,
"line": 19
},
"file": "app/components/static/About.js",
"id": "static.about.title",
"start": {
"column": 14,
"line": 15
}
},
{
"defaultMessage": "!!!2017.0.1 x64 Release",
"description": "Label for \"App Release Version\"",
"end": {
"column": 3,
"line": 24
},
"file": "app/components/static/About.js",
"id": "static.about.release.version",
"start": {
"column": 23,
"line": 20
}
},
{
"defaultMessage": "!!!Charles Hoskinson, Jeremy Wood, Aggelos Kiayias, Eileen Fitzgerald, Philip Wadler, Elias Koutsoupias, Mario Larangeira, Bernardo David, Peter Gaži, Rafael Dowsley, Roman Oliynykov, Dmitry Shtukenberg, Duncan Coutts, Lars Brünjes, Philipp Kant, Peter Thompson, Darryl McAdams, Ante Kegalj, Jens Krause, Kristijan Šarić, Denis Shevchenko, Alfredo Di Napoli, Jonn Mostovoy, Arseniy Seroka, Alexander Vieth, Mikhail Volkhov, George Agapov, Ivan Gromakovskii, Alexandre Baldé, Artyom Kazak, Dmitry Kovanikov, Alan McSherry, Alan Verbner, Nicolas Tallar, Lukasz Gasior, Adam Smolarek, Radek Tkaczyk, Alexander Chepurnoy, Dmitry Meshkov, Jan Kotek, Darko Mijić, Dominik Guzei, Nikola Glumac, Tomislav Horaček, Domen Kožar, Jacob Mitchell, Serge Kosyrev, Michael Bishop, Christian Lindgren, Reslav Hollos, Daniel Friedman, Alejandro Garcia, Dmytro Kaidalov, Andrii Nastenko, Mariia Rodinko, Oleksiy Shevtsov, Richard Wild, Tomas Vrana, Alexander Rukin, Jonny Smillie, Jane Wild, Carlo Vicari, Christian Seberino, Laurie Wang, Leonidas Tsagkalias, Costas Saragkas, Tamara Haasen, Naho Nagahara",
"description": "About page main text",
"end": {
"column": 3,
"line": 29
},
"file": "app/components/static/About.js",
"id": "static.about.content.text",
"start": {
"column": 20,
"line": 25
}
},
{
"defaultMessage": "!!!2016–2017 IOHK. All rights reserved.",
"description": "About \"copyright\"",
"end": {
"column": 3,
"line": 34
},
"file": "app/components/static/About.js",
"id": "static.about.copyright",
"start": {
"column": 18,
"line": 30
}
}
],
"path": "app/components/static/About.json"
},
{
"descriptors": [
{
Expand Down
7 changes: 6 additions & 1 deletion app/i18n/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@
"settings.support.sendLogs.switchLabel": "Send logs to the central server",
"settings.support.sendLogs.switchPlaceholder": "Do you want to help diagnose issues by opting in to send logs to our central logging server? Logs will not include any sensitive data.",
"sidebar.wallets.addWallet": "Add wallet",
"static.about.content.text": "Charles Hoskinson, Jeremy Wood, Aggelos Kiayias, Eileen Fitzgerald, Philip Wadler, Elias Koutsoupias, Mario Larangeira, Bernardo David, Peter Gaži, Rafael Dowsley, Roman Oliynykov, Dmitry Shtukenberg, Duncan Coutts, Lars Brünjes, Philipp Kant, Peter Thompson, Darryl McAdams, Ante Kegalj, Jens Krause, Kristijan Šarić, Denis Shevchenko, Alfredo Di Napoli, Jonn Mostovoy, Arseniy Seroka, Alexander Vieth, Mikhail Volkhov, George Agapov, Ivan Gromakovskii, Alexandre Baldé, Artyom Kazak, Dmitry Kovanikov, Alan McSherry, Alan Verbner, Nicolas Tallar, Lukasz Gasior, Adam Smolarek, Radek Tkaczyk, Alexander Chepurnoy, Dmitry Meshkov, Jan Kotek, Darko Mijić, Dominik Guzei, Nikola Glumac, Tomislav Horaček, Domen Kožar, Jacob Mitchell, Serge Kosyrev, Michael Bishop, Christian Lindgren, Reslav Hollos, Daniel Friedman, Alejandro Garcia, Dmytro Kaidalov, Andrii Nastenko, Mariia Rodinko, Oleksiy Shevtsov, Richard Wild, Tomas Vrana, Alexander Rukin, Jonny Smillie, Jane Wild, Carlo Vicari, Christian Seberino, Laurie Wang, Leonidas Tsagkalias, Costas Saragkas, Tamara Haasen, Naho Nagahara",
"static.about.copyright": "2016–2017 IOHK. All rights reserved.",
"static.about.release.version": "2017.0.1 x64 Release",
"static.about.title": "Daedalus",
"wallet.add.dialog.create.description": "Create a new wallet",
"wallet.add.dialog.create.label": "Create",
"wallet.add.dialog.import.description": "Import wallet from a key",
Expand Down Expand Up @@ -237,5 +241,6 @@
"wallet.transaction.type.card": "Card Payment",
"wallet.transaction.type.exchange": "Exchange",
"wallet.transactions.no.transactions": "No transactions",
"wallet.transactions.no.transactions.found": "No transactions found"
"wallet.transactions.no.transactions.found": "No transactions found",
"window.about.title": "About Daedalus"
}
7 changes: 6 additions & 1 deletion app/i18n/locales/hr-HR.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@
"settings.support.sendLogs.switchLabel": "!!!Send logs to the central server",
"settings.support.sendLogs.switchPlaceholder": "!!!Do you want to help diagnose issues by opting in to send logs to our central logging server? Logs will not include any sensitive data.",
"sidebar.wallets.addWallet": "Dodaj novčanik",
"static.about.content.text": "!!!Charles Hoskinson, Jeremy Wood, Aggelos Kiayias, Eileen Fitzgerald, Philip Wadler, Elias Koutsoupias, Mario Larangeira, Bernardo David, Peter Gaži, Rafael Dowsley, Roman Oliynykov, Dmitry Shtukenberg, Duncan Coutts, Lars Brünjes, Philipp Kant, Peter Thompson, Darryl McAdams, Ante Kegalj, Jens Krause, Kristijan Šarić, Denis Shevchenko, Alfredo Di Napoli, Jonn Mostovoy, Arseniy Seroka, Alexander Vieth, Mikhail Volkhov, George Agapov, Ivan Gromakovskii, Alexandre Baldé, Artyom Kazak, Dmitry Kovanikov, Alan McSherry, Alan Verbner, Nicolas Tallar, Lukasz Gasior, Adam Smolarek, Radek Tkaczyk, Alexander Chepurnoy, Dmitry Meshkov, Jan Kotek, Darko Mijić, Dominik Guzei, Nikola Glumac, Tomislav Horaček, Domen Kožar, Jacob Mitchell, Serge Kosyrev, Michael Bishop, Christian Lindgren, Reslav Hollos, Daniel Friedman, Alejandro Garcia, Dmytro Kaidalov, Andrii Nastenko, Mariia Rodinko, Oleksiy Shevtsov, Richard Wild, Tomas Vrana, Alexander Rukin, Jonny Smillie, Jane Wild, Carlo Vicari, Christian Seberino, Laurie Wang, Leonidas Tsagkalias, Costas Saragkas, Tamara Haasen, Naho Nagahara",
"static.about.copyright": "!!!2016–2017 IOHK. All rights reserved.",
"static.about.release.version": "!!!2017.0.1 x64 Release",
"static.about.title": "!!!Daedalus",
"wallet.add.dialog.create.description": "!!!Create a new wallet",
"wallet.add.dialog.create.label": "!!!Create",
"wallet.add.dialog.import.description": "!!!Import wallet from a key",
Expand Down Expand Up @@ -237,5 +241,6 @@
"wallet.transaction.type.card": "Plaćanje karticom",
"wallet.transaction.type.exchange": "Konverzija",
"wallet.transactions.no.transactions": "Nema transakcija",
"wallet.transactions.no.transactions.found": "Ne postoje transakcije koje zadovoljavaju uvjete pretraživanja"
"wallet.transactions.no.transactions.found": "Ne postoje transakcije koje zadovoljavaju uvjete pretraživanja",
"window.about.title": "!!!About Daedalus"
}
7 changes: 6 additions & 1 deletion app/i18n/locales/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@
"settings.support.sendLogs.switchLabel": "中心サーバーにログを送信する",
"settings.support.sendLogs.switchPlaceholder": "中央サーバーにログを送信し、問題の診断を行いますか。ログには機密データは含まれていません。",
"sidebar.wallets.addWallet": "ウォレット追加",
"static.about.content.text": "!!!Charles Hoskinson, Jeremy Wood, Aggelos Kiayias, Eileen Fitzgerald, Philip Wadler, Elias Koutsoupias, Mario Larangeira, Bernardo David, Peter Gaži, Rafael Dowsley, Roman Oliynykov, Dmitry Shtukenberg, Duncan Coutts, Lars Brünjes, Philipp Kant, Peter Thompson, Darryl McAdams, Ante Kegalj, Jens Krause, Kristijan Šarić, Denis Shevchenko, Alfredo Di Napoli, Jonn Mostovoy, Arseniy Seroka, Alexander Vieth, Mikhail Volkhov, George Agapov, Ivan Gromakovskii, Alexandre Baldé, Artyom Kazak, Dmitry Kovanikov, Alan McSherry, Alan Verbner, Nicolas Tallar, Lukasz Gasior, Adam Smolarek, Radek Tkaczyk, Alexander Chepurnoy, Dmitry Meshkov, Jan Kotek, Darko Mijić, Dominik Guzei, Nikola Glumac, Tomislav Horaček, Domen Kožar, Jacob Mitchell, Serge Kosyrev, Michael Bishop, Christian Lindgren, Reslav Hollos, Daniel Friedman, Alejandro Garcia, Dmytro Kaidalov, Andrii Nastenko, Mariia Rodinko, Oleksiy Shevtsov, Richard Wild, Tomas Vrana, Alexander Rukin, Jonny Smillie, Jane Wild, Carlo Vicari, Christian Seberino, Laurie Wang, Leonidas Tsagkalias, Costas Saragkas, Tamara Haasen, Naho Nagahara",
"static.about.copyright": "!!!2016–2017 IOHK. All rights reserved.",
"static.about.release.version": "!!!2017.0.1 x64 Release",
"static.about.title": "!!!Daedalus",
"wallet.add.dialog.create.description": "ウォレット新規作成",
"wallet.add.dialog.create.label": "作成",
"wallet.add.dialog.import.description": "キーからウォレットをインポート",
Expand Down Expand Up @@ -237,5 +241,6 @@
"wallet.transaction.type.card": "カード支払い",
"wallet.transaction.type.exchange": "換金",
"wallet.transactions.no.transactions": "トランザクションはありません",
"wallet.transactions.no.transactions.found": "トランザクションが見つかりません"
"wallet.transactions.no.transactions.found": "トランザクションが見つかりません",
"window.about.title": "!!!About Daedalus"
}
Loading

0 comments on commit e7b5207

Please sign in to comment.