photo stroke size and color, remove empry cell button and page margin added

yourabusufiyan · yourabusufiyan · commit 53820deecc06 · 2025-04-02T01:58:26.000+05:30
diff --git a/changelogs.txt b/changelogs.txt
@@ -1,3 +1,11 @@
+1.0.9
+* Improvements
+  1. Fix bug in Custom Front and Back card in CardMaker
+* Added 
+  1. photo border stroke and stroke color on photosheet maker 
+  2. Margin in photosheet maker
+  3. Button: Removed Empty Cell in PhotoSheet Maker
+
 1.0.8
 * Improvements
   * get computerName on app start
@@ -12,8 +20,7 @@
   * hide gap field if grid layout selected to 1 in photoSheet maker
 * Added 
   1. Skeleton for photosheet page in photoSheet Maker
-  2. Custom Front and Back card in CardMaker - undone
-  3. re arrange the images in photoSheet maker - undone
+  2. Custom Front and Back card in CardMaker
 
 1.0.7
 * Added
diff --git a/electron-builder.json5 b/electron-builder.json5
@@ -11,6 +11,7 @@
     output: 'release/${version}',
   },
   files: ['dist-electron', 'dist'],
+  asarUnpack: ['dist/assets/*.css'],
   win: {
     target: 'nsis',
     icon: 'public/favicon.ico',
diff --git a/electron/main/express-app.ts b/electron/main/express-app.ts
@@ -521,7 +521,6 @@ class expressAppClass {
         res.json(o);
       }
 
-
       expressAppClass.db.write()
       expressAppClass.win?.webContents.send('reloadDatabase')
       return;
diff --git a/electron/main/index.ts b/electron/main/index.ts
@@ -25,6 +25,8 @@ process.env.PUBLIC = process.env.VITE_DEV_SERVER_URL
   ? path.join(process.env.DIST_ELECTRON, '../public')
   : process.env.DIST;
 
+const isDev = !app.isPackaged || process.env.NODE_ENV === 'development';
+
 // Disable GPU Acceleration for Windows 7
 if (release().startsWith('6.1')) app.disableHardwareAcceleration();
 
@@ -63,6 +65,12 @@ app.setLoginItemSettings({
   args: ['--hidden']
 });
 
+// Global settings for dev and production
+if (!process.env.VITE_DEV_SERVER_URL) {
+  // For production
+  Menu.setApplicationMenu(null)
+}
+
 
 async function createWindow() {
 
@@ -104,15 +112,11 @@ async function createWindow() {
   const contextMenu = Menu.buildFromTemplate([
     {
       label: 'Show App',
-      click: () => {
-        win?.show();
-      },
+      click: () => win?.show(),
     },
     {
-      label: 'Quit',
-      click: () => {
-        app.quit();
-      },
+      label: 'Close App',
+      click: () => app.quit(),
     },
   ]);
   tray.setToolTip('MotionPrinter');
@@ -528,12 +532,10 @@ ipcMain.on("printFile", async (event, file: any) => {
 })
 
 
-ipcMain.on('generate-pdf', async (event, obj: { htmlContent: string, isPrint?: boolean, printPDF?: boolean, filename?: string, }) => {
-
-  console.log('generate-pdf')
+ipcMain.on('generate-pdf', async (event, obj: { htmlContent: string, head: string, isPrint?: boolean, printPDF?: boolean, filename?: string }) => {
 
   const win = new BrowserWindow({
-    show: false,
+    show: isDev,
     webPreferences: {
       nodeIntegration: true,
       contextIsolation: false,
@@ -542,11 +544,42 @@ ipcMain.on('generate-pdf', async (event, obj: { htmlContent: string, isPrint?: b
 
   try {
 
-    await win.loadURL(`data:text/html;charset=UTF-8,${encodeURIComponent(obj.htmlContent)}`);
+    let cssFiles: string[] = []
+
+    if (!isDev) {
+      console.log("Running in production mode");
+      const cssDir = path.join(process.resourcesPath, 'app.asar.unpacked/dist/assets');
+      const files = fs.readdirSync(cssDir);
+
+      // Read all .css files
+      cssFiles = files
+        .filter(file => file.endsWith('.css'))
+        .map(file => fs.readFileSync(path.join(cssDir, file), 'utf8'));
+
+    }
+
+    const htmlContent = `
+    <!DOCTYPE html>
+    <html>
+      <head>
+        ${cssFiles.map((el, i) => `<style type="text/css" id="inserted-${i}">${el}</style>`).join('\n')}
+        ${obj.head}
+      </head>
+      <body>
+        ${obj.htmlContent}
+      </body>
+    </html>
+  `;
+
+    await win.loadURL(`data:text/html;charset=UTF-8,${encodeURIComponent(htmlContent)}`);
+
+    await sleep(500);
+
 
     if (obj?.printPDF) {
       console.log('Printing to PDF...')
       const pdfOptions = {
+        color: true,
         margins: {
           marginType: 'printableArea' as "printableArea", // 'none', 'printableArea', or custom
           top: 0,
@@ -601,4 +634,17 @@ ipcMain.on('generate-pdf', async (event, obj: { htmlContent: string, isPrint?: b
     console.error(error)
   }
 
+});
+
+const fsPromise = require('fs').promises;
+ipcMain.handle('read-css-file', async (event, fileUrl) => {
+  try {
+    // Convert file:// URL to filesystem path
+    const filePath = fileUrl.replace('file://', '');
+    // Read the CSS file from app.asar
+    const content = await fsPromise.readFile(filePath, 'utf-8');
+    return content;
+  } catch (error: any) {
+    throw new Error(`Failed to read CSS file: ${error.message}`);
+  }
 });
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "motionprinter",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "MotionPrinter makes your printing easy.",
   "author": "Abu Sufiyan<abusufiyan@engineer.com>",
   "license": "MIT",
@@ -71,8 +71,10 @@
   "dependencies": {
     "@canopassoftware/vue-file-upload": "^1.0.8",
     "@radix-icons/vue": "^1.0.0",
+    "@tanstack/vue-table": "^8.21.2",
     "@tato30/vue-pdf": "^1.11.3",
     "@types/sleep": "^6.3.0",
+    "asar": "^3.2.0",
     "axios": "^1.7.9",
     "body-parser": "^1.20.2",
     "canvas": "^3.0.1",
@@ -108,7 +110,8 @@
     "tailwindcss-animate": "^1.0.7",
     "uuid": "^11.0.4",
     "vee-validate": "^4.15.0",
-    "vue-sonner": "^1.3.0"
+    "vue-sonner": "^1.3.0",
+    "vue3-colorpicker": "^2.3.0"
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/src/components/Footer.vue b/src/components/Footer.vue
@@ -20,5 +20,5 @@ footer.footer.bg-white.px-5.py-4.border-t( class="dark:bg-gray-900" )
       p 
         | Made with &#10084; in
         img.inline.w-auto.mx-1(:src="flagUrl" style="height: 2cap")
-        | by #[a.uppercase.font-medium.font-sm(href="https://yourabusufiyan.pages.dev/" class="hover:underline" target="_blank") abu sufiyan ]
+        | by #[a.uppercase.font-medium.font-sm(href="https://yourabusufiyan.pages.dev/" class="hover:underline" target="_blank") abu sufiyan's Team ]
 </template>
diff --git a/src/main.ts b/src/main.ts
@@ -6,6 +6,9 @@ import App from './App.vue';
 import './samples/node-api';
 import router from './router/router';
 
+import Vue3ColorPicker from "vue3-colorpicker";
+import "vue3-colorpicker/style.css";
+
 const app = createApp(App);
 
 const messages = Object.fromEntries(
@@ -30,6 +33,7 @@ app.use(
 );
 app.use(createPinia());
 app.use(router);
+app.use(Vue3ColorPicker);
 
 app.mount('#app').$nextTick(() => {
   postMessage({ payload: 'removeLoading' }, '*');
diff --git a/src/views/PhotoSheetMakerPage.vue b/src/views/PhotoSheetMakerPage.vue
diff --git a/src/views/cards/cardGeneratedView.vue b/src/views/cards/cardGeneratedView.vue
diff --git a/src/views/cards/cards.vue b/src/views/cards/cards.vue

Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,6 @@ class expressAppClass {`
`521`	`521`	`res.json(o);`
`522`	`522`	`}`
`523`	`523`
`524`		`-`
`525`	`524`	`expressAppClass.db.write()`
`526`	`525`	`expressAppClass.win?.webContents.send('reloadDatabase')`
`527`	`526`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@ footer.footer.bg-white.px-5.py-4.border-t( class="dark:bg-gray-900" )`
`20`	`20`	`p`
`21`	`21`	`\| Made with ❤ in`
`22`	`22`	`img.inline.w-auto.mx-1(:src="flagUrl" style="height: 2cap")`
`23`		`- \| by #[a.uppercase.font-medium.font-sm(href="https://yourabusufiyan.pages.dev/" class="hover:underline" target="_blank") abu sufiyan ]`
	`23`	`+ \| by #[a.uppercase.font-medium.font-sm(href="https://yourabusufiyan.pages.dev/" class="hover:underline" target="_blank") abu sufiyan's Team ]`
`24`	`24`	`</template>`