diff options
author | 2019-09-29 12:46:41 -0400 | |
---|---|---|
committer | 2019-09-29 12:46:41 -0400 | |
commit | a87a8002cee27ced41acaee8211ebdf3072ebf4c (patch) | |
tree | 2cc120ad1bcfc0e5b905b941175efaee26d7a1da /src | |
parent | Trying to fix the code for Signup.js (diff) | |
download | ferdium-app-a87a8002cee27ced41acaee8211ebdf3072ebf4c.tar.gz ferdium-app-a87a8002cee27ced41acaee8211ebdf3072ebf4c.tar.zst ferdium-app-a87a8002cee27ced41acaee8211ebdf3072ebf4c.zip |
Revert Signup.js and updated Menu.js
Diffstat (limited to 'src')
-rw-r--r-- | src/components/auth/Signup.js | 6 | ||||
-rw-r--r-- | src/lib/Menu.js | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 88c742a54..b36e71ce1 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js | |||
@@ -117,11 +117,7 @@ export default @observer class Signup extends Component { | |||
117 | const { intl } = this.context; | 117 | const { intl } = this.context; |
118 | const { isSubmitting, loginRoute, error } = this.props; | 118 | const { isSubmitting, loginRoute, error } = this.props; |
119 | 119 | ||
120 | //Old code before my commit | 120 | const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com'; |
121 | //const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com'; | ||
122 | |||
123 | //This is the change for the issue #80, need testing | ||
124 | const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://server.getferdi.com' ? window.ferdi.stores.settings.all.app.server : 'https://getferdi.com'; | ||
125 | 121 | ||
126 | return ( | 122 | return ( |
127 | <div className="auth__scroll-container"> | 123 | <div className="auth__scroll-container"> |
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 65e0326da..6afb63c83 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -463,11 +463,11 @@ const _templateFactory = intl => [ | |||
463 | }, | 463 | }, |
464 | { | 464 | { |
465 | label: intl.formatMessage(menuItems.tos), | 465 | label: intl.formatMessage(menuItems.tos), |
466 | click() { shell.openExternal('https://meetfranz.com/terms'); }, | 466 | click() { shell.openExternal('${termsBase}/terms'); }, |
467 | }, | 467 | }, |
468 | { | 468 | { |
469 | label: intl.formatMessage(menuItems.privacy), | 469 | label: intl.formatMessage(menuItems.privacy), |
470 | click() { shell.openExternal('https://meetfranz.com/privacy'); }, | 470 | click() { shell.openExternal('${termsBase}/privacy'); }, |
471 | }, | 471 | }, |
472 | ], | 472 | ], |
473 | }, | 473 | }, |
@@ -655,11 +655,11 @@ const _titleBarTemplateFactory = intl => [ | |||
655 | }, | 655 | }, |
656 | { | 656 | { |
657 | label: intl.formatMessage(menuItems.tos), | 657 | label: intl.formatMessage(menuItems.tos), |
658 | click() { shell.openExternal('https://meetfranz.com/terms'); }, | 658 | click() { shell.openExternal('${termsBase}/terms'); }, |
659 | }, | 659 | }, |
660 | { | 660 | { |
661 | label: intl.formatMessage(menuItems.privacy), | 661 | label: intl.formatMessage(menuItems.privacy), |
662 | click() { shell.openExternal('https://meetfranz.com/privacy'); }, | 662 | click() { shell.openExternal('${termsBase}/privacy'); }, |
663 | }, | 663 | }, |
664 | ], | 664 | ], |
665 | }, | 665 | }, |