diff options
author | 2018-02-06 09:10:31 +0100 | |
---|---|---|
committer | 2018-02-06 09:10:31 +0100 | |
commit | 48059682d04c5911add9f962a85ef6d514355ee5 (patch) | |
tree | 9f22d69b0720a3162a9492037feaa2369c829656 /src | |
parent | Merge branch 'develop' into feature/invite-button (diff) | |
download | ferdium-app-48059682d04c5911add9f962a85ef6d514355ee5.tar.gz ferdium-app-48059682d04c5911add9f962a85ef6d514355ee5.tar.zst ferdium-app-48059682d04c5911add9f962a85ef6d514355ee5.zip |
[MINOR] house cleaning
Diffstat (limited to 'src')
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 6 | ||||
-rw-r--r-- | src/components/settings/user/EditUserForm.js | 2 | ||||
-rw-r--r-- | src/components/ui/Link.js | 5 | ||||
-rw-r--r-- | src/containers/auth/InviteScreen.js | 11 | ||||
-rw-r--r-- | src/containers/settings/AccountScreen.js | 6 | ||||
-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/models/User.js | 2 |
11 files changed, 6 insertions, 31 deletions
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index e079fd2f4..5724181f5 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -48,10 +48,6 @@ 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 | invoiceDownload: { | 51 | invoiceDownload: { |
56 | id: 'settings.account.invoiceDownload', | 52 | id: 'settings.account.invoiceDownload', |
57 | defaultMessage: '!!!Download', | 53 | defaultMessage: '!!!Download', |
@@ -178,7 +174,7 @@ export default class AccountDashboard extends Component { | |||
178 | <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span> | 174 | <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span> |
179 | )} | 175 | )} |
180 | </div> | 176 | </div> |
181 | <Link to="/settings/user/edit" className="button account__edit-button"> | 177 | <Link to="/settings/user/edit" className="button"> |
182 | {intl.formatMessage(messages.accountEditButton)} | 178 | {intl.formatMessage(messages.accountEditButton)} |
183 | </Link> | 179 | </Link> |
184 | {user.emailValidated} | 180 | {user.emailValidated} |
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js index 0a7b7c396..f36887fc2 100644 --- a/src/components/settings/user/EditUserForm.js +++ b/src/components/settings/user/EditUserForm.js | |||
@@ -135,7 +135,7 @@ export default class EditServiceForm extends Component { | |||
135 | <Button | 135 | <Button |
136 | type="submit" | 136 | type="submit" |
137 | label={intl.formatMessage(messages.buttonSave)} | 137 | label={intl.formatMessage(messages.buttonSave)} |
138 | htmlForm="form" // why is form attribute escaped in JSX?? couldn't find any info on that, did you mean "htmlFor"? | 138 | htmlForm="form" |
139 | /> | 139 | /> |
140 | )} | 140 | )} |
141 | </div> | 141 | </div> |
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js index 693be84ea..f5da921fa 100644 --- a/src/components/ui/Link.js +++ b/src/components/ui/Link.js | |||
@@ -62,10 +62,7 @@ Link.wrappedComponent.propTypes = { | |||
62 | oneOrManyChildElements, | 62 | oneOrManyChildElements, |
63 | PropTypes.string, | 63 | PropTypes.string, |
64 | ]).isRequired, | 64 | ]).isRequired, |
65 | to: PropTypes.oneOfType([ | 65 | to: PropTypes.string.isRequired, |
66 | PropTypes.string, | ||
67 | PropTypes.object, | ||
68 | ]).isRequired, | ||
69 | className: PropTypes.string, | 66 | className: PropTypes.string, |
70 | activeClassName: PropTypes.string, | 67 | activeClassName: PropTypes.string, |
71 | strictFilter: PropTypes.bool, | 68 | strictFilter: PropTypes.bool, |
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js index 7102df0b9..e54d8d225 100644 --- a/src/containers/auth/InviteScreen.js +++ b/src/containers/auth/InviteScreen.js | |||
@@ -11,16 +11,12 @@ export default class InviteScreen extends Component { | |||
11 | } | 11 | } |
12 | 12 | ||
13 | render() { | 13 | render() { |
14 | const { | 14 | const { actions } = this.props; |
15 | actions, | ||
16 | location, | ||
17 | } = this.props; | ||
18 | 15 | ||
19 | return ( | 16 | return ( |
20 | <div className="auth__container auth__container--signup"> | 17 | <div className="auth__container auth__container--signup"> |
21 | <Invite | 18 | <Invite |
22 | onSubmit={actions.user.invite} | 19 | onSubmit={actions.user.invite} |
23 | from={location.query.from} | ||
24 | embed={false} | 20 | embed={false} |
25 | /> | 21 | /> |
26 | </div> | 22 | </div> |
@@ -34,9 +30,4 @@ InviteScreen.wrappedComponent.propTypes = { | |||
34 | invite: PropTypes.func.isRequired, | 30 | invite: PropTypes.func.isRequired, |
35 | }).isRequired, | 31 | }).isRequired, |
36 | }).isRequired, | 32 | }).isRequired, |
37 | location: PropTypes.shape({ | ||
38 | query: PropTypes.shape({ | ||
39 | from: PropTypes.string, | ||
40 | }), | ||
41 | }).isRequired, | ||
42 | }; | 33 | }; |
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index 9ee93a9e9..c5c2982b0 100644 --- a/src/containers/settings/AccountScreen.js +++ b/src/containers/settings/AccountScreen.js | |||
@@ -61,7 +61,7 @@ export default class AccountScreen extends Component { | |||
61 | render() { | 61 | render() { |
62 | const { user, payment } = this.props.stores; | 62 | const { user, payment } = this.props.stores; |
63 | const { openExternalUrl } = this.props.actions.app; | 63 | const { openExternalUrl } = this.props.actions.app; |
64 | const { user: userActions } = this.props.actions; // @adlk: :+1 what's the opposite of git blame? | 64 | const { user: userActions } = this.props.actions; |
65 | 65 | ||
66 | const isLoadingUserInfo = user.getUserInfoRequest.isExecuting; | 66 | const isLoadingUserInfo = user.getUserInfoRequest.isExecuting; |
67 | const isLoadingOrdersInfo = payment.ordersDataRequest.isExecuting; | 67 | const isLoadingOrdersInfo = payment.ordersDataRequest.isExecuting; |
@@ -83,7 +83,6 @@ export default class AccountScreen extends Component { | |||
83 | deleteAccount={userActions.delete} | 83 | deleteAccount={userActions.delete} |
84 | isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting} | 84 | isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting} |
85 | isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError} | 85 | isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError} |
86 | pathname={this.props.location.pathname} | ||
87 | /> | 86 | /> |
88 | ); | 87 | ); |
89 | } | 88 | } |
@@ -107,7 +106,4 @@ AccountScreen.wrappedComponent.propTypes = { | |||
107 | delete: PropTypes.func.isRequired, | 106 | delete: PropTypes.func.isRequired, |
108 | }).isRequired, | 107 | }).isRequired, |
109 | }).isRequired, | 108 | }).isRequired, |
110 | location: PropTypes.shape({ | ||
111 | pathname: PropTypes.string, | ||
112 | }).isRequired, | ||
113 | }; | 109 | }; |
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json index 180db3018..1ea0554ba 100644 --- a/src/i18n/locales/de.json +++ b/src/i18n/locales/de.json | |||
@@ -45,7 +45,6 @@ | |||
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", | ||
49 | "settings.account.accountType.basic" : "Basis Konto", | 48 | "settings.account.accountType.basic" : "Basis Konto", |
50 | "settings.account.accountType.premium" : "Premium-Supporter Konto", | 49 | "settings.account.accountType.premium" : "Premium-Supporter Konto", |
51 | "settings.account.buttonSave" : "Profil aktualisieren", | 50 | "settings.account.buttonSave" : "Profil aktualisieren", |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 29b979838..3c09fca3b 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -77,7 +77,6 @@ | |||
77 | "settings.account.accountType.basic": "Basic Account", | 77 | "settings.account.accountType.basic": "Basic Account", |
78 | "settings.account.accountType.premium": "Premium Supporter Account", | 78 | "settings.account.accountType.premium": "Premium Supporter Account", |
79 | "settings.account.account.editButton": "Edit account", | 79 | "settings.account.account.editButton": "Edit account", |
80 | "settings.account.account.inviteButton" : "Invite friends", | ||
81 | "settings.account.invoiceDownload": "Download", | 80 | "settings.account.invoiceDownload": "Download", |
82 | "settings.account.userInfoRequestFailed": "Could not load user information", | 81 | "settings.account.userInfoRequestFailed": "Could not load user information", |
83 | "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 dddd1bf1f..c4f598bd1 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json | |||
@@ -45,7 +45,6 @@ | |||
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", | ||
49 | "settings.account.accountType.basic" : "Cuenta Básica", | 48 | "settings.account.accountType.basic" : "Cuenta Básica", |
50 | "settings.account.accountType.premium" : "Cuenta Colaborador Premium", | 49 | "settings.account.accountType.premium" : "Cuenta Colaborador Premium", |
51 | "settings.account.buttonSave" : "Actualizar perfil", | 50 | "settings.account.buttonSave" : "Actualizar perfil", |
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index a717577be..4a06975bb 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json | |||
@@ -45,7 +45,6 @@ | |||
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", | ||
49 | "settings.account.accountType.basic" : "Compte de base", | 48 | "settings.account.accountType.basic" : "Compte de base", |
50 | "settings.account.accountType.premium" : "Compte supporteur premium", | 49 | "settings.account.accountType.premium" : "Compte supporteur premium", |
51 | "settings.account.buttonSave" : "Mettre à jour le profil", | 50 | "settings.account.buttonSave" : "Mettre à jour le profil", |
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json index 5b89b3a12..1d2485b19 100644 --- a/src/i18n/locales/it.json +++ b/src/i18n/locales/it.json | |||
@@ -45,7 +45,6 @@ | |||
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", | ||
49 | "settings.account.accountType.basic" : "Account Basic", | 48 | "settings.account.accountType.basic" : "Account Basic", |
50 | "settings.account.accountType.premium" : "Premium Supporter Account", | 49 | "settings.account.accountType.premium" : "Premium Supporter Account", |
51 | "settings.account.buttonSave" : "Aggiorna profilo", | 50 | "settings.account.buttonSave" : "Aggiorna profilo", |
diff --git a/src/models/User.js b/src/models/User.js index d2a455e20..2e5df4795 100644 --- a/src/models/User.js +++ b/src/models/User.js | |||
@@ -10,7 +10,7 @@ export default class User { | |||
10 | @observable emailIsConfirmed = true; // better assume it's confirmed to avoid noise | 10 | @observable emailIsConfirmed = true; // better assume it's confirmed to avoid noise |
11 | @observable subscription = {}; | 11 | @observable subscription = {}; |
12 | @observable isSubscriptionOwner = false; | 12 | @observable isSubscriptionOwner = false; |
13 | @observable isPremium = true; | 13 | @observable isPremium = false; |
14 | @observable beta = false; | 14 | @observable beta = false; |
15 | @observable donor = {}; | 15 | @observable donor = {}; |
16 | @observable isDonor = false; | 16 | @observable isDonor = false; |