geer-builder 1.2.526 → 1.2.529
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/GCashOut.vue +10 -2
- package/GInvestment.vue +2 -2
- package/GInvestmentLogin.vue +20 -3
- package/GInvestmentLogs.vue +2 -2
- package/GLeads.vue +12 -13
- package/GRegistration.vue +2 -2
- package/components/Investment/InvestmentAddWallet.vue +64 -22
- package/components/Investment/InvestmentListDialog.vue +4 -3
- package/dialogs/AddInvestment.vue +1 -1
- package/dialogs/ClaimInvestmentDialog.vue +11 -1
- package/package.json +1 -1
package/GCashOut.vue
CHANGED
|
@@ -108,6 +108,7 @@ import DB_CASHOUT from './models/DB_MEMBER_CASHOUT';
|
|
|
108
108
|
import DB_USER from './models/DB_USER';
|
|
109
109
|
import CashoutStatusDialog from './dialogs/CashoutStatusDialog'
|
|
110
110
|
import TinRegistrationDialog from './dialogs/TinRegistrationDialog'
|
|
111
|
+
import {QSpinnerFacebook } from 'quasar'
|
|
111
112
|
|
|
112
113
|
export default {
|
|
113
114
|
data: () =>
|
|
@@ -294,8 +295,15 @@ export default {
|
|
|
294
295
|
submitdata.cashout_method = this.cashout_choice;
|
|
295
296
|
submitdata.amount = this.cashout_amount;
|
|
296
297
|
|
|
297
|
-
this.$q.loading.show(
|
|
298
|
-
|
|
298
|
+
this.$q.loading.show({
|
|
299
|
+
spinner: QSpinnerFacebook,
|
|
300
|
+
spinnerColor: 'white',
|
|
301
|
+
spinnerSize: 140,
|
|
302
|
+
backgroundColor: 'primary',
|
|
303
|
+
message: 'Some important process is in progress. Hang on...',
|
|
304
|
+
messageColor: 'black'
|
|
305
|
+
})
|
|
306
|
+
|
|
299
307
|
try
|
|
300
308
|
{
|
|
301
309
|
await this.$_fbCall('memberCashOut', submitdata);
|
package/GInvestment.vue
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<
|
|
2
|
+
<div v-if="this.user_info" class="investment-page">
|
|
3
3
|
<div class="plan-grid">
|
|
4
4
|
<!-- <div class="plan-item" v-for="(item, i) in investment_packages" :key="i" @click="choosePlan(item)" v-bind:class="{active : chosen_plan.key === item.key}">
|
|
5
5
|
<div class="plan-title">
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
<investment-view-dialog :investment_details="plan"></investment-view-dialog>
|
|
36
36
|
</q-dialog>
|
|
37
37
|
|
|
38
|
-
</
|
|
38
|
+
</div>
|
|
39
39
|
<div v-else>
|
|
40
40
|
<span>You need to login to view this component.</span>
|
|
41
41
|
</div>
|
package/GInvestmentLogin.vue
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div class="g-investment-login" @click="loginMetaMask">
|
|
2
|
+
<div class="g-investment-login" @click="loginMetaMask" v-if="!hide_button">
|
|
3
3
|
<img :src="require('./assets/statics/metamask-icon.png')" class="image" alt="">
|
|
4
4
|
<div class="label">Connect to MetaMask</div>
|
|
5
5
|
</div>
|
|
@@ -22,10 +22,16 @@ export default
|
|
|
22
22
|
signer: null,
|
|
23
23
|
payment_processor: null,
|
|
24
24
|
usdt: null
|
|
25
|
-
}
|
|
25
|
+
},
|
|
26
|
+
hide_button:false,
|
|
26
27
|
}),
|
|
27
28
|
mounted()
|
|
28
29
|
{
|
|
30
|
+
console.log(sessionStorage.metamask_login);
|
|
31
|
+
if(sessionStorage.metamask_login)
|
|
32
|
+
{
|
|
33
|
+
this.hide_button = true;
|
|
34
|
+
}
|
|
29
35
|
},
|
|
30
36
|
methods: {
|
|
31
37
|
async loginMetaMask()
|
|
@@ -48,7 +54,18 @@ export default
|
|
|
48
54
|
this.metamask.signer
|
|
49
55
|
);
|
|
50
56
|
|
|
51
|
-
|
|
57
|
+
try
|
|
58
|
+
{
|
|
59
|
+
let metamask_address = await this.metamask.usdt.balanceOf(await this.metamask.signer.getAddress()).then(result => ethers.utils.formatEther(result.toString()));
|
|
60
|
+
console.log(metamask_address, 'address');
|
|
61
|
+
sessionStorage.setItem('metamask_login', true);
|
|
62
|
+
this.hide_button = true;
|
|
63
|
+
}
|
|
64
|
+
catch (error)
|
|
65
|
+
{
|
|
66
|
+
console.log(error);
|
|
67
|
+
}
|
|
68
|
+
// console.log(await this.metamask.usdt.balanceOf(await this.metamask.signer.getAddress()).then(result => ethers.utils.formatEther(result.toString())));
|
|
52
69
|
// this.merchant_balance = await this.usdt.balanceOf(this.settings.merchant).then(result => ethers.utils.formatEther(result.toString()));
|
|
53
70
|
}
|
|
54
71
|
else
|
package/GInvestmentLogs.vue
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<q-card class="wallet-logs-dialog">
|
|
3
|
-
<q-bar class="bg-primary text-white q-pa-lg">
|
|
3
|
+
<!-- <q-bar class="bg-primary text-white q-pa-lg">
|
|
4
4
|
<q-icon class="q-mr-sm" name="fa fa-splotch"></q-icon>
|
|
5
5
|
<b>Wallet Logs</b>
|
|
6
6
|
<q-space />
|
|
7
7
|
<q-btn dense flat icon="close" v-close-popup>
|
|
8
8
|
<q-tooltip content-class="bg-white text-primary">Close</q-tooltip>
|
|
9
9
|
</q-btn>
|
|
10
|
-
</q-bar>
|
|
10
|
+
</q-bar> -->
|
|
11
11
|
<div class="table-holder">
|
|
12
12
|
<div class="temp-nav-holder" v-if="!hide_search">
|
|
13
13
|
<!-- FILTER FROM -->
|
package/GLeads.vue
CHANGED
|
@@ -6,15 +6,15 @@
|
|
|
6
6
|
</div>
|
|
7
7
|
<q-dialog full-width v-model="is_dialog_open">
|
|
8
8
|
<q-card v-if="lead_list.length > 0" class="full-width full-height form member-lead-list">
|
|
9
|
-
<q-bar class="bg-primary text-white q-pa-lg">
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
<!-- <q-bar class="bg-primary text-white q-pa-lg">
|
|
10
|
+
<q-icon class="q-mr-sm" name="fa fa-eye"></q-icon>
|
|
11
|
+
Lead List
|
|
12
|
+
<q-space />
|
|
13
13
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
<q-btn dense flat icon="close" v-close-popup>
|
|
15
|
+
<q-tooltip content-class="bg-white text-primary">Close</q-tooltip>
|
|
16
|
+
</q-btn>
|
|
17
|
+
</q-bar> -->
|
|
18
18
|
|
|
19
19
|
<div class="list">
|
|
20
20
|
<div @click="createSlot(lead)" v-for="lead in lead_list" :key="lead.uid" class="item">
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
</div> -->
|
|
33
33
|
</q-card>
|
|
34
34
|
<q-card v-else style="height: 500px; width: 500px !important">
|
|
35
|
-
<q-bar class="bg-primary text-white q-pa-lg">
|
|
35
|
+
<!-- <q-bar class="bg-primary text-white q-pa-lg">
|
|
36
36
|
<q-icon class="q-mr-sm" name="fa fa-eye"></q-icon>
|
|
37
37
|
Lead List
|
|
38
38
|
<q-space />
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
<q-btn dense flat icon="close" v-close-popup>
|
|
41
41
|
<q-tooltip content-class="bg-white text-primary">Close</q-tooltip>
|
|
42
42
|
</q-btn>
|
|
43
|
-
</q-bar>
|
|
43
|
+
</q-bar> -->
|
|
44
44
|
<div class="icon" style="text-align: center">
|
|
45
45
|
<q-icon class="q-mr-sm" name="fas fa-exclamation-circle" style="font-size: 100px; color: #3887d1; margin-top: 20%"></q-icon>
|
|
46
46
|
</div>
|
|
@@ -53,12 +53,11 @@
|
|
|
53
53
|
<div v-else>
|
|
54
54
|
<q-card class="full-width full-height form member-lead-list">
|
|
55
55
|
<!-- HEADER -->
|
|
56
|
-
<q-bar class="bg-primary text-white q-pa-lg">
|
|
56
|
+
<!-- <q-bar class="bg-primary text-white q-pa-lg">
|
|
57
57
|
<q-icon class="q-mr-sm" name="fa fa-eye"></q-icon>
|
|
58
58
|
Lead List
|
|
59
59
|
<q-space />
|
|
60
|
-
|
|
61
|
-
</q-bar>
|
|
60
|
+
</q-bar> -->
|
|
62
61
|
|
|
63
62
|
<div v-if="lead_list.length > 0" class="list">
|
|
64
63
|
<div @click="createSlot(lead)" v-for="lead in lead_list" :key="lead.uid" class="item">
|
package/GRegistration.vue
CHANGED
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
<div class="g-registration__fields q-mt-md">
|
|
65
65
|
<q-btn :loading="is_submitting" unelevated class="full-width" color="primary" type="submit">Sign Up</q-btn>
|
|
66
66
|
</div>
|
|
67
|
-
<div class="term"><q-checkbox v-model="val" /> <span @click="is_term_and_condition_open =true" class="term_span"> By clicking sign-up, I have read and I agree to the Company Policies, Terms and Conditions, Rules and Regulation, Code of Conduct And Ethical Standards and the Privacy Policy</span></div>
|
|
67
|
+
<div v-if="!mbot" class="term"><q-checkbox v-model="val" /> <span @click="is_term_and_condition_open =true" class="term_span"> By clicking sign-up, I have read and I agree to the Company Policies, Terms and Conditions, Rules and Regulation, Code of Conduct And Ethical Standards and the Privacy Policy</span></div>
|
|
68
68
|
<!--
|
|
69
69
|
<div class="social-holder">
|
|
70
70
|
<div class="social-title">
|
|
@@ -148,6 +148,7 @@ export default
|
|
|
148
148
|
if(this.terms_and_conditions.hasOwnProperty('mbot'))
|
|
149
149
|
{
|
|
150
150
|
this.mbot = true;
|
|
151
|
+
this.val = true;
|
|
151
152
|
}
|
|
152
153
|
if(this.$route.query.hasOwnProperty('sponsor') || sessionStorage.referral_slot_code)
|
|
153
154
|
{
|
|
@@ -197,7 +198,6 @@ export default
|
|
|
197
198
|
this.form_data.location = 'Location';
|
|
198
199
|
this.form_data.mbot = true;
|
|
199
200
|
}
|
|
200
|
-
console.log(this.form_data, 'mbot');
|
|
201
201
|
this.is_submitting = true;
|
|
202
202
|
try
|
|
203
203
|
{
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<q-card :style="`min-width: ${ $q.platform.is.mobile ? '100%' : '400px' };`" class="form add-slot">
|
|
3
3
|
<!-- HEADER -->
|
|
4
|
-
<div class="
|
|
4
|
+
<div class="add-wallet-dialog">
|
|
5
5
|
<q-card-section class="content">
|
|
6
6
|
<q-stepper flat v-model="step" vertical color="primary" animated>
|
|
7
7
|
<q-step :name="1" title="Add Wallet" icon="settings" :done="step > 1">
|
|
@@ -54,8 +54,9 @@
|
|
|
54
54
|
import GlobalMixins from '../../mixins/global_mixins';
|
|
55
55
|
import PaymentProcessor from '../../contracts/PaymentProcessor.json';
|
|
56
56
|
import USDT from '../../contracts/USDT.json';
|
|
57
|
-
import settings from '../../settings';
|
|
57
|
+
import settings from '../../settings/settings';
|
|
58
58
|
import { ethers, Contract } from 'ethers';
|
|
59
|
+
import {QSpinnerFacebook } from 'quasar'
|
|
59
60
|
|
|
60
61
|
|
|
61
62
|
export default
|
|
@@ -92,33 +93,43 @@ export default
|
|
|
92
93
|
async mounted()
|
|
93
94
|
{
|
|
94
95
|
await this.$_getSlotInfo();
|
|
95
|
-
if (window.ethereum)
|
|
96
|
-
{
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
96
|
+
// if (window.ethereum)
|
|
97
|
+
// {
|
|
98
|
+
// await window.ethereum.request({ method: 'eth_requestAccounts' });
|
|
99
|
+
// const provider = new ethers.providers.Web3Provider(window.ethereum);
|
|
100
|
+
// this.metamask.signer = provider.getSigner();
|
|
100
101
|
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
102
|
+
// this.metamask.payment_processor = new Contract(
|
|
103
|
+
// settings.payment_processor,
|
|
104
|
+
// PaymentProcessor.abi,
|
|
105
|
+
// this.metamask.signer
|
|
106
|
+
// );
|
|
106
107
|
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
108
|
+
// this.metamask.usdt = new Contract(
|
|
109
|
+
// settings.usdt,
|
|
110
|
+
// USDT.abi,
|
|
111
|
+
// this.metamask.signer
|
|
112
|
+
// );
|
|
112
113
|
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
}
|
|
114
|
+
// console.log(await this.metamask.usdt.balanceOf(await this.metamask.signer.getAddress()).then(result => ethers.utils.formatEther(result.toString())));
|
|
115
|
+
// // this.merchant_balance = await this.usdt.balanceOf(this.settings.merchant).then(result => ethers.utils.formatEther(result.toString()));
|
|
116
|
+
// }
|
|
116
117
|
},
|
|
117
118
|
methods:
|
|
118
119
|
{
|
|
119
120
|
async confirmPlan()
|
|
120
121
|
{
|
|
122
|
+
this.$q.loading.show({
|
|
123
|
+
spinner: QSpinnerFacebook,
|
|
124
|
+
spinnerColor: 'white',
|
|
125
|
+
spinnerSize: 140,
|
|
126
|
+
backgroundColor: 'primary',
|
|
127
|
+
message: 'Some important process is in progress. Hang on...',
|
|
128
|
+
messageColor: 'black'
|
|
129
|
+
})
|
|
130
|
+
|
|
121
131
|
this.submit_loading = true;
|
|
132
|
+
|
|
122
133
|
if(Number(this.investment_amount) < 1)
|
|
123
134
|
{
|
|
124
135
|
this.$q.dialog({ title: "Something's not quite right", message: "Please enter valid amount." });
|
|
@@ -142,6 +153,7 @@ export default
|
|
|
142
153
|
}
|
|
143
154
|
this.submit_loading = false;
|
|
144
155
|
}
|
|
156
|
+
this.$q.loading.hide();
|
|
145
157
|
|
|
146
158
|
},
|
|
147
159
|
addDaysToDate(days)
|
|
@@ -155,8 +167,31 @@ export default
|
|
|
155
167
|
this.submit_loading = true;
|
|
156
168
|
try
|
|
157
169
|
{
|
|
170
|
+
|
|
171
|
+
if (window.ethereum)
|
|
172
|
+
{
|
|
173
|
+
await window.ethereum.request({ method: 'eth_requestAccounts' });
|
|
174
|
+
const provider = new ethers.providers.Web3Provider(window.ethereum);
|
|
175
|
+
this.metamask.signer = provider.getSigner();
|
|
176
|
+
|
|
177
|
+
this.metamask.payment_processor = new Contract(
|
|
178
|
+
settings.payment_processor,
|
|
179
|
+
PaymentProcessor.abi,
|
|
180
|
+
this.metamask.signer
|
|
181
|
+
);
|
|
182
|
+
|
|
183
|
+
this.metamask.usdt = new Contract(
|
|
184
|
+
settings.usdt,
|
|
185
|
+
USDT.abi,
|
|
186
|
+
this.metamask.signer
|
|
187
|
+
);
|
|
188
|
+
|
|
189
|
+
console.log(await this.metamask.usdt.balanceOf(await this.metamask.signer.getAddress()).then(result => ethers.utils.formatEther(result.toString())));
|
|
190
|
+
// this.merchant_balance = await this.usdt.balanceOf(this.settings.merchant).then(result => ethers.utils.formatEther(result.toString()));
|
|
191
|
+
}
|
|
158
192
|
const amount = Number(this.wallet_details.amount);
|
|
159
193
|
|
|
194
|
+
|
|
160
195
|
const tx1 = await this.metamask.usdt.approve(settings.payment_processor, amount);
|
|
161
196
|
await tx1.wait();
|
|
162
197
|
|
|
@@ -165,7 +200,14 @@ export default
|
|
|
165
200
|
}
|
|
166
201
|
catch (e)
|
|
167
202
|
{
|
|
168
|
-
|
|
203
|
+
if(e.code == 4001)
|
|
204
|
+
{
|
|
205
|
+
this.$q.dialog({ title: "Something's not quite right!", message: 'User denied transaction signature' });
|
|
206
|
+
}
|
|
207
|
+
else
|
|
208
|
+
{
|
|
209
|
+
this.$q.dialog({ title: "Something's not quite right!", message: 'Your transaction cannot be process now' });
|
|
210
|
+
}
|
|
169
211
|
}
|
|
170
212
|
finally
|
|
171
213
|
{
|
|
@@ -181,7 +223,7 @@ export default
|
|
|
181
223
|
|
|
182
224
|
<style lang="scss">
|
|
183
225
|
|
|
184
|
-
.
|
|
226
|
+
.add-wallet-dialog
|
|
185
227
|
{
|
|
186
228
|
.add-slot {
|
|
187
229
|
.instruction {
|
|
@@ -122,22 +122,23 @@ export default
|
|
|
122
122
|
align : 'left',
|
|
123
123
|
}
|
|
124
124
|
],
|
|
125
|
+
table_status:false,
|
|
125
126
|
}),
|
|
126
127
|
props:
|
|
127
128
|
{
|
|
128
|
-
|
|
129
|
+
completed:Boolean
|
|
129
130
|
},
|
|
130
131
|
async mounted()
|
|
131
132
|
{
|
|
132
133
|
await this.$_getSlotInfo()
|
|
133
134
|
this.getHistory()
|
|
134
|
-
|
|
135
135
|
},
|
|
136
136
|
methods:
|
|
137
137
|
{
|
|
138
138
|
async getHistory()
|
|
139
139
|
{
|
|
140
|
-
|
|
140
|
+
this.table_status = this.completed ? true : false;
|
|
141
|
+
await this.$bind('investment_history', new DB_INVESTMENT_LOGS(this.current_slot_info.id).collection().where('completed', '==' , this.table_status));
|
|
141
142
|
this.loading_table = false;
|
|
142
143
|
},
|
|
143
144
|
viewStatus(row)
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
<div class="q-py-md col-12 plan-amount-text text-center">
|
|
20
20
|
<b>Current Wallet </b> :
|
|
21
21
|
<div class="text-primary" v-if="current_slot_info">
|
|
22
|
-
{{ $_formatNumber(current_slot_info.wallet ? current_slot_info.wallet : 0, { decimal: 2 }) }}
|
|
22
|
+
{{ $_formatNumber(current_slot_info.wallet ? current_slot_info.wallet : 0, { decimal: 2 }) }} USDT
|
|
23
23
|
</div>
|
|
24
24
|
</div>
|
|
25
25
|
</div>
|
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
</template>
|
|
22
22
|
|
|
23
23
|
<script>
|
|
24
|
+
import {QSpinnerFacebook } from 'quasar'
|
|
24
25
|
import GlobalMixins from '../mixins/global_mixins.js';
|
|
25
26
|
export default
|
|
26
27
|
{
|
|
@@ -43,6 +44,15 @@ export default
|
|
|
43
44
|
{
|
|
44
45
|
async checkEarnings()
|
|
45
46
|
{
|
|
47
|
+
this.$q.loading.show({
|
|
48
|
+
spinner: QSpinnerFacebook,
|
|
49
|
+
spinnerColor: 'white',
|
|
50
|
+
spinnerSize: 140,
|
|
51
|
+
backgroundColor: 'primary',
|
|
52
|
+
message: 'Some important process is in progress. Hang on...',
|
|
53
|
+
messageColor: 'black'
|
|
54
|
+
})
|
|
55
|
+
|
|
46
56
|
this.submit_loading = true;
|
|
47
57
|
let fields = this.investment_info;
|
|
48
58
|
fields.slot_info = this.current_slot_info;
|
|
@@ -65,7 +75,7 @@ export default
|
|
|
65
75
|
}
|
|
66
76
|
|
|
67
77
|
this.submit_loading = false;
|
|
68
|
-
|
|
78
|
+
this.$q.loading.hide();
|
|
69
79
|
}
|
|
70
80
|
},
|
|
71
81
|
computed:
|