create-gardener 2.0.2 → 2.0.4

package/template/src/backend/controllers/gardener/addPage.ts

@@ -1,5 +1,6 @@
 import type { Request, Response } from "express";
 import fsp from "fs/promises";
+import { access } from "fs/promises";
 import path from 'path';
 
 import { fileURLToPath } from "url";
@@ -7,22 +8,58 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 const frontendDir = path.resolve(__dirname, '..', '..', '..', 'frontend');
+const templateDir = path.join(frontendDir, 'template');
+
+
+
+async function findTemplate(fileName: string) {
+  while (fileName.length !== 0) {
+
+    console.log(fileName)
+    const searchFile = `template.${fileName}.ejs`;
+    console.log(searchFile)
+    const searchPath = path.join(templateDir, searchFile);
+
+    console.log(searchPath)
+    try {
+      await access(searchPath); // ✅ checks if file exists
+      return searchPath;        // return full path immediately
+    } catch {
+      // file does not exist → continue
+    }
+
+    const lastUnderscore = fileName.lastIndexOf('_');
+    if (lastUnderscore === -1) break;
+
+    fileName = fileName.substring(0, lastUnderscore + 1);
+    console.log(fileName);
+  }
+
+  // ❗ explicit failure instead of silent bug
+  throw new Error("Template not found");
+}
 
 export async function addPage(req: Request, res: Response) {
   try {
     const pagename: string = req.body.page;
     const name = pagename.replaceAll('/', '_');
 
-    const templatePath = path.join(frontendDir, 'frontendtemplate.ejs');
+
+
+    const templatePath = await findTemplate(name);//path.join(frontendDir, findTemplate(name)); //path.join(frontendDir, 'frontendtemplate.ejs');
+
+
+
+
     const viewPath = path.join(frontendDir, `views`, `${name}.ejs`);
     const routePath = path.resolve(__dirname, '..', '..', 'routes', 'gardener.route.ts');
     const jsDir = path.join(frontendDir, 'static/pages');
-    const jsFilePath = path.join(jsDir, `${name}.js`);
+    const jsFilePath = path.join(jsDir, `pages.${name}.js`);
 
     const templateContent = await fsp.readFile(templatePath, 'utf8');
     await fsp.writeFile(viewPath, templateContent, "utf8");
 
-    await replaceLastOccurrence(viewPath, '<script', `<script src="/static/pages/${name}.js" type='module'></script>`);
+    await replaceLastOccurrence(viewPath, '<script', `<script src="/static/pages/pages.${name}.js" type='module'></script>`);
 
     const routeEntry = `router.route("${pagename}").get((req: Request, res: Response) => res.render("${name}"));\n`;
     await fsp.appendFile(routePath, routeEntry, "utf8");

package/template/src/backend/controllers/gardener/index.ts

@@ -2,3 +2,4 @@ export * from './imageOptimiser.js';
 export * from './addPage.js';
 export * from './createStatic.js';
 export * from './addComponent.js';
+export * from './saveTemplate.js';

package/template/src/backend/controllers/gardener/saveTemplate.ts

@@ -0,0 +1,60 @@
+import type { Request, Response } from "express";
+import fsp from "fs/promises";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const frontendDir = path.resolve(__dirname, "..", "..", "..", "frontend");
+const templateDir = path.join(frontendDir, "template");
+
+export async function saveTemplate(req: Request, res: Response) {
+  try {
+    const { path: reqPath } = req.body; // ✅ renamed
+
+    const name = reqPath.replaceAll("/", "_");
+
+    const sourceFile = path.join(frontendDir, 'views', `${name}.ejs`);
+
+    const sourceFileContent = await fsp.readFile(sourceFile, "utf-8");
+
+    const targetFileContent = replaceLastOccurrence(
+      sourceFileContent,
+      `/static/pages/pages.${name}.js`,
+      ""
+    );
+
+    // ✅ ensure directory exists
+    await fsp.mkdir(templateDir, { recursive: true });
+
+    await fsp.writeFile(
+      path.join(templateDir, `template.${name}.ejs`),
+      targetFileContent,
+      "utf-8"
+    );
+
+    return res.json({ message: "Template Saved Successfully" });
+  } catch (err) {
+    console.error(err);
+    return res.status(500).json({ message: "Something went wrong" });
+  }
+}
+
+function replaceLastOccurrence(
+  content: string,
+  searchPattern: string,
+  replacementLine: string
+) {
+  const lines = content.split("\n");
+
+  for (let i = lines.length - 1; i >= 0; i--) {
+    if (lines[i]!.includes(searchPattern)) {
+      lines[i] = replacementLine; // ✅ replace cleanly
+      return lines.join("\n");    // ✅ return result
+    }
+  }
+
+  console.warn(`Pattern not found: ${searchPattern}`);
+  return content; // fallback
+}

package/template/src/backend/routes/gardener.route.ts

@@ -1,6 +1,6 @@
 import type { Request, Response } from 'express';
 import { Router } from "express";
-import { addComponent, addPage, createStatic, imageOptimiser } from "../controllers/gardener/index.js";
+import { addComponent, addPage, createStatic, imageOptimiser, saveTemplate } from "../controllers/gardener/index.js";
 
 const router: Router = Router();
 export default router;
@@ -14,6 +14,7 @@ if (process.env.NODE_ENV !== 'production') {
   router.route("/createstatic").get(createStatic);
   router.route('/addcomponent').post(addComponent);
   router.route('/addpage').post(addPage);
+  router.route('/savetemplate').post(saveTemplate);
 }
 
 
@@ -21,12 +22,3 @@ if (process.env.NODE_ENV !== 'production') {
 
 
 router.route('/').get((req: Request, res: Response) => res.render('_'));
-router.route('/login').get((req: Request, res: Response) => res.render('_login'));
-router.route("/test").get((req: Request, res: Response) => res.render("_test"))
-router.route("/rd").get((req: Request, res: Response) => res.render("_rd"));
-router.route("/car").get((req: Request, res: Response) => res.render("_car"));
-router.route("/onemore").get((req: Request, res: Response) => res.render("_onemore"));
-
-router.route("/re").get((req: Request, res: Response) => res.render("_re"));
-router.route("/playground").get((req: Request, res: Response) => res.render("_playground"));
-router.route("/get-started").get((req: Request, res: Response) => res.render("_get-started"));

package/template/src/frontend/static/gardenerDev.js

@@ -20,15 +20,108 @@ else if (localStore === 'false') hotReload = false
 
 
 
+// const addPagebtn = gardener({
+//   t: 'button',
+//   cn: ['pb-1.5', 'flex', 'items-center', 'justify-center', 'h-15', 'w-15', 'bg-green-300', 'fixed', 'bottom-22', 'right-2', 'rounded-full', 'text-5xl'],
+//   children: [{ t: 'span', txt: '+' }],
+//   events: {
+//     click: opnPagedialog
+//   }
+// });
+
+const pagebtns = gardener({
+  t: 'div',
+  cn: [
+    'fixed',
+    'bottom-20',
+    'right-4',
+    'flex',
+    'flex-col',
+    'gap-2',
+    'bg-white',
+    'shadow-lg',
+    'rounded-xl',
+    'p-3',
+    'z-50'
+  ],
+  children: [
+    {
+      t: 'button',
+      cn: [
+        'px-4',
+        'py-2',
+        'bg-blue-500',
+        'text-white',
+        'rounded-lg',
+        'hover:bg-blue-600',
+        'transition'
+      ],
+      children: [{ t: 'span', txt: 'New Page' }],
+      events: {
+        click: opnPagedialog
+      }
+    },
+    {
+      t: 'button',
+      cn: [
+        'px-4',
+        'py-2',
+        'bg-gray-800',
+        'text-white',
+        'rounded-lg',
+        'hover:bg-gray-900',
+        'transition'
+      ],
+      children: [{ t: 'span', txt: 'Save Template' }],
+      events: {
+        click: async () => {
+          const result = await fetch('/savetemplate', {
+            method: 'POST',
+            headers: { "Content-Type": 'application/json' },
+            body: JSON.stringify({ path: window.location.pathname })
+          });
+
+          const data = await result.json(); // ✅ fix
+          alert(data.message);
+        }
+      }
+    }
+  ]
+});
 const addPagebtn = gardener({
-  t: 'button',
-  cn: ['pb-1.5', 'flex', 'items-center', 'justify-center', 'h-15', 'w-15', 'bg-green-300', 'fixed', 'bottom-22', 'right-2', 'rounded-full', 'text-5xl'],
-  children: [{ t: 'span', txt: '+' }],
+  t: 'div',
+  cn: ['fixed', 'bottom-4', 'right-4', 'z-50'],
   events: {
-    click: opnPagedialog
-  }
+    mouseenter: () => appendElement(addPagebtn, pagebtns),
+    mouseleave: () => pagebtns.remove()
+  },
+  children: [
+    {
+      t: 'span',
+      // cn: ['pb-1.5', 'flex', 'items-center', 'justify-center', 'h-15', 'w-15', 'bg-black', 'text-white', 'fixed', 'bottom-22', 'right-2'],
+
+      cn: [
+        'flex',
+        'items-center',
+        'justify-center',
+        'h-14',
+        'w-14',
+        'bg-black',
+        'text-white',
+        'fixed',
+        'bottom-22',
+        'right-2',
+        'rounded-full',
+        'shadow-lg',
+        'cursor-pointer',
+      ],
+      txt: 'GR'
+    }
+  ]
 });
 
+
+
 if (mode === 'dev') {
   appendElement(body, addPagebtn);
 

package/template/src/frontend/static/pages/{_get-started.js → pages._al.js}

@@ -1,5 +1,2 @@
 import { gardener, fetchElement, replaceElement, appendElement } from "/static/gardener.js";
-import { log, parser, addEl, State } from "/static/gardenerDev.js"
-
-
-
+ import {log, parser, addEl, State} from "/static/gardenerDev.js"

package/template/src/frontend/static/pages/pages._new.js

@@ -0,0 +1,2 @@
+import { gardener, fetchElement, replaceElement, appendElement } from "/static/gardener.js";
+ import {log, parser, addEl, State} from "/static/gardenerDev.js"