diff --git a/.gitignore b/.gitignore index 2bae452..020469b 100644 --- a/.gitignore +++ b/.gitignore @@ -30,8 +30,7 @@ logs # Zip files static/data/*.zip # Zip Extracted files -# data json -src/assets/data.json # assets pictures public/data/pictures public/data/fonts +public/data/data.json diff --git a/electron/UnzipData.ts b/electron/UnzipData.ts index 8f81557..9b332fb 100644 --- a/electron/UnzipData.ts +++ b/electron/UnzipData.ts @@ -45,18 +45,13 @@ export default abstract class UnzipData { const zip = new AdmZip(fs.readFileSync(UnzipData.zipFileToUse)); UnzipData.removeOldExtractedFiles(); zip.extractAllTo("public/data"); - // * Move data to src assets - fs.renameSync( - path.resolve(__dirname, "../public/data/data.json"), - path.resolve(__dirname, "../src/assets/data.json") - ); return UnzipData.loadJsonDataFile(); } public static removeOldExtractedFiles() { // * Clear export dir fs.rmSync(path.resolve(__dirname, "../public/data/pictures"), { recursive: true, force: true }); - fs.rmSync(path.resolve(__dirname, "../src/assets/data.json"), { recursive: true, force: true }); + fs.rmSync(path.resolve(__dirname, "../public/data/data.json"), { recursive: true, force: true }); } /** @@ -64,7 +59,7 @@ export default abstract class UnzipData { */ public static loadJsonDataFile(): TypeApp | null { const jsonData = fs.readFileSync( - path.resolve(__dirname, "../src/assets/data.json"), + path.resolve(__dirname, "../public/data/data.json"), { encoding: "utf8", flag: "r" } ); const jsonSchemaPath = "public/schemas";