0.0.63
This commit is contained in:
parent
1104cc9ee3
commit
ab0e89e568
41
css/main.css
41
css/main.css
@ -35,11 +35,6 @@ body[data-theme=dark] {
|
||||
body[data-theme=dark] .flo-balance-card {
|
||||
color: rgba(var(--text-color), 1);
|
||||
}
|
||||
body[data-theme=dark] #my_qr_code {
|
||||
background: #fff;
|
||||
border-radius: 1rem;
|
||||
padding: 1rem;
|
||||
}
|
||||
|
||||
a {
|
||||
font-weight: 600;
|
||||
@ -455,6 +450,13 @@ sm-popup h5:not(.tag) {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.my-qr-code {
|
||||
background: #fff;
|
||||
border-radius: 1rem;
|
||||
padding: 1rem;
|
||||
max-width: max-content;
|
||||
}
|
||||
|
||||
#qr_code_popup::part(popup) {
|
||||
height: 90vh;
|
||||
}
|
||||
@ -1395,9 +1397,17 @@ sm-panel {
|
||||
#transaction_page #transaction_details strong {
|
||||
font-weight: 500;
|
||||
}
|
||||
#transaction_page #transaction_details strong:not(:last-of-type) + sm-button {
|
||||
margin-bottom: 1.5rem;
|
||||
margin-top: -0.4rem;
|
||||
}
|
||||
#transaction_page #transaction_details strong:not(:last-of-type) {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
#transaction_page #transaction_details sm-button {
|
||||
width: max-content;
|
||||
margin-top: 0.6rem;
|
||||
}
|
||||
#transaction_page .transaction-amount {
|
||||
font-size: 2rem;
|
||||
font-weight: 400;
|
||||
@ -1516,9 +1526,12 @@ sm-panel {
|
||||
justify-content: left;
|
||||
}
|
||||
|
||||
#settings_page > h4 {
|
||||
#settings_page h4 {
|
||||
margin-top: 2rem;
|
||||
margin-bottom: 0.4rem;
|
||||
margin-bottom: 0.6rem;
|
||||
}
|
||||
#settings_page .copy-row h4 {
|
||||
margin: 0;
|
||||
}
|
||||
#settings_page p {
|
||||
color: rgba(var(--text-color), 0.7);
|
||||
@ -1529,6 +1542,13 @@ sm-panel {
|
||||
#settings_page .flex {
|
||||
max-width: 60ch;
|
||||
}
|
||||
#settings_page .my-qr-code {
|
||||
margin-bottom: 1.5rem;
|
||||
height: 14rem;
|
||||
}
|
||||
#settings_page .my-qr-code img {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 640px) {
|
||||
#home_page, #deposit {
|
||||
@ -1563,6 +1583,13 @@ sm-panel {
|
||||
video {
|
||||
height: 100vw;
|
||||
}
|
||||
|
||||
#settings_page > h4:first-of-type {
|
||||
text-align: center;
|
||||
}
|
||||
#settings_page .my-qr-code {
|
||||
margin: 0 auto 3rem auto;
|
||||
}
|
||||
}
|
||||
@media only screen and (min-width: 640px) {
|
||||
.hide-on-desktop {
|
||||
|
||||
2
css/main.min.css
vendored
2
css/main.min.css
vendored
File diff suppressed because one or more lines are too long
@ -32,11 +32,6 @@ body[data-theme="dark"]{
|
||||
.flo-balance-card{
|
||||
color: rgba(var(--text-color), 1);
|
||||
}
|
||||
#my_qr_code{
|
||||
background: #fff;
|
||||
border-radius: 1rem;
|
||||
padding: 1rem;
|
||||
}
|
||||
}
|
||||
|
||||
a {
|
||||
@ -470,6 +465,12 @@ sm-popup{
|
||||
#reader{
|
||||
overflow: hidden;
|
||||
}
|
||||
.my-qr-code{
|
||||
background: #fff;
|
||||
border-radius: 1rem;
|
||||
padding: 1rem;
|
||||
max-width: max-content;
|
||||
}
|
||||
#qr_code_popup{
|
||||
&::part(popup){
|
||||
height: 90vh;
|
||||
@ -1446,10 +1447,18 @@ sm-panel{
|
||||
}
|
||||
strong{
|
||||
font-weight: 500;
|
||||
&:not(:last-of-type) + sm-button{
|
||||
margin-bottom: 1.5rem;
|
||||
margin-top: -0.4rem;
|
||||
}
|
||||
}
|
||||
strong:not(:last-of-type){
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
sm-button{
|
||||
width: max-content;
|
||||
margin-top: 0.6rem;
|
||||
}
|
||||
}
|
||||
.transaction-amount{
|
||||
font-size: 2rem;
|
||||
@ -1569,10 +1578,13 @@ sm-panel{
|
||||
}
|
||||
}
|
||||
#settings_page{
|
||||
& > h4{
|
||||
h4{
|
||||
margin-top: 2rem;
|
||||
margin-bottom: 0.4rem;
|
||||
margin-bottom: 0.6rem;
|
||||
}
|
||||
.copy-row h4{
|
||||
margin: 0;
|
||||
}
|
||||
p{
|
||||
color: rgba(var(--text-color), 0.7);
|
||||
}
|
||||
@ -1582,6 +1594,13 @@ sm-panel{
|
||||
.flex{
|
||||
max-width: 60ch;
|
||||
}
|
||||
.my-qr-code{
|
||||
margin-bottom: 1.5rem;
|
||||
height: 14rem;
|
||||
img{
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
@media only screen and (max-width: 640px) {
|
||||
#home_page, #deposit{
|
||||
@ -1613,6 +1632,14 @@ sm-panel{
|
||||
video{
|
||||
height: 100vw;
|
||||
}
|
||||
#settings_page{
|
||||
& > h4:first-of-type{
|
||||
text-align: center;
|
||||
}
|
||||
.my-qr-code{
|
||||
margin: 0 auto 3rem auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 640px) {
|
||||
|
||||
36
index.html
36
index.html
@ -74,7 +74,7 @@
|
||||
</p>
|
||||
</sm-panel>
|
||||
<sm-panel>
|
||||
<div id="my_qr_code"></div>
|
||||
<div class="my-qr-code"></div>
|
||||
<p>Show this QR Code to receive money using RanchiMall Pay</p>
|
||||
</sm-panel>
|
||||
</sm-tab-panels>
|
||||
@ -968,6 +968,8 @@
|
||||
</section>
|
||||
<section id="settings_page" class="page hide-completely">
|
||||
<h3 class="bottom-margin">Settings<h3>
|
||||
<h4>My QR Code</h4>
|
||||
<div class="my-qr-code"></div>
|
||||
<section>
|
||||
<h4>My FLO address</h4>
|
||||
<div class="copy-row">
|
||||
@ -1006,8 +1008,7 @@
|
||||
</header>
|
||||
<div id="transaction_details" class="grid direction-column"></div>
|
||||
<p id="caution_message"></p>
|
||||
<sm-button id="show_report_btn" class="hide" onclick="showPopup('report_popup')" variant="outlined">Report
|
||||
</div>
|
||||
<sm-button id="show_report_btn" class="hide" onclick="showPopup('report_popup')">Report</sm-button>
|
||||
</section>
|
||||
</main>
|
||||
<script src="components.js"></script>
|
||||
@ -1630,6 +1631,7 @@
|
||||
break;
|
||||
case 'person_popup':
|
||||
personPopupOpen = true
|
||||
personName = showPersonName.textContent
|
||||
break;
|
||||
case 'send_rupee_popup':
|
||||
if (personPopupOpen) {
|
||||
@ -2249,9 +2251,13 @@
|
||||
₹ <span class="transaction-amount"> ${amount}</span>
|
||||
</div>`
|
||||
|
||||
if (receiver !== 'undefined')
|
||||
if (receiver !== 'undefined'){
|
||||
transactionFloId = receiver
|
||||
composition += `
|
||||
<h5>${transaction}</h5> <strong class="breakable">${allContacts[receiver] ? allContacts[receiver].name : receiver}</strong>`
|
||||
<h5>${transaction}</h5> <strong class="breakable">${allContacts[receiver] ? allContacts[receiver].name : receiver}</strong>`
|
||||
if(floCrypto.validateAddr(receiver) && !allContacts[receiver])
|
||||
composition += `<sm-button onclick="addPersonFromTransaction()">Save this FLO address</sm-button>`
|
||||
}
|
||||
|
||||
if (upiTxId !== 'undefined')
|
||||
composition += `
|
||||
@ -2261,7 +2267,7 @@
|
||||
|
||||
if (receiverUPI !== 'undefined')
|
||||
composition += `
|
||||
<h5>Sent to UPI ID</h5>
|
||||
<h5>Sent to cashier UPI ID</h5>
|
||||
<strong>${receiverUPI}</strong>
|
||||
`
|
||||
composition += `<h5 id="transaction_time">${formatedTime(timeStamp)}</h5>`
|
||||
@ -2381,8 +2387,13 @@
|
||||
})
|
||||
}
|
||||
|
||||
function addPersonFromTransaction(){
|
||||
contactFlo.value = transactionFloId
|
||||
showPopup('add_person_popup')
|
||||
}
|
||||
|
||||
const peopleContainer = document.getElementById('people_container')
|
||||
let allContacts
|
||||
let allContacts, transactionFloId
|
||||
async function renderAllContacts() {
|
||||
allContacts = await compactIDB.readAllData('contacts')
|
||||
peopleContainer.innerHTML = ``
|
||||
@ -11942,15 +11953,9 @@
|
||||
"FCja6sLv58e3RMy41T5AmWyvXEWesqBCkX": {
|
||||
"upi_id": "8507742774@ybl"
|
||||
},
|
||||
"FHW2kgYEhDt85vjAiMMF7bQqdP74L7iwvQ": {
|
||||
"upi_id": "8340617958@ybl"
|
||||
},
|
||||
"FTmJ6QeBjDFjdqS6Zs4V5amac2X19AjXcF": {
|
||||
"upi_id": "8902496422@ybl"
|
||||
},
|
||||
"FBun3694ZdxmD66os9oL5DxMrif3vyVjT3": {
|
||||
"upi_id": "7004801428@ybl"
|
||||
},
|
||||
"FTpxFWdBDvYARGZuPWDhw9gke72J2pruvv": {
|
||||
"upi_id": "aakriti1705sinha@okicici"
|
||||
},
|
||||
@ -12099,7 +12104,10 @@
|
||||
defaultUPI = localStorage.getItem(`defaultUPI${myFloID}`)
|
||||
renderUserUPI()
|
||||
renderAllContacts()
|
||||
new QRCode(document.getElementById("my_qr_code"), myFloID);
|
||||
|
||||
document.querySelectorAll('.my-qr-code').forEach(code => {
|
||||
new QRCode(code, myFloID);
|
||||
})
|
||||
|
||||
showPage('home_page', 'home_page_btn')
|
||||
show_payment_requests()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user