RanchiMall/flopay
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ui-work

Browse Source
This commit is contained in:
sairaj mote 2022-04-25 20:23:32 +05:30 committed by GitHub
commit a9d290fadf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
css/main.css
View File

@ -64,7 +64,6 @@ a {
a:focus-visible { a:focus-visible {
box-shadow: 0 0 0 0.1rem rgba(var(--text-color), 1) inset; box-shadow: 0 0 0 0.1rem rgba(var(--text-color), 1) inset;
} }
a.button { a.button {
padding: 0.4rem 0.6rem; padding: 0.4rem 0.6rem;
border-radius: 0.3rem; border-radius: 0.3rem;

6
index.html
View File

@ -23,7 +23,7 @@
FLO: ['https://flosight.duckdns.org/', 'https://livenet.flocha.in/'], FLO: ['https://flosight.duckdns.org/', 'https://livenet.flocha.in/'],
FLO_TEST: ['https://testnet-flosight.duckdns.org/', 'https://testnet.flocha.in/'] FLO_TEST: ['https://testnet-flosight.duckdns.org/', 'https://testnet.flocha.in/']
}, },
adminID: "FKAEdnPfjXLHSYwrXQu377ugN4tXU7VGdf", adminID: "FH64hLqB71e6i11rnZZW7hvzoH8daCwy1J",
sendAmt: 0.001, sendAmt: 0.001,
fee: 0.0005, fee: 0.0005,
@ -37,7 +37,7 @@
//for cloud apps //for cloud apps
subAdmins: [], subAdmins: [],
application: "TEST_MODE", application: "blockchainUPI",
appObjects: {}, appObjects: {},
generalData: {}, generalData: {},
lastVC: {} lastVC: {}
@ -1277,6 +1277,7 @@
floGlobals.savedUserData = { floGlobals.savedUserData = {
upiIds: {} upiIds: {}
} }
console.log(`Welcome ${myFloID}`); console.log(`Welcome ${myFloID}`);
getRef('logged_in_user_id').value = myFloID; getRef('logged_in_user_id').value = myFloID;
floGlobals.isSubAdmin = floGlobals.subAdmins.includes(myFloID) floGlobals.isSubAdmin = floGlobals.subAdmins.includes(myFloID)
@ -1297,6 +1298,7 @@
}).catch(error => console.error(error)) }).catch(error => console.error(error))
} else { } else {
userUI.renderSavedIds() userUI.renderSavedIds()
userUI.renderCashierRequests(User.cashierRequests); userUI.renderCashierRequests(User.cashierRequests);
userUI.renderMoneyRequests(User.moneyRequests); userUI.renderMoneyRequests(User.moneyRequests);
User.init().then(result => { User.init().then(result => {

7
qrcode-scanner.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
qrcode.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
scripts/fn_ui.js
View File

@ -713,7 +713,7 @@ function getSignedIn() {
showPage('loading'); showPage('loading');
}; };
}); });
}
function signOut() { function signOut() {
getConfirmation('Sign out?', 'You are about to sign out of the app, continue?', 'Stay', 'Leave') getConfirmation('Sign out?', 'You are about to sign out of the app, continue?', 'Stay', 'Leave')
.then(async (res) => { .then(async (res) => {

1
scripts/std_ui.js
View File

@ -664,7 +664,6 @@ class LazyLoader {
this.intersectionObserver.observe(this.lazyContainer.firstElementChild) this.intersectionObserver.observe(this.lazyContainer.firstElementChild)
else else
this.intersectionObserver.observe(this.lazyContainer.lastElementChild) this.intersectionObserver.observe(this.lazyContainer.lastElementChild)
} }
} }
}) })