major bug fixes

Author: DeliciousLlama

TODO.md

@@ -13,9 +13,8 @@
 8. ~~Create export functionality~~
 9. ~~Add meta previews~~
 10. ~~Fix the bug for training failure~~
-11. Add file type detection
-12. Test all features
-13. Improve home page
-14. Add analytics
-15. Fuck you
-16. write a basic *README*
+11. ~~Add file type detection~~
+12. ~~Test all features~~
+13. ~~Improve home page~~
+14. ~~Add analytics~~
+15. write a basic *README*

about/index.html

@@ -58,7 +58,9 @@ <h2 class='unselectable' style="font-size: 2.5rem; font-weight:430; font-family:
     <a href="../license-info/" class='copyrightmsg unselectable' style='position: absolute; bottom:1vh; color:gray'>
         Copyright &copy; 2021 LemonOrange
     </a>
+    
     <script src="../anime.min.js"></script>
     <script src="index.js"></script>
+    <script data-host="https://microanalytics.io" data-dnt="false" src="https://microanalytics.io/js/script.js" id="ZwSg9rf6GA" async defer></script>
 </body>
 </html>

blank/index.html

@@ -29,5 +29,6 @@
     </p>
     <script src="../anime.min.js"></script>
     <script src="index.js"></script>
+    <script data-host="https://microanalytics.io" data-dnt="false" src="https://microanalytics.io/js/script.js" id="ZwSg9rf6GA" async defer></script>
 </body>
 </html>

grid.svg

@@ -46,7 +46,7 @@
                     </h2>
                     <h3 class='unselectable' style='cursor: default; font-weight: 500; font-size: 1.2rem;
                     letter-spacing: 0rem; margin:0; color: #747474; font-family: poppins;'>
-                        Beta 1.0
+                        Beta 1.1
                     </h3>
                 </section>
             </section>
@@ -60,7 +60,7 @@
             What Is This
         </a>
     </section>
-    <a style="font-size: 0.85rem; color:#767676" href="https://github.com/LemonOrangeWasTaken/DeepFusion/issues/new" target="_blank">Report Bug</a>
+    <a style="font-size: 0.85rem; color:#767676; margin-top: 0.75rem;" href="https://github.com/LemonOrangeWasTaken/DeepFusion/issues" target="_blank">Report Bug</a>
 
     <!-- github corner thing -->
     <a href="https://github.com/LemonOrangeWasTaken/DeepFusion" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#ffffff; color:#1d2021; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
@@ -71,5 +71,6 @@
 
     <script src="anime.min.js"></script>
     <script src="index.js"></script>
+    <script data-host="https://microanalytics.io" data-dnt="false" src="https://microanalytics.io/js/script.js" id="ZwSg9rf6GA" async defer></script>
 </body>
 </html>

index.html

@@ -820,5 +820,6 @@ <h5 style='color:white; width:100%; text-align: center; margin-top:1rem'>
 
     <script src="../anime.min.js"></script>
     <script src="index.js"></script>
+    <script data-host="https://microanalytics.io" data-dnt="false" src="https://microanalytics.io/js/script.js" id="ZwSg9rf6GA" async defer></script>
 </body>
 </html>

license-info/index.html

