From 92dfe673914668ba7bccba139979b26b5181b531 Mon Sep 17 00:00:00 2001 From: Ro Date: Thu, 9 Jul 2020 12:57:03 -0700 Subject: [PATCH] removed tag pages where corresponding page is not published or deleted, fixed settings button overlay so its not blocking links --- brain/data/Render.js | 16 +++++++++++----- package.json | 4 ++-- src/styles/main/_settings.styl | 4 +++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/brain/data/Render.js b/brain/data/Render.js index 82093e3..da4e8d5 100644 --- a/brain/data/Render.js +++ b/brain/data/Render.js @@ -184,13 +184,19 @@ export default class Render { let page = pages[i]; //TODO: filter for deleted and unpublished pages - if (_.includes(page.metadata.tags, tag.tag_name)) { - pageList.push({ - title: page.metadata.title, - slug: page.metadata.slug - }); + if ( + page.metedata.deleted === false && + page.metadata.published === true + ) { + if (_.includes(page.metadata.tags, tag.tag_name)) { + pageList.push({ + title: page.metadata.title, + slug: page.metadata.slug + }); + } } } + console.log('TAG LIST', tag.tag_name + ' count:' + pageList.length); renderList.push({ tag: tag.tag_name, tag_list: pageList, slug: tag.slug }); } let response = []; diff --git a/package.json b/package.json index 72f14f1..840fd2f 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "dev": "nodemon -r esm init.js --ignore node_modules/ -e js", "debug": "nodemon inspect -r esm init.js --ignore node_modules/ -e js", "prettier-watch": "npx onchange '**/*.js' -- npx prettier --write {{changed}}", - "watch-back": "stylus -w -m -o public/assets/css src/styles/dash.styl & parcel watch src/com/Start.js --out-dir public/assets/scripts --out-file dash.min.js --public-url /assets/scripts", + "watch": "stylus -w -m -o public/assets/css src/styles/dash.styl & parcel watch src/com/Start.js --out-dir public/assets/scripts --out-file dash.min.js --public-url /assets/scripts", "build-back-kit": "uglifyjs src/libraries/highlight.pack.js node_modules/sortablejs/Sortable.min.js node_modules/scramble-text/dist/ScrambleText.min.js node_modules/reframe.js/dist/reframe.min.js -c -o public/assets/scripts/dashkit.min.js" }, "engines": { @@ -65,4 +65,4 @@ "scramble-text": "0.0.8", "stylus": "^0.54.7" } -} +} \ No newline at end of file diff --git a/src/styles/main/_settings.styl b/src/styles/main/_settings.styl index 43d4952..28e8481 100644 --- a/src/styles/main/_settings.styl +++ b/src/styles/main/_settings.styl @@ -1,7 +1,9 @@ #settings-actions position fixed - width 100% + width 40% margin-top -85px + left 50% + margin-left -20% #buttons width 155px margin 0 auto