qumra-engine 2.0.148 → 2.0.150

package/dist/graphql/query/findAllCountries.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const graphql_request_1 = require("graphql-request");
+exports.default = (0, graphql_request_1.gql) `
+query FindAllCountries {
+  countries:findAllCountries {
+    success
+    message
+    data {
+      _id
+      value:_id
+      currency {
+        _id
+        title
+        currencyCode
+        currencySymbol
+      }
+      label:name
+      image {
+        image
+        imageUrl
+      }
+      code
+      continent
+      capital
+      active
+      deleted
+      phonekey
+      createdAt
+      updatedAt
+    }
+    pagination {
+      totalItems
+      totalPages
+      currentPage
+      limit
+      hasNextPage
+    }
+  }
+}
+`;

package/dist/graphql/query/index.d.ts

@@ -1,2 +1,3 @@
 import findAllProducts from "./findAllProducts";
-export { findAllProducts };
+import findAllCountries from "./findAllCountries";
+export { findAllProducts, findAllCountries };

package/dist/graphql/query/index.js

@@ -3,6 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAllProducts = void 0;
+exports.findAllCountries = exports.findAllProducts = void 0;
 const findAllProducts_1 = __importDefault(require("./findAllProducts"));
 exports.findAllProducts = findAllProducts_1.default;
+const findAllCountries_1 = __importDefault(require("./findAllCountries"));
+exports.findAllCountries = findAllCountries_1.default;

package/dist/middleware/init.middleware.js

@@ -37,11 +37,8 @@ const initMiddleware = ({ mode, getRender, setRender, app, renderApi, market, })
             res.locals.cache.setRender = setRender;
         }
         const langCookie = req.cookies.lang;
-        console.log("🚀 ~ initMiddleware ~ langCookie:", langCookie);
         const currencyCookie = req.cookies.currency;
-        console.log("🚀 ~ initMiddleware ~ currencyCookie:", currencyCookie);
         const marketCookie = req.cookies.market;
-        console.log("🚀 ~ initMiddleware ~ marketCookie:", marketCookie);
         if (langCookie || currencyCookie || marketCookie) {
             res.locals.lang = langCookie;
             res.locals.currency = currencyCookie;

package/dist/middleware/nunjucks.middleware.js

@@ -24,7 +24,7 @@ const nunjucksMiddleWare = (req, res, next) => {
         res.locals[key] = value;
     });
     res.locals.mainPath = mainPath;
-    const env = (0, nunjucksEnv_1.configureNunjucks)(mainPath);
+    const env = (0, nunjucksEnv_1.configureNunjucks)(mainPath, req.app);
     for (const [key, value] of Object.entries(paths)) {
         env.addGlobal(key, value);
     }

package/dist/middleware/prepareData.middleware.js

@@ -76,7 +76,7 @@ const prepareDataMiddleware = (req, res, next) => {
         next();
     })
         .catch((err) => {
-        console.log("❌ prepareDataMiddleware error:", err.message);
+        console.log("❌ prepareDataMiddleware error:", err);
         next(err);
     });
 };

package/dist/middleware/render.middleware.js

@@ -1,11 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderMiddleware = void 0;
-const resolveTranslations_1 = require("../utils/resolveTranslations");
 const globals_1 = require("../store/globals");
