diff options
author | 2018-01-21 18:35:29 +0100 | |
---|---|---|
committer | 2018-01-21 18:35:29 +0100 | |
commit | 05269a20c78406d8ff3a83fddca923a996f82d1b (patch) | |
tree | 0b6b4b69f08cd5632e25a43b4b554a12be411f01 | |
parent | allow arbitrary routes in dev mode (diff) | |
download | ferdium-app-05269a20c78406d8ff3a83fddca923a996f82d1b.tar.gz ferdium-app-05269a20c78406d8ff3a83fddca923a996f82d1b.tar.zst ferdium-app-05269a20c78406d8ff3a83fddca923a996f82d1b.zip |
ADDED invite button in Account Settings
[WIP] return to previous route on submit / cancel
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 27 | ||||
-rw-r--r-- | src/containers/auth/InviteScreen.js | 3 | ||||
-rw-r--r-- | src/i18n/locales/de.json | 1 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 1 | ||||
-rw-r--r-- | src/i18n/locales/es.json | 1 | ||||
-rw-r--r-- | src/i18n/locales/fr.json | 1 | ||||
-rw-r--r-- | src/i18n/locales/it.json | 1 | ||||
-rw-r--r-- | src/stores/UserStore.js | 2 | ||||
-rw-r--r-- | src/styles/settings.scss | 9 |
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({ | |||
48 | id: 'settings.account.account.editButton', | 48 | id: 'settings.account.account.editButton', |
49 | defaultMessage: '!!!Edit Account', | 49 | defaultMessage: '!!!Edit Account', |
50 | }, | 50 | }, |
51 | accountInviteButton: { | ||
52 | id: "settings.account.account.inviteButton", | ||
53 | defaultMessage: '!!!Invite Friends', | ||
54 | }, | ||
55 | |||
51 | invoiceDownload: { | 56 | invoiceDownload: { |
52 | id: 'settings.account.invoiceDownload', | 57 | id: 'settings.account.invoiceDownload', |
53 | defaultMessage: '!!!Download', | 58 | defaultMessage: '!!!Download', |
@@ -174,10 +179,24 @@ export default class AccountDashboard extends Component { | |||
174 | <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span> | 179 | <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span> |
175 | )} | 180 | )} |
176 | </div> | 181 | </div> |
177 | <Link to="/settings/user/edit" className="button"> | 182 | <div className="grid"> |
178 | {intl.formatMessage(messages.accountEditButton)} | 183 | <div className="grid__row"> |
179 | </Link> | 184 | <Link to="/settings/user/edit" className="button account__edit-button"> |
180 | 185 | {intl.formatMessage(messages.accountEditButton)} | |
186 | </Link> | ||
187 | </div> | ||
188 | <div className="grid__row"> | ||
189 | <Link | ||
190 | to={{ | ||
191 | pathname: '/auth/signup/invite', | ||
192 | state: { fromSettings: true } | ||
193 | }} | ||
194 | className="button account__invite-button"> | ||
195 | {intl.formatMessage(messages.accountInviteButton)} | ||
196 | </Link> | ||
197 | </div> | ||
198 | </div> | ||
199 | |||
181 | {user.emailValidated} | 200 | {user.emailValidated} |
182 | </div> | 201 | </div> |
183 | </div> | 202 | </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 { | |||
12 | 12 | ||
13 | render() { | 13 | render() { |
14 | const { actions } = this.props; | 14 | const { actions } = this.props; |
15 | |||
16 | console.log(this.props.location.state) | ||
17 | |||
15 | return ( | 18 | return ( |
16 | <Invite | 19 | <Invite |
17 | onSubmit={actions.user.invite} | 20 | 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 @@ | |||
45 | "services.getStarted" : "Loslegen", | 45 | "services.getStarted" : "Loslegen", |
46 | "services.welcome" : "Willkommen bei Franz.", | 46 | "services.welcome" : "Willkommen bei Franz.", |
47 | "settings.account.account.editButton" : "Konto bearbeiten", | 47 | "settings.account.account.editButton" : "Konto bearbeiten", |
48 | "settings.account.account.inviteButton" : "Freunde einladen", | ||
48 | "settings.account.accountType.basic" : "Basis Konto", | 49 | "settings.account.accountType.basic" : "Basis Konto", |
49 | "settings.account.accountType.premium" : "Premium-Supporter Konto", | 50 | "settings.account.accountType.premium" : "Premium-Supporter Konto", |
50 | "settings.account.buttonSave" : "Profil aktualisieren", | 51 | "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 @@ | |||
76 | "settings.account.accountType.basic": "Basic Account", | 76 | "settings.account.accountType.basic": "Basic Account", |
77 | "settings.account.accountType.premium": "Premium Supporter Account", | 77 | "settings.account.accountType.premium": "Premium Supporter Account", |
78 | "settings.account.account.editButton": "Edit account", | 78 | "settings.account.account.editButton": "Edit account", |
79 | "settings.account.account.inviteButton" : "Invite friends", | ||
79 | "settings.account.invoiceDownload": "Download", | 80 | "settings.account.invoiceDownload": "Download", |
80 | "settings.account.userInfoRequestFailed": "Could not load user information", | 81 | "settings.account.userInfoRequestFailed": "Could not load user information", |
81 | "settings.account.tryReloadUserInfoRequest": "Try again", | 82 | "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 @@ | |||
45 | "services.getStarted" : "Primeros pasos", | 45 | "services.getStarted" : "Primeros pasos", |
46 | "services.welcome" : "Bienvenido a Franz", | 46 | "services.welcome" : "Bienvenido a Franz", |
47 | "settings.account.account.editButton" : "Editar cuenta", | 47 | "settings.account.account.editButton" : "Editar cuenta", |
48 | "settings.account.account.inviteButton" : "Invitar amigos", | ||
48 | "settings.account.accountType.basic" : "Cuenta Básica", | 49 | "settings.account.accountType.basic" : "Cuenta Básica", |
49 | "settings.account.accountType.premium" : "Cuenta Colaborador Premium", | 50 | "settings.account.accountType.premium" : "Cuenta Colaborador Premium", |
50 | "settings.account.buttonSave" : "Actualizar perfil", | 51 | "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 @@ | |||
45 | "services.getStarted" : "Commencer", | 45 | "services.getStarted" : "Commencer", |
46 | "services.welcome" : "Bienvenue dans Franz", | 46 | "services.welcome" : "Bienvenue dans Franz", |
47 | "settings.account.account.editButton" : "Modifier le compte", | 47 | "settings.account.account.editButton" : "Modifier le compte", |
48 | "settings.account.account.inviteButton" : "Inviter des amis", | ||
48 | "settings.account.accountType.basic" : "Compte de base", | 49 | "settings.account.accountType.basic" : "Compte de base", |
49 | "settings.account.accountType.premium" : "Compte supporteur premium", | 50 | "settings.account.accountType.premium" : "Compte supporteur premium", |
50 | "settings.account.buttonSave" : "Mettre à jour le profil", | 51 | "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 @@ | |||
45 | "services.getStarted" : "Iniziamo", | 45 | "services.getStarted" : "Iniziamo", |
46 | "services.welcome" : "Benvenuto in Franz", | 46 | "services.welcome" : "Benvenuto in Franz", |
47 | "settings.account.account.editButton" : "Modifica account", | 47 | "settings.account.account.editButton" : "Modifica account", |
48 | "settings.account.account.inviteButton" : "Invitare amicos", | ||
48 | "settings.account.accountType.basic" : "Account Basic", | 49 | "settings.account.accountType.basic" : "Account Basic", |
49 | "settings.account.accountType.premium" : "Premium Supporter Account", | 50 | "settings.account.accountType.premium" : "Premium Supporter Account", |
50 | "settings.account.buttonSave" : "Aggiorna profilo", | 51 | "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 { | |||
165 | 165 | ||
166 | this.inviteRequest.execute(data); | 166 | this.inviteRequest.execute(data); |
167 | 167 | ||
168 | console.log(this.stores.router.location ) | ||
169 | |||
168 | // we do not wait for a server response before redirecting the user | 170 | // we do not wait for a server response before redirecting the user |
169 | this.stores.router.push('/'); | 171 | this.stores.router.push('/'); |
170 | 172 | ||
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 @@ | |||
282 | } | 282 | } |
283 | } | 283 | } |
284 | 284 | ||
285 | .account__edit-button { | ||
286 | width: 170px; | ||
287 | margin-bottom: 10px; | ||
288 | } | ||
289 | |||
290 | .account__invite-button { | ||
291 | width: 170px; | ||
292 | } | ||
293 | |||
285 | .account__subscription { | 294 | .account__subscription { |
286 | display: flex; | 295 | display: flex; |
287 | align-items: center; | 296 | align-items: center; |