aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/settings
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-02-12 14:16:33 +0100
committerLibravatar GitHub <noreply@github.com>2018-02-12 14:16:33 +0100
commit7a1872e64262a76f17ac231a47fd8f57cd5a13ac (patch)
tree29ed8aa4dfcb9b179f4fe47c30fb33cf78c2e2ce /src/components/settings
parentMerge pull request #668 from meetfranz/fix/import-screen-toggles (diff)
parentfeat(App) Feature Invite Friends in Settings (diff)
downloadferdium-app-7a1872e64262a76f17ac231a47fd8f57cd5a13ac.tar.gz
ferdium-app-7a1872e64262a76f17ac231a47fd8f57cd5a13ac.tar.zst
ferdium-app-7a1872e64262a76f17ac231a47fd8f57cd5a13ac.zip
Merge pull request #654 from meetfranz/feature/invite-button
Invite Button in Settings
Diffstat (limited to 'src/components/settings')
-rw-r--r--src/components/settings/navigation/SettingsNavigation.js11
-rw-r--r--src/components/settings/services/ServiceError.js2
2 files changed, 12 insertions, 1 deletions
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index fea8d682d..66539f324 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -21,6 +21,10 @@ const messages = defineMessages({
21 id: 'settings.navigation.settings', 21 id: 'settings.navigation.settings',
22 defaultMessage: '!!!Settings', 22 defaultMessage: '!!!Settings',
23 }, 23 },
24 inviteFriends: {
25 id: 'settings.navigation.inviteFriends',
26 defaultMessage: '!!!Invite Friends',
27 },
24 logout: { 28 logout: {
25 id: 'settings.navigation.logout', 29 id: 'settings.navigation.logout',
26 defaultMessage: '!!!Logout', 30 defaultMessage: '!!!Logout',
@@ -70,6 +74,13 @@ export default class SettingsNavigation extends Component {
70 > 74 >
71 {intl.formatMessage(messages.settings)} 75 {intl.formatMessage(messages.settings)}
72 </Link> 76 </Link>
77 <Link
78 to="/settings/invite"
79 className="settings-navigation__link"
80 activeClassName="is-active"
81 >
82 {intl.formatMessage(messages.inviteFriends)}
83 </Link>
73 <span className="settings-navigation__expander" /> 84 <span className="settings-navigation__expander" />
74 <Link 85 <Link
75 to="/auth/logout" 86 to="/auth/logout"
diff --git a/src/components/settings/services/ServiceError.js b/src/components/settings/services/ServiceError.js
index 923053296..1f1512927 100644
--- a/src/components/settings/services/ServiceError.js
+++ b/src/components/settings/services/ServiceError.js
@@ -26,7 +26,7 @@ const messages = defineMessages({
26}); 26});
27 27
28@observer 28@observer
29export default class EditServiceForm extends Component { 29export default class ServiceError extends Component {
30 static contextTypes = { 30 static contextTypes = {
31 intl: intlShape, 31 intl: intlShape,
32 }; 32 };