mirror of
https://github.com/balena-io/etcher.git
synced 2025-07-19 09:16:38 +00:00
Merge pull request #3005 from balena-io/add-version-settings
Add version in settings modal
This commit is contained in:
commit
a119ae7efa
@ -14,6 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import { faGithub } from '@fortawesome/free-brands-svg-icons';
|
||||||
import { faCog } from '@fortawesome/free-solid-svg-icons';
|
import { faCog } from '@fortawesome/free-solid-svg-icons';
|
||||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
@ -22,9 +23,11 @@ import * as propTypes from 'prop-types';
|
|||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import { Badge, Button, Checkbox, Modal, Provider } from 'rendition';
|
import { Badge, Button, Checkbox, Modal, Provider } from 'rendition';
|
||||||
import styled from 'styled-components';
|
import styled from 'styled-components';
|
||||||
|
import packageJSON = require('../../../../../package.json');
|
||||||
import * as settings from '../../models/settings';
|
import * as settings from '../../models/settings';
|
||||||
import * as store from '../../models/store';
|
import * as store from '../../models/store';
|
||||||
import * as analytics from '../../modules/analytics';
|
import * as analytics from '../../modules/analytics';
|
||||||
|
import { open as openExternal } from '../../os/open-external/services/open-external';
|
||||||
import { colors } from '../../theme';
|
import { colors } from '../../theme';
|
||||||
|
|
||||||
const { useState } = React;
|
const { useState } = React;
|
||||||
@ -208,6 +211,17 @@ export const SettingsModal: any = styled(
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
<div>
|
||||||
|
<span
|
||||||
|
onClick={() =>
|
||||||
|
openExternal(
|
||||||
|
'https://github.com/balena-io/etcher/blob/master/CHANGELOG.md',
|
||||||
|
)
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<FontAwesomeIcon icon={faGithub} /> {packageJSON.version}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{_.isEmpty(warning) ? null : (
|
{_.isEmpty(warning) ? null : (
|
||||||
|
@ -21,8 +21,7 @@ const store = require('../../../models/store')
|
|||||||
const analytics = require('../../../modules/analytics')
|
const analytics = require('../../../modules/analytics')
|
||||||
const settings = require('../../../models/settings')
|
const settings = require('../../../models/settings')
|
||||||
|
|
||||||
module.exports = function () {
|
/**
|
||||||
/**
|
|
||||||
* @summary Open an external resource
|
* @summary Open an external resource
|
||||||
* @function
|
* @function
|
||||||
* @public
|
* @public
|
||||||
@ -32,7 +31,7 @@ module.exports = function () {
|
|||||||
* @example
|
* @example
|
||||||
* OSOpenExternalService.open('https://www.google.com');
|
* OSOpenExternalService.open('https://www.google.com');
|
||||||
*/
|
*/
|
||||||
this.open = (url) => {
|
const open = (url) => {
|
||||||
// Don't open links if they're disabled by the env var
|
// Don't open links if they're disabled by the env var
|
||||||
if (settings.get('disableExternalLinks')) {
|
if (settings.get('disableExternalLinks')) {
|
||||||
return
|
return
|
||||||
@ -46,5 +45,10 @@ module.exports = function () {
|
|||||||
if (url) {
|
if (url) {
|
||||||
electron.shell.openExternal(url)
|
electron.shell.openExternal(url)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
module.exports = function () {
|
||||||
|
this.open = open
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports.open = open
|
||||||
|
8
npm-shrinkwrap.json
generated
8
npm-shrinkwrap.json
generated
@ -1018,6 +1018,14 @@
|
|||||||
"@fortawesome/fontawesome-common-types": "^0.2.25"
|
"@fortawesome/fontawesome-common-types": "^0.2.25"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"@fortawesome/free-brands-svg-icons": {
|
||||||
|
"version": "5.11.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.11.2.tgz",
|
||||||
|
"integrity": "sha512-wKK5znpHiZ2S0VgOvbeAnYuzkk3H86rxWajD9PVpfBj3s/kySEWTFKh/uLPyxiTOx8Tsd0OGN4En/s9XudVHLQ==",
|
||||||
|
"requires": {
|
||||||
|
"@fortawesome/fontawesome-common-types": "^0.2.25"
|
||||||
|
}
|
||||||
|
},
|
||||||
"@fortawesome/free-solid-svg-icons": {
|
"@fortawesome/free-solid-svg-icons": {
|
||||||
"version": "5.11.2",
|
"version": "5.11.2",
|
||||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.11.2.tgz",
|
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.11.2.tgz",
|
||||||
|
@ -41,6 +41,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fortawesome/fontawesome-free-webfonts": "^1.0.9",
|
"@fortawesome/fontawesome-free-webfonts": "^1.0.9",
|
||||||
"@fortawesome/fontawesome-svg-core": "^1.2.25",
|
"@fortawesome/fontawesome-svg-core": "^1.2.25",
|
||||||
|
"@fortawesome/free-brands-svg-icons": "^5.11.2",
|
||||||
"@fortawesome/free-solid-svg-icons": "^5.11.2",
|
"@fortawesome/free-solid-svg-icons": "^5.11.2",
|
||||||
"@fortawesome/react-fontawesome": "^0.1.7",
|
"@fortawesome/react-fontawesome": "^0.1.7",
|
||||||
"angular": "1.7.6",
|
"angular": "1.7.6",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user