From ce703ab595093fb9ded307928df4bf1b6f56f253 Mon Sep 17 00:00:00 2001
From: naelstrof <naelstrof@gmail.com>
Date: Fri, 18 Mar 2016 19:50:00 -0600
Subject: [PATCH] More features.

---
 README.md                     |   4 +--
 database.json                 |  16 +++++------
 public/images/beaker.png      | Bin 0 -> 248 bytes
 public/scripts/get.js         |  20 +++++++++----
 public/styles/application.css |   6 ++--
 source/chemAPI.d              |  52 ++++++++++++++++++++++++++++++++--
 views/get.dt                  |  18 +++++++++++-
 views/index.dt                |   2 +-
 8 files changed, 95 insertions(+), 23 deletions(-)
 create mode 100644 public/images/beaker.png

diff --git a/README.md b/README.md
index b467313..ccdcddc 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ A goonchem helper that creates and displays dependency graphs of specified chemi
 
 ### Linux
 
-* Requires dub package manager and dlang.
+* Requires dub package manager and a dlang compiler (like dmd).
 
 ``` sh
 git clone git@github.com:naelstrof/omnichem.git
@@ -18,4 +18,4 @@ Browsing to localhost:8080 should open up the application. Have fun!
 
 ### Windows
 
-Just download the pre-compiled package on the releases page above.
\ No newline at end of file
+Just download the pre-compiled package on the releases page above.
diff --git a/database.json b/database.json
index 2d7df2c..53276af 100644
--- a/database.json
+++ b/database.json
@@ -1140,7 +1140,7 @@
     },
     "capulettium": {
         "class": "capulettium",
-        "description": "A rare drug that causes the user to appear dead for some time.\"",
+        "description": "A rare drug that causes the user to appear dead for some time.",
         "fluid_b": 110,
         "fluid_g": 145,
         "fluid_r": 100,
@@ -1163,7 +1163,7 @@
     },
     "capulettium_plus": {
         "class": "capulettium_plus",
-        "description": "A rare and expensive drug that causes the user to appear dead for some time while they retain consciousness and vision.\"",
+        "description": "A rare and expensive drug that causes the user to appear dead for some time while they retain consciousness and vision.",
         "fluid_b": 110,
         "fluid_g": 145,
         "fluid_r": 100,
@@ -1502,7 +1502,7 @@
     },
     "cleaner": {
         "class": "space_cleaner",
-        "description": "A compound used to clean things. It has a sharp, unpleasant odor.\"",
+        "description": "A compound used to clean things. It has a sharp, unpleasant odor.",
         "fluid_b": 220,
         "fluid_g": 220,
         "fluid_r": 110,
@@ -1685,7 +1685,7 @@
         "fluid_g": 195,
         "fluid_r": 125,
         "id": "coniine",
-        "name": "coniine\"",
+        "name": "coniine",
         "reagent_state": "LIQUID",
         "transparency": 80
     },
@@ -1806,7 +1806,7 @@
         "instant": 1,
         "mix_phrase": "The mixture violently reacts, leaving behind a few crystalline shards.",
         "mix_sound": "sound\/effects\/crystalshatter.ogg",
-        "name": "crank\"",
+        "name": "crank",
         "overdose": 20,
         "parents": [
             "initropidril"
@@ -2626,7 +2626,7 @@
         "fluid_r": 100,
         "id": "flaptonium",
         "instant": 1,
-        "mix_phrase": "The substance turns an airy sky-blue and foams up into a new shape.\"",
+        "mix_phrase": "The substance turns an airy sky-blue and foams up into a new shape.",
         "mix_sound": "sound\/misc\/burp.ogg",
         "name": "flaptonium",
         "required_reagents": {
@@ -3449,7 +3449,7 @@
         "fluid_g": 100,
         "fluid_r": 250,
         "id": "histamine",
-        "name": "histamine\"",
+        "name": "histamine",
         "overdose": 40,
         "parents": [
             "initropidril"
@@ -7438,7 +7438,7 @@
             "water_holy": 1,
             "werewolf_serum": 1
         },
-        "result": "\"vampire_serum",
+        "result": "vampire_serum",
         "result_amount": 3,
         "transparency": 255
     },
diff --git a/public/images/beaker.png b/public/images/beaker.png
new file mode 100644
index 0000000000000000000000000000000000000000..dab2f468d8d6b14adeda0ff4b3498e0463f57c31
GIT binary patch
literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ{hlt4ArY;~Ury?zNO&ADS+K3&
zD&Y#_Vm^t|11p#%BqSm_0=KBH_$0y1%<Q~+;S1rUE8+9&bq^mnaNxn_b$7caL@jb+
zxT#>C_$KR4i{Oli(~=S$Jd8;P)@^_Ca`7zY3C_!^6l5Hx3s}TOi##)1n}7A=twjbU
zJAY-?u1<Kv$k}*IN5$Q-nAcaPAxTikfv-`wI!-uO?j+xe`Pa5{%~o#9;V_tVN$Z}|
slJgz9EgoeIx(6D<-Jq^xyTi!ftZwn)spHO8pjQ|?UHx3vIVCg!09Kt|ApigX

literal 0
HcmV?d00001

diff --git a/public/scripts/get.js b/public/scripts/get.js
index bdb3faa..9bf80cf 100644
--- a/public/scripts/get.js
+++ b/public/scripts/get.js
@@ -1,10 +1,10 @@
 var redraw, g, renderer;
 
 function getRandomColor() {
-    var letters = '0123456789ABC'.split('');
+    var letters = '3456789ABC'.split('');
     var color = '#';
     for (var i = 0; i < 6; i++ ) {
-        color += letters[Math.floor(Math.random() * 13)];
+        color += letters[Math.floor(Math.random() * 9)];
     }
     return color;
 }
@@ -24,8 +24,16 @@ $(document).ready(function() {
     }
     $('edge').each( function( index ) {
         var strings = $(this).text().split(",");
-        g.addNode( strings[1], { color : getRandomColor(), render : render } );
-        g.addNode( strings[0], { color : getRandomColor(), render : render } );
+        if ( $(this).attr("color_d") == "#333" ) {
+            g.addNode( strings[1], { color : getRandomColor(), render : render } );
+        } else {
+            g.addNode( strings[1], { color : $(this).attr("color_d"), render : render } );
+        }
+        if ( $(this).attr("color_s") == "#333" ) {
+            g.addNode( strings[0], { color : getRandomColor(), render : render } );
+        } else {
+            g.addNode( strings[0], { color : $(this).attr("color_s"), render : render } );
+        }
         if ( $(this).attr("weight") != "1" ) {
             g.addEdge( strings[1], strings[0], { directed: true, label: $(this).attr("weight") } );
         } else {
@@ -37,11 +45,11 @@ $(document).ready(function() {
         g.edges[e].style.fill = g.edges[e].source.color;
     }
     var layouter = new Graph.Layout.Spring(g);
-    renderer = new Graph.Renderer.Raphael('canvas', g, $("#content").width(), $("#content").height() );
+    renderer = new Graph.Renderer.Raphael('canvas', g, $("#content").width(), 600 );
     redraw = function() {
         layouter.layout();
         renderer.width = $("#content").width()
-        renderer.height = $("#content").height()
+        renderer.height = 600
         renderer.draw();
     };
     $(window).resize( redraw );
diff --git a/public/styles/application.css b/public/styles/application.css
index 3d6c583..066e414 100644
--- a/public/styles/application.css
+++ b/public/styles/application.css
@@ -11,7 +11,7 @@ html, body {
 svg {
     margin: 0;
     width: 100%;
-    height: 100%;
+    height: 600px;
 }
 
 .container {
@@ -21,16 +21,16 @@ svg {
 }
 
 .canvas {
+    background-color: #777;
     margin: 0;
     width: 100%;
-    height: 100%;
+    height: 600px;
 }
 
 .content {
     margin: 0;
     padding: 0;
     width: 100%;
-    height: calc( 100% - 140px );
 }
 
 .search {
diff --git a/source/chemAPI.d b/source/chemAPI.d
index e6770f8..87bc3d3 100644
--- a/source/chemAPI.d
+++ b/source/chemAPI.d
@@ -29,14 +29,62 @@ class ChemAPI : IChemAPI {
             return "";
         }
         foreach( str ; j["required_reagents"].object.keys ) {
-            html ~= `<edge result="` ~ j["result_amount"].toString() ~ `" weight="` ~ j["required_reagents"][str].toString() ~ `" hidden>"`~ j["name"].str ~ `","` ~ reagents[str]["name"].str ~ `"</edge>`;
+            string color_s = "#333";
+            if ( j.object.keys.canFind( "fluid_r" ) ) {
+                color_s = format("#%02x%02x%02x", min(j["fluid_r"].integer,255), min(j["fluid_g"].integer,255), min(j["fluid_b"].integer,255) );
+            }
+            string color_d = "#333";
+            if ( reagents[str].object.keys.canFind( "fluid_r" ) ) {
+                color_d = format("#%02x%02x%02x", min(reagents[str]["fluid_r"].integer,255), min(reagents[str]["fluid_g"].integer,255), min(reagents[str]["fluid_b"].integer,255) );
+            }
+            html ~= `<edge color_s="` ~ color_s ~ `" color_d="` ~ color_d ~ `" result="` ~ j["result_amount"].toString() ~ `" weight="` ~ j["required_reagents"][str].toString() ~ `" hidden>"`~ j["name"].str ~ `","` ~ reagents[str]["name"].str ~ `"</edge>`;
             html ~= generateEdges( str );
         }
         return html;
     }
     void getReagent( string id ) {
         string html = generateEdges( id );
-        render!("get.dt", html );
+        string name, description;
+        string[] parents;
+        string[] children;
+        string color;
+        if ( reagents.object.keys.canFind( id ) ) {
+            if ( reagents[id].object.keys.canFind( "name" ) ) {
+                name = reagents[id]["name"].str ~ " (" ~ id ~ ")";
+            }
+            if ( reagents[id].object.keys.canFind( "description" ) ) {
+                description = reagents[id]["description"].str;
+            }
+            if ( reagents[id].object.keys.canFind( "parents" ) ) {
+                foreach( j ; reagents[id]["parents"].array ) {
+                    parents ~= `<a href="/reagent?id=` ~ reagents[j.str]["id"].str ~ `">` ~ reagents[j.str]["name"].str ~ `</a>`;
+                }
+            }
+            if ( parents.length <= 0 ) {
+                parents ~= "None!";
+            }
+            if ( reagents[id].object.keys.canFind( "required_reagents" ) ) {
+                foreach( j ; reagents[id]["required_reagents"].object.keys ) {
+                    children ~= `<a href="/reagent?id=` ~ reagents[j]["id"].str ~ `">` ~ reagents[j]["name"].str ~ `</a>`;
+                }
+            }
+            if ( children.length <= 0 ) {
+                children ~= "None!";
+            }
+            if ( reagents[id].object.keys.canFind( "fluid_r" ) ) {
+                color = format("#%02x%02x%02x", min(reagents[id]["fluid_r"].integer,255), min(reagents[id]["fluid_g"].integer,255), min(reagents[id]["fluid_b"].integer,255) );
+            }
+            if ( html == "" ) {
+                html = `<edge color_s="` ~ color ~ `" color_d="` ~ color ~ `" result="1" weight="1" hidden>"`~ reagents[id]["name"].str ~ `","` ~ reagents[id]["name"].str ~ `"</edge>`;
+            }
+        } else {
+            name = "Unknown";
+            description = "Unknown";
+            parents = ["Unknown"];
+            children = ["Unknown"];
+            color = "#FFF";
+        }
+        render!("get.dt", html, name, description, parents, children );
     }
     void index() {
         render!("index.dt", sorted_reagents);
diff --git a/views/get.dt b/views/get.dt
index b679343..67ec770 100644
--- a/views/get.dt
+++ b/views/get.dt
@@ -1,8 +1,24 @@
 extends layout
 
 block body
-    |!= html
+    h1!= name
+    p!= description
+    hr
     #canvas.canvas
+    hr
+    h2 Children
+    table.table.table-hover.table-bordered.table-striped
+        tbody
+            - foreach( str ; children )
+                tr
+                    td!= str
+    h2 Parents
+    table.table.table-hover.table-bordered.table-striped
+        tbody
+            - foreach( str ; parents )
+                tr
+                    td!= str
+    |!= html
 
 block after
     - js( "raphael-min" );
diff --git a/views/index.dt b/views/index.dt
index 5d13869..d88668c 100644
--- a/views/index.dt
+++ b/views/index.dt
@@ -4,6 +4,6 @@ block body
     table.table.table-hover.table-bordered
         - foreach( r ; sorted_reagents )
             tr
-                td!= `<a href="/reagent?id=` ~ r.id ~ `">` ~ r.name ~ `</a>`
+                td!= `<a href="/reagent?id=` ~ r.id ~ `">` ~ r.name ~ ` (` ~ r.id ~ `)</a>`
 block after
     - js( "filter" );