Guest User

Untitled

a guest
Nov 22nd, 2017
78
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.64 KB | None | 0 0
  1. diff --git a/client/campaign/src/App.js b/client/campaign/src/App.js
  2. index ab0867bdc..296e1c51b 100644
  3. --- a/client/campaign/src/App.js
  4. +++ b/client/campaign/src/App.js
  5. @@ -43,6 +43,12 @@ export class App extends React.Component {
  6. this.props.store.dispatch(setCurrency(currency.id))
  7. }
  8.  
  9. + handleLogOut = () => {
  10. + console.log('asdf')
  11. + // this.props.userActions.logout() //// this one not sure if works yet
  12. + window.location.reload()
  13. + }
  14. +
  15. render() {
  16. const { locale, store, localeResources, isMobile } = this.props
  17. const i18n = getI18n(locale, localeResources, {
  18. @@ -59,7 +65,9 @@ export class App extends React.Component {
  19. <ForgotModal />
  20. <CartPanel />
  21. <AdminBar />
  22. - <CampaignPage isMobile={isMobile} />
  23. + <CampaignPage
  24. + isMobile={isMobile}
  25. + onLogoutClick={this.handleLogOut} />
  26. <Footer
  27. onChangeLanguage={this.handleLanguageChange}
  28. onChangeCurrency={this.handleCurrencyChange}
  29. diff --git a/client/campaign/src/components/page/index.js b/client/campaign/src/components/page/index.js
  30. index 8b2c4a742..1dd5244f9 100644
  31. --- a/client/campaign/src/components/page/index.js
  32. +++ b/client/campaign/src/components/page/index.js
  33. @@ -199,11 +199,16 @@ export default class CampaignPage extends Component {
  34. }
  35. }
  36.  
  37. + // handleLogOut = () => {
  38. + // console.log('handleLogOut')
  39. + // }
  40. +
  41. handleDownloadClick = () => {
  42. const { campaign: { id } } = this.props
  43. const mockupId = this.state.mockups[0].id
  44. + const colorId = this.state.mockups[0].color_id
  45.  
  46. - const url = `api/v1/campaigns/${id}/campaign_mockups/${mockupId}/download.json`
  47. + const url = `api/v1/campaigns/${id}/campaign_mockups/${mockupId}/download.json?color_id=${colorId}`
  48. window.open(url, '_blank')
  49. }
  50.  
  51. diff --git a/client/shared/modules/cross-site/components/header.js b/client/shared/modules/cross-site/components/header.js
  52. index fb4383322..6b26b8bcb 100644
  53. --- a/client/shared/modules/cross-site/components/header.js
  54. +++ b/client/shared/modules/cross-site/components/header.js
  55. @@ -18,6 +18,7 @@ export default function AppHeader(props, context) {
  56. hasItemsInCart,
  57. isLogged,
  58. actions,
  59. + handleLogOut,
  60. ...otherProps
  61. } = props
  62.  
  63. @@ -34,7 +35,7 @@ export default function AppHeader(props, context) {
  64. hasItemsInCart={hasItemsInCart}
  65. onLoginClick={actions.openLoginModal}
  66. onRegisterClick={actions.openSignUpModal}
  67. - onLogoutClick={actions.logout}
  68. + onLogoutClick={handleLogOut || actions.logout}
  69. designNowUrl="/builder"
  70. productsUrl=""
  71. howItWorksUrl="/how"
Add Comment
Please, Sign In to add comment