Skip to content
Extraits de code Groupes Projets
Vérifiée Valider c4e8e32c rédigé par Kubat's avatar Kubat
Parcourir les fichiers

INSTANCE: Update layout

parent 4fd1b7f3
Aucune branche associée trouvée
Aucune étiquette associée trouvée
2 requêtes de fusion!3Dev kubat,!2Base interface and system
Masquer les modifications d'espaces
En ligne Côte à côte
instance/index.html
+ 7
− 15
Voir le fichier @ c4e8e32c
...@@ -17,24 +17,16 @@ ...@@ -17,24 +17,16 @@
</head> </head>
<body> <body>
<div id="mainFrame" class="container-fluid"> <div id="mainFrame" class="container-fluid">
<div id="headerBar" class="row"> <div id="buttonPanelListLeft" class="d-flex flex-row bd-highlight mb-3 row card"
<div id="headerCard" class="card"> style="padding:0px!important;margin-bottom:0px!important;margin-top:0px">
<div id="headerTitle" class="card-header text-center"> <!-- Will be generated on loading page --!>
<h2 class="text-center">
LektorApp Admin Interface
</h2>
</div>
<div id="buttonPanelListLeft" class="card-body text-left"
style="padding-top: 0px;padding-bottom: 0px;padding-right: 0px;padding-left: 0px;">
<!-- Will be generated on loading page --!>
</div>
</div>
</div> </div>
<div id="panelWrapper" class="row"> <div id="panelWrapper" class="row"
<div id="panelLeft" class="col panel"> style="padding-top:0px;padding-bottom:0px;padding-right:0px;padding-left:0px;">
<div id="panelLeft" class="col panel d-flex flex-column bd-highlight mb-3">
<!-- Will be generated on loading page --!> <!-- Will be generated on loading page --!>
</div> </div>
<div id="panelRight" class="col panel"> <div id="panelRight" class="col panel d-flex flex-column bd-highlight mb-3">
<!-- Will be generated on loading page --!> <!-- Will be generated on loading page --!>
</div> </div>
</div> </div>
......
instance/main.js
+ 15
− 9
Voir le fichier @ c4e8e32c
...@@ -36,27 +36,33 @@ function createButtonList(list) { ...@@ -36,27 +36,33 @@ function createButtonList(list) {
list.forEach( (btn) => { list.forEach( (btn) => {
if (btn[0] == "left") { if (btn[0] == "left") {
renderHtmlLeft = `${renderHtmlLeft} renderHtmlLeft = `${renderHtmlLeft}
<button id="${btn[2]}" type="button" class="btn btn-outline-primary"> <button id="${btn[2]}" type="button" class="btn btn-outline-primary p-2 bd-highlight">${btn[1]}</button>`;
${btn[1]}
</button>`;
logger.debug(`Create button for "${btn[1]}" with id "${btn[2]} at the left"`); logger.debug(`Create button for "${btn[1]}" with id "${btn[2]} at the left"`);
} else if (btn[0] == "right") { } else if (btn[0] == "right") {
renderHtmlRight = `${renderHtmlRight} renderHtmlRight = `${renderHtmlRight}
<button id="${btn[2]}" type="button" class="btn btn-outline-primary"> <button id="${btn[2]}" type="button" class="btn btn-outline-primary p-2 bd-highlight">${btn[1]}</button>`;
${btn[1]}
</button>`;
logger.debug(`Create button for "${btn[1]}" with id "${btn[2]} at the right"`); logger.debug(`Create button for "${btn[1]}" with id "${btn[2]} at the right"`);
} }
}); });
document.getElementById("buttonPanelListLeft").innerHTML = renderHtmlLeft + renderHtmlRight; document.getElementById("buttonPanelListLeft").innerHTML =
`${renderHtmlLeft}
<h5 class="text-capitalize font-weight-bold text-center p-2 mr-auto ml-auto bd-highlight align-middle">
lektor-app admin iterface</h5>
${renderHtmlRight}`;
} }
ipcRenderer.on("reload-db-responce", (event, arg) => { ipcRenderer.on("reload-db-responce", (event, arg) => {
var karaList = ""; var karaList = "";
logger.debug(`Web page got reload-db`); logger.debug(`Web page got reload-db`);
arg.forEach( kara => { arg.forEach( kara => {
karaList += `<div class="card shadow" style="margin: 5px; border-radius: 10px; margin: 20px 0px 20px 0px;"> karaList +=
<div class="card-body">${kara.string} </div></div>`; `<div class="card p-2 bd-highlight shadow-none d-flex flex-row bd-highlight mb-3 border border-secondary"
style="border:0px;margin:0px!important;">
<div class="p-2 bd-highlight">${kara.id}</div>
<div class="p-2 bd-highlight">${kara.cat}</div>
<div class="p-2 bd-highlight">${kara.type}</div>
<div class="p-2 bd-highlight ml-auto">${kara.string}</div>
</div>`;
}); });
document.getElementById("panelLeft").innerHTML = karaList; document.getElementById("panelLeft").innerHTML = karaList;
}); });
main.js
+ 23
− 21
Voir le fichier @ c4e8e32c
const logger = require.main.require('./common/logger.js'); const logger = require.main.require('./common/logger.js');
const electron = require('electron'); const electron = require('electron');
const { app, BrowserWindow } = require('electron'); const { app, BrowserWindow } = require('electron');
const { globalShortcut } = require('electron'); const { globalShortcut } = require('electron');
const { ipcMain } = require('electron'); const { ipcMain } = require('electron');
const { fork, spawn } = require('child_process'); const { fork, spawn } = require('child_process');
const fs = require("fs"); const fs = require("fs");
...@@ -25,16 +25,16 @@ tail.on("line", function(data) { console.log(data); }); ...@@ -25,16 +25,16 @@ tail.on("line", function(data) { console.log(data); });
***************************************************************/ ***************************************************************/
function createInstanceWindow () { function createInstanceWindow () {
/* Main window */
const win = new BrowserWindow({ const win = new BrowserWindow({
width: 1280, width: 1280,
height: 720, height: 720,
frame: false, frame: false,
menuBarVisible: true, menuBarVisible: true,
webPreferences: { webPreferences: {
nodeIntegration: true nodeIntegration: true
} }
}); });
win.loadFile('instance/index.html'); win.loadFile('instance/index.html');
} }
...@@ -60,23 +60,25 @@ app.on('ready', () => { ...@@ -60,23 +60,25 @@ app.on('ready', () => {
createInstanceWindow(); createInstanceWindow();
client = fork('client/main.js'); client = fork('client/main.js');
globalShortcut.register('CommandOrControl+D', () => { globalShortcut.register('CommandOrControl+D', () => {
var win = BrowserWindow.getFocusedWindow(); var win = BrowserWindow.getFocusedWindow();
if (win === null) { if (win === null) {
return; return;
} }
logger.info("Reloading DB"); logger.info("Reloading DB");
let contents = win.webContents; let contents = win.webContents;
myDb.all().then( karas => { myDb.all().then( karas => {
contents.send("reload-db-responce", karas); contents.send("reload-db-responce", karas);
}); });
}); });
globalShortcut.register('F12', () => { globalShortcut.register('CommandOrControl+C', () => {
var focused = BrowserWindow.getFocusedWindow(); });
if (focused) { globalShortcut.register('F12', () => {
focused.webContents.openDevTools(); var focused = BrowserWindow.getFocusedWindow();
} if (focused) {
}); focused.webContents.openDevTools();
}
});
}); });
/********************************* /*********************************
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter