Skip to content

Commit 68cc2ec

Browse files
committed
👍 node-json-db issue fixed + osx build script
1 parent 3bb1955 commit 68cc2ec

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

app/main/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const link = require('./link-helper');
1313

1414
const {linkIsInternal} = link;
1515

16-
const db = new JsonDB('domain', true, true);
16+
const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
1717
const data = db.getData('/');
1818

1919
// adds debug features like hotkeys for triggering dev tools and reload

app/renderer/about.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<p class="left"><a class="bug" onclick="linkInBrowser()" href="#">Found bug?</a></p>
1414
</div>
1515
<script>
16-
16+
1717
function linkInBrowser(event) {
18-
18+
1919
const shell = require('electron').shell;
2020

2121
const url = "https://github.com/zulip/zulip-electron/issues/new?body=Please describe your issue and steps to reproduce it."

app/renderer/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
<link rel="stylesheet" href="css/main.css" type="text/css" media="screen">
99
<script type="text/javascript">
1010
const JsonDB = require('node-json-db');
11-
const db = new JsonDB('domain', true, true);
11+
const {app} = require('electron').remote;
12+
const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
1213
const data = db.getData('/');
1314

1415
if (data.domain) {

app/renderer/js/main.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
/* global app */
12
// eslint-disable-next-line no-unused-vars
23
function addDomain() {
34
const request = require('request');
45
const ipcRenderer = require('electron').ipcRenderer;
56
const JsonDB = require('node-json-db');
67

7-
const db = new JsonDB('domain', true, true);
8-
// const data = db.getData('/');
8+
const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
99

1010
document.getElementById('main').innerHTML = 'checking...';
1111

app/renderer/js/pref.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ function addDomain() {
1717
const request = require('request');
1818
const ipcRenderer = require('electron').ipcRenderer;
1919
const JsonDB = require('node-json-db');
20+
const {app} = require('electron').remote;
2021

21-
const db = new JsonDB('domain', true, true);
22+
const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
2223
document.getElementById('main').innerHTML = 'checking...';
2324
document.getElementById('pic').style.display = 'block';
2425

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Zulip-Desktop",
33
"productName": "Zulip",
4-
"version": "0.2.1",
4+
"version": "0.3.0",
55
"description": "Zulip Desktop App",
66
"license": "MIT",
77
"repository": {
@@ -16,7 +16,7 @@
1616
"test": "xo",
1717
"start": "electron .",
1818
"dev": "gulp dev",
19-
"build:osx": "electron-packager . --out=dist --app-version=$npm_package_version --prune --asar --ignore=^app/resources --ignore=domain.json --overwrite --platform=darwin --arch=x64",
19+
"build:osx": "electron-packager . --out=dist --app-version=$npm_package_version --prune --asar --icon=app/resources/Icon.icns --overwrite --platform=darwin --arch=x64",
2020
"build": "electron-packager . --out=dist --app-version=$npm_package_version --prune --asar --overwrite --all"
2121
},
2222
"keywords": [

0 commit comments

Comments
 (0)