npm - webfast - Versions diffs - 0.0.8 → 0.1.12 - Mend

webfast 0.0.8 → 0.1.12

Files changed (9) hide show

package/README.md +7 -1
package/ejs/view/list.ejs +19 -0
package/index.js +30 -29
package/modules/bots/applications/telegram/send.js +23 -1
package/modules/bots/applications/telegram.js +18 -3
package/modules/bots/init.js +13 -2
package/modules/express/init.js +39 -7
package/modules/express/routes/view/list.get.js +12 -0
package/package.json +10 -4

package/README.md CHANGED Viewed

@@ -24,7 +24,7 @@ WebFast! provides a flexible and intuitive platform for creating web application
 1. Clone the repository:
     ```bash
-    git clone https://github.com/ThePhotoCodeGrapher/WebFast!.git
+    git clone https://github.com/ThePhotoCodeGrapher/webfast.git
     ```
 2. Navigate to the project directory:
@@ -84,6 +84,12 @@ module.exports = {
     }
 }
+```
+## Important!
+The folder [/app] is for your custom project, your custom github and code but can be used in combination with Webfast. Don't wory to contribute.
+```
 ```
 ## License

package/ejs/view/list.ejs ADDED Viewed

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title><%= title %></title>
+</head>
+<body>
+    <h1>Hello, <%= name %>!</h1>
+    <ul>
+        <% fruits.forEach(function(fruit) { %>
+            <li><%= fruit %></li>
+        <% }); %>
+    </ul>
+</body>
+</html>

package/index.js CHANGED Viewed

@@ -3,7 +3,8 @@ const { readdirSync } = require("fs");
 console.log(`WebFast!! Program`);
 let program = {
     ts  :   Date.now(),
-    modules : {}
+    modules : {},
+    tmp : {}
 }
 // Setup The Requirements
@@ -154,7 +155,7 @@ program.modules.fetch = async function(folder,program) {
                     case `object`:
                         // It's a object so check for dependend things etc.
                         console.log(`Depending object`);
-                        await program.modules.dependOn(reqFunc,program,fileNameWithoutExtension,function(program,name){
+                        return await program.modules.dependOn(reqFunc,program,fileNameWithoutExtension,function(program,name){
                             console.log(`Setup `,name)
                         });
                     break;
@@ -173,70 +174,70 @@ program.modules.fetch = async function(folder,program) {
     }
 }
-program.modules.walkDirectory = async function (directoryPath, callback, forward) {
+// Create tmp file path
+program.modules.walkDirectory = async function (directoryPath, callback, forward, parentFileData) {
+    let allFiles = [];
     try {
       // Read the contents of the current directory
       const files = await program.fs.readdirSync(directoryPath);
-      let allFiles = [];
       // Iterate through the files in the directory
-      for (let f in files) {
+      for (const file of files) {
         // Construct the full path of the current file or directory
-        let file = files[f];
-        const fullPath = await program.path.join(directoryPath, file);
+        const fullPath = program.path.join(directoryPath, file);
         // Check if the current item is a directory
         const pathSync = await program.fs.statSync(fullPath);
         const isDirectoryPath = await pathSync.isDirectory();
-        const fileExtension = await program.path.extname(fullPath);
+        const fileExtension = program.path.extname(fullPath);
         // Get the filename without the extension
-        const fileName = await program.path.basename(fullPath, fileExtension);
+        const fileName = program.path.basename(fullPath, fileExtension);
+        // Create a new fileData object for each file or directory
+        const currentFileData = {
+          extension: fileExtension,
+          name: fileName,
+          path: fullPath,
+          sub: [],
+        };
         if (isDirectoryPath) {
           // If it's a directory, recursively walk through it
-          let pushData = await program.modules.walkDirectory(fullPath, callback, fileName);
+          let pushData = await program.modules.walkDirectory(fullPath, callback, fileName, currentFileData);
           if (pushData.length !== 0) {
-            allFiles = allFiles.concat(pushData); // Concatenate arrays instead of pushing an array
+            // Concatenate arrays instead of pushing an array
+            allFiles.push(currentFileData);
+            allFiles = allFiles.concat(pushData);
+          } else {
+            allFiles.push(currentFileData);
           }
         } else {
           // If it's a file, print the path
           console.log('File Extension:', fileExtension);
           console.log('File Name:', fileName);
-          // Make Key from fileName extension
-          const fileData = {
-            extension: fileExtension,
-            name: fileName,
-            path: fullPath,
-            sub: [],
-          };
           if (forward !== undefined) {
             // Push it to sub
-            fileData.sub.push(forward);
+            parentFileData.sub.push(currentFileData);
           } else {
-            allFiles.push(fileData);
+            allFiles.push(currentFileData);
           }
         }
       }
-      if (forward !== undefined) {
-        // Return data
-        return allFiles;
-      }
       if (callback && forward === undefined) {
         await callback(allFiles);
-      } else {
-        return allFiles;
       }
+      return allFiles;
     } catch (error) {
       console.error('Error:', error.message);
     }
   };
 // Run program fetch

package/modules/bots/applications/telegram/send.js CHANGED Viewed

@@ -1,8 +1,25 @@
-module.exports = async function(program,message,id) {
+module.exports = async function(program,message,id,buttons) {
     console.log(`Telegram Send`);
     // Create Request for send
     const telegramURL = `https://api.telegram.org/bot${process.env.telegram}/sendMessage`;
