ADDED invite button in Account Settings

[WIP] return to previous route on submit / cancel

9 files changed, 42 insertions, 4 deletions

diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 43272fe96..1e71beadf 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -48,6 +48,11 @@ const messages = defineMessages({
     id: 'settings.account.account.editButton',
     defaultMessage: '!!!Edit Account',
   },
+  accountInviteButton: {
+    id: "settings.account.account.inviteButton",
+    defaultMessage: '!!!Invite Friends',
+  },
+
   invoiceDownload: {
     id: 'settings.account.invoiceDownload',
     defaultMessage: '!!!Download',
@@ -174,10 +179,24 @@ export default class AccountDashboard extends Component {
                         <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span>
                       )}
                     </div>
-                    <Link to="/settings/user/edit" className="button">
-                      {intl.formatMessage(messages.accountEditButton)}
-                    </Link>
-
+                    <div className="grid">
+                      <div className="grid__row">
+                        <Link to="/settings/user/edit" className="button account__edit-button">
+                          {intl.formatMessage(messages.accountEditButton)}
+                        </Link>
+                      </div>
+                      <div className="grid__row">
+                        <Link
+                          to={{
+                            pathname: '/auth/signup/invite',
+                            state: { fromSettings: true }
+                          }}
+                          className="button account__invite-button">
+                          {intl.formatMessage(messages.accountInviteButton)}
+                        </Link>  
+                      </div>
+                    </div>
+                    
                     {user.emailValidated}
                   </div>
                 </div>
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index 51971f436..6b39b1dd1 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -12,6 +12,9 @@ export default class InviteScreen extends Component {
 
   render() {
     const { actions } = this.props;
+
+    console.log(this.props.location.state)
+
     return (
       <Invite
         onSubmit={actions.user.invite}
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 1ea0554ba..180db3018 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -45,6 +45,7 @@
    "services.getStarted" : "Loslegen",
    "services.welcome" : "Willkommen bei Franz.",
    "settings.account.account.editButton" : "Konto bearbeiten",
+   "settings.account.account.inviteButton" : "Freunde einladen",
    "settings.account.accountType.basic" : "Basis Konto",
    "settings.account.accountType.premium" : "Premium-Supporter Konto",
    "settings.account.buttonSave" : "Profil aktualisieren",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 63d7ce60b..6162455bb 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -76,6 +76,7 @@
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.account.editButton": "Edit account",
+  "settings.account.account.inviteButton" : "Invite friends",
   "settings.account.invoiceDownload": "Download",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.tryReloadUserInfoRequest": "Try again",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index c4f598bd1..dddd1bf1f 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -45,6 +45,7 @@
    "services.getStarted" : "Primeros pasos",
    "services.welcome" : "Bienvenido a Franz",
    "settings.account.account.editButton" : "Editar cuenta",
+   "settings.account.account.inviteButton" : "Invitar amigos",
    "settings.account.accountType.basic" : "Cuenta Básica",
    "settings.account.accountType.premium" : "Cuenta Colaborador Premium",
    "settings.account.buttonSave" : "Actualizar perfil",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 4a06975bb..a717577be 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -45,6 +45,7 @@
    "services.getStarted" : "Commencer",
    "services.welcome" : "Bienvenue dans Franz",
    "settings.account.account.editButton" : "Modifier le compte",
+   "settings.account.account.inviteButton" : "Inviter des amis",   
    "settings.account.accountType.basic" : "Compte de base",
    "settings.account.accountType.premium" : "Compte supporteur premium",
    "settings.account.buttonSave" : "Mettre à jour le profil",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 1d2485b19..5b89b3a12 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -45,6 +45,7 @@
    "services.getStarted" : "Iniziamo",
    "services.welcome" : "Benvenuto in Franz",
    "settings.account.account.editButton" : "Modifica account",
+   "settings.account.account.inviteButton" : "Invitare amicos",
    "settings.account.accountType.basic" : "Account Basic",
    "settings.account.accountType.premium" : "Premium Supporter Account",
    "settings.account.buttonSave" : "Aggiorna profilo",
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 3a43668a7..2c164f1bf 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -165,6 +165,8 @@ export default class UserStore extends Store {
 
     this.inviteRequest.execute(data);
 
+    console.log(this.stores.router.location )
+
     // we do not wait for a server response before redirecting the user
     this.stores.router.push('/');
 
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index 2182c9b5f..f436b1eda 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -282,6 +282,15 @@
       }
     }
 
+    .account__edit-button {
+      width: 170px;
+      margin-bottom: 10px;
+    }
+
+    .account__invite-button {
+      width: 170px;
+    }
+
     .account__subscription {
       display: flex;
       align-items: center;