From b335e39baaf5929ee094996213812e7b6d22bc00 Mon Sep 17 00:00:00 2001 From: alicestrt Date: Thu, 15 Oct 2020 16:46:23 +0200 Subject: [PATCH] added group 1 --- static/css/style.css | 15 ++++++-- static/js/d3_map.js | 6 +-- static/js/group1.json | 90 +++++++++++++++++++++++++++++++++++++++++++ testing/test.json | 74 ++++++++++++++++++++++++++--------- 4 files changed, 160 insertions(+), 25 deletions(-) create mode 100644 static/js/group1.json diff --git a/static/css/style.css b/static/css/style.css index f4187eb..11d177f 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -6,13 +6,13 @@ /*Main areas*/ .map_area { text-align: center; - margin-top: 200px; + margin-top: 20px; height:80%; } .media_area { margin-top: 10px; padding-right: 20px; - height:100%; + height:100%; } .media_area img { @@ -20,6 +20,16 @@ height: 150px; } +.link { + stroke: #ccc; +} + +.node text { + pointer-events: none; + font: 10px sans-serif; +} + + svg{ width:100%; height:200%; } path{ @@ -134,4 +144,3 @@ draggable { pointer-events: none; font: 1em sans-serif; } - diff --git a/static/js/d3_map.js b/static/js/d3_map.js index 7af9261..e850d66 100644 --- a/static/js/d3_map.js +++ b/static/js/d3_map.js @@ -11,7 +11,7 @@ var force = d3.layout.force() .charge(-100) .size([width, height]); -d3.json("/static/js/test.json", function(error, json) { +d3.json("/static/js/group1.json", function(error, json) { if (error) throw error; force @@ -71,7 +71,7 @@ d3.json("/static/js/test.json", function(error, json) { // audio1.play(); }); - + $("#muharrem").click(function(){$("#showmuharrem").fadeIn() console.log("around") var muh = document.getElementById("textmuharrem"); @@ -86,7 +86,7 @@ d3.json("/static/js/test.json", function(error, json) { if (!$(e.target).parents().andSelf().is('#dadaloglu')) { $("#showdadaloglu").fadeOut(); $("#audiodadaloglu").trigger('pause'); - + }; if (!$(e.target).parents().andSelf().is('#muharrem')) { $("#showmuharrem").fadeOut(); diff --git a/static/js/group1.json b/static/js/group1.json new file mode 100644 index 0000000..a452ddd --- /dev/null +++ b/static/js/group1.json @@ -0,0 +1,90 @@ +{ + "nodes": [ + { + "name": "Dadaloğlu", + "group": 1, + "id":"dadaloglu" + }, + { + "name": "Dedekorkut", + "group": 1 + }, + { + "name": "Aşık Nesimi", + "group": 1 + }, + { + "name": "Aşık Ali İzzet", + "group": 1 + }, + { + "name": "Karacaoğlan", + "group": 1 + }, + { + "name": "Aşık Veysel", + "group": 1 + } + , + { + "name": "Neşet Ertaş", + "group": 1 + } + , + { + "name": "Muharrem Ertaş", + "group": 1, + "id":"muharrem" + + } + , + { + "name": "Ali Ekber Çiçek", + "group": 1 + } + , + { + "name": "Dedeoğlu", + "group": 1 + } + , + { + "name": "Pir Sultan Abdal", + "group": 1 + }, + { + "name": "Yunus Emre", + "group": 1 + }, + { + "name": "Kul Nesimi", + "group": 1 + }, + { + "name": "Kaygusuz Abdal", + "group": 1 + } + ], + "links": [ + { + "source": 8, + "target": 0, + "value": 1 + }, + { + "source": 4, + "target": 11, + "value": 1 + }, + { + "source": 14, + "target": 11, + "value": 1 + }, + { + "source": 2, + "target": 11, + "value": 1 + } + ] +} diff --git a/testing/test.json b/testing/test.json index ea85be8..7ce8807 100644 --- a/testing/test.json +++ b/testing/test.json @@ -1,51 +1,87 @@ { "nodes": [ { - "name": "Dadaloglu", + "name": "Dadaloğlu", "group": 1, "id":"dadaloglu" }, { - "name": "Muharrem Ertas", + "name": "Dedekorkut", "group": 1 }, { - "name": "Asik Veysel", + "name": "Aşık Nesimi", "group": 1 }, { - "name": "test1", - "group": 2 + "name": "Aşık Ali İzzet", + "group": 1 }, { - "name": "test2", - "group": 2 + "name": "Karacaoğlan", + "group": 1 + }, + { + "name": "Aşık Veysel", + "group": 1 } - ], - "links": [ + , { - "source": 1, - "target": 0, - "value": 1 + "name": "Neşet Ertaş", + "group": 1 + } + , + { + "name": "Muharrem Ertaş", + "group": 1 + } + , + { + "name": "Ali Ekber Çiçek", + "group": 1 + } + , + { + "name": "Dedeoğlu", + "group": 1 + } + , + { + "name": "Pir Sultan Abdal", + "group": 1 }, { - "source": 2, + "name": "Yunus Emre", + "group": 1 + }, + { + "name": "Kul Nesimi", + "group": 1 + }, + { + "name": "Kaygusuz Abdal", + "group": 1 + } + ], + "links": [ + { + "source": 8, "target": 0, "value": 1 }, { - "source": 2, - "target": 1, + "source": 4, + "target": 11, "value": 1 }, { - "source": 3, - "target": 2, + "source": 14, + "target": 11, "value": 1 }, { - "source": 4, - "target": 3, + "source": 2, + "target": 11, "value": 1 } ]