Merge remote-tracking branch 'origin/main' into main

NathanShih04 · Oct 6, 2021 · a2bf445 · a2bf445
2 parents 6927402 + efa3512
commit a2bf445
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 14 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/templates/clicker.html b/templates/clicker.html
@@ -74,6 +74,7 @@
              DOM assignment by converting decimal https://www.w3schools.com/jsref/jsref_fromcharcode.asp
              below ASCII for more ideas of where to make changes
              */
+            document.getElementById('ASCII').innerHTML = String.fromCharCode(parseInt(binary, 2).toString(10));
         }
 
         /* This function converts decimal number to selected base using decimal, base, quotient, remainder.
@@ -190,6 +191,7 @@ <h1 class="text-center">Binary Math with Conversions</h1>
                         <th>Octal</th>
                         <th>Hexadecimal</th>
                         <th>Decimal</th>
+                        <th>ASCII</th>
                         <!-- Hack: display ASCII label for printable character(s)  -->
                         <th>Minus</th>
                         <th>Shift Right (/2)</th>
@@ -201,6 +203,7 @@ <h1 class="text-center">Binary Math with Conversions</h1>
                         <td id="octal">0</td>
                         <td id="hexadecimal">0</td>
                         <td id="decimal">0</td>
+                        <td id="ASCII">null</td>
                         <!-- Hack: display ASCII printable character(s)  -->
                         <td><button type="button" id="sub1" onclick="add(-1)">-1</button></td>
                         <td><button type="button" id="divide2" onclick="multiply(0.5)">/2</button></td>

diff --git a/templates/layouts/navbar.html b/templates/layouts/navbar.html
@@ -106,6 +106,7 @@
                 </a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropdown">
                     <a class="dropdown-item" href="/binary">Binary Clicker</a>
+                    <a class="dropdown-item" href="/colorcode">Color Codes</a>
                     <a class="dropdown-item" href="/greet">Mini-Lab1(Greet page)</a>
                     <a class="dropdown-item" href=/rgb>RGB</a>
                     <a class="dropdown-item" href="https://docs.google.com/document/d/1tz7A3Lp6vaa3a2ihFki3gpXrv0AbuLO8AQ0fRD_HylU/edit">Brain Write</a>