@capillarytech/creatives-library 3.0.35 → 3.1.0

package/containers/Line/Create/messages.js

@@ -7,183 +7,167 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   "imageUploadLabel": {
-    id: 'creatives.containers.Line.Create.ImageUploadLabel',
+    id: 'app.containers.Line.Create.ImageUploadLabel',
     defaultMessage: 'Upload image',
   },
   "Enter template name*": {
-    id: 'creatives.containers.Line.Create.enterTemplateNameImportant',
+    id: 'app.containers.Line.Create.enterTemplateNameImportant',
     defaultMessage: 'Enter template name*',
   },
   "Enter template name": {
-    id: 'creatives.containers.Line.Create.enterTemplateName',
+    id: 'app.containers.Line.Create.enterTemplateName',
     defaultMessage: 'Enter template name',
   },
   "Template name cannot be empty": {
-    id: 'creatives.containers.Line.Create.templateCantEmpty',
+    id: 'app.containers.Line.Create.templateCantEmpty',
     defaultMessage: 'Template name cannot be empty',
   },
   "Discard Changes": {
-    id: 'creatives.containers.Line.Create.discardChanges',
+    id: 'app.containers.Line.Create.discardChanges',
     defaultMessage: 'Discard changes',
   },
   "Cancel": {
-    id: 'creatives.containers.Line.Create.cancel',
+    id: 'app.containers.Line.Create.cancel',
     defaultMessage: 'Cancel',
   },
   "Save": {
-    id: 'creatives.containers.Line.Create.save',
+    id: 'app.containers.Line.Create.save',
     defaultMessage: 'Save',
   },
   "Select Line Account": {
-    id: 'creatives.containers.Line.Create.selectLineAccount',
+    id: 'app.containers.Line.Create.selectLineAccount',
     defaultMessage: 'Select line account',
   },
   "Account Id": {
-    id: 'creatives.containers.Line.Create.accountId',
+    id: 'app.containers.Line.Create.accountId',
     defaultMessage: 'Account id',
   },
   "Select Line Template": {
-    id: 'creatives.containers.Line.Create.selectLineTemplate',
+    id: 'app.containers.Line.Create.selectLineTemplate',
     defaultMessage: 'Select line template',
   },
   "Template": {
-    id: 'creatives.containers.Line.Create.template',
+    id: 'app.containers.Line.Create.template',
     defaultMessage: 'Template',
   },
   "Title*": {
-    id: 'creatives.containers.Line.Create.titleLabel',
+    id: 'app.containers.Line.Create.titleLabel',
     defaultMessage: 'Title*',
   },
   "Title": {
-    id: 'creatives.containers.Line.Create.title',
+    id: 'app.containers.Line.Create.title',
     defaultMessage: 'Title',
   },
   "Please input message title name.": {
-    id: 'creatives.containers.Line.Create.titleNameInvalid',
+    id: 'app.containers.Line.Create.titleNameInvalid',
     defaultMessage: 'Please enter the message title',
   },
   "Template message has unsupported/missing tags!": {
-    id: 'creatives.containers.Line.Create.messageHasUnsupportedTag',
+    id: 'app.containers.Line.Create.messageHasUnsupportedTag',
     defaultMessage: 'Please check the message content for unsupported/missing tags',
   },
   "Tags": {
-    id: 'creatives.containers.Line.Create.Tags',
+    id: 'app.containers.Line.Create.Tags',
     defaultMessage: 'Tags',
   },
   "Message*": {
-    id: 'creatives.containers.Line.Create.messageLabel',
+    id: 'app.containers.Line.Create.messageLabel',
     defaultMessage: 'Message*',
   },
   "Message": {
-    id: 'creatives.containers.Line.Create.message',
+    id: 'app.containers.Line.Create.message',
     defaultMessage: 'Message',
   },
   "Please input line template content.": {
-    id: 'creatives.containers.Line.Create.inputLineTemplateContent',
+    id: 'app.containers.Line.Create.inputLineTemplateContent',
     defaultMessage: 'Please enter the message content',
   },
   "Template title has unsupported/missing tags.": {
-    id: 'creatives.containers.Line.Create.titleHasUnsupportedTag',
+    id: 'app.containers.Line.Create.titleHasUnsupportedTag',
     defaultMessage: 'Please check the message content for unsupported/missing tags',
   },
   "Template name cannot be empty.": {
-    id: 'creatives.containers.Line.Create.templateNameNotEmpty',
+    id: 'app.containers.Line.Create.templateNameNotEmpty',
     defaultMessage: 'Please provide a template name ',
   },
   "Message title has unsupported/missing tags!": {
-    id: 'creatives.containers.Line.Create.messageTitleWithUnsupportedTag',
+    id: 'app.containers.Line.Create.messageTitleWithUnsupportedTag',
     defaultMessage: 'Please check the message content for unsupported/missing tags',
   },
   "Image": {
-    id: 'creatives.containers.Line.Create.Image',
+    id: 'app.containers.Line.Create.Image',
     defaultMessage: 'Image',
   },
   "Max file size acceptable is 5mb": {
-    id: 'creatives.containers.Line.Create.maxUploadFileSize',
+    id: 'app.containers.Line.Create.maxUploadFileSize',
     defaultMessage: 'Max file size acceptable is 5mb',
   },
   "Please upload Image": {
-    id: 'creatives.containers.Line.Create.pleaseUploadImage',
+    id: 'app.containers.Line.Create.pleaseUploadImage',
     defaultMessage: 'Please upload Image',
   },
   "Upload Image": {
-    id: 'creatives.containers.Line.Create.uploadImage',
+    id: 'app.containers.Line.Create.uploadImage',
     defaultMessage: 'Upload image',
   },
   "Line Template Created Successfully": {
-    id: 'creatives.containers.Line.Create.templateCreatedSuccessfully',
+    id: 'app.containers.Line.Create.templateCreatedSuccessfully',
     defaultMessage: 'Line template created successfully',
   },
   "Line Template Edited Successfully": {
-    id: 'creatives.containers.Line.Create.templateEditedSuccessfully',
+    id: 'app.containers.Line.Create.templateEditedSuccessfully',
     defaultMessage: 'Line template edited successfully',
   },
   "somethingWentWrong": {
-    id: 'creatives.containers.Line.Create.somethingWentWrong',
+    id: 'app.containers.Line.Create.somethingWentWrong',
     defaultMessage: 'Something went wrong!!',
   },
   "Name and Description": {
-    id: 'creatives.containers.Line.Create.nameAndDescription',
+    id: 'app.containers.Line.Create.nameAndDescription',
     defaultMessage: 'Name and description',
   },
   "Button 1": {
-    id: 'creatives.containers.Line.Create.button1',
+    id: 'app.containers.Line.Create.button1',
     defaultMessage: 'Button 1',
   },
   "Button 2": {
-    id: 'creatives.containers.Line.Create.button2',
+    id: 'app.containers.Line.Create.button2',
     defaultMessage: 'Button 2',
   },
   "File size cannot be more than 1mb": {
-    id: 'creatives.containers.Line.Create.uploadFileSizeError',
+    id: 'app.containers.Line.Create.uploadFileSizeError',
     defaultMessage: 'File size cannot be more than 1mb',
   },
   "value cannot be empty.": {
-    id: 'creatives.containers.Line.Create.valueCantEmpty',
+    id: 'app.containers.Line.Create.valueCantEmpty',
     defaultMessage: 'value cannot be empty.',
   },