+const render_handler_1 = __importDefault(require("../functions/render-handler"));
 const renderMiddleware = (req, res, next) => {
     const render = res.locals.render;
     const { context, globals, engine } = render;
+    const renderData = (0, render_handler_1.default)(res.locals);
     const jsonPreview = req.query?.jsonPreview ?? null;
     const widgetId = req.query?.widgetId ?? null;
     (0, globals_1.setGlobal)("injectionCode", engine?.injectionCode);
@@ -13,14 +17,16 @@ const renderMiddleware = (req, res, next) => {
     const pageLayout = env.getGlobal("pageData").layout ?? "layout";
     if (widgetId && jsonPreview === "true") {
         const overrideLayout = `{% content %}`;
-        env.renderString(overrideLayout, (0, resolveTranslations_1.resolveTranslations)({
+        env.renderString(overrideLayout, 
+        // resolveTranslations(
+        {
             context,
             globals,
-            settings: env.getGlobal("settings"),
-            market: res.locals.market || "",
-            lang: res.locals.lang || "",
-            currency: res.locals.currency || "",
-        }, env.getGlobal("t")), (err, html) => {
+            ...renderData
+        }, 
+        //   env.getGlobal("t")
+        // ),
+        (err, html) => {
             if (err) {
                 return next(new Error(`❌ Nunjucks render error: ${err.message}`));
             }
@@ -35,14 +41,16 @@ const renderMiddleware = (req, res, next) => {
         });
         return;
     }
-    env.render(`layouts/${pageLayout}.njk`, (0, resolveTranslations_1.resolveTranslations)({
+    env.render(`layouts/${pageLayout}.njk`, 
+    // resolveTranslations(
+    {
         context,
         globals,
-        settings: env.getGlobal("settings"),
-        market: res.locals.market || "",
-        lang: res.locals.lang || "",
-        currency: res.locals.currency || "",
-    }, env.getGlobal("t")), (err, html) => {
+        ...renderData
+    }, 
+    // env.getGlobal("t")
+    // ),
+    (err, html) => {
         if (err) {
             return next(new Error(`❌ Nunjucks render error: ${err.message}`));
         }

package/dist/middleware.js

@@ -71,7 +71,6 @@ const startEngine = async ({ renderApi, mode, getRender, setRender, port = 3000,
             (0, locals_1.setLocales)("cookies", req.cookies);
             next();
         });
-        console.log("🚀 ~ startEngine ~ currentApp:", currentApp);
         app.use((0, init_middleware_1.initMiddleware)({
             mode,
             getRender,

package/dist/nunjucksEnv.d.ts

@@ -3,4 +3,4 @@ import nunjucks from "nunjucks";
  * إعداد Nunjucks مع مسار مخصص للقوالب
  * @param viewsPath المسار الكامل لملفات القوالب
  */
-export declare function configureNunjucks(viewsPath: string): nunjucks.Environment;
+export declare function configureNunjucks(viewsPath: string, app: any): nunjucks.Environment;

package/dist/nunjucksEnv.js

@@ -9,11 +9,12 @@ const nunjucks_1 = __importDefault(require("nunjucks"));
  * إعداد Nunjucks مع مسار مخصص للقوالب
  * @param viewsPath المسار الكامل لملفات القوالب
  */
-function configureNunjucks(viewsPath) {
+function configureNunjucks(viewsPath, app) {
     const env = nunjucks_1.default.configure(viewsPath, {
         autoescape: true,
         noCache: true,
         watch: false,
+        // express:app
     });
     return env;
 }

package/dist/types/sharedTypes.d.ts

@@ -7,6 +7,7 @@ export interface Globals {
     app: any;
     Setting: any;
     assets: string;
+    customer: any;
     currency: Currency;
     cart?: any;
     themeDevMode?: boolean;
@@ -14,6 +15,9 @@ export interface Globals {
 }
 export interface RenderContext {
     page: Page;
+    query: {
+        q: string;
+    };
     [key: string]: any;
 }
 export type TMode = "production" | "devlopment";

package/dist/utils/client.js

@@ -10,7 +10,7 @@ function getGqlClient() {
     const qdid = cookies.qdid;
     const app = (0, globals_1.getGlobal)('app');
     const rawBaseUrl = app?.url;
-    console.log("🚀 ~ getGqlClient ~ app:", app);
+    // console.log("🚀 ~ getGqlClient ~ app:", app);
     // نشيل أي / في آخر الرابط
     const baseUrl = rawBaseUrl?.replace(/\/+$/, '');
     const endpoint = `${baseUrl}/api/graphql`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qumra-engine",
-  "version": "2.0.148",
+  "version": "2.0.150",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {