comunes/todos-contra-el-fuego-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added feedback

Browse source
This commit is contained in:
vjrj 2018-02-21 15:29:25 +01:00
parent d865ac8e06
commit f46aabb4d3
8 changed files with 148 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

8
imports/ui/layouts/App/App.js
View file

@ -18,7 +18,6 @@ import '/imports/startup/client/meta';
import '/imports/startup/client/ravenLogger';
import '/imports/startup/client/geolocation';
import '/imports/startup/client/piwik-start.js';
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,8 +138,8 @@ const App = props => (
</Switch>
</Grid>
<Footer />
{ Meteor.isDevelopment && !props.isHome && <Feedback {...props} /> }
<Reconnect {...props} />
<Feedback history={history} {...props} />
{props.i18nReady.get() &&
<Blaze template="cookieConsent" />
}
@ -161,8 +160,7 @@ App.propTypes = {
i18nReady: PropTypes.object.isRequired,
userId: PropTypes.string,
emailAddress: PropTypes.string,
emailVerified: PropTypes.bool.isRequired,
isHome: PropTypes.bool.isRequired
emailVerified: PropTypes.bool.isRequired
};
const getUserName = name => ({
@ -178,7 +176,6 @@ export default withTracker(() => {
const name = user && user.profile && user.profile.name && getUserName(user.profile.name);
const emailAddress = user && user.emails && user.emails[0].address;
// console.log(`i18n ready?: ${i18nReady.get()}`);
console.log(`isHome?: ${isHome()}`);
return {
loading,
loggingIn,
@ -188,7 +185,6 @@ export default withTracker(() => {
roles: !loading && Roles.getRolesForUser(userId),
userId,
emailAddress,
isHome: isHome(),
emailVerified: user && user.emails ? user && user.emails && user.emails[0].verified : true
};
})(App);