diff options
author | 2018-11-15 12:38:55 +0100 | |
---|---|---|
committer | 2018-11-15 12:38:55 +0100 | |
commit | f6d1b8bd3b7667922e7bf802590db834c3fc2798 (patch) | |
tree | f0a963a357c8f066f8590719098e375358d834c1 /src | |
parent | Update stylesheets and added darkMode variable and toggle. (diff) | |
parent | Merge branch 'chore/update-dependencies' into develop (diff) | |
download | ferdium-app-f6d1b8bd3b7667922e7bf802590db834c3fc2798.tar.gz ferdium-app-f6d1b8bd3b7667922e7bf802590db834c3fc2798.tar.zst ferdium-app-f6d1b8bd3b7667922e7bf802590db834c3fc2798.zip |
Merge remote-tracking branch 'origin/develop' into pr/1026
Diffstat (limited to 'src')
-rw-r--r-- | src/api/server/ServerApi.js | 2 | ||||
-rw-r--r-- | src/app.js | 2 | ||||
-rw-r--r-- | src/components/auth/Signup.js | 4 | ||||
-rw-r--r-- | src/config.js | 4 | ||||
-rw-r--r-- | src/index.js | 5 | ||||
-rw-r--r-- | src/lib/Menu.js | 4 | ||||
-rw-r--r-- | src/models/News.js | 8 | ||||
-rw-r--r-- | src/models/Plan.js | 4 | ||||
-rw-r--r-- | src/models/RecipePreview.js | 8 | ||||
-rw-r--r-- | src/models/Service.js | 2 | ||||
-rw-r--r-- | src/stores/SettingsStore.js | 2 | ||||
-rw-r--r-- | src/stores/UIStore.js | 2 |
12 files changed, 26 insertions, 21 deletions
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js index 353faa7f4..2e80e520b 100644 --- a/src/api/server/ServerApi.js +++ b/src/api/server/ServerApi.js | |||
@@ -35,7 +35,7 @@ module.paths.unshift( | |||
35 | ); | 35 | ); |
36 | 36 | ||
37 | const { app } = remote; | 37 | const { app } = remote; |
38 | const fetch = remote.require('electron-fetch'); | 38 | const { default: fetch } = remote.require('electron-fetch'); |
39 | 39 | ||
40 | const SERVER_URL = API; | 40 | const SERVER_URL = API; |
41 | const API_VERSION = 'v1'; | 41 | const API_VERSION = 'v1'; |
diff --git a/src/app.js b/src/app.js index 814bfacf1..43d0cf018 100644 --- a/src/app.js +++ b/src/app.js | |||
@@ -6,7 +6,7 @@ import { Provider } from 'mobx-react'; | |||
6 | import { syncHistoryWithStore, RouterStore } from 'mobx-react-router'; | 6 | import { syncHistoryWithStore, RouterStore } from 'mobx-react-router'; |
7 | import { Router, Route, hashHistory, IndexRedirect } from 'react-router'; | 7 | import { Router, Route, hashHistory, IndexRedirect } from 'react-router'; |
8 | 8 | ||
9 | import 'babel-polyfill'; | 9 | import '@babel/polyfill'; |
10 | import smoothScroll from 'smoothscroll-polyfill'; | 10 | import smoothScroll from 'smoothscroll-polyfill'; |
11 | 11 | ||
12 | import ServerApi from './api/server/ServerApi'; | 12 | import ServerApi from './api/server/ServerApi'; |
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 219948274..923aa456d 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js | |||
@@ -187,7 +187,7 @@ export default class Signup extends Component { | |||
187 | {intl.formatMessage(messages.legalInfo)} | 187 | {intl.formatMessage(messages.legalInfo)} |
188 | <br /> | 188 | <br /> |
189 | <Link | 189 | <Link |
190 | to="http://meetfranz.com/terms" | 190 | to="https://meetfranz.com/terms" |
191 | target="_blank" | 191 | target="_blank" |
192 | className="link" | 192 | className="link" |
193 | > | 193 | > |
@@ -195,7 +195,7 @@ export default class Signup extends Component { | |||
195 | </Link> | 195 | </Link> |
196 | & | 196 | & |
197 | <Link | 197 | <Link |
198 | to="http://meetfranz.com/privacy" | 198 | to="https://meetfranz.com/privacy" |
199 | target="_blank" | 199 | target="_blank" |
200 | className="link" | 200 | className="link" |
201 | > | 201 | > |
diff --git a/src/config.js b/src/config.js index daccfb03a..663b2653d 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -25,7 +25,7 @@ export const DEFAULT_APP_SETTINGS = { | |||
25 | enableGPUAcceleration: true, | 25 | enableGPUAcceleration: true, |
26 | }; | 26 | }; |
27 | 27 | ||
28 | export const FRANZ_SERVICE_REQUEST = 'http://bit.ly/franz-service-request'; | 28 | export const FRANZ_SERVICE_REQUEST = 'https://bit.ly/franz-service-request'; |
29 | export const FRANZ_TRANSLATION = 'http://bit.ly/franz-translate'; | 29 | export const FRANZ_TRANSLATION = 'https://bit.ly/franz-translate'; |
30 | 30 | ||
31 | export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config', 'settings.json'); | 31 | export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config', 'settings.json'); |
diff --git a/src/index.js b/src/index.js index ac94804c1..4480199a7 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -19,6 +19,11 @@ const debug = require('debug')('App'); | |||
19 | let mainWindow; | 19 | let mainWindow; |
20 | let willQuitApp = false; | 20 | let willQuitApp = false; |
21 | 21 | ||
22 | // DEV MODE: Save user data into FranzDev | ||
23 | if (isDevMode) { | ||
24 | app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev')); | ||
25 | } | ||
26 | |||
22 | // Ensure that the recipe directory exists | 27 | // Ensure that the recipe directory exists |
23 | fs.emptyDirSync(path.join(app.getPath('userData'), 'recipes', 'temp')); | 28 | fs.emptyDirSync(path.join(app.getPath('userData'), 'recipes', 'temp')); |
24 | fs.ensureFileSync(path.join(app.getPath('userData'), 'window-state.json')); | 29 | fs.ensureFileSync(path.join(app.getPath('userData'), 'window-state.json')); |
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 19b8d5b15..bdaf203c5 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -285,7 +285,7 @@ const _templateFactory = intl => [ | |||
285 | submenu: [ | 285 | submenu: [ |
286 | { | 286 | { |
287 | label: intl.formatMessage(menuItems.learnMore), | 287 | label: intl.formatMessage(menuItems.learnMore), |
288 | click() { shell.openExternal('http://meetfranz.com'); }, | 288 | click() { shell.openExternal('https://meetfranz.com'); }, |
289 | }, | 289 | }, |
290 | { | 290 | { |
291 | label: intl.formatMessage(menuItems.changelog), | 291 | label: intl.formatMessage(menuItems.changelog), |
@@ -296,7 +296,7 @@ const _templateFactory = intl => [ | |||
296 | }, | 296 | }, |
297 | { | 297 | { |
298 | label: intl.formatMessage(menuItems.support), | 298 | label: intl.formatMessage(menuItems.support), |
299 | click() { shell.openExternal('http://meetfranz.com/support'); }, | 299 | click() { shell.openExternal('https://meetfranz.com/support'); }, |
300 | }, | 300 | }, |
301 | { | 301 | { |
302 | type: 'separator', | 302 | type: 'separator', |
diff --git a/src/models/News.js b/src/models/News.js index a96e6550f..caf1d70e5 100644 --- a/src/models/News.js +++ b/src/models/News.js | |||
@@ -1,10 +1,10 @@ | |||
1 | // @flow | 1 | // @flow |
2 | 2 | ||
3 | export default class News { | 3 | export default class News { |
4 | id: string = ''; | 4 | id = ''; |
5 | message: string = ''; | 5 | message = ''; |
6 | type: string = 'primary'; | 6 | type = 'primary'; |
7 | sticky: bool = false; | 7 | sticky = false; |
8 | 8 | ||
9 | constructor(data) { | 9 | constructor(data) { |
10 | if (!data.id) { | 10 | if (!data.id) { |
diff --git a/src/models/Plan.js b/src/models/Plan.js index e77353824..c7b4a0962 100644 --- a/src/models/Plan.js +++ b/src/models/Plan.js | |||
@@ -1,11 +1,11 @@ | |||
1 | // @flow | 1 | // @flow |
2 | 2 | ||
3 | export default class Plan { | 3 | export default class Plan { |
4 | month: { | 4 | month = { |
5 | id: '', | 5 | id: '', |
6 | price: 0, | 6 | price: 0, |
7 | } | 7 | } |
8 | year: { | 8 | year = { |
9 | id: '', | 9 | id: '', |
10 | price: 0, | 10 | price: 0, |
11 | } | 11 | } |
diff --git a/src/models/RecipePreview.js b/src/models/RecipePreview.js index 525a5c4b5..7470d757a 100644 --- a/src/models/RecipePreview.js +++ b/src/models/RecipePreview.js | |||
@@ -1,10 +1,10 @@ | |||
1 | // @flow | 1 | // @flow |
2 | 2 | ||
3 | export default class RecipePreview { | 3 | export default class RecipePreview { |
4 | id: string = ''; | 4 | id = ''; |
5 | name: string = ''; | 5 | name = ''; |
6 | icon: string = ''; // TODO: check if this isn't replaced by `icons` | 6 | icon = ''; // TODO: check if this isn't replaced by `icons` |
7 | featured: bool = false; | 7 | featured = false; |
8 | 8 | ||
9 | constructor(data) { | 9 | constructor(data) { |
10 | if (!data.id) { | 10 | if (!data.id) { |
diff --git a/src/models/Service.js b/src/models/Service.js index bafb3f564..4f8767dbe 100644 --- a/src/models/Service.js +++ b/src/models/Service.js | |||
@@ -7,7 +7,7 @@ export default class Service { | |||
7 | recipe = ''; | 7 | recipe = ''; |
8 | webview = null; | 8 | webview = null; |
9 | timer = null; | 9 | timer = null; |
10 | events: {}; | 10 | events = {}; |
11 | 11 | ||
12 | isAttached = false; | 12 | isAttached = false; |
13 | 13 | ||
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index d8519c609..9270a6481 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js | |||
@@ -68,7 +68,7 @@ export default class SettingsStore extends Store { | |||
68 | 68 | ||
69 | // Helper | 69 | // Helper |
70 | _migrate() { | 70 | _migrate() { |
71 | const legacySettings = localStorage.getItem('app'); | 71 | const legacySettings = localStorage.getItem('app') || {}; |
72 | 72 | ||
73 | if (!this.all.migration['5.0.0-beta.17-settings']) { | 73 | if (!this.all.migration['5.0.0-beta.17-settings']) { |
74 | this.actions.settings.update({ | 74 | this.actions.settings.update({ |
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js index b391bdcae..bee6c8bcf 100644 --- a/src/stores/UIStore.js +++ b/src/stores/UIStore.js | |||
@@ -26,7 +26,7 @@ export default class UIStore extends Store { | |||
26 | this.stores.router.push(settingsPath); | 26 | this.stores.router.push(settingsPath); |
27 | } | 27 | } |
28 | 28 | ||
29 | @action _closeSettings(): void { | 29 | @action _closeSettings() { |
30 | this.stores.router.push('/'); | 30 | this.stores.router.push('/'); |
31 | } | 31 | } |
32 | 32 | ||