wip ihm

mx · mx · commit 3993fa1f67a2 · 2019-11-06T12:36:12.000+01:00
diff --git a/app.py b/app.py
@@ -1,8 +1,7 @@
+import time
 from flask import Flask, render_template
 from network_integration import run
 
-# my_blockchain, network = run()
-
 app = Flask(__name__)
 
 """
@@ -12,11 +11,13 @@
 """
 
 
-# @app.route('/')
-# def accueil():
-#     chain = my_blockchain.chain
-#     current_transactions = my_blockchain.current_transactions
-#     return render_template('index.html', chain=chain, current_transactions=current_transactions)
+@app.route('/')
+def accueil():
+    my_blockchain, network = run()
+
+    chain = my_blockchain.chain
+    current_transactions = my_blockchain.current_transactions
+    return render_template('index.html', chain=chain, current_transactions=current_transactions)
 
 
 if __name__ == '__main__':
diff --git a/network_integration.py b/network_integration.py
@@ -32,4 +32,5 @@ def run():
     return bc, network
 
 
-run()
+if __name__ == '__main__':
+    run()
diff --git a/templates/index.html b/templates/index.html
@@ -19,6 +19,7 @@
                     <th class="p-3 text-left">Creation time</th>
                     <th class="p-3 text-left">Previous hash</th>
                     <th class="p-3 text-left" width="110px">Number of transactions</th>
+                    <th>transactions</th>
                 </tr>
                 {% endfor %}
             </thead>
@@ -29,14 +30,23 @@
                     <td class="border-grey-light border hover:bg-gray-100 p-3 truncate">{{ block.previous_hash }}</td>
                     <td class="border-grey-light border hover:bg-gray-100 p-3 truncate">
                         {{ block.transactions | length }}</td>
+
+                    <td>
+                        {% for transaction in block.transactions %}
+                        {{ transaction.value }} - {{ transaction }}
+                        {% endfor %}
+                    </td>
                     <!-- <td
                         class="border-grey-light border hover:bg-gray-100 p-3 text-blue-400 hover:text-blue-600 hover:font-medium cursor-pointer">
                         See more</td> -->
                 </tr>
                 {% endfor %}
-
             </tbody>
         </table>
+
+        <!-- current transactions -->
+        <table class="w-full flex flex-row flex-no-wrap sm:bg-white rounded-lg overflow-hidden sm:shadow-lg my-5">
+        </table>
     </div>
 </body>
 
