Finiliazing project and version 0.5 ready for production and showcase

Author: migbash

src/main/java/blockmatrix/controllers/Blockmatrix_RestController.java

@@ -187,10 +187,10 @@ public ResponseEntity<String> send_funds(@RequestParam(value = "funds", required
     }
 
     @RequestMapping(path = "/modify_transaction_info")
-    public void modify_transaction_info(@RequestParam(value = "num", required = true, defaultValue = "1") int blockNumber,
-        @RequestParam(value = "transaction", required = true, defaultValue = "0") int transactionNumber,
-        @RequestParam(value = "new_info", required = true, defaultValue = "null") String new_info) {
-        new_blockMatrix.modifyTXinfo_InBM(blockNumber, transactionNumber, new_info);
+    public void modify_transaction_info(@RequestParam(value = "num", required = true, defaultValue = "null") int blockNumber,
+        @RequestParam(value = "transaction", required = true, defaultValue = "null") String txId,
+        @RequestParam(value = "new_info", required = true, defaultValue = "null") String newTxInfo) {
+        new_blockMatrix.modifyTXinfo_InBM(blockNumber, txId, newTxInfo);
     }
 
     // @Scheduled(fixedRate = 10000) // ms = (60 sec)

src/main/java/blockmatrix/model/Block.java

@@ -88,14 +88,12 @@ public boolean add_Transaction_To_Block(Transaction transaction) {
         return true;
     }
 
-    public void clear_Transaction_Info_In_Block(int transactionNumber) {
-        transactions.get(transactionNumber).clear_Transaction_Info();
-        merkleRoot = StringUtil.getMerkleRoot(transactions);
-        this.hash = calculate_Block_Hash();
-    }
-
-    public void modifyTX_InfoInBlock(int transactionNumber, String new_transaction_info){
-        transactions.get(transactionNumber).modifyTX(new_transaction_info);
+    public void modifyTX_InfoInBlock(String txId, String newTxInfo){
+        for (Transaction tx : transactions) {
+            if (tx.getTransactionId().equals(txId)) {
+                tx.modifyTX(newTxInfo);
+            }
+        }
         merkleRoot = StringUtil.getMerkleRoot(transactions);
         this.hash = calculate_Block_Hash();
     }

src/main/java/blockmatrix/model/BlockMatrix.java

@@ -160,18 +160,15 @@ private void update_Column_Hash(int column) {
         columnHashes[column] = calculate_Column_Hash(column);
     }
 
-    public void modifyTXinfo_InBM(int blockNumber, int transactionNumber, String new_transaction_info) {
+    public void modifyTXinfo_InBM(int blockNumber, String txId, String newTxInfo) {
+        
         // the "delete" function, which will overwrite and message info passed in along with the transaction for every transaction in the block
 
         this.blocksWithModifiedData.add(blockNumber);                               // Add 'this' block to a list to keep track of all modified blocks
         int row = get_Block_Row_Index(blockNumber);                                 // ..
         int column = get_Block_Column_Index(blockNumber);                           // ..
 
-        if (new_transaction_info.equals("null")) {
-            getBlock(blockNumber).clear_Transaction_Info_In_Block(transactionNumber);               // Clear the transaction in that particular block
-        } else {
-            getBlock(blockNumber).modifyTX_InfoInBlock(transactionNumber, new_transaction_info);    // Modify the transaction in that particular block
-        }
+        getBlock(blockNumber).modifyTX_InfoInBlock(txId, newTxInfo);    // Modify the transaction in that particular block
 
         String[] prevRowHashes = this.getRowHashes().clone();
         String[] prevColumnHashes = this.getColumnHashes().clone();

src/main/java/blockmatrix/model/Transaction.java

@@ -144,11 +144,6 @@ public float get_OutputsValue() {
         return total;
     }
 
-    public void clear_Transaction_Info() {
-        this.info = "CLEARED";
-        this.transactionId =  calculate_Transaction_Hash();
-    }
-
     public void modifyTX(String new_info){
         this.info = new_info;
         this.transactionId =  calculate_Transaction_Hash();

src/main/resources/static/images/Vector 7.svg

@@ -57,20 +57,16 @@ if (path_url.includes('/block_explorer')) {
     // Event Listeners
     // -------------------------
 
-    document.getElementById('view_keys').addEventListener('click', submitTX)
+    // document.getElementById('view_keys').addEventListener('click', submitTX)
     document.getElementById('new_wallet').addEventListener('click', createNewWallet)
-    document.getElementById('access_wallet').addEventListener('click', submitTX)
+    //TODO: document.getElementById('access_wallet').addEventListener('click', submitTX)
     document.getElementById('sendTx').addEventListener('click', submitTX)
     document.getElementById('show_more_btn').addEventListener('click', showMoreTx)
 
     document.getElementById('cpy_pub_add').addEventListener('click', function () {
         copyClipboard(this)
     })
 
-    document.getElementById('select_tx_btn').addEventListener('click', function () {
-        clearData(this)
-    })
-
     document.getElementById('user_action_btn').addEventListener('mouseout', function () {
         document.getElementById('_btn_div_action_txt').style.visibility = 'hidden'
     })
@@ -82,6 +78,14 @@ if (path_url.includes('/block_explorer')) {
             showBtnFunc(this)
         })
     }
+
+    var btns_arrs_table = document.getElementsByClassName('_btn_modifyTX')
+
+    for (let i = 0; i < btns_arrs_table.length; i++) {
+        btns_arrs_table[i].addEventListener('click', function () {
+            clearData(this)
+        })
+    }
 }
 
 // -------------------------
@@ -96,6 +100,9 @@ function showMoreTx() {
             rows_arr[i].classList.toggle('display_row');
         }
     }
+
+    document.getElementById('showMore').classList.toggle('enabled')
+    document.getElementById('showLess').classList.toggle('enabled')
 }
 
 function changeInputTxt(x) {
@@ -194,13 +201,13 @@ async function submitTX() {
 async function clearData(x) {
 
     var block_num = x.parentNode.parentNode.getElementsByTagName("td")[5].innerHTML
-    // var transaction_num = x.parentNode.parentNode.getElementsByTagName("strong")[5].innerHTML
+    var txId = x.parentNode.parentNode.getElementsByTagName("td")[0].innerHTML
     var new_info = "null"
 
     var url = new URL("/modify_transaction_info", document.URL),
         params = {
             num: block_num,
-            transaction: 0,
+            transaction: txId,
             new_info: new_info
         }
     Object.keys(params).forEach(key => url.searchParams.append(key, params[key]))

src/main/resources/static/images/Vectors.svg

@@ -26,6 +26,7 @@
         background-color: $primary_light;
         color: $secondary_dark;
         border: 1px solid $secondary_dark;
+        outline: none;
 
         & svg path
             stroke: $secondary_dark;

src/main/resources/static/js/main.js

@@ -23,6 +23,17 @@ h1, h2, h3, h4, h5, h6
         weight: bold;
     margin: 0px;
 
+// ------------------
+// Global Project Effects
+// ------------------
+.overflow
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 100%;
+    background-image: linear-gradient(90deg,#000000 35%,rgba(0,0,0,0));
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+
 // ------------------
 // Main Container Style(s)
 // ------------------

src/main/resources/static/styles/main.css

@@ -16,7 +16,7 @@ table
             transition-duration: .5s;
             cursor: pointer;
 
-        & td
+        & td:nth-child(-n+6)
             font:
                 family: 'Open Sans';
                 size: 14px;

src/main/resources/static/styles/main.css.map

@@ -18,7 +18,7 @@
           <svg width="22" height="21" viewbox="0 0 22 21" fill="none" xmlns="http://www.w3.org/2000/svg">
             <path d="M20.3315 11.1459L16.0512 9.17561V7.39679C15.5928 7.16331 15.1756 6.85664 14.8159 6.48885V9.16944L10.8444 11.0224V6.27267C10.9188 6.26874 10.9919 6.25202 11.0606 6.22326L13.8277 4.95091C13.6737 4.55437 13.574 4.13885 13.5312 3.71561L10.8012 4.95091L7.6512 3.53032L10.8012 2.07885L13.5065 3.31414V3.26473C13.5066 2.84736 13.5626 2.43188 13.6733 2.02944L11.0483 0.843555C10.967 0.805928 10.8784 0.786438 10.7888 0.786438C10.6993 0.786438 10.6107 0.805928 10.5294 0.843555L5.89708 2.97444C5.78987 3.02405 5.69914 3.10338 5.63564 3.203C5.57215 3.30262 5.53856 3.41836 5.53885 3.5365V9.18179L1.27708 11.1459C1.16987 11.1955 1.07914 11.2748 1.01564 11.3745C0.952149 11.4741 0.918556 11.5898 0.918848 11.708V17.7486C0.918556 17.8667 0.952149 17.9824 1.01564 18.0821C1.07914 18.1817 1.16987 18.261 1.27708 18.3106L5.90944 20.4415C5.99074 20.4791 6.07926 20.4986 6.16885 20.4986C6.25844 20.4986 6.34696 20.4791 6.42826 20.4415L10.8012 18.428L15.1741 20.4415C15.2554 20.4791 15.344 20.4986 15.4336 20.4986C15.5231 20.4986 15.6117 20.4791 15.693 20.4415L20.3253 18.3106C20.4325 18.261 20.5233 18.1817 20.5868 18.0821C20.6503 17.9824 20.6838 17.8667 20.6836 17.7486V11.708C20.6844 11.5905 20.6517 11.4752 20.5894 11.3757C20.527 11.2761 20.4376 11.1964 20.3315 11.1459ZM3.03738 11.708L6.19355 10.2503L9.34973 11.7018L6.16885 13.1471L3.03738 11.708ZM6.16885 19.2V14.4503C6.25482 14.4439 6.33872 14.4208 6.41591 14.3824L10.1712 12.653V17.3471L6.16885 19.2ZM12.2836 11.708L15.4397 10.2565L18.5959 11.708L15.4397 13.1471L12.2836 11.708ZM15.4583 19.2V14.4503C15.5364 14.4438 15.6122 14.4206 15.6806 14.3824L19.4359 12.653V17.3471L15.4583 19.2Z" fill="white"></path>
             <path d="M18.139 6.35292C19.8445 6.35292 21.2272 4.97027 21.2272 3.26469C21.2272 1.5591 19.8445 0.176453 18.139 0.176453C16.4334 0.176453 15.0507 1.5591 15.0507 3.26469C15.0507 4.97027 16.4334 6.35292 18.139 6.35292Z" fill="#00A3FF"></path>
-          </svg><span class="ml-2">BlockMatrix Status |</span><span th:text="${bm_verify}"> </span>
+          </svg><span class="ml-2 mr-1">BlockMatrix Status | </span><span th:text="${bm_verify}"> </span>
         </div>
       </div>
       <div class="container-fluid pb-3 pt-0 pl-5">

src/main/resources/static/styles/sass/_buttons.sass

@@ -18,7 +18,7 @@
           <svg width="22" height="21" viewbox="0 0 22 21" fill="none" xmlns="http://www.w3.org/2000/svg">
             <path d="M20.3315 11.1459L16.0512 9.17561V7.39679C15.5928 7.16331 15.1756 6.85664 14.8159 6.48885V9.16944L10.8444 11.0224V6.27267C10.9188 6.26874 10.9919 6.25202 11.0606 6.22326L13.8277 4.95091C13.6737 4.55437 13.574 4.13885 13.5312 3.71561L10.8012 4.95091L7.6512 3.53032L10.8012 2.07885L13.5065 3.31414V3.26473C13.5066 2.84736 13.5626 2.43188 13.6733 2.02944L11.0483 0.843555C10.967 0.805928 10.8784 0.786438 10.7888 0.786438C10.6993 0.786438 10.6107 0.805928 10.5294 0.843555L5.89708 2.97444C5.78987 3.02405 5.69914 3.10338 5.63564 3.203C5.57215 3.30262 5.53856 3.41836 5.53885 3.5365V9.18179L1.27708 11.1459C1.16987 11.1955 1.07914 11.2748 1.01564 11.3745C0.952149 11.4741 0.918556 11.5898 0.918848 11.708V17.7486C0.918556 17.8667 0.952149 17.9824 1.01564 18.0821C1.07914 18.1817 1.16987 18.261 1.27708 18.3106L5.90944 20.4415C5.99074 20.4791 6.07926 20.4986 6.16885 20.4986C6.25844 20.4986 6.34696 20.4791 6.42826 20.4415L10.8012 18.428L15.1741 20.4415C15.2554 20.4791 15.344 20.4986 15.4336 20.4986C15.5231 20.4986 15.6117 20.4791 15.693 20.4415L20.3253 18.3106C20.4325 18.261 20.5233 18.1817 20.5868 18.0821C20.6503 17.9824 20.6838 17.8667 20.6836 17.7486V11.708C20.6844 11.5905 20.6517 11.4752 20.5894 11.3757C20.527 11.2761 20.4376 11.1964 20.3315 11.1459ZM3.03738 11.708L6.19355 10.2503L9.34973 11.7018L6.16885 13.1471L3.03738 11.708ZM6.16885 19.2V14.4503C6.25482 14.4439 6.33872 14.4208 6.41591 14.3824L10.1712 12.653V17.3471L6.16885 19.2ZM12.2836 11.708L15.4397 10.2565L18.5959 11.708L15.4397 13.1471L12.2836 11.708ZM15.4583 19.2V14.4503C15.5364 14.4438 15.6122 14.4206 15.6806 14.3824L19.4359 12.653V17.3471L15.4583 19.2Z" fill="white"></path>
             <path d="M18.139 6.35292C19.8445 6.35292 21.2272 4.97027 21.2272 3.26469C21.2272 1.5591 19.8445 0.176453 18.139 0.176453C16.4334 0.176453 15.0507 1.5591 15.0507 3.26469C15.0507 4.97027 16.4334 6.35292 18.139 6.35292Z" fill="#00A3FF"></path>
-          </svg><span class="ml-2">BlockMatrix Status |</span><span th:text="${bm_verify}"> </span>
+          </svg><span class="ml-2 mr-1">BlockMatrix Status | </span><span th:text="${bm_verify}"> </span>
         </div>
       </div>
       <div class="container-fluid pb-3 pt-0 pl-5">
@@ -125,16 +125,23 @@ <h4>My Transaction History</h4></span>
               <td th:text="${tsx.getInfo()}"></td>
               <td th:text="${tsx.getBlockNumber()}"></td>
               <td>
-                <button class="button_main_dark" id="select_tx_btn">Modify Info</button>
+                <button class="_btn_modifyTX button_main_dark">Modify Info</button>
               </td>
             </tr>
           </tbody>
         </table>
         <div class="container" style="display: flex; justify-content: center;">
-          <button class="button_main_dark mb-4" id="show_more_btn"><span class="mr-2">Show More</span>
-            <svg width="12" height="9" viewbox="0 0 12 9" fill="none" xmlns="http://www.w3.org/2000/svg">
-              <path d="M1.5 1L5.31502 6.70623C5.71971 7.31153 6.61494 7.29524 6.99733 6.67562L10.5 1" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-            </svg>
+          <button class="button_main_dark mb-4" id="show_more_btn">
+            <div class="enabled" id="showMore" style="display: none;"><span class="mr-2">Show More</span>
+              <svg width="12" height="9" viewbox="0 0 12 9" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M1.5 1L5.31502 6.70623C5.71971 7.31153 6.61494 7.29524 6.99733 6.67562L10.5 1" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+              </svg>
+            </div>
+            <div id="showLess" style="display: none;"><span class="mr-2">Show Less</span>
+              <svg width="12" height="9" viewbox="0 0 12 9" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M10.5 8L6.68498 2.29377C6.28029 1.68847 5.38506 1.70476 5.00267 2.32438L1.5 8" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+              </svg>
+            </div>
           </button>
         </div>
       </div>
@@ -168,7 +175,7 @@ <h5 class="modal-title" id="exampleModalLabel">New Transaction Message</h5>
               <h5 class="modal-title" id="staticBackdropLabel">New Wallet Details</h5>
               <button class="close" type="button" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
             </div>
-            <div class="modal-body" id="wallet_info">
+            <div class="modal-body overflow" id="wallet_info">
               <p>Modal body text goes here.</p>
             </div>
             <div class="modal-footer">

src/main/resources/static/styles/sass/_layout.sass

@@ -8,7 +8,7 @@
                 h5#staticBackdropLabel.modal-title New Wallet Details
                 button.close(type='button' data-dismiss='modal' aria-label='Close')
                     span(aria-hidden='true') ×
-            #wallet_info.modal-body
+            #wallet_info.modal-body.overflow
                 p Modal body text goes here.
             .modal-footer
                 button.btn.btn-secondary(type='button' data-dismiss='modal') I have stored the wallet keys somewhere safe

src/main/resources/static/styles/sass/_table.sass

@@ -18,10 +18,17 @@
                 td(th:text="${tsx.getInfo()}")
                 td(th:text="${tsx.getBlockNumber()}")
                 td
-                    button#select_tx_btn.button_main_dark Modify Info
+                    button._btn_modifyTX.button_main_dark Modify Info
                     //- button.btn.btn-primary(type='button' data-toggle='modal' data-target='#exampleModal' data-whatever='@getbootstrap') Modify Transaction Info
     .container(style="display: flex; justify-content: center;")
         button#show_more_btn.button_main_dark.mb-4
-            span.mr-2 Show More
-            svg(width='12' height='9' viewbox='0 0 12 9' fill='none' xmlns='http://www.w3.org/2000/svg')
-                path(d='M1.5 1L5.31502 6.70623C5.71971 7.31153 6.61494 7.29524 6.99733 6.67562L10.5 1' stroke='white' stroke-width='2' stroke-linecap='round' stroke-linejoin='round')
+            #showMore.enabled(style="display: none;")
+                span.mr-2 Show More
+                svg(width='12' height='9' viewbox='0 0 12 9' fill='none' xmlns='http://www.w3.org/2000/svg')
+                    path(d='M1.5 1L5.31502 6.70623C5.71971 7.31153 6.61494 7.29524 6.99733 6.67562L10.5 1' stroke='white' stroke-width='2' stroke-linecap='round' stroke-linejoin='round')
+            #showLess(style="display: none;")
+                span.mr-2 Show Less
+                svg(width='12' height='9' viewbox='0 0 12 9' fill='none' xmlns='http://www.w3.org/2000/svg')
+                    path(d="M10.5 8L6.68498 2.29377C6.28029 1.68847 5.38506 1.70476 5.00267 2.32438L1.5 8" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round")
+                
+