Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Jay Mehta
/
zango-frontend
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Registry
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Commit bab1fecc
authored
10 months ago
by
Chetan
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
sign up issue and status added in giftcard
1 parent
1da2081c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
6 deletions
components/signup/Signup.js
components/user/MyGiftCard.js
components/signup/Signup.js
View file @
bab1fec
...
@@ -197,7 +197,7 @@ const Signup = props => {
...
@@ -197,7 +197,7 @@ const Signup = props => {
onChange
=
{
handleChange
}
onChange
=
{
handleChange
}
onBlur
=
{
e
=>
{
onBlur
=
{
e
=>
{
handleBlur
(
e
);
handleBlur
(
e
);
setCountryCode
(
e
.
target
.
value
);
//
setCountryCode(e.target.value);
}}
}}
style
=
{{
width
:
"80px"
}}
style
=
{{
width
:
"80px"
}}
>
>
...
...
This diff is collapsed.
Click to expand it.
components/user/MyGiftCard.js
View file @
bab1fec
...
@@ -4,6 +4,7 @@ import { Button } from "react-bootstrap";
...
@@ -4,6 +4,7 @@ import { Button } from "react-bootstrap";
import
{
cleanImage
,
renderImage
}
from
"../../services/imageHandling"
;
import
{
cleanImage
,
renderImage
}
from
"../../services/imageHandling"
;
import
{
useDispatch
,
useSelector
}
from
"react-redux"
;
import
{
useDispatch
,
useSelector
}
from
"react-redux"
;
import
{
getGiftCard
}
from
"../../redux/actions/giftCardAction"
;
import
{
getGiftCard
}
from
"../../redux/actions/giftCardAction"
;
import
{
Tag
}
from
"antd"
;
const
MyGiftCard
=
()
=>
{
const
MyGiftCard
=
()
=>
{
const
dispatch
=
useDispatch
();
const
dispatch
=
useDispatch
();
...
@@ -17,7 +18,27 @@ const MyGiftCard = () => {
...
@@ -17,7 +18,27 @@ const MyGiftCard = () => {
console
.
log
(
"endUser"
,
endUser
);
console
.
log
(
"endUser"
,
endUser
);
console
.
log
(
"giftCard"
,
giftCard
);
console
.
log
(
"giftCard"
,
giftCard
);
const
getStatus
=
(
status
)
=>
{
let
text
;
let
color
;
switch
(
status
)
{
case
'new'
:
text
=
'PENDING'
;
color
=
'warning'
;
break
;
case
'fulfilled'
:
text
=
'APPROVED'
;
color
=
'success'
;
break
;
case
'rejected'
:
text
=
'REJECTED'
;
color
=
'error'
;
break
;
default
:
break
;
}
return
<
Tag
color
=
{
color
}
>
{
text
.
toUpperCase
()}
<
/Tag>
;
}
return
(
return
(
<
Fragment
>
<
Fragment
>
<
div
className
=
"container"
>
<
div
className
=
"container"
>
...
@@ -28,7 +49,7 @@ const MyGiftCard = () => {
...
@@ -28,7 +49,7 @@ const MyGiftCard = () => {
{
giftCard
?.
length
>
0
?
{
giftCard
?.
length
>
0
?
<>
<>
{
giftCard
.
map
((
data
,
index
)
=>
(
{
giftCard
.
map
((
data
,
index
)
=>
(
<
div
className
=
"col-12 col-lg-4
px-4 px-lg-3"
key
=
{
`1
${
index
}
`
}
>
<
div
className
=
"col-12 col-lg-4 col-md-6
px-4 px-lg-3"
key
=
{
`1
${
index
}
`
}
>
<
div
className
=
"card-booking"
>
<
div
className
=
"card-booking"
>
<
div
className
=
"card-booking-img bgGrey"
>
<
div
className
=
"card-booking-img bgGrey"
>
<
span
className
=
"image-container"
>
<
span
className
=
"image-container"
>
...
@@ -37,7 +58,7 @@ const MyGiftCard = () => {
...
@@ -37,7 +58,7 @@ const MyGiftCard = () => {
<
/div
>
<
/div
>
<
div
className
=
"card-booking-content details-wrapper"
>
<
div
className
=
"card-booking-content details-wrapper"
>
<
p
className
=
"details"
>
Details
<
/p
>
<
p
className
=
"details"
>
Details
<
/p
>
<
div
className
=
"d-flex
align-items-start justify-content-between"
>
<
div
className
=
"d-flex flex-column flex-md-row flex-sm-row flex-lg-row
align-items-start justify-content-between"
>
<
div
className
=
"details-div"
>
<
div
className
=
"details-div"
>
<
p
>
Sender
’
s
Email
Id
<
/p
>
<
p
>
Sender
’
s
Email
Id
<
/p
>
<
p
>
{
data
.
attributes
.
senderEmail
}
<
/p
>
<
p
>
{
data
.
attributes
.
senderEmail
}
<
/p
>
...
@@ -47,9 +68,17 @@ const MyGiftCard = () => {
...
@@ -47,9 +68,17 @@ const MyGiftCard = () => {
<
p
>
{
data
.
attributes
.
receiverEmail
}
<
/p
>
<
p
>
{
data
.
attributes
.
receiverEmail
}
<
/p
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
className
=
"details-div"
>
<
div
className
=
"details-div d-flex align-items-end justify-content-between"
>
<
div
>
<
p
>
Gift
Amount
<
/p
>
<
p
>
Gift
Amount
<
/p
>
<
p
>
$
{
data
.
attributes
.
amount
}
<
/p
>
<
p
className
=
"m-0"
>
$
{
data
.
attributes
.
amount
}
<
/p
>
<
/div
>
{
data
.
attributes
.
status
!==
null
&&
<
div
>
{
getStatus
(
data
?.
attributes
?.
status
)}
<
/div
>
}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Styling with
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment