commit: e5035ca75b6eeb49b46b20fbcb3afc904960591a
parent 7d732dc47fc9ebb43b6a75cb69e4fc2c78a67539
Author: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Mon, 5 Mar 2018 12:18:13 +1300
Added missing icons
Diffstat:
9 files changed, 54 insertions(+), 45 deletions(-)
diff --git a/riven.html b/riven.html
@@ -14,6 +14,7 @@
<script src="scripts/dictionary/ingredients.js"></script>
<script src="scripts/dictionary/recipes.js"></script>
+ <script src="scripts/dictionary/pages.js"></script>
<link rel="stylesheet" type="text/css" href="links/reset.css"/>
<link rel="stylesheet" type="text/css" href="links/riven.fonts.css"/>
diff --git a/scripts/dictionary/grim.custom.mh b/scripts/dictionary/grim.custom.mh
@@ -1,30 +0,0 @@
-~ NAME : Grigrains Pages
-~ NOTE : Hundred Rabbits
-~ AUTH : Devine Lu Linvega
-
-ABOUT
- BREF : I started {*Grim Grains*} once I realized that food could be artistically fulfilling. Cooking became an creative output, while the blog allowed me to document my progress and keep track of the things I made. The blog is about being artistically creative with food and colour. Colours for added nutrition, for contrast and for visual harmony. Most of my recipes are also nut-free and plant-based.
- LONG
- & This website showcases some of my favourite creations, along with hand draw illustrations for {{each of their ingredients|ingredients-list}}.
- % about
- & I am {{Rekka Bellum|http://kokorobot.ca/}}, an illustrator, living on a small sailboat somewhere on the shores of the Pacific Ocean.
- & You can contact me on my twitter {{@grimgrains|http://twitter.com/grimgrains}}.
-
-INGREDIENTS
- BREF : Here is an unsorted list of all the ingredients used in GrimGrains recipes!
- LONG
- & Select any item below to view recipes in which they were used and to find more information on them!
-
-DISCLAIMER
- BREF : The content of grimgrains.com, unless stated otherwise, is © Rekka Bell. All rights reserved. Photographs, drawings or text should not be used, published, reprinted or modified without my permission.
- LONG
- * Copyright policy
- & You may adapt one of my grim creations, but be sure to link back to the original recipe and to give proper credit.
- & Opinions expressed by any third parties are theirs and do not reflect my own.
- * Disclaimer
- & All recipes featured on grimgrains.com are my own, unless stated otherwise. The information is for food enthusiasts like myself, i do not claim to be an all-knowing food guru. Nor am I a health professional. My views are my own, i encourage curiosity whenever possible.
- * Privacy statement
- & Ads on the website are from third parties such as google, who may store information about your online coming and goings to provide personalized advertisements. All concerns about browsing privacy should be addressed to google.
- & Any visitor personal information will be kept private and will not be shared/sold to another party. I am not responsible for the privacy practices or actions of any of my blog commenters.
- & I reserve the right to alter the blog at my own discretion, as well as to filter comments without notice.
- & Words addressed to me in private will not be shared, nor will i use any of it in future publications.-
\ No newline at end of file
diff --git a/scripts/dictionary/pages.js b/scripts/dictionary/pages.js
@@ -0,0 +1,28 @@
+DICTIONARY.pages = `
+ABOUT
+ BREF : I started {*Grim Grains*} once I realized that food could be artistically fulfilling. Cooking became an creative output, while the blog allowed me to document my progress and keep track of the things I made. The blog is about being artistically creative with food and colour. Colours for added nutrition, for contrast and for visual harmony. Most of my recipes are also nut-free and plant-based.
+ LONG
+ & This website showcases some of my favourite creations, along with hand draw illustrations for {{each of their ingredients|ingredients-list}}.
+ % about
+ & I am {{Rekka Bellum|http://kokorobot.ca/}}, an illustrator, living on a small sailboat somewhere on the shores of the Pacific Ocean.
+ & You can contact me on my twitter {{@grimgrains|http://twitter.com/grimgrains}}.
+
+INGREDIENTS
+ BREF : Here is an unsorted list of all the ingredients used in GrimGrains recipes!
+ LONG
+ & Select any item below to view recipes in which they were used and to find more information on them!
+
+DISCLAIMER
+ BREF : The content of grimgrains.com, unless stated otherwise, is © Rekka Bell. All rights reserved. Photographs, drawings or text should not be used, published, reprinted or modified without my permission.
+ LONG
+ * Copyright policy
+ & You may adapt one of my grim creations, but be sure to link back to the original recipe and to give proper credit.
+ & Opinions expressed by any third parties are theirs and do not reflect my own.
+ * Disclaimer
+ & All recipes featured on grimgrains.com are my own, unless stated otherwise. The information is for food enthusiasts like myself, i do not claim to be an all-knowing food guru. Nor am I a health professional. My views are my own, i encourage curiosity whenever possible.
+ * Privacy statement
+ & Ads on the website are from third parties such as google, who may store information about your online coming and goings to provide personalized advertisements. All concerns about browsing privacy should be addressed to google.
+ & Any visitor personal information will be kept private and will not be shared/sold to another party. I am not responsible for the privacy practices or actions of any of my blog commenters.
+ & I reserve the right to alter the blog at my own discretion, as well as to filter comments without notice.
+ & Words addressed to me in private will not be shared, nor will i use any of it in future publications.
+`+
\ No newline at end of file
diff --git a/scripts/graph.js b/scripts/graph.js
@@ -64,19 +64,20 @@ function graph()
Ø("print").cast({x:26,y:4},PrintNode)
Ø("model").mesh({x:6,y:0},[
- Ø("router").cast({x:2,y:2},RouterNode),
- Ø("database").cast({x:2,y:8},DatabaseNode),
+ Ø("router").cast({x:5,y:2},RouterNode),
+ Ø("database").cast({x:5,y:8},DatabaseNode),
Ø("recipes").cast({x:2,y:14},DictionaryNode),
Ø("ingredients").cast({x:5,y:14},DictionaryNode),
+ Ø("pages").cast({x:8,y:14},DictionaryNode),
])
- Ø("view").mesh({x:15,y:0},[
+ Ø("view").mesh({x:18,y:0},[
Ø("template").cast({x:2,y:2},TemplateNode),
Ø("body").cast({x:2,y:8},ElementNode),
])
Ø("router").syphon("database")
- Ø("database").syphon(["recipes","ingredients"])
+ Ø("database").syphon(["recipes","ingredients","pages"])
Ø("template").syphon("body")
diff --git a/scripts/lib/riven.js b/scripts/lib/riven.js
@@ -208,10 +208,14 @@ var PORT_TYPES = {default:"default",input:"input",output:"output",request:"reque
var ROUTE_TYPES = {default:"default",request:"request"}
var NODE_GLYPHS = {
default: "M150,60 L150,60 L60,150 L150,240 L240,150 Z",
- router:"M60,60 L60,60 L240,60 M120,120 A30,30 0 0,1 150,150 M150,150 A30,30 0 0,0 180,180 M180,180 L180,180 L240,180 M120,120 L120,120 L60,120 M60,240 L60,240 L240,240 M240,120 L240,120 L180,120 M60,180 L60,180 L120,180",
+ router:"M60,120 L60,120 L150,120 L240,60 M60,150 L60,150 L240,150 M60,180 L60,180 L150,180 L240,240",
+ parser:"M60,60 L60,60 L240,60 M120,120 A30,30 0 0,1 150,150 M150,150 A30,30 0 0,0 180,180 M180,180 L180,180 L240,180 M120,120 L120,120 L60,120 M60,240 L60,240 L240,240 M240,120 L240,120 L180,120 M60,180 L60,180 L120,180",
entry:"M60,150 L60,150 L240,150 L240,150 L150,240 M150,60 L150,60 L240,150",
bang:"M150,60 L150,60 L150,180 M150,240 L150,240 L150,240",
value:"M60,60 L60,60 L240,60 L240,240 L60,240 Z M60,150 L60,150 L240,150",
equal:"M60,60 L60,60 L240,60 M60,120 L60,120 L240,120 M60,180 L60,180 L240,180 M60,240 L60,240 L240,240",
render:"M60,60 L60,60 L240,60 L240,240 L60,240 Z M240,150 L240,150 L150,150 L150,240",
+ database:"M60,60 L60,60 L240,60 L240,240 L60,240 Z M120,120 L120,120 L180,120 M120,180 L120,180 L180,180 M120,150 L120,150 L180,150",
+ cache:"M60,60 L60,60 L240,60 L240,240 L60,240 Z",
+ builder:"M60,60 L60,60 L150,120 L240,120 M60,150 L60,150 L240,150 M60,240 L60,240 L150,180 L240,180",
}
diff --git a/scripts/nodes/database.js b/scripts/nodes/database.js
@@ -2,7 +2,7 @@ function DatabaseNode(id,rect)
{
Node.call(this,id,rect);
- this.glyph = NODE_GLYPHS.entry
+ this.glyph = NODE_GLYPHS.cache
this.cache = null;
diff --git a/scripts/nodes/dictionary.js b/scripts/nodes/dictionary.js
@@ -2,7 +2,7 @@ function DictionaryNode(id,rect)
{
Node.call(this,id,rect);
- this.glyph = NODE_GLYPHS.router
+ this.glyph = NODE_GLYPHS.database
this.answer = function(q)
{
diff --git a/scripts/nodes/router.js b/scripts/nodes/router.js
@@ -8,18 +8,18 @@ function RouterNode(id,rect)
this.receive = function(q)
{
var db = this.request("database").database;
-
- console.log(q,find(q,db))
-
- var page = {type:"custom"}
- this.send(page)
+ var type = find(q,db)
+ this.send({
+ name:q,
+ type:type,
+ body:db[type].hash[q]
+ })
}
function find(key,db)
{
for(id in db){
var table = db[id].hash
- console.log(table)
if(table[key]){
return id
}
diff --git a/scripts/nodes/template.js b/scripts/nodes/template.js
@@ -2,5 +2,10 @@ function TemplateNode(id,rect)
{
Node.call(this,id,rect);
- this.glyph = NODE_GLYPHS.entry
+ this.glyph = NODE_GLYPHS.builder
+
+ this.receive = function(page)
+ {
+ console.log(page)
+ }
}
\ No newline at end of file