-  "uploadingImage": {
-    id: 'creatives.containers.Line.Create.uploadingImage',
+  "Uploading Image...": {
+    id: 'app.containers.Line.Create.uploadingImage',
     defaultMessage: 'Uploading image...',
   },
   "Photo Uploaded Successfully": {
-    id: 'creatives.containers.Line.Create.uploadSuccess',
+    id: 'app.containers.Line.Create.uploadSuccess',
     defaultMessage: 'Photo uploaded successfully',
   },
   "Campaigns": {
-    id: 'creatives.containers.Line.Create.Campaigns',
+    id: 'app.containers.Line.Create.Campaigns',
     defaultMessage: 'Campaigns',
   },
   "Creatives": {
-    id: 'creatives.containers.Line.Create.Creatives',
+    id: 'app.containers.Line.Create.Creatives',
     defaultMessage: 'Creatives',
   },
   "Line": {
-    id: 'creatives.containers.Line.Create.line',
+    id: 'app.containers.Line.Create.line',
     defaultMessage: 'Line',
   },
   "Please upload an image to proceed": {
-    id: 'creatives.containers.Line.Create.image',
+    id: 'app.containers.Line.Create.image',
     defaultMessage: 'Please upload an image to proceed',
   },
   "Maximum characters length exceeds": {
-    id: 'creatives.containers.Line.Create.maximumCharacterLengthExceeds',
+    id: 'app.containers.Line.Create.line',
     defaultMessage: 'Maximum characters length exceeds',
   },
-  "goBackConfirmation": {
-    id: 'creatives.containers.Line.Create.goBackConfirmation',
-    defaultMessage: "Going back will discard all the changes you've made. Continue?",
-  },
-  "alertMessage": {
-    id: 'creatives.containers.Line.Create.alertMessage',
-    defaultMessage: "Alert",
-  },
-  "templateNotConfigured": {
-    id: 'creatives.containers.Line.Create.templateNotConfigured',
-    defaultMessage: "template not configured,",
-  },
-  "savingTemplate": {
-    id: 'creatives.containers.Line.Create.savingTemplate',
-    defaultMessage: "Saving Template...",
-  },
 });

