From b72ecaf291a77afa42f4f574edd2f8462cd80668 Mon Sep 17 00:00:00 2001 From: Prashanth <67097277+StarOne01@users.noreply.github.com> Date: Sun, 26 May 2024 06:49:59 +0000 Subject: [PATCH 1/2] Formated the generated PDF in firebase folders --- assets/js/firebase.js | 52 +++++++++++++++++-------------------------- assets/js/printPdf.js | 6 ++--- 2 files changed, 23 insertions(+), 35 deletions(-) diff --git a/assets/js/firebase.js b/assets/js/firebase.js index c8bac09..33a2938 100644 --- a/assets/js/firebase.js +++ b/assets/js/firebase.js @@ -31,43 +31,31 @@ pdfMake.createPdf(DataDef) console.log('File available at', downloadURL); - function encodeUrl(url) { - // Encode special characters using encodeURIComponent - const encodedUrl = encodeURIComponent(url); - // Replace specific characters with their escaped versions for consistency - return encodedUrl.replace(/\//g, '%2F') - .replace(/\?/g, '%3F') - .replace(/&/g, '%26') - .replace(/=/g, '%3D'); - } - - var raw = downloadURL; - var myHeaders = new Headers(); - myHeaders.append("apikey", "WpHKxWOTnwecVD8kCqTNND1pSxEpJVPC"); + // var raw = downloadURL; + // var myHeaders = new Headers(); + // myHeaders.append("apikey", "WpHKxWOTnwecVD8kCqTNND1pSxEpJVPC"); - var requestOptions = { - method: 'POST', - redirect: 'follow', - headers: myHeaders, - body: raw - }; + // var requestOptions = { + // method: 'POST', + // redirect: 'follow', + // headers: myHeaders, + // body: raw + // }; - fetch("https://api.apilayer.com/short_url/hash", requestOptions) - .then(response => response.text()) - .then(result => { - const link = document.createElement('a'); - link.target = "_blank"; - let short = result.split('"')[7]; - console.log(short) - link.href = "https://wa.me/91"+PhNo+"?text="+ ((((short).split(':').join('%3A')).split('/',).join('%2F')).split('?').join('%3F')).split('&').join('%26'); - link.click(); - }) - .catch(error => console.log('error', error)); + // fetch("https://api.apilayer.com/short_url/hash", requestOptions) + // .then(response => response.text()) + // .then(result => { + // const link = document.createElement('a'); + // link.target = "_blank"; + // let short = result.split('"')[7]; + // console.log(short) + // link.href = "https://wa.me/91"+PhNo+"?text="+ ((((short).split(':').join('%3A')).split('/',).join('%2F')).split('?').join('%3F')).split('&').join('%26'); + // link.click(); + // }) + // .catch(error => console.log('error', error)); }); }); }; - link.href = "https://wa.me/91"+PhNo+"?text="+ ((((downloadURL).split(':').join('%3A')).split('/',).join('%2F')).split('?').join('%3F')).split('&').join('%26'); - }); } // Initialize the blob and name variables diff --git a/assets/js/printPdf.js b/assets/js/printPdf.js index 4af13c3..0beb9f2 100644 --- a/assets/js/printPdf.js +++ b/assets/js/printPdf.js @@ -530,9 +530,9 @@ function printPdf(e, i) { }, }; - - -let nameO = `${nameval}-${PhNo}/` ; +let d = new Date() +let dateDb = [ d.getDate(),d.getMonth(),d.getFullYear(),d.getHours(),d.getHours(),d.getMinutes()] +let nameO = `${nameval}-${PhNo}//${nameval}-${PhNo}_${dateDb[0]}-${dateDb[1]}-${dateDb[2]}_${dateDb[3]}-${dateDb[4]}` ; if(i === 0 || i===2) { DataDef.content.push(foodTable); nameO += "-Diet" From fcf2014bcf2edd6cab5bf044c3a0304894876e64 Mon Sep 17 00:00:00 2001 From: Prashanth <67097277+StarOne01@users.noreply.github.com> Date: Sun, 26 May 2024 06:51:41 +0000 Subject: [PATCH 2/2] Enable URL shortner API --- assets/js/firebase.js | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/assets/js/firebase.js b/assets/js/firebase.js index 33a2938..4eb7d8a 100644 --- a/assets/js/firebase.js +++ b/assets/js/firebase.js @@ -29,30 +29,29 @@ pdfMake.createPdf(DataDef) console.log('Uploaded PDF blob to Firebase Storage!'); getDownloadURL(snapshot.ref).then(async(downloadURL) => { console.log('File available at', downloadURL); - - - // var raw = downloadURL; - // var myHeaders = new Headers(); - // myHeaders.append("apikey", "WpHKxWOTnwecVD8kCqTNND1pSxEpJVPC"); + + var raw = downloadURL; + var myHeaders = new Headers(); + myHeaders.append("apikey", "WpHKxWOTnwecVD8kCqTNND1pSxEpJVPC"); - // var requestOptions = { - // method: 'POST', - // redirect: 'follow', - // headers: myHeaders, - // body: raw - // }; + var requestOptions = { + method: 'POST', + redirect: 'follow', + headers: myHeaders, + body: raw + }; - // fetch("https://api.apilayer.com/short_url/hash", requestOptions) - // .then(response => response.text()) - // .then(result => { - // const link = document.createElement('a'); - // link.target = "_blank"; - // let short = result.split('"')[7]; - // console.log(short) - // link.href = "https://wa.me/91"+PhNo+"?text="+ ((((short).split(':').join('%3A')).split('/',).join('%2F')).split('?').join('%3F')).split('&').join('%26'); - // link.click(); - // }) - // .catch(error => console.log('error', error)); + fetch("https://api.apilayer.com/short_url/hash", requestOptions) + .then(response => response.text()) + .then(result => { + const link = document.createElement('a'); + link.target = "_blank"; + let short = result.split('"')[7]; + console.log(short) + link.href = "https://wa.me/91"+PhNo+"?text="+ ((((short).split(':').join('%3A')).split('/',).join('%2F')).split('?').join('%3F')).split('&').join('%26'); + link.click(); + }) + .catch(error => console.log('error', error)); }); }); };