+    // Check if buttons is send as []
+    let options;
+    if (buttons != undefined) {
+        console.log(`Loop Through Buttons`);
+        const keyboard = {
+            inline_keyboard: buttons,
+            resize_keyboard: true,
+            one_time_keyboard: true
+        };
+        options = {
+            reply_markup: JSON.stringify(keyboard)
+        };
+    }
     const body = {
         text: message,
         disable_web_page_preview: false,
@@ -12,6 +29,11 @@ module.exports = async function(program,message,id) {
         parse_mode : 'HTML'
     }
+    // If options is there add as
+    if (options != undefined) {
+        body.reply_markup = options.reply_markup;
+    }
     const madeRequest = await program.modules.request.post(program,telegramURL,body)
     console.log(`Send Message`);
     return madeRequest;

package/modules/bots/applications/telegram.js CHANGED Viewed

@@ -143,7 +143,12 @@ module.exports = async function(program,folder) {
                                 } catch (err) {
                                     //console.error(err);
                                     //console.error(`Error For Telegram Function`);
-                                    await program.modules.telegram.functions.send(program,`${command}`,middleValue.chat.id);
+                                    await program.modules.telegram.functions.send(program,`${command}`,middleValue.chat.id,[
+                                        [
+                                            { text: 'EventGO!',  web_app : { url : 'https://cloud.eventgo.today/events/list'}},
+                                            { text: 'Create Event', callback_data: 'create_event' },
+                                        ]
+                                    ]);
                                 }
@@ -225,8 +230,18 @@ module.exports = async function(program,folder) {
         // Try to load it
         try {
-            telegram.functions[key] = require(module.path);
-            console.log(`Having The Module`,module);
+            const pathSync = await program.fs.statSync(module.path);
+            const isDirectoryPath = await pathSync.isDirectory();
+            const fileExtension = program.path.extname(module.path);
+            // Check if directory
+            if (isDirectoryPath) {
+                // It's directory so don't do anything yet
+                console.log(`It's Directory fo something`);
+            } else {
+                telegram.functions[key] = require(module.path);
+                console.log(`Having The Module`,module);
+            }
         } catch (err) {
             console.error(err);
             console.error(`Error Setting Up Telegram Module`);

package/modules/bots/init.js CHANGED Viewed

@@ -20,8 +20,19 @@ module.exports = {
             // Create module in setModule
             try {
                 // We have set module
-                const runModule = await require(module.path)(program,module);
-                setModule[module.name] = runModule;
+                const pathSync = await program.fs.statSync(module.path);
+                const isDirectoryPath = await pathSync.isDirectory();
+                const fileExtension = program.path.extname(module.path);
+                // Check if directory
+                if (isDirectoryPath) {
+                    // It's directory so don't do anything yet
+                    console.log(`It's Directory init bots`);
+                } else {
+                    const runModule = await require(module.path)(program,module);
+                    setModule[module.name] = runModule;
+                }
             } catch (err) {
                 console.error(err);
                 console.error(`Error Setting Module Data`,module.name);

package/modules/express/init.js CHANGED Viewed

@@ -47,11 +47,10 @@ module.exports = async function(program) {
             let route = routesData[rI];
             //console.log(`Route : `,route.path);
-            let routePath = `${basePath}`
+            let routePath = `${basePath}/${route.name}`
             // Loop Through sub and create path with basePath
-            for (let s in route.sub) {
-                routePath = `${routePath}/${route.sub[s]}`
-            }
+            console.log(`Set Route Name`);
             // Check to split name
             const split = route.name.split(`.`);
@@ -63,7 +62,7 @@ module.exports = async function(program) {
             }
             // FUll Route
-            routePath = `${routePath}/${route.name}`;
+            //routePath = `${routePath}/${route.name}`;
             // Create Route UUID for easy findable
             const routeID = program.uuid.v4();
@@ -73,7 +72,40 @@ module.exports = async function(program) {
             // Setup the function
             try {
-                route.func = require(route.path);
+                const pathSync = await program.fs.statSync(route.path);
+                const isDirectoryPath = await pathSync.isDirectory();
+                const fileExtension = program.path.extname(route.path);
+                console.log(`If it's directory or not`);
+                // Check if directory
+                if (isDirectoryPath) {
+                    console.log(`It's directoyr`);
+                    // Create routes now
+                    for (let s in route.sub) {
+                        const subData =  route.sub[rI];
+                        if (subData != undefined) {
+                            const routeName = subData.name.replace(`.get`,``).replace(`.post`,``);
+                            routePath = `${routePath}/${routeName}`
+                            // Create type
+                            const subDataSplit = subData.name.split(`.`);
+                            const type = subDataSplit[subDataSplit.length-1];
+                            subData.name = routeName;
+                            delete subData.sub;
+                            subData.type = type;
+                            // Create func
+                            subData.func = require(subData.path);
+                            // Set route
+                            exprs[routePath] = subData;
+                        }
+                    }
+                } else {
+                    route.func = require(route.path);
+                }
             } catch(err) {
                 console.error(`Error Route Func`,routePath);
                 console.error(err);
@@ -81,7 +113,6 @@ module.exports = async function(program) {
             // Save route for path
             route.webwalk = 0;
-            exprs[routePath] = route;
             console.log(`Setting Up Route`);
         }
@@ -96,6 +127,7 @@ module.exports = async function(program) {
             let routeData = exprs[route];
             console.log(`Setup Route`,route);
             let state = false;
             try {
                 // This is where the magic happens when we receive an incomming request it will
                 // route it through the dynamice route folder

package/modules/express/routes/view/list.get.js ADDED Viewed

@@ -0,0 +1,12 @@
+module.exports = async function(program,req,res,route) {
+    console.log(`Create`);
+    const fullPath = program.path.join(__dirname, `..`,`..`,`..`,`..`,`ejs`,`example`,`list.ejs`);
+    // Render the EJS template
+    res.render(fullPath, {
+        title: 'EJS Example',
+        name: 'John Doe',
+        isAdmin: true,
+        fruits: ['Apple', 'Banana', 'Orange']
+    });
+}

package/package.json CHANGED Viewed

@@ -1,11 +1,11 @@
 {
   "name": "webfast",
-  "version": "0.0.8",
-  "description": "WebFast!! Bot Application, including TON mini-apps",
+  "version": "0.1.12",
+  "description": "WebFast! Bot Application, including TON mini-apps",
   "main": "index.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/ThePhotoCodeGrapher/WebFast!"
+    "url": "https://github.com/ThePhotoCodeGrapher/webfast"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -16,7 +16,13 @@
     "mini",
     "app",
     "ton",
-    "telegram"
+    "telegram",
+    "fast",
+    "framework",
+    "lowcode",
+    "kaigartner",
+    "bots",
+    "generator"
   ],
   "author": "Kai Gartner",
   "license": "ISC",