Skip to content
This repository was archived by the owner on Oct 30, 2023. It is now read-only.

Commit 592ec2e

Browse files
chiragobchiragob
authored
Merge pull request #269 from FlowzPlatform/develop
Develop
2 parents cc537a5 + cbfe445 commit 592ec2e

File tree

3 files changed

+150
-145
lines changed

3 files changed

+150
-145
lines changed

‎client/src/components/Register.vue

Lines changed: 134 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,15 @@ export default {
119119
}
120120
})
121121
.catch(e => {
122-
this.$Notice.error({
123-
title: e.response.data.name,
124-
message: e.response.data.message,
125-
duration: 10
126-
})
122+
if (typeof (e.response.data) === 'string') {
123+
this.$Message.error(e.response.data)
124+
} else {
125+
this.$Notice.error({
126+
title: e.response.data.name,
127+
message: e.response.data.message,
128+
duration: 10
129+
})
130+
}
127131
this.loading = false
128132
})
129133
} else {
@@ -210,136 +214,136 @@ export default {
210214
}
211215
.animate0 {
212216
-webkit-animation-duration: .8s;
213-
-webkit-animation-delay: 0s;
214-
-webkit-animation-timing-function: ease;
215-
-webkit-animation-fill-mode: both;
216-
-moz-animation-duration: .8s;
217-
-moz-animation-delay: 0s;
218-
-moz-animation-timing-function: ease;
219-
-moz-animation-fill-mode: both;
220-
-ms-animation-duration: .8s;
221-
-ms-animation-delay: 0s;
222-
-ms-animation-timing-function: ease;
223-
-ms-animation-fill-mode: both;
224-
animation-duration: .8s;
225-
animation-delay: 0s;
226-
animation-timing-function: ease;
227-
animation-fill-mode: both;
228-
}
229-
230-
.animate1{
231-
-webkit-animation-duration: .8s;
232-
-webkit-animation-delay: .2s;
233-
-webkit-animation-timing-function: ease;
234-
-webkit-animation-fill-mode: both;
235-
-moz-animation-duration: .8s;
236-
-moz-animation-delay: .2s;
237-
-moz-animation-timing-function: ease;
238-
-moz-animation-fill-mode: both;
239-
-ms-animation-duration: .8s;
240-
-ms-animation-delay: .2s;
241-
-ms-animation-timing-function: ease;
242-
-ms-animation-fill-mode: both;
243-
animation-duration: .8s;
244-
animation-delay: .2s;
245-
animation-timing-function: ease;
246-
animation-fill-mode: both;
247-
}
217+
-webkit-animation-delay: 0s;
218+
-webkit-animation-timing-function: ease;
219+
-webkit-animation-fill-mode: both;
220+
-moz-animation-duration: .8s;
221+
-moz-animation-delay: 0s;
222+
-moz-animation-timing-function: ease;
223+
-moz-animation-fill-mode: both;
224+
-ms-animation-duration: .8s;
225+
-ms-animation-delay: 0s;
226+
-ms-animation-timing-function: ease;
227+
-ms-animation-fill-mode: both;
228+
animation-duration: .8s;
229+
animation-delay: 0s;
230+
animation-timing-function: ease;
231+
animation-fill-mode: both;
232+
}
248233
249-
.animate2{
234+
.animate1{
250235
-webkit-animation-duration: .8s;
251-
-webkit-animation-delay: .4s;
252-
-webkit-animation-timing-function: ease;
253-
-webkit-animation-fill-mode: both;
254-
-moz-animation-duration: .8s;
255-
-moz-animation-delay: .4s;
256-
-moz-animation-timing-function: ease;
257-
-moz-animation-fill-mode: both;
258-
-ms-animation-duration: .8s;
259-
-ms-animation-delay: .4s;
260-
-ms-animation-timing-function: ease;
261-
-ms-animation-fill-mode: both;
262-
animation-duration: .8s;
263-
animation-delay: .4s;
264-
animation-timing-function: ease;
265-
animation-fill-mode: both;
266-
}
236+
-webkit-animation-delay: .2s;
237+
-webkit-animation-timing-function: ease;
238+
-webkit-animation-fill-mode: both;
239+
-moz-animation-duration: .8s;
240+
-moz-animation-delay: .2s;
241+
-moz-animation-timing-function: ease;
242+
-moz-animation-fill-mode: both;
243+
-ms-animation-duration: .8s;
244+
-ms-animation-delay: .2s;
245+
-ms-animation-timing-function: ease;
246+
-ms-animation-fill-mode: both;
247+
animation-duration: .8s;
248+
animation-delay: .2s;
249+
animation-timing-function: ease;
250+
animation-fill-mode: both;
251+
}
267252
268-
.animate3{
269-
-webkit-animation-duration: .8s;
270-
-webkit-animation-delay: .6s;
271-
-webkit-animation-timing-function: ease;
272-
-webkit-animation-fill-mode: both;
273-
-moz-animation-duration: .8s;
274-
-moz-animation-delay: .6s;
275-
-moz-animation-timing-function: ease;
276-
-moz-animation-fill-mode: both;
277-
-ms-animation-duration: .8s;
278-
-ms-animation-delay: .6s;
279-
-ms-animation-timing-function: ease;
280-
-ms-animation-fill-mode: both;
281-
animation-duration: .8s;
282-
animation-delay: .6s;
283-
animation-timing-function: ease;
284-
animation-fill-mode: both;
285-
}
253+
.animate2{
254+
-webkit-animation-duration: .8s;
255+
-webkit-animation-delay: .4s;
256+
-webkit-animation-timing-function: ease;
257+
-webkit-animation-fill-mode: both;
258+
-moz-animation-duration: .8s;
259+
-moz-animation-delay: .4s;
260+
-moz-animation-timing-function: ease;
261+
-moz-animation-fill-mode: both;
262+
-ms-animation-duration: .8s;
263+
-ms-animation-delay: .4s;
264+
-ms-animation-timing-function: ease;
265+
-ms-animation-fill-mode: both;
266+
animation-duration: .8s;
267+
animation-delay: .4s;
268+
animation-timing-function: ease;
269+
animation-fill-mode: both;
270+
}
286271
287-
.animate4{
288-
-webkit-animation-duration: .8s;
289-
-webkit-animation-delay: .8s;
290-
-webkit-animation-timing-function: ease;
291-
-webkit-animation-fill-mode: both;
292-
-moz-animation-duration: .8s;
293-
-moz-animation-delay: .8s;
294-
-moz-animation-timing-function: ease;
295-
-moz-animation-fill-mode: both;
296-
-ms-animation-duration: .8s;
297-
-ms-animation-delay: .8s;
298-
-ms-animation-timing-function: ease;
299-
-ms-animation-fill-mode: both;
300-
animation-duration: .8s;
301-
animation-delay: .8s;
302-
animation-timing-function: ease;
303-
animation-fill-mode: both;
304-
}
272+
.animate3{
273+
-webkit-animation-duration: .8s;
274+
-webkit-animation-delay: .6s;
275+
-webkit-animation-timing-function: ease;
276+
-webkit-animation-fill-mode: both;
277+
-moz-animation-duration: .8s;
278+
-moz-animation-delay: .6s;
279+
-moz-animation-timing-function: ease;
280+
-moz-animation-fill-mode: both;
281+
-ms-animation-duration: .8s;
282+
-ms-animation-delay: .6s;
283+
-ms-animation-timing-function: ease;
284+
-ms-animation-fill-mode: both;
285+
animation-duration: .8s;
286+
animation-delay: .6s;
287+
animation-timing-function: ease;
288+
animation-fill-mode: both;
289+
}
305290
306-
.animate5{
307-
-webkit-animation-duration: .8s;
308-
-webkit-animation-delay: 1s;
309-
-webkit-animation-timing-function: ease;
310-
-webkit-animation-fill-mode: both;
311-
-moz-animation-duration: .8s;
312-
-moz-animation-delay: 1s;
313-
-moz-animation-timing-function: ease;
314-
-moz-animation-fill-mode: both;
315-
-ms-animation-duration: .8s;
316-
-ms-animation-delay: 1s;
317-
-ms-animation-timing-function: ease;
318-
-ms-animation-fill-mode: both;
319-
animation-duration: .8s;
320-
animation-delay: 1s;
321-
animation-timing-function: ease;
322-
animation-fill-mode: both;
323-
}
324-
#particles-js {
325-
position: fixed;
326-
top: 0;
327-
left: 0;
328-
width: 100%;
329-
height: 100%;
330-
}
291+
.animate4{
292+
-webkit-animation-duration: .8s;
293+
-webkit-animation-delay: .8s;
294+
-webkit-animation-timing-function: ease;
295+
-webkit-animation-fill-mode: both;
296+
-moz-animation-duration: .8s;
297+
-moz-animation-delay: .8s;
298+
-moz-animation-timing-function: ease;
299+
-moz-animation-fill-mode: both;
300+
-ms-animation-duration: .8s;
301+
-ms-animation-delay: .8s;
302+
-ms-animation-timing-function: ease;
303+
-ms-animation-fill-mode: both;
304+
animation-duration: .8s;
305+
animation-delay: .8s;
306+
animation-timing-function: ease;
307+
animation-fill-mode: both;
308+
}
331309
332-
.registerpanel .ivu-form-item-error-tip {
333-
display: block
334-
}
335-
.ivu-form-item-error-tip {
336-
position: relative !important;
337-
top: 100%;
310+
.animate5{
311+
-webkit-animation-duration: .8s;
312+
-webkit-animation-delay: 1s;
313+
-webkit-animation-timing-function: ease;
314+
-webkit-animation-fill-mode: both;
315+
-moz-animation-duration: .8s;
316+
-moz-animation-delay: 1s;
317+
-moz-animation-timing-function: ease;
318+
-moz-animation-fill-mode: both;
319+
-ms-animation-duration: .8s;
320+
-ms-animation-delay: 1s;
321+
-ms-animation-timing-function: ease;
322+
-ms-animation-fill-mode: both;
323+
animation-duration: .8s;
324+
animation-delay: 1s;
325+
animation-timing-function: ease;
326+
animation-fill-mode: both;
327+
}
328+
#particles-js {
329+
position: fixed;
330+
top: 0;
338331
left: 0;
339-
line-height: 1;
340-
padding-top: 0px;
341-
margin-top:7px !important;
342-
font-size:15px !important;
343-
color: #ed3f14;
344-
}
332+
width: 100%;
333+
height: 100%;
334+
}
335+
336+
.registerpanel .ivu-form-item-error-tip {
337+
display: block
338+
}
339+
.ivu-form-item-error-tip {
340+
position: relative !important;
341+
top: 100%;
342+
left: 0;
343+
line-height: 1;
344+
padding-top: 0px;
345+
margin-top:7px !important;
346+
font-size:15px !important;
347+
color: #ed3f14;
348+
}
345349
</style>

