fix; module framework flow dev

nodefony · Mar 6, 2024 · ce29e61 · ce29e61
1 parent f82544c
commit ce29e61
Show file tree

Hide file tree

Showing 54 changed files with 4,668 additions and 802 deletions.
diff --git a/index.ts b/index.ts
@@ -1,11 +1,12 @@
+import { resolve } from "node:path";
 import { Kernel, Module, modules } from "nodefony";
 import { controllers } from "@nodefony/framework";
 import AppController from "./nodefony/controllers/AppController";
 import config from "./nodefony/config/config";
-import http from "@nodefony/http";
-import security from "@nodefony/security";
-import framework from "@nodefony/framework";
-import sequelize from "@nodefony/sequelize";
+//import http from "@nodefony/http";
+//import security from "@nodefony/security";
+//import framework from "@nodefony/framework";
+//import sequelize from "@nodefony/sequelize";
 
 /**
  * The App class extends the Module class and represents an application  entry point.
@@ -15,6 +16,7 @@ import sequelize from "@nodefony/sequelize";
   "@nodefony/security",
   "@nodefony/framework",
   "@nodefony/sequelize",
+  "@nodefony/test",
 ])
 @controllers([AppController])
 class App extends Module {
@@ -38,10 +40,10 @@ class App extends Module {
   //     this.kernel?.environment === "production" ||
   //     this.kernel?.environment === "staging"
   //   ) {
-  //     //await this.kernel?.use(http);
-  //     //await this.kernel?.use(security);
-  //     //await this.kernel?.use(framework);
-  //     //await this.kernel?.use(sequelize);
+  //     //await this.kernel?.addModule(http);
+  //     //await this.kernel?.addModule(security);
+  //     //await this.kernel?.addModule(framework);
+  //     //await this.kernel?.addModule(sequelize);
   //   } else {
   //     //await this.kernel?.loadModule("@nodefony/http", false);
   //     //await this.kernel?.loadModule("@nodefony/security", false);

diff --git a/nodefony/controllers/AppController.ts b/nodefony/controllers/AppController.ts
@@ -1,44 +1,28 @@
 import { resolve } from "node:path";
-
 import { inject, Fetch, FileClass } from "nodefony";
 import { DefineRoute, DefineController, Controller } from "@nodefony/framework";
 import { ContextType } from "@nodefony/http";
-import https from "node:https";
-//import { twig } from "@nodefony/framework";
 
 class AppController extends Controller {
   static override basepath: string = "/app";
-  constructor(
-    context: ContextType,
-    @inject("Fetch") private fetchService: Fetch
-  ) {
+  constructor(context: ContextType) {
     super("app", context);
   }
 
   async initialize() {
-    //await this.startSession();
-    //let response = await this.fetchService.fetch("https://google.fr");
-    //TODO add certificat client in serfice for unit test
-    // const agent = new https.Agent({
-    //   rejectUnauthorized: false,
-    // });
-    // const response = await this.fetchService.fetch("https://localhost:5152", {
-    //   agent,
-    // });
-    // console.log(response.headers, response.status, response.statusText);
+    await this.startSession("app");
     return this;
   }
 
   @DefineRoute("route1", { path: "", method: "GET" })
   async method1() {
-    //await this.startSession();
     const view = resolve(
       this.module?.path as string,
       "nodefony",
       "views",
       "index.twig"
     );
-    return this.renderTwigView(view, this.metaData).catch((e) => {
+    return this.renderTwigView(view, this.context?.metaData).catch((e) => {
       throw e;
     });
   }
@@ -55,14 +39,16 @@ class AppController extends Controller {
       "views",
       "index.ejs"
     );
-    return this.renderEjsView(view, { name, ...this.metaData }).catch((e) => {
-      throw e;
-    });
+    return this.renderEjsView(view, { name, ...this.context?.metaData }).catch(
+      (e) => {
+        throw e;
+      }
+    );
   }
 
   @DefineRoute("route3", { method: "DELETE" })
   async method3() {
-    return this.renderJson(this.metaData);
+    return this.renderJson(this.context?.metaData);
   }
 
   @DefineRoute("route2", { path: "/add", requirements: { methods: "POST" } })

diff --git a/nodefony/views/index.ejs b/nodefony/views/index.ejs
@@ -1,25 +1,25 @@
 <!doctype html>
-<html lang="{{nodefony.local|escape}}">
-<head>
+<html lang="<%=  nodefony.locale %>">
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <meta name="generator" content="Nodefony (https://nodefony.net)" />
+    <meta
+      name="keywords"
+      content="web,Framework,realtime,node.js,symfony,javascript,npm,linux"
+    />
+    <meta
+      name="description"
+      content="Node.js full-stack web framework Symfony Like"
+    />
 
-  <meta charset="utf-8">
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width,initial-scale=1">
-  <meta name="generator" content="Nodefony (https://nodefony.net)">
-  <meta name="keywords" content="web,Framework,realtime,node.js,symfony,javascript,npm,linux">
-  <meta name="description" content="Node.js full-stack web framework Symfony Like">
-
-  <title><%= nodefony.name %></title>
-
-</head>
-
-<body>
-
-<h1><%= nodefony.name %></h1>
-<h1><%= name %></h1>
-
-
-</body>
+    <title><%= nodefony.name %></title>
+  </head>
 
+  <body>
+    <h1><%= nodefony.name %></h1>
+    <h1><%= name %></h1>
+  </body>
 </html>