@@ -421,6 +421,14 @@ function add_input_menu_events(){
     document.querySelector("#input-file").onchange = () => {
         let file = document.querySelector("#input-file").files[0], read = new FileReader()
         let file_name = file.name
+
+        // check file type
+        if(file.type !== "text/csv"){
+            dflog(errormsg, "Upload failed: Only CSV files are supported for now!")
+            dflog(blankmsg, "Or if you don't have a CSV file, you can click the <strong>⋮</strong> next to the upload button for a sample dataset.")
+            return;
+        }
+
         read.readAsBinaryString(file); // convert to String
         read.onloadend = function(){
             // when uploading, lag stems from here. This needs to be shifted to a backend server for processing in the future.
@@ -461,6 +469,14 @@ function add_output_menu_events(){
         // read csv file from the upload button
         let file = document.querySelector("#output-file").files[0], read = new FileReader()
         let file_name = file.name
+        
+        // check file type
+        if(file.type !== "text/csv"){
+            dflog(errormsg, "Upload failed: Only CSV files are supported for now!")
+            dflog(blankmsg, "Or if you don't have a CSV file, you can click the <strong>⋮</strong> next to the upload button for a sample dataset.")
+            return;
+        }
+
         read.readAsBinaryString(file); // convert to String
         read.onloadend = function(){
             // when uploading, lag stems from here. This needs to be shifted to a backend server for processing in the future.

model-maker/events.js

@@ -63,10 +63,8 @@ <h4 style="margin:0">Add Layers:</h4>
                         <p>Dropout</p>
                     </button>
                     <div class="vr" style="height:70%"></div>
-                    <a class="default-upload smallest-default-upload node-selection node-selection-menu-expander buttonlike"
-                            style="height:80%;" id="drop_node_add" href="https://github.com/LemonOrangeWasTaken/DeepFusion/discussions/new" target="_blank">
-                        <p class="default-upload-decor" style="cursor: pointer;">···</p>
-                        <p style="margin-left:0.65rem; cursor: pointer;">Suggestions?</p>
+                    <a class="buttonlike node-selection" style="width: fit-content" id="drop_node_add" href="https://github.com/LemonOrangeWasTaken/DeepFusion/discussions/categories/feature-requests" target="_blank">
+                        <p style="cursor: pointer;">Suggestions?</p>
                     </a>
                 </section>
         </div>
@@ -105,9 +103,8 @@ <h4>
                     <button id="check-net" style="width:100%">
                         <p>Check Network</p>
                     </button>
-                    <button id="compile-net" class='default-upload smaller-default-upload'>
-                        <p class="default-upload-decor">···</p>
-                        <p style="margin-left:0.65rem">Compile</p>
+                    <button id="compile-net" style="padding:0; width:70%">
+                        <p>Compile</p>
                     </button>
                 </section>
 
@@ -130,38 +127,40 @@ <h4>
                 style="width:17rem; height:calc(100vh - 3.2rem); bottom:0; left:0;
             display:flex; align-items: center; justify-content: flex-start; padding:0.2rem 0.8rem 0 0.8rem; flex-direction: column; overflow: auto;">
 
-            <section style="width:95%; height: fit-content">
-                <div class="terminal" style="min-height:10rem; height:calc(100vh - 24rem)" id="dfterm">
-                    <span style="margin:0.5vh 0 0 0">Welcome to DeepFusion <span style="color:greenyellow">Beta 1.0</span>.</span>
+            <section style="width:95%; height: fit-content; position:relative">
+                <div class="terminal" style="min-height:10rem; height:calc(100vh - 24rem); position: relative;" id="dfterm">
+                    <span style="margin:0.5vh 0 0 0">Welcome to DeepFusion <span style="color:greenyellow">Beta 1.1</span>.</span>
                     <span>If you want to you can support this project on 
                         <a style="color:rgb(0, 153, 255); font-weight: 600;" href="https://github.com/LemonOrangeWasTaken/DeepFusion">GitHub</a>
                         , or subscribe to my 
                         <a style="color:rgb(255, 68, 68); font-weight: 600;" href="https://www.youtube.com/channel/UCut2xeBl7HcPEPatqpEUoQw">YouTube</a>.
                         Yes you can scroll on this makeshift terminal when it overflows.
                     </span>
                     <span style="margin:0">---</span>
-                    <span class="info">Type "help", "about", or "license" for more information</span>
+                    <span class="info">Type "help", "whatsnew", or "license" for more information</span>
+                    
                 </div>
-    
+
+                <!-- terminal control buttons -->
+                <section id="terminal-ctrl"
+                        style="position: absolute; right:0.4rem; bottom:2.45rem; display: flex; flex-direction: row; justify-content: flex-end;
+                        padding: 0; width:fit-content">
+
+                    <button class="terminal-btn" id="zoom-in-term" title="Zoom In Terminal">
+                        <img style="width:auto; height:0.5rem; margin:0" src="../zoom-in.svg" alt="Zoom In Terminal">
+                    </button>
+                    <button class="terminal-btn" id="zoom-out-term" title="Zoom Out Terminal">
+                        <img style="width:0.5rem; height:auto; margin:0" src="../zoom-out.svg" alt="Zoom Out Terminal">
+                    </button>
+
+                </section>
+                
                 <!-- terminal input section. It will also contain the buttons for configuring the terminal. -->
 
-                <section style="display:flex; width:100%; height:auto; position: relative;">
+                <section id="term-input-container" style="display:flex; width:100%; height:auto; position: relative;">
                     <input type="text" class="terminal-in" id="term-input"
                         style="font-family: 'Source Code Pro'; font-size: 0.75rem;" placeholder=">>>">
                     </input>
-
-                    <!-- terminal control buttons -->
-                    <section id="terminal-ctrl"
-                            style="position: absolute; right:0.4rem; top:-3rem; display: flex; flex-direction: row; justify-content: flex-end; padding: 1rem 0 0 0; width:55%; pointer-events: none;">
-
-                        <button class="terminal-btn">
-                            <img style="width:0.75rem; height:auto; margin:0" src="../zoom-in.svg" alt="Zoom In Terminal">
-                        </button>
-                        <button class="terminal-btn">
-                            <img style="width:0.75rem; height:auto; margin:0" src="../zoom-out.svg" alt="Zoom Out Terminal">
-                        </button>
-
-                    </section>
                 </section>
             </section>
 
@@ -271,7 +270,7 @@ <h3 class="unselectable" style="cursor:pointer">
         </section>
 
         <!-- version watermark -->
-        <p style="position: absolute; bottom:8rem; font-size: 0.9rem; font-family: Montserrat; opacity: 0.4;">Public Beta 1.0</p>
+        <p style="position: absolute; bottom:8rem; font-size: 0.9rem; font-family: Montserrat; opacity: 0.4;">Public Beta 1.1</p>
 
         <!-- canvas area -->
         <section id="canvas-drag" style="position:absolute; display:flex; justify-content: center; align-items:center;
@@ -305,12 +304,12 @@ <h3 class="unselectable" style="cursor:pointer">
             .pagecontainer {display:none;}
         </style>
         <div class="noscriptmsg" style="z-index:999; position:absolute; width:100%; height:100%; top:0; left:0; display:flex; flex-direction: column;
-        align-items: center; justify-content: center; background-color: #00000083; backdrop-filter: blur(5px);">
+        align-items: center; justify-content: center; background-color: #00000065; backdrop-filter: blur(5px);">
             <h1 style="font-family: arial; text-align: center; margin-bottom:2rem; cursor: text; z-index: 1000;">
                 ( ._.)
             </h1>
             <h2 style="letter-spacing:0; font-weight: 500; font-size: 2rem; cursor: text; z-index: 1000;">
-                You don"t seem to have Javascript enabled...
+                You don't seem to have Javascript enabled...
             </h2>
             <h4 style="text-align:center; margin-top:1vh; font-weight: 400; font-size: 1rem; z-index: 1000; margin-top:1rem">
                 This site needs Javascript to function properly.
@@ -319,12 +318,14 @@ <h4 style="text-align:center; margin-top:1vh; font-weight: 400; font-size: 1rem;
     </noscript>    
 
     <script src="https://cdn.jsdelivr.net/npm/@tensorflow/tfjs@2.0.0/dist/tf.min.js"></script>
+    <script data-host="https://microanalytics.io" data-dnt="false" src="https://microanalytics.io/js/script.js" id="ZwSg9rf6GA" async defer></script>
     <script src="../anime.min.js"></script>
     <script src="../json2html.min.js"></script>
     <script src="terminal-handler.js"></script>
     <script src="events.js"></script>
     <script src="style.js"></script>
     <script src="node-templates.js"></script>
+    <script src="terminal-templates.js"></script>
     <script src="menu-templates.js"></script>
     <script src="menu-handler.js"></script>
     <script src="standards.js"></script>

model-maker/index.html

@@ -20,11 +20,11 @@ const INPUT_NODE_MENU = [ // file_name
         "html" : [
             {
                 "<>" : "section",
-                "style" : "width:100%; height:fit-content; display:flex; flex-direction:row",
+                "style" : "width:100%; height:fit-content; display:flex; flex-direction:row;",
                 "html": [{
                     "<>" : "button",
                     "id" : "input-upload",
-                    "style" : "width:100%",
+                    "style" : "width:calc(100% - 0rem)",
                     "html":[{
                         "<>":"p",
                         "text":"Upload"
@@ -41,7 +41,7 @@ const INPUT_NODE_MENU = [ // file_name
                     },{
                         "<>":"p",
                         "id":"default-upload-text",
-                        "style":"margin-left:0.65rem",
+                        "style":"margin-left:0.1rem",
                         "text":"use default"
                     }]
                 }],
@@ -113,7 +113,7 @@ const OUTPUT_NODE_MENU = [ // file_name
                     },{
                         "<>":"p",
                         "id":"default-upload-text",
-                        "style":"margin-left:0.65rem",
+                        "style":"margin-left:0.1rem",
                         "text":"use default"
                     }]
                 }],
@@ -170,7 +170,7 @@ const DENSE_NODE_MENU = [ // uuid, neuronct
                         "<>" : "input",
                         "type" : "range",
                         "min" : "1",
-                        "max" : "200",
+                        "max" : "1000",
                         "value" : "${neuronct}",
                         "class" : "slider",
                         "id" : "${uuid}neuron-slider",
@@ -264,10 +264,6 @@ const DENSE_NODE_MENU = [ // uuid, neuronct
                         "<>" : "option",
                         "value" : "heu",
                         "text" : "He-Uniform", 
-                    },{
-                        "<>" : "option",
-                        "value" : "ide",
-                        "text" : "Identity", 
                     },{
                         "<>" : "option",
                         "value" : "lec",
@@ -344,10 +340,6 @@ const DENSE_NODE_MENU = [ // uuid, neuronct
                         "<>" : "option",
                         "value" : "heu",
                         "text" : "He-Uniform", 
-                    },{
-                        "<>" : "option",
-                        "value" : "ide",
-                        "text" : "Identity", 
                     },{
                         "<>" : "option",
                         "value" : "lec",
@@ -534,7 +526,7 @@ const DROP_NODE_MENU = [ // uuid, neuronct
                         "<>" : "input",
                         "type" : "range",
                         "min" : "0",
-                        "max" : "100",
+                        "max" : "90",
                         "value" : "${chance}",
                         "class" : "slider",
                         "id" : "${uuid}prob-slider",