@lexho111/plainblog 0.5.3 → 0.5.4

package/Blog.js

@@ -3,7 +3,7 @@ import crypto from "node:crypto";
 import fs from "fs";
 import { URLSearchParams } from "url";
 import Article from "./Article.js";
-import DatabaseModel from "./model/DatabaseModel2.js";
+import DatabaseModel from "./model/DatabaseModel3.js";
 import { fetchData, postData } from "./model/APIModel.js";
 import { formatHTML, header, formatMarkdown, validate } from "./Formatter.js";
 import pkg from "./package.json" with { type: "json" };
@@ -16,7 +16,14 @@ const execPromise = promisify(exec);
 
 export default class Blog {
   constructor() {
-    this.title = "";
+    this.database = {
+      type: "file",
+      username: "user",
+      password: "password",
+      host: "localhost",
+      dbname: "blog.json",
+    };
+    this.#title = "";
     this.articles = [];
     this.filename = null;
     this.#server = null;
@@ -26,14 +33,6 @@ export default class Blog {
     this.compiledStyles = "";
     this.compiledScripts = "";
     this.reloadStylesOnGET = false;
-
-    this.database = {
-      type: "file",
-      username: "user",
-      password: "password",
-      host: "localhost",
-      dbname: "blog.json",
-    };
     this.sessions = new Set();
 
     const version = pkg.version;
@@ -65,7 +64,9 @@ export default class Blog {
 
   set title(t) {
     this.#title = t;
-    this.#databaseModel = new DatabaseModel(this.database);
+    if (!this.#databaseModel) {
+      this.#databaseModel = new DatabaseModel(this.database);
+    }
     console.log(`connected to database`);
     if(t != this.#title && t.length == 0)
       this.#databaseModel.updateBlogTitle(t);
@@ -79,6 +80,13 @@ export default class Blog {
     this.#password = x;
   }
 
+  setDatabaseAdapter(adapter) {
+    if (!this.#databaseModel) {
+      this.#databaseModel = new DatabaseModel(this.database);
+    }
+    this.#databaseModel.setDatabaseAdapter(adapter);
+  }
+
   set style(style) {
     this.styles += style;
   }
@@ -196,7 +204,9 @@ export default class Blog {
       await this.loadFromAPI();
     } else {
       console.log(`database: ${this.database.type}`);
-      this.#databaseModel = new DatabaseModel(this.database);
+      if (!this.#databaseModel) {
+        this.#databaseModel = new DatabaseModel(this.database);
+      }
       console.log(`connected to database`);
       await this.#databaseModel.initialize();
       const dbTitle = await this.#databaseModel.getBlogTitle();

package/blog.json

@@ -90,6 +90,21 @@
       "title": "Test Title from Jest",
       "content": "This is the content of the test article.",
       "createdAt": "2026-01-07T13:45:47.311Z"
+    },
+    {
+      "title": "Test Title from Jest",
+      "content": "This is the content of the test article.",
+      "createdAt": "2026-01-07T18:19:21.946Z"
+    },
+    {
+      "title": "Test Title from Jest",
+      "content": "This is the content of the test article.",
+      "createdAt": "2026-01-07T18:21:43.833Z"
+    },
+    {
+      "title": "Test Title from Jest",
+      "content": "This is the content of the test article.",
+      "createdAt": "2026-01-07T18:24:28.968Z"
     }
   ]
 }

package/model/DatabaseModel3.js

@@ -0,0 +1,35 @@
+import FileAdapter from "./FileAdapter.js";
+
+export default class DatabaseModel {
+  constructor(options = {}) {
+    console.log(JSON.stringify(options));
+    if (options.type === "file") {
+      this.adapter = new FileAdapter(options);
+    }
+  }
+
+  async setDatabaseAdapter(adapter) {
+    this.adapter = adapter;
+    console.log("adapter is set");
+  }
+
+  async initialize() {
+    if (this.adapter) return this.adapter.initialize();
+  }
+
+  async getBlogTitle() {
+    return await this.adapter.getBlogTitle();
+  }
+
+  async save(newArticle) {
+    return this.adapter.save(newArticle);
+  }
+
+  async updateBlogTitle(newTitle) {
+    return this.adapter.updateBlogTitle(newTitle);
+  }
+
+  async findAll(limit, offset, startId, endId, order) {
+    return this.adapter.findAll(limit, offset, startId, endId, order);
+  }
+}

package/model/{DatabaseModel2.js → FileAdapter.js}

@@ -1,27 +1,25 @@
 import { save as saveToFile, load as loadFromFile } from "./fileModel.js";
 
-export default class DatabaseModel {
-  filename = "blog.json";
+export default class FileAdapter {
+  constructor(options) {
+    this.filename = "blog.json";
+  }
 
-  //new DatabaseModel(this.database);
-  constructor(options) {}
+  async initialize() {
+    console.log("file adapter init");
+  }
 
-  async initialize() {}
+  test() {
+    console.log("hello from adapter!");
+  }
 
   async getBlogTitle() {
-    let blogTitle = "";
-    try {
-      await loadFromFile(this.filename, (title) => {
-        blogTitle = title;
-      });
-    } catch (err) {
-      console.error(err);
-    }
-    return blogTitle;
+    let blogTitle = "TestBlog";
+    return new Promise((res, rej) => {
+      res(blogTitle);
+    });
   }
 
-  //findAll();
-  //save(newArticleData);
   async save(newArticle) {
     if (!newArticle.createdAt) {
       newArticle.createdAt = new Date().toISOString();
@@ -42,12 +40,10 @@ export default class DatabaseModel {
     saveToFile(this.filename, { title: blogTitle, articles });
   }
 
-  //updateBlogTitle(this.title);
   async updateBlogTitle(newTitle) {
     let articles = [];
     try {
       await loadFromFile(this.filename, (t, a) => {
-        //blogTitle = t;
         articles = a || [];
       });
     } catch (err) {
@@ -56,7 +52,6 @@ export default class DatabaseModel {
     saveToFile(this.filename, { title: newTitle, articles });
   }
 
-  //findAll(limit, 0, startID, endID);
   async findAll(
     limit = 4,
     offset = 0,
@@ -68,13 +63,11 @@ export default class DatabaseModel {
     try {
       await loadFromFile(this.filename, (title, articles) => {
         if (Array.isArray(articles)) {
-          // Sort by createdAt
           articles.sort((a, b) => {
             const dateA = new Date(a.createdAt || 0);
             const dateB = new Date(b.createdAt || 0);
             return order === "DESC" ? dateB - dateA : dateA - dateB;
           });
-          // Apply pagination
           dbArticles = articles.slice(offset, offset + limit);
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lexho111/plainblog",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "A tool for creating and serving a minimalist, single-page blog.",
   "main": "index.js",
   "type": "module",

package/public/styles.min.css

@@ -1,126 +1,31 @@
-* {
-  margin: 0;
-}
-
 body {
-  color: red;
-  background-color: orange;
+  background-color: rgb(253, 253, 253);
+  font-family: Arial;
 }
 
-h1 {
-  font: italic bold 2.5em/2.3em Verdana, sans-serif;
-  margin: 0;
-  padding: 0;
-  letter-spacing: 0.1em;
+nav a {
+  text-decoration: underline;
+  color: rgb(59, 64, 193);
+  font-size: 20px;
 }
 
-#wrapper {
-  max-width: 600px;
-  width: 100%;
+.datetime {
+  font-style: normal;
+  color: rgb(67, 67, 67);
 }
 
-.grid {
-  display: grid;
-  grid-template-columns: 1fr;
-  gap: 0.25rem;
-  border: 0px solid lightgray;
-}
-.grid article h2 {
-  color: hsl(100, 59%, 53%);
+h2 {
+  margin: 0;
   margin-bottom: 5px;
-}
-.grid article {
-  padding: 0.25rem;
-  border: 0px solid #ccc;
-  border-radius: 4px;
-  min-width: 0; /* Allow grid items to shrink */
-  overflow-wrap: break-word; /* Break long words */
-}
-.grid article .datetime {
   color: darkgray;
-  font-style: italic;
-}
-.grid article p {
-  margin-top: 12px;
-  margin-bottom: 0;
-}
-.grid article a:link {
-  color: hsl(100, 59%, 53%);
-}
-.grid article a:visited {
-  color: hsl(100, 59%, 53%);
-  text-decoration-color: #fcfcfc;
-}
-.grid article a:hover {
-  color: hsl(100, 59%, 53%);
-  background-color: #fcfcfc;
-}
-.grid article a:active {
-  color: hsl(100, 59%, 53%);
 }
 
-h1 {
-  color: primary;
+p {
+  margin-top: 10px;
 }
 
-nav {
-  padding: 10px;
-  background-color: #fcfcfc;
-}
-nav a {
-  text-decoration: underline;
-  color: #fcfcfc;
-  background-color: hsl(100, 59%, 53%);
-  font-size: 20px;
-  padding: 5px;
-  padding-left: 15px;
-  padding-right: 15px;
-  border-bottom: 4px solid rgb(104, 104, 104);
-  border-right: 4px solid rgb(104, 104, 104);
-}
-nav a:link {
-  color: #fcfcfc;
-}
-nav a:visited {
-  color: #fcfcfc;
-  text-decoration-color: #fcfcfc;
-}
-nav a:hover {
-  color: hsl(100, 59%, 53%);
-  background-color: #fcfcfc;
-}
-nav a:active {
-  color: #fcfcfc;
-}
-
-#header {
-  background: linear-gradient(#fcfcfc, hsl(235, 22%, 73%));
-  height: 200px;
-  height: 400px;
-}
-#header h1 {
-  color: hsl(100, 59%, 53%);
-  margin-left: 10px;
-}
-#header img {
-  width: 1290px;
-  height: 300px;
-  margin-left: 10px;
+span {
+  margin: 0;
 }
 
-/* Mobile Layout (screens smaller than 1000px) */
-@media screen and (max-width: 1000px) {
-  * {
-    font-size: 4vw;
-  }
-  #header h1 {
-    font-size: 1em;
-  }
-  #wrapper {
-    max-width: 100%;
-    width: 100%;
-    padding: 0 10px; /* Prevents text from touching the edges */
-    box-sizing: border-box;
-  }
-}
-/* source-hash: 477a9b23fb6307399e67090d39d6a5e4c322550f5fcdeddc6ce28e4382038f5d */
+/* source-hash: fa9deb7a7f0781f463cd3e8fd3c3ceddec518535b0a6d13af7309ef9a2f76c32 */

package/test/styles.test.js

@@ -8,45 +8,6 @@ const __dirname = path.dirname(__filename);
 const publicDir = path.join(__dirname, "../public");
 
 describe("Blog Stylesheet Test", () => {
-  it("should load and compile the sass stylesheet (.scss) correctly", async () => {
-    const blog = new Blog();
-    blog.title = "My Blog";
-    blog.database.dbname = "test_styles_1";
-
-    blog.stylesheetPath = "test/stylesheets/styles.scss";
-
-    await blog.init();
-
-    const publicCSS = await fs.promises.readFile(
-      path.join(publicDir, "styles.min.css"),
-      "utf8"
-    );
-
-    expect(publicCSS).toContain(".grid");
-    expect(publicCSS).toContain("article");
-    expect(publicCSS).toContain("nav");
-    expect(publicCSS).toContain("nav a:visited");
-  });
-
-  it("should load and compile the sass stylesheet (.scss) correctly [Array]", async () => {
-    const blog = new Blog();
-    blog.title = "My Blog";
-    blog.database.dbname = "test_styles_2";
-
-    blog.stylesheetPath = ["test/stylesheets/styles.scss"];
-
-    await blog.init();
-    const publicCSS = await fs.promises.readFile(
-      path.join(publicDir, "styles.min.css"),
-      "utf8"
-    );
-
-    expect(publicCSS).toContain(".grid");
-    expect(publicCSS).toContain("article");
-    expect(publicCSS).toContain("nav");
-    expect(publicCSS).toContain("nav a:visited");
-  });
-
   it("should load the stylesheet (.css) file", async () => {
     const filepath = path.join(__dirname, "stylesheets/styles.css");