@capillarytech/creatives-library 3.0.35 → 3.1.0

package/components/SmsTest/index.js

@@ -9,8 +9,6 @@ import React from 'react';
 
 // import { FormattedMessage } from 'react-intl';
 // import messages from './messages';
-import { injectIntl, intlShape } from 'react-intl';
-import messages from './messages';
 import FormBuilder from '../FormBuilder';
 
 class SmsTest extends React.Component { // eslint-disable-line react/prefer-stateless-function
@@ -48,7 +46,7 @@ class SmsTest extends React.Component { // eslint-disable-line react/prefer-stat
           metaType: "text",
           datatype: "string",
           required: true,
-          placeholder: this.props.intl.formatMessage(messages.inputTemplateName),
+          placeholder: "Please input template name.",
           fluid: true,
           styling: "semantic",
           order: 1,
@@ -64,7 +62,7 @@ class SmsTest extends React.Component { // eslint-disable-line react/prefer-stat
           metaType: "text",
           datatype: "string",
           required: true,
-          placeholder: this.props.intl.formatMessage(messages.inputSmsTemplate),
+          placeholder: "Please input sms template content.",
           fluid: false,
           styling: "custom",
           order: 2,
@@ -111,7 +109,7 @@ class SmsTest extends React.Component { // eslint-disable-line react/prefer-stat
 }
 
 SmsTest.propTypes = {
-  intl: intlShape.isRequired,
+
 };
 
-export default injectIntl(SmsTest);
+export default SmsTest;

package/components/SmsTest/messages.js

@@ -7,15 +7,7 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   header: {
-    id: 'creatives.components.SmsTest.header',
+    id: 'app.components.SmsTest.header',
     defaultMessage: 'This is the SmsTest component !',
   },
-  inputTemplateName: {
-    id: 'creatives.components.SmsTest.inputTemplateName',
-    defaultMessage: 'Please input template name.',
-  },
-  inputSmsTemplate: {
-    id: 'creatives.components.SmsTest.inputSmsTemplate',
-    defaultMessage: 'Please input sms template content.',
-  },
 });

package/components/TemplatePreview/WechatRichmediaTemplatePreview/messages.js

@@ -7,15 +7,15 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   header: {
-    id: 'creatives.components.WechatRichmediaTemplatePreview.header',
+    id: 'app.components.WechatRichmediaTemplatePreview.header',
     defaultMessage: 'This is the WechatRichmediaTemplatePreview component !',
   },
   select: {
-    id: 'creatives.components.WechatRichmediaTemplatePreview.select',
+    id: 'app.components.WechatRichmediaTemplatePreview.select',
     defaultMessage: 'Select',
   },
   edit: {
-    id: 'creatives.components.WechatRichmediaTemplatePreview.edit',
+    id: 'app.components.WechatRichmediaTemplatePreview.edit',
     defaultMessage: 'Edit',
   },
 });

package/components/TemplatePreview/index.js

@@ -9,6 +9,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import _ from 'lodash';
 import { injectIntl, intlShape} from 'react-intl';
+// import styled from 'styled-components';
 import {CapColumn} from '@capillarytech/cap-react-ui-library';
 import './_templatePreview.scss';
 import {updateCharCount} from '../../utils/smsCharCountV2';