package/containers/Line/Edit/index.js

@@ -81,7 +81,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       injectedTags: {},
       showModal: false,
       eventsMap: map,
-      modalContent: {title: this.props.intl.formatMessage(messages.alertMessage), body: this.props.intl.formatMessage(messages['template not configured,']), type: 'confirm'},
+      modalContent: {title: "Alert", body: this.props.intl.formatMessage(messages['template not configured,']), type: 'confirm'},
     };
   }
   componentWillMount() {
@@ -655,16 +655,16 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   setModalContent = (type) => {
     if (type === 'ios') {
       const modalContent = {
-        title: this.props.intl.formatMessage(messages.alertMessage),
-        body: this.props.intl.formatMessage(messages.androidNotConfigured),
+        title: "Alert",
+        body: "Android template is not configured. Save without Android template",
         type: 'confirm',
         id: 'ios',
       };
       this.setState({modalContent, showModal: true});
     } else if (type === 'android') {
       const modalContent = {
-        title: this.props.intl.formatMessage(messages.alertMessage),
-        body: this.props.intl.formatMessage(messages.iosNotConfigured),
+        title: "Alert",
+        body: "IOS template is not configured, Save without IOS template",
         type: 'confirm',
         id: 'android',
       };
@@ -718,8 +718,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       this.props.globalActions.addMessageToQueue(message);
     } else {
       const name = data.file.name.split('.');
-      // const blob = data.file.slice(0, -1, 'image');
-      const newFile = new File([data.file], `${name[0]}${Date.now()}.${name[1]}`, {type: 'image'});
+      const blob = data.file.slice(0, -1, 'image');
+      const newFile = new File([blob], `${name[0]}${Date.now()}.${name[1]}`, {type: 'image'});
       this.props.actions.uploadAsset(newFile, data.type, data.fileParams);
     }
   };
@@ -761,8 +761,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   moveToTemplates = () => {
     console.log('in move to Templates');
     const modalContent = {
-      title: this.props.intl.formatMessage(messages.alertMessage),
-      body: this.props.intl.formatMessage(messages.goBackConfirmation),
+      title: "Alert",
+      body: "Do you really want to go back? All your temporary changes will be lost!",
       type: 'confirm',
       id: 'template-back-confirm-modal',
       show: true,
@@ -955,8 +955,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
 
   render() {
     const schema = this.state.schema;
-    let tipText = this.props.Edit && ("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) ? this.props.intl.formatMessage(messages.gettingTemplate) : '';
-    tipText = this.props.Edit && ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress) ? this.props.intl.formatMessage(messages.savingTemplate) : '';
+    let tipText = this.props.Edit && ("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) ? 'Getting template details...' : '';
+    tipText = this.props.Edit && ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress) ? 'Saving Template...' : '';
     const spinning = this.props.Edit.fetchingDefaultTemplates || this.props.Edit.assetUploading || this.state.loading || (this.props.Edit && (("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) || ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress)));
     let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
     if (this.props.supportedTags) {
@@ -969,9 +969,9 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
             <Col offset={1}>
               {this.props.location.query.type !== "embedded" &&
                 <Breadcrumb>
-                  <BreadcrumbItem>{this.props.intl.formatMessage(messages.Campaigns)}</BreadcrumbItem>
-                  <BreadcrumbItem>{this.props.intl.formatMessage(messages.Creatives)}</BreadcrumbItem>
-                  <BreadcrumbItem>{this.props.intl.formatMessage(messages.Line)}</BreadcrumbItem>
+                  <BreadcrumbItem>Campaigns</BreadcrumbItem>
+                  <BreadcrumbItem>Creatives</BreadcrumbItem>
+                  <BreadcrumbItem>Mobile Push</BreadcrumbItem>
                 </Breadcrumb>
               }
             </Col>

package/containers/Line/Edit/messages.js

@@ -7,171 +7,151 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   "imageUploadLabel": {
-    id: 'creatives.containers.Line.Edit.ImageUploadLabel',
+    id: 'app.containers.Line.Edit.ImageUploadLabel',
     defaultMessage: 'Upload image',
   },
   "Enter template name*": {
-    id: 'creatives.containers.Line.Edit.enterTemplateNameImportant',
+    id: 'app.containers.Line.Edit.enterTemplateNameImportant',
     defaultMessage: 'Enter template name*',
   },
   "Enter template name": {
-    id: 'creatives.containers.Line.Edit.enterTemplateName',
+    id: 'app.containers.Line.Edit.enterTemplateName',
     defaultMessage: 'Enter template name',
   },
   "Template name cannot be empty": {
-    id: 'creatives.containers.Line.Edit.templateCantEmpty',
+    id: 'app.containers.Line.Edit.templateCantEmpty',
     defaultMessage: 'Template name cannot be empty',
   },
   "Discard Changes": {
-    id: 'creatives.containers.Line.Edit.discardChanges',
+    id: 'app.containers.Line.Edit.discardChanges',
     defaultMessage: 'Discard changes',
   },
   "Cancel": {
-    id: 'creatives.containers.Line.Edit.cancel',
+    id: 'app.containers.Line.Edit.cancel',
     defaultMessage: 'Cancel',
   },
   "Save": {
-    id: 'creatives.containers.Line.Edit.save',
+    id: 'app.containers.Line.Edit.save',
     defaultMessage: 'Save',
   },
   "Select Line Template": {
-    id: 'creatives.containers.Line.Edit.selectLineTemplate',
+    id: 'app.containers.Line.Edit.selectLineTemplate',
     defaultMessage: 'Select line template',
   },
   "Template": {
-    id: 'creatives.containers.Line.Edit.template',
+    id: 'app.containers.Line.Edit.template',
     defaultMessage: 'Template',
   },
   "Title*": {
-    id: 'creatives.containers.Line.Edit.titleLabel',
+    id: 'app.containers.Line.Edit.titleLabel',
     defaultMessage: 'Title*',
   },
   "Title": {
-    id: 'creatives.containers.Line.Edit.title',
+    id: 'app.containers.Line.Edit.title',
     defaultMessage: 'Title',
   },
   "Please input message title name.": {
-    id: 'creatives.containers.Line.Edit.titleNameInvalid',
+    id: 'app.containers.Line.Edit.titleNameInvalid',
     defaultMessage: 'Please enter the message title',
   },
   "Template message has unsupported/missing tags!": {
-    id: 'creatives.containers.Line.Edit.messageHasUnsupportedTag',
+    id: 'app.containers.Line.Edit.messageHasUnsupportedTag',
     defaultMessage: 'Please check the message content for unsupported/missing tags',
   },
   "Tags": {
-    id: 'creatives.containers.Line.Edit.Tags',
+    id: 'app.containers.Line.Edit.Tags',
     defaultMessage: 'Tags',
   },
   "Message*": {
-    id: 'creatives.containers.Line.Edit.messageLabel',
+    id: 'app.containers.Line.Edit.messageLabel',
     defaultMessage: 'Message*',
   },
   "Message": {
-    id: 'creatives.containers.Line.Edit.message',
+    id: 'app.containers.Line.Edit.message',
     defaultMessage: 'Message',
   },
   "Please input mobile push template content.": {
-    id: 'creatives.containers.Line.Edit.inputLineTemplateContent',
+    id: 'app.containers.Line.Edit.inputLineTemplateContent',
     defaultMessage: 'Please enter the message content',
   },
   "Template title has unsupported/missing tags.": {
-    id: 'creatives.containers.Line.Edit.titleHasUnsupportedTag',
+    id: 'app.containers.Line.Edit.titleHasUnsupportedTag',
     defaultMessage: 'Please check the message content for unsupported/missing tags',
   },
   "Template name cannot be empty.": {
-    id: 'creatives.containers.Line.Edit.templateNameNotEmpty',
+    id: 'app.containers.Line.Edit.templateNameNotEmpty',
     defaultMessage: 'Please provide a template name ',
   },
   "Message title has unsupported/missing tags!": {
-    id: 'creatives.containers.Line.Edit.messageTitleWithUnsupportedTag',
+    id: 'app.containers.Line.Edit.messageTitleWithUnsupportedTag',
     defaultMessage: 'Please check the message content for unsupported/missing tags',
   },
   "Image": {
-    id: 'creatives.containers.Line.Edit.Image',
+    id: 'app.containers.Line.Edit.Image',
     defaultMessage: 'Image',
   },
   "Max file size acceptable is 5mb": {
-    id: 'creatives.containers.Line.Edit.maxUploadFileSize',
+    id: 'app.containers.Line.Edit.maxUploadFileSize',
     defaultMessage: 'Max file size acceptable is 5mb',
   },
   "Please upload Image": {
-    id: 'creatives.containers.Line.Edit.pleaseUploadImage',
+    id: 'app.containers.Line.Edit.pleaseUploadImage',
     defaultMessage: 'Please upload image',
   },
   "Upload Image": {
-    id: 'creatives.containers.Line.Edit.uploadImage',
+    id: 'app.containers.Line.Edit.uploadImage',
     defaultMessage: 'Upload image',
   },
   "Line Template Edited Successfully": {
-    id: 'creatives.containers.Line.Edit.templateEditedSuccessfully',
+    id: 'app.containers.Line.Edit.templateEditedSuccessfully',
     defaultMessage: 'Line template edited successfully',
   },
   "somethingWentWrong": {
-    id: 'creatives.containers.Line.Edit.somethingWentWrong',
+    id: 'app.containers.Line.Edit.somethingWentWrong',
     defaultMessage: 'Something went wrong!!',
   },
-  "goBackConfirmation": {
-    id: 'creatives.containers.Line.Edit.goBackConfirmation',
+  "Do you really want to go back? All your temporary changes will be lost!": {
+    id: 'app.containers.Line.Edit.goBackConfirmation',
     defaultMessage: "Going back will discard all the changes you've made. Continue?",
   },
-  "alertMessage": {
-    id: 'creatives.containers.Line.Edit.alertMessage',
-    defaultMessage: "Alert",
-  },
   "Name and Description": {
-    id: 'creatives.containers.Line.Edit.nameAndDescription',
+    id: 'app.containers.Line.Edit.nameAndDescription',
     defaultMessage: 'Name and description',
   },
   "Button 1": {
-    id: 'creatives.containers.Line.Edit.button1',
+    id: 'app.containers.Line.Edit.button1',
     defaultMessage: 'Button 1',
   },
   "Button 2": {
-    id: 'creatives.containers.Line.Edit.button2',
+    id: 'app.containers.Line.Edit.button2',
     defaultMessage: 'Button 2',
   },
   "File size cannot be more than 5mb": {
-    id: 'creatives.containers.Line.Edit.uploadFileSizeError',
+    id: 'app.containers.Line.Edit.uploadFileSizeError',
     defaultMessage: 'File size cannot be more than 5mb',
   },
   "value cannot be empty.": {
-    id: 'creatives.containers.Line.Edit.valueCantEmpty',
+    id: 'app.containers.Line.Edit.valueCantEmpty',
     defaultMessage: 'value cannot be empty.',
   },
   "Uploading Image...": {
-    id: 'creatives.containers.Line.Edit.uploadingImage',
+    id: 'app.containers.Line.Edit.uploadingImage',
     defaultMessage: 'Uploading image...',
   },
   "Campaigns": {
-    id: 'creatives.containers.Line.Edit.Campaigns',
+    id: 'app.containers.Line.Edit.Campaigns',
     defaultMessage: 'Campaigns',
   },
   "Creatives": {
-    id: 'creatives.containers.Line.Edit.Creatives',
+    id: 'app.containers.Line.Edit.Creatives',
     defaultMessage: 'Creatives',
   },
   "Line": {
-    id: 'creatives.containers.Line.Edit.mobilePush',
+    id: 'app.containers.Line.Edit.mobilePush',
     defaultMessage: 'Mobile Push',
   },
   "template not configured,": {
-    id: 'creatives.containers.Line.Edit.templateNotConfigured',
+    id: 'app.containers.Line.Edit.templateNotConfigured',
     defaultMessage: 'template not configured,',
   },
-  "androidNotConfigured": {
-    id: 'creatives.containers.Line.Edit.androidNotConfigured',
-    defaultMessage: 'Android template is not configured. Save without Android template',
-  },
-  "iosNotConfigured": {
-    id: 'creatives.containers.Line.Edit.iosNotConfigured',
-    defaultMessage: 'IOS template is not configured, Save without IOS template',
-  },
-  "savingTemplate": {
-    id: 'creatives.containers.Line.Edit.savingTemplate',
-    defaultMessage: "Saving Template...",
-  },
-  "gettingTemplate": {
-    id: 'creatives.containers.Line.Create.gettingTemplate',
-    defaultMessage: "Getting template details...",
-  },
 });

package/containers/Login/components/LoginForm/index.js

@@ -2,8 +2,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { Form, Icon } from 'antd';
 import { CapInput, CapButton } from '@capillarytech/cap-react-ui-library';
-import { injectIntl, intlShape } from 'react-intl';
-import messages from './messages';
 const FormItem = Form.Item;
 
 class NormalLoginForm extends React.Component {
@@ -22,27 +20,27 @@ class NormalLoginForm extends React.Component {
       <Form onSubmit={this.handleSubmit} className="login-form">
         <FormItem className="login-form-item">
           {getFieldDecorator('username', {
-            rules: [{ required: true, message: this.props.intl.formatMessage(messages.inputUsernameMandatory) }],
+            rules: [{ required: true, message: 'Please input your username!' }],
           })(
-            <CapInput prefix={<Icon type="user" style={{ fontSize: 13 }} />} placeholder={this.props.intl.formatMessage(messages.username)} />
+            <CapInput prefix={<Icon type="user" style={{ fontSize: 13 }} />} placeholder="Username" />
           )}
         </FormItem>
         <FormItem className="login-form-item">
           {getFieldDecorator('password', {
-            rules: [{ required: true, message: this.props.intl.formatMessage(messages.inputPasswordMandatory) }],
+            rules: [{ required: true, message: 'Please input your Password!' }],
           })(
-            <CapInput prefix={<Icon type="lock" style={{ fontSize: 13 }} />} type="password" placeholder={this.props.intl.formatMessage(messages.password)} />
+            <CapInput prefix={<Icon type="lock" style={{ fontSize: 13 }} />} type="password" placeholder="Password" />
           )}
         </FormItem>
         {this.props.isError
         ? <FormItem>
-          <span style={{color: "red"}}>{this.props.intl.formatMessage(messages.invalidCredentials)}</span>
+          <span style={{color: "red"}}>{"Invalid or Incorrect credentials!"}</span>
         </FormItem>
         : null
         }
         <FormItem>
           <CapButton loading={this.props.loginInProgress} type="primary" htmlType="submit" className="login-form-button">
-            {this.props.intl.formatMessage(messages.loginButton)}
+            Log in
           </CapButton>
         </FormItem>
       </Form>
@@ -55,8 +53,7 @@ NormalLoginForm.propTypes = {
   loginInProgress: PropTypes.bool,
   isError: PropTypes.bool,
   form: PropTypes.object,
-  intl: intlShape.isRequired,
 };
 
 const WrappedNormalLoginForm = Form.create()(NormalLoginForm);
-export default injectIntl(WrappedNormalLoginForm);
+export default WrappedNormalLoginForm;

package/containers/Login/components/LoginForm/messages.js

@@ -7,27 +7,15 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   username: {
-    id: 'creatives.containers.Login.components.LoginForm.input.username',
+    id: 'reon.modules.Login.components.LoginForm.input.username',
     defaultMessage: 'Username or email',
   },
   password: {
-    id: 'creatives.containers.Login.components.LoginForm.input.password',
+    id: 'reon.modules.Login.components.LoginForm.input.password',
     defaultMessage: 'Password',
   },
   loginButton: {
-    id: 'creatives.containers.Login.components.LoginForm.input.loginButton',
+    id: 'reon.modules.Login.components.LoginForm.input.loginButton',
     defaultMessage: 'Login',
   },
-  invalidCredentials: {
-    id: 'creatives.containers.Login.components.LoginForm.input.invalidCredentials',
-    defaultMessage: 'Invalid or Incorrect credentials!',
-  },
-  inputPasswordMandatory: {
-    id: 'creatives.containers.Login.components.LoginForm.input.inputPasswordMandatory',
-    defaultMessage: 'Please input your Password!',
-  },
-  inputUsernameMandatory: {
-    id: 'creatives.containers.Login.components.LoginForm.input.inputUsernameMandatory',
-    defaultMessage: 'Please input your username!',
-  },
 });

package/containers/Login/index.js

@@ -58,7 +58,7 @@ export class Login extends React.Component { // eslint-disable-line react/prefer
           <Helmet
             title={message}
             meta={[
-              { name: 'description', content: <FormattedMessage {...messages.loginPage}/> },
+              { name: 'description', content: 'Login Page' },
             ]}
           />}
         </FormattedMessage>

package/containers/Login/messages.js

@@ -7,19 +7,15 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   pageTitle: {
-    id: 'creatives.containers.Login.pageTitle',
+    id: 'app.containers.Login.pageTitle',
     defaultMessage: 'Login',
   },
   header: {
-    id: 'creatives.containers.Login.header',
+    id: 'app.containers.Login.header',
     defaultMessage: 'This is login container change !',
   },
   invalidCredential: {
-    id: 'creatives.containers.Login.invalidCredential',
+    id: 'app.containers.Login.invalidCredential',
     defaultMessage: 'Invalid username or password',
   },
-  loginPage: {
-    id: 'creatives.containers.Login.loginPage',
-    defaultMessage: 'Login Page',
-  },
 });