aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar vantezzen <hello@vantezzen.io>2019-10-08 10:19:42 +0200
committerLibravatar vantezzen <hello@vantezzen.io>2019-10-08 10:19:42 +0200
commit938d519b992656126b690d8de2b054d4e6566a1d (patch)
treec2eaa72d448e6ad725e16fc35c332d610fab01bc
parent#87 Use FERDI_APPDATA_DIR instead of FERDI_USERDATA_DIR (diff)
downloadferdium-app-938d519b992656126b690d8de2b054d4e6566a1d.tar.gz
ferdium-app-938d519b992656126b690d8de2b054d4e6566a1d.tar.zst
ferdium-app-938d519b992656126b690d8de2b054d4e6566a1d.zip
Switch to custom Ferdi API
-rw-r--r--src/components/auth/Login.js4
-rw-r--r--src/config.js8
-rw-r--r--src/i18n/locales/defaultMessages.json4
-rw-r--r--src/i18n/locales/en-US.json4
-rw-r--r--src/i18n/messages/src/components/auth/Login.json4
5 files changed, 12 insertions, 12 deletions
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 270dff30b..eea5a09bf 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -36,11 +36,11 @@ const messages = defineMessages({
36 }, 36 },
37 customServerQuestion: { 37 customServerQuestion: {
38 id: 'login.customServerQuestion', 38 id: 'login.customServerQuestion',
39 defaultMessage: '!!!Using a custom Ferdi server?', 39 defaultMessage: '!!!Using a Franz account to log in?',
40 }, 40 },
41 customServerSuggestion: { 41 customServerSuggestion: {
42 id: 'login.customServerSuggestion', 42 id: 'login.customServerSuggestion',
43 defaultMessage: '!!!Try importing your Franz account', 43 defaultMessage: '!!!Try importing your Franz account into Ferdi',
44 }, 44 },
45 tokenExpired: { 45 tokenExpired: {
46 id: 'login.tokenExpired', 46 id: 'login.tokenExpired',
diff --git a/src/config.js b/src/config.js
index d46db36dc..cd1b2a6c2 100644
--- a/src/config.js
+++ b/src/config.js
@@ -12,7 +12,7 @@ export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks
12 12
13export const LOCAL_API = 'http://localhost:3000'; 13export const LOCAL_API = 'http://localhost:3000';
14export const DEV_API = 'https://dev.franzinfra.com'; 14export const DEV_API = 'https://dev.franzinfra.com';
15export const LIVE_API = 'https://api.franzinfra.com'; 15export const LIVE_API = 'https://api.getferdi.com';
16 16
17export const LOCAL_WS_API = 'ws://localhost:3000'; 17export const LOCAL_WS_API = 'ws://localhost:3000';
18export const DEV_WS_API = 'wss://dev.franzinfra.com'; 18export const DEV_WS_API = 'wss://dev.franzinfra.com';
@@ -21,7 +21,7 @@ export const LIVE_WS_API = 'wss://api.franzinfra.com';
21export const LOCAL_API_WEBSITE = 'http://localhost:3333'; 21export const LOCAL_API_WEBSITE = 'http://localhost:3333';
22// export const DEV_API_WEBSITE = 'https://meetfranz.com';t 22// export const DEV_API_WEBSITE = 'https://meetfranz.com';t
23export const DEV_API_WEBSITE = 'http://hash-58883791519ef6288c952316bdce7fb462283893.franzstaging.com/'; // TODO: revert me 23export const DEV_API_WEBSITE = 'http://hash-58883791519ef6288c952316bdce7fb462283893.franzstaging.com/'; // TODO: revert me
24export const LIVE_API_WEBSITE = 'https://meetfranz.com'; 24export const LIVE_API_WEBSITE = 'https://getferdi.com';
25 25
26export const STATS_API = 'https://stats.franzinfra.com'; 26export const STATS_API = 'https://stats.franzinfra.com';
27 27
@@ -99,8 +99,8 @@ export const DEFAULT_WINDOW_OPTIONS = {
99 y: 0, 99 y: 0,
100}; 100};
101 101
102export const FRANZ_SERVICE_REQUEST = 'https://bit.ly/franz-plugin-docs'; 102export const FRANZ_SERVICE_REQUEST = 'https://github.com/getferdi/recipes/issues';
103export const FRANZ_TRANSLATION = 'https://bit.ly/franz-translate'; 103export const FRANZ_TRANSLATION = 'https://crowdin.com/project/getferdi';
104export const FRANZ_DEV_DOCS = 'http://bit.ly/franz-dev-hub'; 104export const FRANZ_DEV_DOCS = 'http://bit.ly/franz-dev-hub';
105 105
106export const FILE_SYSTEM_SETTINGS_TYPES = [ 106export const FILE_SYSTEM_SETTINGS_TYPES = [
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index e4e596b0c..f5b268cba 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -334,7 +334,7 @@
334 } 334 }
335 }, 335 },
336 { 336 {
337 "defaultMessage": "!!!Using a custom Ferdi server?", 337 "defaultMessage": "!!!Using a Franz account to log in?",
338 "end": { 338 "end": {
339 "column": 3, 339 "column": 3,
340 "line": 40 340 "line": 40
@@ -347,7 +347,7 @@
347 } 347 }
348 }, 348 },
349 { 349 {
350 "defaultMessage": "!!!Try importing your Franz account", 350 "defaultMessage": "!!!Try importing your Franz account into Ferdi",
351 "end": { 351 "end": {
352 "column": 3, 352 "column": 3,
353 "line": 44 353 "line": 44
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 0cd8abf70..319a55f28 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -53,8 +53,8 @@
53 "locked.invalidCredentials": "Password invalid", 53 "locked.invalidCredentials": "Password invalid",
54 "locked.password.label": "Password", 54 "locked.password.label": "Password",
55 "locked.submit.label": "Unlock", 55 "locked.submit.label": "Unlock",
56 "login.customServerQuestion": "Using a custom Ferdi server?", 56 "login.customServerQuestion": "Using a Franz account to log in?",
57 "login.customServerSuggestion": "Try importing your Franz account", 57 "login.customServerSuggestion": "Try importing your Franz account into Ferdi",
58 "login.email.label": "Email address", 58 "login.email.label": "Email address",
59 "login.headline": "Sign in", 59 "login.headline": "Sign in",
60 "login.invalidCredentials": "Email or password not valid", 60 "login.invalidCredentials": "Email or password not valid",
diff --git a/src/i18n/messages/src/components/auth/Login.json b/src/i18n/messages/src/components/auth/Login.json
index d593eac68..7e4b32294 100644
--- a/src/i18n/messages/src/components/auth/Login.json
+++ b/src/i18n/messages/src/components/auth/Login.json
@@ -66,7 +66,7 @@
66 }, 66 },
67 { 67 {
68 "id": "login.customServerQuestion", 68 "id": "login.customServerQuestion",
69 "defaultMessage": "!!!Using a custom Ferdi server?", 69 "defaultMessage": "!!!Using a Franz account to log in?",
70 "file": "src/components/auth/Login.js", 70 "file": "src/components/auth/Login.js",
71 "start": { 71 "start": {
72 "line": 37, 72 "line": 37,
@@ -79,7 +79,7 @@
79 }, 79 },
80 { 80 {
81 "id": "login.customServerSuggestion", 81 "id": "login.customServerSuggestion",
82 "defaultMessage": "!!!Try importing your Franz account", 82 "defaultMessage": "!!!Try importing your Franz account into Ferdi",
83 "file": "src/components/auth/Login.js", 83 "file": "src/components/auth/Login.js",
84 "start": { 84 "start": {
85 "line": 41, 85 "line": 41,