‎client/src/components/addconfig.vue

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ export default {
5252
})
5353
if (res.status) {
5454
if (!res.valid) {
55-
callback(new Error('! Name Already Exist, Please Enter another Name.'))
55+
callback(new Error('Name Already Exist, Please Enter another Name.'))
5656
} else {
5757
callback()
5858
}
5959
} else {
60-
callback(new Error('! Network Error'))
60+
callback(new Error('Network Error'))
6161
}
6262
}
6363
const editvalidateName = async(rule, value, callback) => {
@@ -80,12 +80,12 @@ export default {
8080
})
8181
if (res.status) {
8282
if (!res.valid) {
83-
callback(new Error('! Name Already Exist, Please Enter another Name.'))
83+
callback(new Error('Name Already Exist, Please Enter another Name.'))
8484
} else {
8585
callback()
8686
}
8787
} else {
88-
callback(new Error('! Network Error'))
88+
callback(new Error('Network Error'))
8989
}
9090
}
9191
}
@@ -104,32 +104,32 @@ export default {
104104
},
105105
rulesformItem: {
106106
name: [
107-
{ required: true, message: '! Please Enter the Name', trigger: 'blur' },
107+
{ required: true, message: 'Please Enter the Name', trigger: 'blur' },
108108
{ validator: validateName, trigger: 'blur' }
109109
],
110110
number: [
111-
{ required: true, message: '! Please Enter the Number', trigger: 'blur' }
111+
{ required: true, message: 'Please Enter the Number', trigger: 'blur' }
112112
],
113113
user: [
114-
{ required: true, message: '! Please Enter the User', trigger: 'blur' }
114+
{ required: true, message: 'Please Enter the User', trigger: 'blur' }
115115
],
116116
password: [
117-
{ required: true, message: '! Please Enter the Password', trigger: 'blur' }
117+
{ required: true, message: 'Please Enter the Password', trigger: 'blur' }
118118
]
119119
},
120120
updateRulesformItem: {
121121
name: [
122-
{ required: true, message: '! Please Enter the Name', trigger: 'blur' },
122+
{ required: true, message: 'Please Enter the Name', trigger: 'blur' },
123123
{ validator: editvalidateName, trigger: 'blur' }
124124
],
125125
number: [
126-
{ required: true, message: '! Please Enter the Number', trigger: 'blur' }
126+
{ required: true, message: 'Please Enter the Number', trigger: 'blur' }
127127
],
128128
user: [
129-
{ required: true, message: '! Please Enter the User', trigger: 'blur' }
129+
{ required: true, message: 'Please Enter the User', trigger: 'blur' }
130130
],
131131
password: [
132-
{ required: true, message: '! Please Enter the Password', trigger: 'blur' }
132+
{ required: true, message: 'Please Enter the Password', trigger: 'blur' }
133133
]
134134
},
135135
validName: ''

