diff --git a/client/src/assets/learning_path.svg b/client/src/assets/learning_path.svg new file mode 100644 index 00000000..e69de29b diff --git a/client/src/components/circle/CircleDiagram.vue b/client/src/components/circle/CircleDiagram.vue index e850a3a7..3f2e4ef6 100644 --- a/client/src/components/circle/CircleDiagram.vue +++ b/client/src/components/circle/CircleDiagram.vue @@ -1,75 +1,58 @@ - - diff --git a/client/src/components/circle/LearningPathCircleDiagram.vue b/client/src/components/circle/LearningPathCircleDiagram.vue deleted file mode 100644 index 8cc97a90..00000000 --- a/client/src/components/circle/LearningPathCircleDiagram.vue +++ /dev/null @@ -1,299 +0,0 @@ - - - - - diff --git a/client/src/components/circle/LearningPathDiagram.vue b/client/src/components/circle/LearningPathDiagram.vue new file mode 100644 index 00000000..42f3aa1a --- /dev/null +++ b/client/src/components/circle/LearningPathDiagram.vue @@ -0,0 +1,352 @@ + + + + diff --git a/client/src/components/circle/italy.json b/client/src/components/circle/italy.json new file mode 100644 index 00000000..e69de29b diff --git a/client/src/components/circle/map.html b/client/src/components/circle/map.html new file mode 100644 index 00000000..6b6499c3 --- /dev/null +++ b/client/src/components/circle/map.html @@ -0,0 +1,10 @@ + + + + + $Title$ + + +$END$ + + diff --git a/client/src/views/HomeView.vue b/client/src/views/HomeView.vue index de8b39f2..35d4e0b9 100644 --- a/client/src/views/HomeView.vue +++ b/client/src/views/HomeView.vue @@ -10,7 +10,7 @@ import MainNavigationBar from '@/components/MainNavigationBar.vue';
Styelguide Login - + Lernpfad "Versicherungsvermittlerin" (Login benötigt) Circle "Analyse" (Login benötigt)
diff --git a/client/src/views/LearningPathView.vue b/client/src/views/LearningPathView.vue index 1f54ea75..52f53ac0 100644 --- a/client/src/views/LearningPathView.vue +++ b/client/src/views/LearningPathView.vue @@ -3,16 +3,19 @@ import axios from 'axios'; import * as log from 'loglevel'; import MainNavigationBar from '../components/MainNavigationBar.vue'; -import SimpleCircleDiagram from '../components/circle/LearningPathCircleDiagram.vue'; +import LearningPathDiagram from '../components/circle/LearningPathDiagram.vue'; + export default { - components: {MainNavigationBar, SimpleCircleDiagram}, + + + components: {MainNavigationBar, LearningPathDiagram}, props: ['learningPathSlug',], data() { return { count: 0, learningPathData: {}, - learningPathContents: {}, + learningPathContents: null, circles: [], learningSequences: [], } @@ -23,39 +26,32 @@ export default { method: 'get', url: `/learnpath/api/learningpath/${this.learningPathSlug}/`, }).then((response) => { + this.learningPathData = response.data - - let learningPathContents = { topics: [] } - let topic = { - id : 0, - title : '', - slug : '', - type : 'learnpath.Topic', - translation_key : '', - is_visible : false, - cirlces : [] - } - + let learningPathContents = {topics: []} + let topic = { + id: 0, + title: '', + slug: '', + type: 'learnpath.Topic', + translation_key: '', + is_visible: false, + cirlces: [] + } response.data.children.forEach((child) => { if (child.type === 'learnpath.Topic') { - if (topic.id != 0){ - learningPathContents.topics.push(topic) + if (topic.id != 0) { + learningPathContents.topics.push(child) } - topic = child topic.circles = [] } if (child.type === 'learnpath.Circle') { - console.log(child) topic.circles.push(child) } }); learningPathContents.topics.push(topic) - console.log(learningPathContents) - console.log('oskadfjnmlasdmflkmsadlf') - - this.learningPathContents = learningPathContents; }); @@ -67,16 +63,17 @@ export default {