committing before getting more from keriann

Author: LOLDragoon

src/components/CodeSnippet.vue

@@ -93,11 +93,16 @@ export default {
           nestedString += `<${child}/>\n`
         }
         else{
-        nestedString += htmlElementMap[child.text][0]
-        nestedString += '\n';
-        nestedString += writeNested(child.children,indented)
-        nestedString += indented + htmlElementMap[child.text][1]
-        nestedString += '\n'
+          if(child.children.length){
+            nestedString += htmlElementMap[child.text][0]
+            nestedString += '\n';
+            nestedString += writeNested(child.children,indented)
+            nestedString += indented + htmlElementMap[child.text][1]
+            nestedString += '\n'
+          }
+           else{
+            nestedString += htmlElementMap[child.text][0]+htmlElementMap[child.text][1]+'\n';
+          }
         }
       })
       return nestedString
@@ -114,12 +119,17 @@ export default {
         }
         else{
         outputStr += `    `;
-        outputStr += htmlElementMap[el.text][0];
-        outputStr += '\n'
-        outputStr += writeNested(el.children,`    `)
-        outputStr += `    `
-        outputStr += htmlElementMap[el.text][1];
-        outputStr += `  \n`;
+          if(el.children.length){
+          outputStr += htmlElementMap[el.text][0];
+          outputStr += '\n'
+          outputStr += writeNested(el.children,`    `)
+          outputStr += `    `
+          outputStr += htmlElementMap[el.text][1];
+          outputStr += `  \n`;
+          }
+          else{
+            outputStr += htmlElementMap[el.text][0]+htmlElementMap[el.text][1]+'\n';
+          }
         }
       }
       // console.log(`outputStr from writeTemplateTag: ${outputStr}`)

src/components/ComponentDisplay.vue

@@ -138,19 +138,11 @@ export default {
         // console.log('component parent',component.parent)
         // console.log('component parent parent', component.parent.parent)
         if (!Object.keys(component.parent).length) return lineage;
-<<<<<<< HEAD
         for(var parents in component.parent) {
           //for each parent in our component
           // console.log('parents', parents)
           lineage.push(parents); //push the parent into lineage
           // console.log('lineage pre push', component, lineage)
-=======
-        for (var parents in component.parent) {
-          // for each parent in our component
-          console.log('parents', parents)
-          lineage.push(parents); // push the parent into lineage
-          console.log('lineage pre push', component, lineage)
->>>>>>> c3465a8ee7303f95f469f78b7ab5d89214b77193
           checkParents(component.parent[parents], lineage);
           // console.log('lineage post recursive call', lineage)
         }