From f96c13d616e429447ac0a6a24c6aeee902162b88 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Tue, 10 Apr 2018 15:28:52 -0700
Subject: Refactor page-container component structure

---
 .../page-container/page-container-footer/index.js  |  1 +
 .../page-container-footer.component.js             | 49 ++++++++++++++++++++++
 .../tests/page-container-footer.component.test.js  |  0
 3 files changed, 50 insertions(+)
 create mode 100644 ui/app/components/page-container/page-container-footer/index.js
 create mode 100644 ui/app/components/page-container/page-container-footer/page-container-footer.component.js
 create mode 100644 ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js

(limited to 'ui/app/components/page-container/page-container-footer')

diff --git a/ui/app/components/page-container/page-container-footer/index.js b/ui/app/components/page-container/page-container-footer/index.js
new file mode 100644
index 000000000..7825c4520
--- /dev/null
+++ b/ui/app/components/page-container/page-container-footer/index.js
@@ -0,0 +1 @@
+export { default } from './page-container-footer.component'
diff --git a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
new file mode 100644
index 000000000..fafe1c19e
--- /dev/null
+++ b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
@@ -0,0 +1,49 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+
+export default class PageContainerFooter extends Component {
+
+  static propTypes = {
+    onCancel: PropTypes.func,
+    cancelText: PropTypes.string,
+    onSubmit: PropTypes.func,
+    submitText: PropTypes.string,
+    disabled: PropTypes.bool,
+  }
+
+  static contextTypes = {
+    t: PropTypes.func,
+  }
+
+  render () {
+    const {
+      onCancel,
+      cancelText,
+      onSubmit,
+      submitText,
+      disabled,
+    } = this.props
+
+    return (
+      <div className="page-container__footer">
+
+        <button
+          className="btn-secondary--lg page-container__footer-button"
+          onClick={() => onCancel()}
+        >
+          { this.context.t('cancel') || cancelText }
+        </button>
+
+        <button
+          className="btn-primary--lg page-container__footer-button"
+          disabled={disabled}
+          onClick={e => onSubmit(e)}
+        >
+          { this.context.t('next') || submitText }
+        </button>
+
+      </div>
+    )
+  }
+
+}
diff --git a/ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js b/ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js
new file mode 100644
index 000000000..e69de29bb
-- 
cgit 


From 6bc8cc819a16118acc010d0efdec90afbda14590 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Mon, 14 May 2018 11:00:50 -0230
Subject: Merge branch 'develop' into i3725-refactor-send-component-

---
 .../page-container-footer.component.js                  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'ui/app/components/page-container/page-container-footer')

diff --git a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
index fafe1c19e..84d8296b0 100644
--- a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
+++ b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
+import Button from './components/button'
 
 export default class PageContainerFooter extends Component {
 
@@ -27,20 +28,24 @@ export default class PageContainerFooter extends Component {
     return (
       <div className="page-container__footer">
 
-        <button
-          className="btn-secondary--lg page-container__footer-button"
+        <Button
+          type="secondary"
+          large={true}
+          className="page-container__footer-button"
           onClick={() => onCancel()}
         >
           { this.context.t('cancel') || cancelText }
-        </button>
+        </Button>
 
-        <button
-          className="btn-primary--lg page-container__footer-button"
+        <Button
+          type="primary"
+          large={true}
+          className="page-container__footer-button"
           disabled={disabled}
           onClick={e => onSubmit(e)}
         >
           { this.context.t('next') || submitText }
-        </button>
+        </Button>
 
       </div>
     )
-- 
cgit 


From 8ff60267d851be1b64f7024e6263e1e5ba1ef01c Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Tue, 15 May 2018 09:13:39 -0230
Subject: Fix Button component path in page-container footer.

---
 .../page-container-footer/page-container-footer.component.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/components/page-container/page-container-footer')

diff --git a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
index 84d8296b0..f591ff83f 100644
--- a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
+++ b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import Button from './components/button'
+import Button from '../../button'
 
 export default class PageContainerFooter extends Component {
 
-- 
cgit 


From 3a87d9221d7ae1d0d7cb526e5fb22ea528498105 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 24 May 2018 18:25:23 -0230
Subject: Fix order of button text in page-container-footer.

---
 .../page-container-footer/page-container-footer.component.js          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui/app/components/page-container/page-container-footer')

diff --git a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
index f591ff83f..9172aea94 100644
--- a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
+++ b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
@@ -34,7 +34,7 @@ export default class PageContainerFooter extends Component {
           className="page-container__footer-button"
           onClick={() => onCancel()}
         >
-          { this.context.t('cancel') || cancelText }
+          { cancelText || this.context.t('cancel') }
         </Button>
 
         <Button
@@ -44,7 +44,7 @@ export default class PageContainerFooter extends Component {
           disabled={disabled}
           onClick={e => onSubmit(e)}
         >
-          { this.context.t('next') || submitText }
+          { submitText || this.context.t('next') }
         </Button>
 
       </div>
-- 
cgit