Feedback not in home and email for non auth users

This commit is contained in:
vjrj 2018-02-18 20:21:26 +01:00
parent 458627f520
commit 719ea435d4
5 changed files with 18 additions and 7 deletions

View file

@ -8,6 +8,7 @@ import { Meteor } from 'meteor/meteor';
import { translate } from 'react-i18next';
import { FormGroup, Button, FormControl } from 'react-bootstrap';
import { Bert } from 'meteor/themeteorchef:bert';
import { withTracker } from 'meteor/react-meteor-data';
import validate from '../../../modules/validate';
import './Feedback.scss';
@ -78,10 +79,11 @@ class Feedback extends Component {
<input
onChange={this.handleChange}
name="email"
autoFocus
className="form-control"
ref={email => (this.email = email)}
placeholder={this.t('Tu correo')}
disabled={this.props.authenticated}
defaultValue={this.props.authenticated ? Meteor.user().emails[0].address : ''}
type="email"
/>
</FormGroup>
@ -114,7 +116,10 @@ class Feedback extends Component {
}
Feedback.propTypes = {
t: PropTypes.func.isRequired
t: PropTypes.func.isRequired,
authenticated: PropTypes.bool.isRequired
};
export default translate([], { wait: true })(Feedback);
export default translate([], { wait: true })(withTracker(() => ({
authenticated: !!Meteor.userId()
}))(Feedback));

View file

@ -1,7 +1,8 @@
import isMobile from 'ismobilejs';
import { isHome } from './location';
// https://github.com/ReactTraining/react-router/issues/184
export const isHomeAndMobile = (window.location.pathname === '/' && isMobile.any);
export const isHomeAndMobile = isHome() && isMobile.any;
export const isNotHomeAndMobile = !isHomeAndMobile;
export const isAnyMobile = isMobile.any;
// https://stackoverflow.com/questions/18625321/detect-webkit-browser-in-javascript

View file

@ -19,6 +19,7 @@ import '/imports/startup/client/ravenLogger';
import '/imports/startup/client/geolocation';
import '/imports/startup/client/piwik-start.js';
import 'simple-line-icons/css/simple-line-icons.css';
import { isHome } from '/imports/ui/components/Utils/location';
import Reconnect from '../../components/Reconnect/Reconnect';
import Navigation from '../../components/Navigation/Navigation';
import Authenticated from '../../components/Authenticated/Authenticated';
@ -139,7 +140,7 @@ const App = props => (
</Switch>
</Grid>
<Footer />
{ props.authenticated && <Feedback /> }
{ !isHome() && <Feedback /> }
<Reconnect />
{props.i18nReady.get() &&
<Blaze template="cookieConsent" />

View file

@ -204,5 +204,7 @@
"Desconectado del servidor, reconectando...":
"Disconnected from server, trying to reconnect...",
"Reintentar ahora":
"Retry now"
"Retry now",
"Feedback recibido, gracias...":
"Feedback received, thanks..."
}

View file

@ -291,5 +291,7 @@
"Desconectado del servidor, reconectando...":
"Desconectado del servidor, reconectando...",
"Reintentar ahora":
"Reintentar ahora"
"Reintentar ahora",
"Feedback recibido, gracias...":
"Feedback recibido, gracias..."
}