diff --git a/package.json b/package.json index f3e0ec7..faece7f 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "start": "cross-env NODE_ENV=development webpack serve --hot --host 0.0.0.0 --config=./webpack.dev.config.js --mode development", "build": "cross-env NODE_ENV=production webpack --config webpack.build.config.js --mode production", "package": "npm run build", - "postpackage": "electron-packager ./ --out=./builds --overwrite" + "postpackage": "electron-packager ./ --out=./builds --overwrite --platform win32,linux --icon marvin.ico --extra-resource 'resources/files'" }, "dependencies": { "@emotion/react": "^11.10.0", diff --git a/resources/config/config.json b/resources/config/config.json deleted file mode 100644 index b0b532a..0000000 --- a/resources/config/config.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "rootDir": "/home/rbrt/Schreibtisch/marvin" -} \ No newline at end of file diff --git a/resources/files/config/config.json b/resources/files/config/config.json new file mode 100644 index 0000000..6981927 --- /dev/null +++ b/resources/files/config/config.json @@ -0,0 +1,3 @@ +{ + "rootDir": "/home/rbrt/Schreibtisch/marvin/Gm312/leihgabenbegleitblaetter" +} \ No newline at end of file diff --git a/resources/templates/lbb-template.docx b/resources/files/templates/a-template.docx similarity index 100% rename from resources/templates/lbb-template.docx rename to resources/files/templates/a-template.docx diff --git a/resources/templates/rp-template.docx b/resources/files/templates/lbb-template.docx similarity index 100% rename from resources/templates/rp-template.docx rename to resources/files/templates/lbb-template.docx diff --git a/resources/files/templates/rp-template.docx b/resources/files/templates/rp-template.docx new file mode 100644 index 0000000..69667af Binary files /dev/null and b/resources/files/templates/rp-template.docx differ diff --git a/src/DocxInserter.js b/src/DocxInserter.js index 37dece9..acd0c96 100644 --- a/src/DocxInserter.js +++ b/src/DocxInserter.js @@ -21,7 +21,7 @@ export async function fillTemplate(log, objectData) { let documentInfo; try { // Load config file. - let ConfigFile = fs.readFileSync('resources/config/config.json') + let ConfigFile = fs.readFileSync('resources/files/config/config.json') configJson = JSON.parse(ConfigFile) // Choose the template for selected document type. @@ -46,7 +46,7 @@ export async function fillTemplate(log, objectData) { break; } // Read template. - const template = fs.readFileSync(path.join('resources/templates/', documentInfo.templateFile)); + const template = fs.readFileSync(path.join('resources/files/templates/', documentInfo.templateFile)); // Create report. buffer = await createReport({ diff --git a/src/routes/settings.js b/src/routes/settings.js index ff2eae7..1571988 100644 --- a/src/routes/settings.js +++ b/src/routes/settings.js @@ -1,5 +1,5 @@ // Config -import configImport from '/resources/config/config.json' +import configImport from '/home/rbrt/WebstormProjects/marvin/resources/files/config/config.json' // Components import {Log} from "../components/Log"; @@ -49,7 +49,7 @@ export default function Settings() { } if (rootDirFromWindow) { let message; - await writeFile('resources/config/config.json', JSON.stringify(config2Safe, null, 2), (err) => { + await writeFile('resources/files/config/config.json', JSON.stringify(config2Safe, null, 2), (err) => { if (err) { message = err; } else {