From c780aa5fba02b27019c6f956bb1d028e6b6fe61f Mon Sep 17 00:00:00 2001
From: QiTao <qitaoweng@gmail.com>
Date: Sun, 9 Feb 2020 05:55:07 -0600
Subject: [PATCH] Stopped root page from exporting as html and fix URL for icon

---
 app/assets/export-template.html      | 2 +-
 app/controllers/Export.controller.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/export-template.html b/app/assets/export-template.html
index 009056a..8043116 100644
--- a/app/assets/export-template.html
+++ b/app/assets/export-template.html
@@ -61,7 +61,7 @@
         <div class="row">
             <div class="col-sm-3 navsec">
                 <nav class="navbar navbar-dark bg-dark flex-column">
-                    <a class="navbar-brand" href="#"><img src="/logo/Asset+1.svg" width="30" height="30" class="d-inline-block align-top" alt="">Noded</a>
+                    <a class="navbar-brand" href="#"><img src="https://hack20.glmdev.tech/assets/logo/3x/logo3x.png" width="30" height="30" class="d-inline-block align-top" alt="">Noded</a>
                     <div class="nav nav-pills flex-column">
                         %%SIDEBAR%%
                     </div>
diff --git a/app/controllers/Export.controller.js b/app/controllers/Export.controller.js
index 8b5924e..8fc1734 100644
--- a/app/controllers/Export.controller.js
+++ b/app/controllers/Export.controller.js
@@ -23,7 +23,7 @@ class Export extends Controller {
         const pages = await Page.find({ OrgUserId: user._id })
 
         const ExportData = {}
-        for (const page of pages) {
+        for (const page of pages) { //for all pages of the user, generate a copy of the data
             const nodes = await Node.find({ PageId: page.UUID })
 
             const PageData = { ...page }
@@ -84,7 +84,7 @@ class Export extends Controller {
         const Page = this.models.get('api:Page')
         const Node = this.models.get('api:Node')
         const user = req.user
-        const pages = await Page.find({ OrgUserId: user._id })
+        const pages = await Page.find({ OrgUserId: user._id, ParentId: { $ne: '0' } })
         const mapping = {} //keeps track of html file UUID and file name
         const page0 = await user.get_root_page() //topmost page
 
@@ -121,12 +121,12 @@ class Export extends Controller {
         const Node = this.models.get('api:Node')
         const virt_root = await user.get_root_page()
         return await this._sidebar_recurse(mapping, virt_root)
-        
+
     }
     async _sidebar_recurse(mapping, parent) {
         const Page = this.models.get('api:Page')
         const Node = this.models.get('api:Node')
-        const children = await Page.find({ ParentId : parent.UUID})
+        const children = await Page.find({ ParentId: parent.UUID })
         let base = ''
         for (const child of children) {
             if (child.ChildPageIds.length === 0) {