@@ -54,9 +55,9 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
       <div className={`preview-container ${type === 'embedded' ? 'embedded-preview' : ''}`}>
         { channel && channel.toLowerCase() === 'sms' &&
           <div className="shell align-center" id="sms-preview">
-            <img className="preview-image sms" src={smsBody} alt={this.props.intl.formatMessage(messages.previewGenerated)}/>
+            <img className="preview-image sms" src={smsBody} alt="Preview is being generated"/>
             <div className="msgContainer sms">
-              <img className="sms-icon" src={smsIcon} alt={this.props.intl.formatMessage(messages.smsIcon)} />
+              <img className="sms-icon" src={smsIcon} alt="Sms icon" />
               <div className={"message-pop sms"}>
                 {content && content.length && content.map((msg) =>
                   <CapColumn className="message-pop-item align-left" style={{ background: '#3F51B5', color: '#ffffff'}}>
@@ -69,9 +70,9 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
         }
         {channel && channel.toLowerCase() === 'wechat' ?
           ( <div className="shell align-center" id="sms-preview">
-            <img className="preview-image" src={channel.toLowerCase() === 'wechat' ? wechatBody : smsBody} alt={this.props.intl.formatMessage(messages.previewGenerated)}/>
+            <img className="preview-image" src={channel.toLowerCase() === 'wechat' ? wechatBody : smsBody} alt="Preview is being generated"/>
             <div className="msgContainer">
-              {this.props.channel.toLowerCase() === 'wechat' ? <div className="sms-icon" style={{ width: '25px', height: '25px', background: '#2E89DF' }}></div> : <img className="sms-icon" src={smsIcon} alt={this.props.intl.formatMessage(messages.smsIcon)} />}
+              {this.props.channel.toLowerCase() === 'wechat' ? <div className="sms-icon" style={{ width: '25px', height: '25px', background: '#2E89DF' }}></div> : <img className="sms-icon" src={smsIcon} alt="Sms icon" />}
               <div className="message-pop align-left" style={{ background: `${this.props.channel.toLowerCase() === 'wechat' ? '#ffffff' : '#3F51B5'}`, color: `${this.props.channel.toLowerCase() === 'wechat' ? '#333333' : '#ffffff'}`}}>{content}
               </div>
             </div>
@@ -80,7 +81,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
         }
         { channel && (channel.toLowerCase() === 'mobilepush') &&
           (<div className="shell align-center" id="mobilepush-preview">
-            <img className="preview-image" src={this.props.device === "android" ? androidPushMessagePhone : iPhonePushMessagePhone} alt={this.props.intl.formatMessage(messages.previewGenerated)}/>
+            <img className="preview-image" src={this.props.device === "android" ? androidPushMessagePhone : iPhonePushMessagePhone} alt="Preview is being generated"/>
               {(!!content.header || !!content.bodyText || !!content.bodyImage) &&
                 <div className={`${this.props.device}-push-message-Container`}>
                   {this.props.device === "android" ?
@@ -108,7 +109,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                     :
                     <div className="message-pop align-left">
                       <div className="app-name">
-                        <span className="app-icon"></span>{content.appName ? content.appName : "App name"} <i className="material-icons">{this.props.intl.formatMessage(messages.close)}</i>
+                        <span className="app-icon"></span>{content.appName ? content.appName : "App name"} <i className="material-icons">close</i>
                       </div>
                       {content.bodyImage && <div className="body-image">
                         <img src={content.bodyImage} alt=""/>
@@ -130,7 +131,7 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
         {
           channel && channel.toLowerCase() === 'line' ? (
             <div className="shell align-center" id="sms-preview">
-              <img className="preview-image" src={wechatBody} alt={this.props.intl.formatMessage(messages.previewGenerated)}/>
+              <img className="preview-image" src={wechatBody} alt="Preview is being generated"/>
               <div className="msgContainer">
                 <div className="sms-icon" style={{ width: '25px', height: '25px', background: '#2E89DF' }}></div>
                 <div className="message-pop align-left" style={{ background: '#ffffff', color: '#333333' }}>
@@ -149,10 +150,8 @@ class TemplatePreview extends React.Component { // eslint-disable-line react/pre
                 {smsDetails.unicode &&
                 <div style={{fontSize: '16px'}}>{`${this.props.intl.formatMessage(messages.smsFormatType)}`}</div>
                 }
-                <div style={{marginTop: '8px', fontSize: '16px'}} >{`${smsDetails.parts} ${this.props.intl.formatMessage(messages.sms)} (${smsDetails.chars_used} ${this.props.intl.formatMessage(messages.characters)})`}</div>
-                {smsDetails.optoutUrlPresent && <div style={{fontWeight: '100', fontSize: '12px'}}>
-                  {`${this.props.intl.formatMessage(messages.includesOptoutTag)} (${smsDetails.optouturlLength} ${this.props.intl.formatMessage(messages.characters)})`}
-                </div>}
+                <div style={{marginTop: '8px', fontSize: '16px'}} >{`${this.props.intl.formatMessage(messages.sms)}: ${smsDetails.parts}`}</div>
+                <div style={{fontSize: '16px'}}>{`${this.props.intl.formatMessage(messages.charactersPerSms)}: ${smsDetails.chars_used}`}</div>
               </p>
             </div>
             : ''

package/components/TemplatePreview/messages.js

@@ -7,39 +7,23 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   previewGenerationMessage: {
-    id: 'creatives.components.TemplatePreview.previewGenerationMessage',
+    id: 'app.components.TemplatePreview.previewGenerationMessage',
     defaultMessage: "Preview is being generated",
   },
   sms: {
-    id: 'creatives.components.TemplatePreview.sms',
+    id: 'app.components.TemplatePreview.sms',
     defaultMessage: "SMS",
   },
-  characters: {
-    id: 'creatives.components.TemplatePreview.characters',
-    defaultMessage: "characters",
+  charactersPerSms: {
+    id: 'app.components.TemplatePreview.charactersPerSms',
+    defaultMessage: "SMS chars",
   },
   charactersTotal: {
-    id: 'creatives.components.TemplatePreview.charactersTotal',
+    id: 'app.components.TemplatePreview.charactersTotal',
     defaultMessage: "SMS char total",
   },
   smsFormatType: {
-    id: 'creatives.components.TemplatePreview.smsFormatType',
+    id: 'app.components.TemplatePreview.smsFormatType',
     defaultMessage: 'Message has unicode characters',
   },
-  includesOptoutTag: {
-    id: 'app.components.TemplatePreview.includesOptoutTag',
-    defaultMessage: 'Includes Optout tag',
-  },
-  previewGenerated: {
-    id: 'creatives.components.TemplatePreview.previewGenerated',
-    defaultMessage: 'Preview is being generated',
-  },
-  close: {
-    id: 'creatives.components.TemplatePreview.close',
-    defaultMessage: 'close',
-  },
-  smsIcon: {
-    id: 'creatives.components.TemplatePreview.smsIcon',
-    defaultMessage: 'Sms Icon',
-  },
 });

package/components/Toastr/messages.js

@@ -7,7 +7,7 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   header: {
-    id: 'creatives.components.Toastr.header',
+    id: 'app.components.Toastr.header',
     defaultMessage: 'This is the Toastr component !',
   },
 });

package/components/ToastrMessage/index.js

@@ -9,11 +9,8 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { Progress } from 'semantic-ui-react';
 import styled from 'styled-components';
-import { FormattedMessage } from 'react-intl';
 import { messageTypeConfig } from '../../config/toastr';
 
-import messages from './messages';
-
 const StyledMessageWrapper = styled.div`
   background: #f9f9fa;
   transition: all .2s fade-out;
@@ -88,7 +85,7 @@ class ToastrMessage extends React.Component { // eslint-disable-line react/prefe
         <div style={{ padding: `${16}px` }}>
           <MessageHeader>
             { this.props.title ? <span style={{ fontSize: `${20}px` }}>{this.props.title}</span> : '' }
-            <StyleIcon className="material-icons" onClick={() => this.closeMessagePopup(this.props.messageId)}><FormattedMessage {...messages.close} /></StyleIcon>
+            <StyleIcon className="material-icons" onClick={() => this.closeMessagePopup(this.props.messageId)}>close</StyleIcon>
           </MessageHeader>
           <MessageContent>
             {this.props.text}

package/components/ToastrMessage/messages.js

@@ -7,11 +7,7 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   header: {
-    id: 'creatives.components.ToastrMessage.header',
+    id: 'app.components.ToastrMessage.header',
     defaultMessage: 'This is the ToastrMessage component !',
   },
-  close: {
-    id: 'creatives.components.ToastrMessage.close',
-    defaultMessage: 'close',
-  },
 });

package/components/TopBar/messages.js

@@ -23,7 +23,7 @@ export default defineMessages({
     defaultMessage: 'Select brand',
   },
   hi: {
-    id: 'creatives.components.TopBar.brand.dropdown',
+    id: 'app.components.TopBar.brand.dropdown',
     defaultMessage: 'Hi',
   },
 });

package/config/app.js

@@ -9,14 +9,12 @@ const config = {
     login_url: 'auth/login',
     dashboard_url: '/sms',
     dashboard_url_v2: '/v2',
-    subscription_api_endpoint: '/arya/api/v1/subscription',
     accountConfig: (strs, accountId) => `${window.location.origin}/org/config/AccountAdd?q=a&channelId=2&accountId=${accountId}&edit=1`,
   },
   development: {
     api_endpoint: 'https://nightly.capillary.in/arya/api/v1/creatives',
     auth_endpoint: 'https://nightly.capillary.in/arya/api/v1/auth',
     arya_endpoint: 'https://nightly.capillary.in/arya/api/v1',
-    subscription_api_endpoint: 'https://nightly.capillary.in/arya/api/v1/subscription',
     login_url: 'auth/login',
     dashboard_url: '/sms',
     dashboard_url_v2: '/v2',

package/containers/Assets/Gallery/messages.js

@@ -7,83 +7,83 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   uploadedAt: {
-    id: 'creatives.containers.Assets.Gallery.uploadedAt',
+    id: 'app.containers.Assets.Gallery.uploadedAt',
     defaultMessage: 'Uploaded at ',
   },
   uploadedOn: {
-    id: 'creatives.containers.Assets.Gallery.uploadedOn',
+    id: 'app.containers.Assets.Gallery.uploadedOn',
     defaultMessage: 'Uploaded on ',
   },
   uploadedBy: {
-    id: 'creatives.containers.Assets.Gallery.uploadedBy',
+    id: 'app.containers.Assets.Gallery.uploadedBy',
     defaultMessage: 'Uploaded by ',
   },
   upload: {
-    id: 'creatives.containers.Assets.Gallery.upload',
+    id: 'app.containers.Assets.Gallery.upload',
     defaultMessage: 'Upload image',
   },
   imagePreview: {
-    id: 'creatives.containers.Assets.Gallery.imagePreview',
+    id: 'app.containers.Assets.Gallery.imagePreview',
     defaultMessage: 'Image preview',
   },
   size: {
-    id: 'creatives.containers.Assets.Gallery.size',
+    id: 'app.containers.Assets.Gallery.size',
     defaultMessage: 'Size',
   },
   dimensions: {
-    id: 'creatives.containers.Assets.Gallery.dimensions',
+    id: 'app.containers.Assets.Gallery.dimensions',
     defaultMessage: 'Dimensions',
   },
   gallery: {
-    id: 'creatives.containers.Assets.Gallery.gallery',
+    id: 'app.containers.Assets.Gallery.gallery',
     defaultMessage: 'Gallery',
   },
   backToGallery: {
-    id: 'creatives.containers.Assets.Gallery.backToGallery',
+    id: 'app.containers.Assets.Gallery.backToGallery',
     defaultMessage: 'Back to image gallery',
   },
   mostRecent: {
-    id: 'creatives.containers.Assets.Gallery.mostRecent',
+    id: 'app.containers.Assets.Gallery.mostRecent',
     defaultMessage: 'Most recent',
   },
   alphabetically: {
-    id: 'creatives.containers.Assets.Gallery.alphabetically',
+    id: 'app.containers.Assets.Gallery.alphabetically',
     defaultMessage: 'Alphabetically',
   },
   sortby: {
-    id: 'creatives.containers.Assets.Gallery.sortby',
+    id: 'app.containers.Assets.Gallery.sortby',
     defaultMessage: 'Sort by',
   },
   delete: {
-    id: 'creatives.containers.Assets.Gallery.delete',
+    id: 'app.containers.Assets.Gallery.delete',
     defaultMessage: 'Delete',
   },
   search: {
-    id: 'creatives.containers.Assets.Gallery.search',
+    id: 'app.containers.Assets.Gallery.search',
     defaultMessage: 'Search',
   },
   select: {
-    id: 'creatives.containers.Assets.Gallery.select',
+    id: 'app.containers.Assets.Gallery.select',
     defaultMessage: 'Select',
   },
   preview: {
-    id: 'creatives.containers.Assets.Gallery.preview',
+    id: 'app.containers.Assets.Gallery.preview',
     defaultMessage: 'Preview',
   },
   assetUploadSuccess: {
-    id: 'creatives.containers.Assets.Gallery.assetUploadSuccess',
+    id: 'app.containers.Assets.Gallery.assetUploadSuccess',
     defaultMessage: 'Image uploaded successfully',
   },
   assetUploadFailed: {
-    id: 'creatives.containers.Assets.Gallery.assetUploadFailed',
+    id: 'app.containers.Assets.Gallery.assetUploadFailed',
     defaultMessage: 'Image uploaded failed',
   },
   assetDeleteSuccess: {
-    id: 'creatives.containers.Assets.Gallery.assetDeleteSuccess',
+    id: 'app.containers.Assets.Gallery.assetDeleteSuccess',
     defaultMessage: 'Image deleted successfully.',
   },
   assetDeleteFailed: {
-    id: 'creatives.containers.Assets.Gallery.assetDeleteFailed',
+    id: 'app.containers.Assets.Gallery.assetDeleteFailed',
     defaultMessage: 'Image deletion failed.',
   },
 });

package/containers/Cap/index.js

@@ -20,7 +20,7 @@ import * as locationActions from '../LanguageProvider/actions';
 import * as appActions from '../App/actions';
 import config from '../../config/app';
 import Toastr from '../../components/Toastr';
-import messages from './messages';
+import messages from './messsages';
 const gtm = window.dataLayer || [];
 
 const CapWrapper = styled.div`
@@ -236,7 +236,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
           },
           {
             link: '/mobilepush',
-            text: this.props.intl.formatMessage(messages.mobilepush),
+            text: 'Mobile Push',
             value: 'MOBILEPUSH',
           },
           {
@@ -256,7 +256,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
           },
           {
             link: '/line',
-            text: this.props.intl.formatMessage(messages.line),
+            text: 'Line',
             value: 'LINE',
           },
         ],
@@ -277,9 +277,9 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
       <CapWrapper>
         <Helmet
           titleTemplate="Capillary - %s"
-          defaultTitle={this.props.intl.formatMessage(messages.appName)}
+          defaultTitle="App Name"
           meta={[
-            { name: 'description', content: this.props.intl.formatMessage(messages.appName) },
+            { name: 'description', content: 'App Name' },
           ]}
         />
         <div className="wrapper">

package/containers/Dashboard/index.js

@@ -30,7 +30,7 @@ export class Dashboard extends React.Component { // eslint-disable-line react/pr
         <FormattedMessage {...messages.header}>{(message) => (<Helmet
           title={message}
           meta={[
-            { name: 'description', content: <FormattedMessage {...messages.header} /> },
+            { name: 'description', content: 'Dashboard' },
           ]}
         />)}
         </FormattedMessage>
@@ -42,7 +42,7 @@ export class Dashboard extends React.Component { // eslint-disable-line react/pr
 }
 
 Dashboard.propTypes = {
-  router: PropTypes.object,
+  actions: PropTypes.object,
 };
 
 const mapStateToProps = createStructuredSelector({

package/containers/Dashboard/messages.js

@@ -7,7 +7,7 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   header: {
-    id: 'creatives.containers.Dashboard.header',
+    id: 'app.containers.Dashboard.header',
     defaultMessage: 'Dashboard',
   },
 });

package/containers/Ebill/index.js

@@ -815,7 +815,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
       console.log('isValid');
       return true;
     }
-    const message = getMessageObject('error', this.props.intl.formatMessage(messages.templateNotValid), true);
+    const message = getMessageObject('error', 'Template data is not valid', true);
     this.props.globalActions.addMessageToQueue(message);
     console.log('not valid');
     return false;

package/containers/Ebill/messages.js

@@ -7,71 +7,67 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   "campaigns": {
-    id: 'creatives.containers.Ebill.campaigns',
+    id: 'app.containers.Ebill.campaigns',
     defaultMessage: 'Campaigns',
   },
   "creatives": {
-    id: 'creatives.containers.Ebill.creatives',
+    id: 'app.containers.Ebill.creatives',
     defaultMessage: 'Creatives',
   },
   "ebill": {
-    id: 'creatives.containers.Ebill.ebill',
+    id: 'app.containers.Ebill.ebill',
     defaultMessage: 'Ebill',
   },
   "ebillPreview": {
-    id: 'creatives.containers.Ebill.ebillPreview',
+    id: 'app.containers.Ebill.ebillPreview',
     defaultMessage: 'Ebill Preview',
   },
   "loading": {
-    id: 'creatives.containers.Ebill.loading',
+    id: 'app.containers.Ebill.loading',
     defaultMessage: 'Loading..',
   },
   "ebillEditSuccess": {
-    id: 'creatives.containers.Ebill.ebillEditSuccess',
+    id: 'app.containers.Ebill.ebillEditSuccess',
     defaultMessage: "Ebill template edited successfully",
   },
   "ebillCreateSuccess": {
-    id: 'creatives.containers.Ebill.ebillCreateSuccess',
+    id: 'app.containers.Ebill.ebillCreateSuccess',
     defaultMessage: "Ebill template created successfully",
   },
   "somethingWentWrong": {
-    id: 'creatives.containers.Ebill.somethingWentWrong',
+    id: 'app.containers.Ebill.somethingWentWrong',
     defaultMessage: "Something went wrong!!",
   },
   "Enter template name": {
-    id: 'creatives.containers.Ebill.enterTemplateName',
+    id: 'app.containers.Ebill.enterTemplateName',
     defaultMessage: "Enter template name",
   },
   "Template name cannot be empty.": {
-    id: 'creatives.containers.Ebill.emptyTemplateErrorMessage',
+    id: 'app.containers.Ebill.emptyTemplateErrorMessage',
     defaultMessage: "Please provide a template name ",
   },
   "Preview": {
-    id: 'creatives.containers.Ebill.Preview',
+    id: 'app.containers.Ebill.Preview',
     defaultMessage: "Preview",
   },
   "Cancel": {
-    id: 'creatives.containers.Ebill.Cancel',
+    id: 'app.containers.Ebill.Cancel',
     defaultMessage: "Cancel",
   },
   "Save": {
-    id: 'creatives.containers.Ebill.Save',
+    id: 'app.containers.Ebill.Save',
     defaultMessage: "Save",
   },
   "Template content has unsupported/missing tags!": {
-    id: 'creatives.containers.Ebill.tagsErrorMessage',
+    id: 'app.containers.Ebill.tagsErrorMessage',
     defaultMessage: "Please check the message content for unsupported/missing tags",
   },
   "Tags": {
-    id: 'creatives.containers.Ebill.tagsLabel',
+    id: 'app.containers.Ebill.tagsLabel',
     defaultMessage: "Tags",
   },
   "New Version": {
-    id: 'creatives.containers.Ebill.newVersionLabel',
+    id: 'app.containers.Ebill.newVersionLabel',
     defaultMessage: "New version",
   },
-  "templateNotValid": {
-    id: 'creatives.containers.Ebill.templateNotValid',
-    defaultMessage: "Template data is not valid",
-  },
 });