Some more minor thingsg

This commit is contained in:
Gregory Schier 2016-07-21 15:26:51 -07:00
parent dbd4fbc991
commit 81f4429ab0
8 changed files with 29 additions and 15 deletions

View File

@ -2,11 +2,15 @@
<html>
<head>
<meta charset="utf-8">
<title>Insomnia REST Client</title>
<title>Insomnia</title>
<script src="./external/jsonlint.js"></script>
</head>
<body>
<div id="root"></div>
<script>
const {longName} = require('./app.json');
document.title = `${longName}`;
</script>
<script>
(function () {
const script = document.createElement('script');

View File

@ -3,6 +3,7 @@
"name": "insomnia",
"version": "3.0.3",
"productName": "Insomnia",
"longName": "Insomnia HTTP Client",
"description": "The best REST API Client",
"homepage": "http://insomnia.rest",
"author": "Gregory Schier <support@insomnia.rest>",

View File

@ -7,13 +7,13 @@ import ModalHeader from './base/ModalHeader';
import ModalFooter from './base/ModalFooter';
import ModalComponent from './lib/ModalComponent';
import {CHANGELOG_URL} from '../lib/constants';
import {getVersion} from '../lib/appInfo';
import {getAppVersion} from '../lib/appInfo';
class ChangelogModal extends ModalComponent {
constructor (props) {
super(props);
this.state = {
startVersion: getVersion(),
startVersion: getAppVersion(),
changelog: null
};
}

View File

@ -14,8 +14,9 @@ import ModalComponent from './lib/ModalComponent';
import * as GlobalActions from '../redux/modules/global';
import * as db from '../database';
import {MASHAPE_URL} from '../lib/constants';
import {getVersion} from '../lib/appInfo';
import {getAppVersion} from '../lib/appInfo';
import {MOD_SYM} from '../lib/constants';
import {getAppName, getAppLongName} from '../lib/appInfo';
class SettingsTabs extends Component {
@ -217,7 +218,7 @@ class SettingsTabs extends Component {
<TabPanel className="pad">
<h1>Why hello there!</h1>
<p>
<Link href="http://insomnia.rest">Insomnia</Link> is made with love by me,&nbsp;
<Link href="http://insomnia.rest">{getAppName()}</Link> is made with love by me,&nbsp;
<Link href="http://schier.co">Gregory Schier</Link>.
</p>
<p>
@ -302,9 +303,9 @@ class SettingsModal extends ModalComponent {
return (
<Modal ref="modal" tall={true} {...this.props}>
<ModalHeader>
Insomnia
{" "}
<span className="faint txt-sm">v{getVersion()}</span>
{getAppLongName()}
&nbsp;&nbsp;
<span className="faint txt-sm">v{getAppVersion()}</span>
</ModalHeader>
<ModalBody>
<ConnectedSettingsTabs selectedIndex={selectedIndex}/>

View File

@ -13,7 +13,7 @@ import ChangelogModal from '../components/ChangelogModal';
import * as WorkspaceActions from '../redux/modules/workspaces';
import * as GlobalActions from '../redux/modules/global';
import * as db from '../database';
import {getVersion} from '../lib/appInfo';
import {getAppVersion} from '../lib/appInfo';
class WorkspaceDropdown extends Component {
_promptUpdateName () {
@ -150,7 +150,7 @@ class WorkspaceDropdown extends Component {
</button>
</li>
<DropdownDivider name={`Insomnia Version ${getVersion()}`}/>
<DropdownDivider name={`Insomnia Version ${getAppVersion()}`}/>
<li>
<button onClick={e => SettingsModal.show(1)}>

View File

@ -12,14 +12,14 @@ import './css/lib/chrome/platform_app.css'
import './css/lib/fontawesome/css/font-awesome.css'
import {initStore} from './redux/initstore';
import {initDB} from './database';
import {getVersion} from './lib/appInfo';
import {getAppVersion} from './lib/appInfo';
// Don't inject component styles (use our own)
Tabs.setUseDefaultStyles(false);
export const store = createStore();
console.log(`-- Loading App v${getVersion()} --`);
console.log(`-- Loading App v${getAppVersion()} --`);
initDB()
.then(() => initStore(store.dispatch))

View File

@ -1,9 +1,17 @@
import * as appJson from '../app.json';
export function getVersion () {
export function getAppVersion () {
return appJson.version;
}
export function getAppLongName () {
return appJson.longName;
}
export function getAppName () {
return appJson.productName;
}
export function isMac () {
return process.platform === 'darwin';
}

View File

@ -1,5 +1,5 @@
import * as db from '../../database';
import {getVersion} from '../appInfo';
import {getAppVersion} from '../appInfo';
const VERSION_CHROME_APP = 1;
const VERSION_DESKTOP_APP = 2;
@ -153,7 +153,7 @@ export function exportJSON () {
_type: 'export',
__export_format: 2,
__export_date: new Date(),
__export_source: `insomnia.desktop.app:v${getVersion()}`,
__export_source: `insomnia.desktop.app:v${getAppVersion()}`,
resources: {}
};