‎client/src/components/mainUpload.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080

8181
<div v-if="showWebImage" id="upload-image-zone">
8282
<form id="f1" class="file-zone" enctype="multipart/form-data" method="post">
83-
<span class="dz-message">Mass image upload<br/>
83+
<span class="dz-message">Select Folder for Mass image upload<br/>
8484
<small>(only *.jpeg, *.jpg, *.png, *.gif files are valid.)</small>
8585
</span>
8686
<input name="dir" id="dir_input" @change="handleImageChange($event,activeTab) " type="file" webkitdirectory directory multiple/><br/>
@@ -225,7 +225,7 @@
225225
</table>
226226
</div>
227227
<div class="pagination">
228-
<Page :total="mObj[activeTab].newUploadCSV.length" :current="mObj[activeTab].cpage" @on-change="changePage" :page-size=5></Page>
228+
<Page :total="mObj[activeTab].newUploadCSV.length" :current="mObj[activeTab].cpage" @on-change="changePage" :page-size=5> </Page>
229229
</div>
230230
</div>
231231
</div>
@@ -707,7 +707,8 @@ export default {
707707
moment: moment,
708708
currentStep: 0,
709709
map: false,
710-
fileTypes: ['Product Variation Price', 'Product Information', 'Product Price', 'Product Imprint Data', 'Product Image', 'Product Shipping', 'Product Additional Charges'],
710+
// fileTypes: ['Product Variation Price', 'Product Information', 'Product Price', 'Product Imprint Data', 'Product Image', 'Product Shipping', 'Product Additional Charges'],
711+
fileTypes: ['Product Shipping', 'Product Information', 'Product Price', 'Product Imprint Data', 'Product Image'],
711712
activeTab: 'Product Information',
712713
fileNames: ['ProductInformation', 'ProductPrice', 'ProductImprintData', 'ProductImage', 'ProductShipping', 'ProductAdditionalCharges', 'ProductVariationPrice'],
713714
validate: true,

0 commit comments

Comments
 (0)