device selection

tomkp · Apr 16, 2016 · 015f501 · 015f501
1 parent d3e6c51
commit 015f501
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 4 deletions.
diff --git a/app/src/components/Application.js b/app/src/components/Application.js
@@ -51,11 +51,22 @@ class Application extends React.Component {
 
             let dx = this.state.dx;
             dx[device] = {device, card: atr};
-
             this.setState({
                 card: atr,
                 dx: dx
             });
+
+            if (device === this.state.device) {
+                let log = this.state.log;
+                log.push({
+                    type: 'card-inserted',
+                    atr: atr,
+                    device: device
+                });
+                this.setState({
+                    log: log
+                });
+            }
         });
         ipc.on('card-removed', (event, {device}) => {
             console.log(`* Card removed from '${device}' `);

diff --git a/app/src/components/console-entry/control-entry.scss b/app/src/components/console-entry/control-entry.scss
@@ -5,11 +5,11 @@
 .console-entry {
 
   padding: 1rem 1rem;
-  border-top: 1px solid #ddd;
+  border-bottom: 1px solid #ddd;
 
   @extend .truncate;
 
-  &:first-child {
+  /*&:first-child {
     border-top: none;
-  }
+  }*/
 }
diff --git a/app/src/components/console/Console.js b/app/src/components/console/Console.js
@@ -29,6 +29,17 @@ export default ({
                 </Fixed>
                 <ScrollToBottom className="commands">
                     { log.map((result, key) => {
+
+                        console.log(`result ${JSON.stringify(result)}`);
+                        if (result.type && result.type === 'card-inserted') {
+                            return (
+                                <div className={`card-inserted`} key={key}>
+                                    <div className={`device`}>{result.device}</div>
+                                    <div className={`atr`}>{result.atr}</div>
+                                </div>
+                            );
+                        }
+
                         return <ConsoleEntry key={key}
                                                 command={result.command}
                                                 ok={result.ok}

diff --git a/app/src/components/console/console.scss b/app/src/components/console/console.scss
@@ -32,4 +32,26 @@
     font-family: "Menlo", "Lucida Console", monospace;
   }
 
+
+  .card-inserted {
+
+    border-bottom: 1px solid #ddd;
+
+    .device {
+      display: inline-block;
+      padding: 1rem;
+    }
+
+    .atr {
+      display: inline-block;
+      padding: 1rem;
+      border-left: 1px solid #ddd;
+      &:before {
+        content: "Answer to reset:";
+        padding-right: .5rem;
+      }
+    }
+
+
+  }
 }