From 0545326dc0319923c0746af0dd0746e98528c39c Mon Sep 17 00:00:00 2001
From: Jason <jason.daurus@gmail.com>
Date: Sun, 6 Mar 2016 20:20:08 +0800
Subject: [web] eliminate SettingsState

---
 web/src/js/components/footer.js | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'web/src/js/components/footer.js')

diff --git a/web/src/js/components/footer.js b/web/src/js/components/footer.js
index 415c2577..7d313b02 100644
--- a/web/src/js/components/footer.js
+++ b/web/src/js/components/footer.js
@@ -1,19 +1,18 @@
 import React from "react";
 import {SettingsState} from "./common.js";
 
-var Footer = React.createClass({
-    mixins: [SettingsState],
-    render: function () {
-        var mode = this.state.settings.mode;
-        var intercept = this.state.settings.intercept;
-        return (
-            <footer>
-                {mode && mode != "regular" ? <span className="label label-success">{mode} mode</span> : null}
-                &nbsp;
-                {intercept ? <span className="label label-success">Intercept: {intercept}</span> : null}
-            </footer>
-        );
-    }
-});
+Footer.propTypes = {
+    settings: React.PropTypes.object.isRequired,
+};
 
-export default Footer;
\ No newline at end of file
+export default function Footer({ settings }) {
+    const mode = settings.mode;
+    const intercept = settings.intercept;
+    return (
+        <footer>
+            {mode && mode != "regular" ? <span className="label label-success">{mode} mode</span> : null}
+            &nbsp;
+            {intercept ? <span className="label label-success">Intercept: {intercept}</span> : null}
+        </footer>
+    );
+}
-- 
cgit v1.2.3


From ca9a493a1c20651d111ab06f43437d97b7104705 Mon Sep 17 00:00:00 2001
From: Jason <jason.daurus@gmail.com>
Date: Tue, 8 Mar 2016 00:57:01 +0800
Subject: [web] uniform code style for Footer component

---
 web/src/js/components/footer.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'web/src/js/components/footer.js')

diff --git a/web/src/js/components/footer.js b/web/src/js/components/footer.js
index 7d313b02..e2d96288 100644
--- a/web/src/js/components/footer.js
+++ b/web/src/js/components/footer.js
@@ -6,13 +6,15 @@ Footer.propTypes = {
 };
 
 export default function Footer({ settings }) {
-    const mode = settings.mode;
-    const intercept = settings.intercept;
+    const {mode, intercept} = settings;
     return (
         <footer>
-            {mode && mode != "regular" ? <span className="label label-success">{mode} mode</span> : null}
-            &nbsp;
-            {intercept ? <span className="label label-success">Intercept: {intercept}</span> : null}
+            {mode && mode != "regular" && (
+                <span className="label label-success">{mode} mode</span>
+            )}
+            {intercept && (
+                <span className="label label-success">Intercept: {intercept}</span>
+            )}
         </footer>
     );
 }
-- 
cgit v1.2.3