implemented import of content into help overlay

5 years ago · 4dbed3b19f
parent 613268a4e1
commit 4dbed3b19f
5 changed files with 24 additions and 9 deletions
--- a/src/assets/views/help-overlay.mustache
+++ b/src/assets/views/help-overlay.mustache
@ -1,7 +1,7 @@
 <html lang="en">
 <div id="help-overlay" onclick="help.closeOverlay()" class="overlay-custom">
-    <p style="position:fixed; top:50%; left:50%; color:red;">
-        HELLO FROM THE HELP SCREEN
-    </p>
+    <div>
+        {{{content}}}
+    </div>
 </div>
 </html>
--- a/src/ts_source/fileutils.ts
+++ b/src/ts_source/fileutils.ts
@ -60,6 +60,9 @@ export module FileUtils {
    export function getPathToView(templateName: string): string {
        return path.join(getPathToAssets(), "views", templateName + ".mustache")
    }
+    export function getPathToPage(pageName: string): string {
+        return path.join(getPathToAssets(), "pages", pageName)
+    }

    export function getPathToImage(imageName: string): string {
        return path.join(getPathToAssets(), "images", imageName)
--- a/src/ts_source/help.ts
+++ b/src/ts_source/help.ts
@ -1,4 +1,4 @@
-import {loadTemplate} from "./templates";
+import {loadTemplate, readHTML} from "./templates";

 let $ = require('jquery')

@ -6,9 +6,14 @@ console.log("we got it loaded")

 export function openHelpOverlay(resourceName: string){
    let body = $("body");
-    let loadedTemplate = loadTemplate("help-overlay.mustache", {}, (x)=>{});
-    let content = $(loadedTemplate);
-    body.append(content)
+
+    let content = readHTML(resourceName);
+    let obj = {"content": content};
+
+    let loadedTemplate = loadTemplate("help-overlay.mustache", obj, (x)=>{});
+    let wrapper = $(loadedTemplate);
+
+    body.append(wrapper)
 }

 export function closeOverlay(){
--- a/src/ts_source/templates.ts
+++ b/src/ts_source/templates.ts
@ -42,6 +42,11 @@ function createId(fileName: String) {
    return crypto.createHash('md5').update(fileName).digest('hex');
 }

-module.exports = {loadTemplate, loadTemplateSingle}
+export function readHTML(fileName: string): string{
+    let baseFilePath = FileUtils.getPathToPage(fileName);
+    return fs.readFileSync(baseFilePath, "utf8").toString();
+}
+
+module.exports = {loadTemplate, loadTemplateSingle, readHTML}

 cacheTemplates()
--- a/src/ts_source/viewFactory.ts
+++ b/src/ts_source/viewFactory.ts
@ -2,6 +2,7 @@ import {Configurator, FileUtils} from './fileutils'
 import {loadTemplate, loadTemplateSingle} from "./templates"

 const shell = require('electron').shell;
+const fs = require('fs');


 export class CardModel {
@ -141,4 +142,5 @@ function launchDocument(filename: string) {

 function launchWebsite(url: string) {
    shell.openItem(url);
-}
+}
+