Merge branch 'shapes'

src/components/user-interface.vue

@@ -43,25 +43,32 @@ export default {
         'green',
         'blue',
         'yellow',
-        'magenta',
         'cyan',
-        'purple'
     ];
 
     data.forEach(element => {
       //index = index + 20
 
-      var rect_1 = nodes.group().translate(element.xpos, element.ypos).draggy({minX: 0,
+    var knowledgeObj = nodes.group().translate(element.xpos, element.ypos).draggy({minX: 0,
     minY: 0,
     maxX: 600,
     maxY: 300})
-      
-      rect_1.rect(150, 40).attr({
+    
+    if (element.type == "projecttxt"){
+   
+      knowledgeObj.rect(60, 40).attr({
+          fill: colours[Math.floor(Math.random() * colours.length)]
+      })
+}else if (element.type == "slidedeck"){
+   knowledgeObj.circle(30, 30).attr({
           fill: colours[Math.floor(Math.random() * colours.length)]
       })
 
-      rect_1.text(element.owner)
-      
+
+}
+      var type = knowledgeObj.text(element.type)
+      var owner = knowledgeObj.text(element.owner)
+      owner.move(0,40)
         
   //  rect_1.connectable({
   //    container: links,