From 6a43cd05abf6be7d30e405f2e797738ffeaf659a Mon Sep 17 00:00:00 2001 From: Bobby Date: Mon, 21 Mar 2022 01:28:56 -0400 Subject: update posts function --- public/views/dashboard.html | 15 +++-- public/views/editPost.html | 137 ++++++++++++++++++++++++++++++++++++++ routes/admin.js | 31 ++++++++- routes/blog.js | 49 ++++++++++++-- routes/index.js | 3 +- routes/posts.js | 1 - static/assets/js/pages/publish.js | 75 +++++++++++++++++++++ 7 files changed, 294 insertions(+), 17 deletions(-) create mode 100644 public/views/editPost.html create mode 100644 static/assets/js/pages/publish.js diff --git a/public/views/dashboard.html b/public/views/dashboard.html index 8692bb4..03dd653 100644 --- a/public/views/dashboard.html +++ b/public/views/dashboard.html @@ -18,13 +18,13 @@
- That Computer Scientist + That Computer Scientist
@@ -35,7 +35,7 @@
    -
  • All Posts
    • +
  • All Posts
  • Add Post
  • Manage Comments
  • Manage Users
    • @@ -87,6 +87,7 @@ editButton.className = 'btn btn-primary'; editButton.innerHTML = 'Edit Post'; editButton.style.marginRight = '15px'; + editButton.href = `/admin/dashboard/edit/${post.slug}`; const deleteButton = document.createElement('a'); deleteButton.className = 'btn btn-danger'; deleteButton.innerHTML = 'Delete Post'; @@ -101,7 +102,7 @@ leadParagraphCotainer.appendChild(editButtonContainer); posts.appendChild(leadParagraphCotainer); }) - }, + }, error: (err) => { console.log(err); } diff --git a/public/views/editPost.html b/public/views/editPost.html new file mode 100644 index 0000000..371b455 --- /dev/null +++ b/public/views/editPost.html @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + Dashboard - Add New Post + + + + +
    +
    +
    + + That Computer Scientist +
    + +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +

    Editing Post

    +
    +
    +
    +
    + + +
    +
    + + +
    +
    +

    Render + Preview

    +
    +
    +
    + + +
    +
    + + +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/routes/admin.js b/routes/admin.js index b6afab7..260f343 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -1,5 +1,8 @@ const express = require("express"); const router = express.Router(); +const cheerio = require("cheerio"); +const fs = require("fs"); +const firebase = require("../firebase"); router.get("/dashboard", function (req, res) { res.render("dashboard.html"); @@ -7,7 +10,33 @@ router.get("/dashboard", function (req, res) { router.get("/dashboard/new", function (req, res) { res.render("createPost.html"); -}) +}); + +router.get("/dashboard/edit/:slug", function (req, res) { + var html = fs.readFileSync( + __dirname + "/../public/views/editPost.html", + "utf8" + ); + var $ = cheerio.load(html); + const store = firebase.firestore(); + let query = store.collection("posts"); + query = query.where("slug", "==", req.params.slug); + query + .get() + .then(function (querySnapshot) { + querySnapshot.forEach(function (doc) { + $("#title").val(doc.data().title); + $("#content").val(Buffer.from(doc.data().content, "base64").toString()); + $("#tags").val(doc.data().tags); + $("#publishDate").val(doc.data().publishDate); + }); + }) + .then(() => { + const publishScript = ``; + $("body").append(publishScript); + res.send($.html()); + }); +}); router.get("/", (req, res) => { // Send admin.html from public folder diff --git a/routes/blog.js b/routes/blog.js index fbdc1f2..8a8cb19 100644 --- a/routes/blog.js +++ b/routes/blog.js @@ -7,13 +7,50 @@ router.get("/posts", (req, res) => { const posts = []; let query = store.collection("posts"); query = query.select("slug", "tags", "title", "shortText", "publishDate"); - query.get().then(function (querySnapshot) { - querySnapshot.forEach(function (doc) { - posts.push(doc.data()); + query + .get() + .then(function (querySnapshot) { + querySnapshot.forEach(function (doc) { + posts.push(doc.data()); + }); + }) + .then(() => { + res.json(posts); + }); +}); + +router.put("/update/:slug", (req, res) => { + const store = firebase.firestore(); + const { title, content, tags, publishDate, shortText, slug } = req.body; + const base64 = Buffer.from(content).toString("base64"); + const post = { + title, + content: base64, + tags: String(tags).split(",").length > 0 ? String(tags).split(",") : [], + publishDate, + shortText, + slug, + }; + let query = store.collection("posts"); + query = query.where("slug", "==", slug); + query + .get() + .then(function (querySnapshot) { + querySnapshot.forEach(function (doc) { + doc.ref.update({ + title: post.title, + content: post.content, + tags: post.tags, + publishDate: post.publishDate, + }); + }); + }) + .then(() => { + res.json({ success: true }); + }) + .catch((err) => { + res.json({ success: false, err }); }); - }).then(() => { - res.json(posts); - }); }); router.post("/new", (req, res) => { diff --git a/routes/index.js b/routes/index.js index 659d50d..605f6ad 100644 --- a/routes/index.js +++ b/routes/index.js @@ -13,8 +13,8 @@ const home = require("./home"); router.use("/admin", admin); router.use("/api/blog", blog); router.use("/", repositories); -router.use("/", posts); router.use("/", home); +router.use("/", posts); // Create the routes @@ -22,6 +22,5 @@ router.get("/about", (req, res) => { res.render("about.html"); }); - // Export the routes module.exports = router; diff --git a/routes/posts.js b/routes/posts.js index bc22670..00b092f 100644 --- a/routes/posts.js +++ b/routes/posts.js @@ -6,7 +6,6 @@ const router = express.Router(); const marked = require("marked"); const hljs = require("highlight.js"); - router.get("/posts/:id", function (req, res) { const id = req.params.id; // get single document where slug === id diff --git a/static/assets/js/pages/publish.js b/static/assets/js/pages/publish.js new file mode 100644 index 0000000..7349fac --- /dev/null +++ b/static/assets/js/pages/publish.js @@ -0,0 +1,75 @@ +window.addEventListener("DOMContentLoaded", () => { + const content = document.getElementById("content"); + const renderPreview = document.getElementById("renderPreview"); + marked.setOptions({ + highlight: function (code) { + return hljs.highlightAuto(code).value; + }, + }); + content.addEventListener("input", () => { + renderPreview.innerHTML = marked.parse(content.value); + renderMathInElement(renderPreview, { + // customised options + // • auto-render specific keys, e.g.: + delimiters: [ + { left: "$$", right: "$$", display: true }, + { left: "$", right: "$", display: false }, + { left: "\\(", right: "\\)", display: false }, + { left: "\\[", right: "\\]", display: true }, + ], + // • rendering keys, e.g.: + throwOnError: false, + }); + }); +}); +$(document).on("click", "#publishPost", () => { + document.getElementById("error").classList.add("hidden"); + const content = $("#content").val(); + const title = $("#title").val(); + const publishDate = $("#publishDate").val(); + const slug = title + .toLowerCase() + .replace(/ /g, "-") + .replace(/[^\w-]+/g, ""); + const tags = $("#tags").val(); + if (title === "" || publishDate === "") { + document.getElementById("error").classList.remove("hidden"); + return; + } else { + // Publish post to api/blog/new + const body = { + title: title, + publishDate: publishDate, + tags: tags, + content: content, + shortText: marked.parse(content.substring(0, 120) + "..."), + slug: slug, + }; + if (window.location.href.includes(slug)) { + // Update post + $.ajax({ + url: `/api/blog/update/${slug}`, + type: "PUT", + data: body, + success: function (data) { + window.location.href = `/posts/${slug}`; + }, + error: function (err) { + console.log(err); + }, + }); + } else { + $.ajax({ + url: "/api/blog/new", + type: "POST", + data: body, + success: (data) => { + window.location.href = "/admin/dashboard"; + }, + error: (err) => { + console.log(err); + }, + }); + } + } +}); -- cgit v1.2.3