Daily commit

fakoua · Aug 4, 2020 · 1863852 · 1863852
1 parent 3aa0d67
commit 1863852
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 8 deletions.
diff --git a/mod.ts b/mod.ts
@@ -61,7 +61,6 @@ router
 
 // static
 app.use(async (context, next: any) => {
-    console.log("------------------------------------------------------------------------")
     if (context.request.url.pathname.startsWith("/themes")) {
         await send(context, context.request.url.pathname, {
             root: `${Deno.cwd()}/src/cms/`,
@@ -121,12 +120,14 @@ router
         const pageId = ctx.request.url.searchParams.get("pageId") ?? ""
         const page = await AdminPages.getPage(ctx.request.url)
         let html = await AdminPages.getTheme()
+        let glob = AdminPages.getGlob()
         page.pageId = pageId
         if (page.head === undefined) {
             ctx.response.body = page.content
         } else {
             const model = {
-                page: page
+                page: page,
+                glob: glob,
             }
             html = handle.render(html, model)
             html = handle.render(html, model) // for the body page.

diff --git a/...s/pages/02.about/02.contact-us/index.html → ...s/pages/02.about/01.contact-us/index.html b/...s/pages/02.about/02.contact-us/index.html → ...s/pages/02.about/01.contact-us/index.html
diff --git a/src/cms/pages/02.about/01.company/index.html → src/cms/pages/02.about/02.company/index.html b/src/cms/pages/02.about/01.company/index.html → src/cms/pages/02.about/02.company/index.html
diff --git a/src/core/admin/layout.html b/src/core/admin/layout.html
@@ -1,11 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" />
     <title>Force - {{page.head.pageTitle}}</title>
-
     <!-- CSS  -->
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link href="/admin/content/css/admin-materialize.min.css" type="text/css" rel="stylesheet"
@@ -161,6 +159,11 @@
             }); // end of document ready
         })(jQuery); // end of jQuery name space
 
+        let glob = {
+            os: '{{glob.os}}',
+            pathSep: '{{glob.pathSep}}'
+        }
+
         function hideLoader() {
             $('#content-container').css('filter', 'blur(0px)')
             $('.preloader-background').delay(200).fadeOut(600);
@@ -177,5 +180,4 @@
     </script>
     {{page.sections.script}}
 </body>
-
 </html>
diff --git a/src/core/admin/pages/pages/index.html b/src/core/admin/pages/pages/index.html
@@ -178,7 +178,6 @@
                                     window.menuItems = res.data
                                 })
                                 .catch((err) => {
-
                                 })
                                 .then(() => {
                                     hideLoader()
@@ -196,8 +195,8 @@
 
         function renameMenu(fullPath, nameView, order) {
             const ord = order < 10 ? `0${order}` : `${order}`
-            let regEx = new RegExp('\\\\(\\d\\d)\\.(' + nameView + ')', 'gi')
-            let res = fullPath.replace(regEx, `\\${ord}.$2`)
+            let regEx = new RegExp(glob.pathSep + '(\\d\\d)\\.(' + nameView + ')', 'gi')
+            let res = fullPath.replace(regEx, `${glob.pathSep}${ord}.$2`)
             return res
         }
     </script>

diff --git a/src/core/bll/admin/Pages.ts b/src/core/bll/admin/Pages.ts
@@ -2,13 +2,21 @@ import { join } from "https://deno.land/std/path/mod.ts"
 import { exists} from "https://deno.land/std/fs/mod.ts"
 import { PageModel } from "../../models/page/PageModel.ts"
 import { SectionModel } from "../../models/page/SectionModel.ts"
+import { GlobModel } from "../../models/GlobModel.ts"
 
 export async function getTheme(): Promise<string> {
     const themePath = join(Deno.cwd(), "src/core/admin/layout.html")
     const result = await Deno.readTextFile(themePath)
     return result
 }
 
+export function getGlob(): GlobModel {
+    return {
+        os: Deno.build.os,
+        pathSep: Deno.build.os == "windows" ? "\\\\" : "/",
+    }
+}
+
 export async function getPage(url: URL | string): Promise<PageModel> {
     let filePath: string
 

diff --git a/src/core/models/GlobModel.ts b/src/core/models/GlobModel.ts
@@ -0,0 +1,4 @@
+export interface GlobModel {
+    os: string,
+    pathSep: string
+}