Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
InvestCustomer
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Giang Tran
InvestCustomer
Commits
8d03e0b3
Commit
8d03e0b3
authored
May 10, 2021
by
Nguyễn Thị Thúy
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'phase2_home' into 'dev_phase2'
Phase2 home See merge request
!11
parents
dc328c41
f362a5d6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
61 additions
and
236 deletions
+61
-236
Home.js
src/Screens/Home/Home.js
+42
-223
HomeView.js
src/Screens/Home/HomeView.js
+1
-4
ItemPrice.js
src/Screens/Home/ItemPrice.js
+8
-8
PriceListView.js
src/Screens/Home/PriceListView.js
+1
-1
Home.js
src/apis/Functions/Home.js
+8
-0
url.js
src/apis/url.js
+1
-0
No files found.
src/Screens/Home/Home.js
View file @
8d03e0b3
import
React
,
{
useEffect
,
useState
}
from
'react'
;
import
React
,
{
useEffect
,
useState
}
from
'react'
;
import
{
View
,
Alert
,
Platform
}
from
'react-native'
;
import
{
Alert
,
Platform
}
from
'react-native'
;
import
{
connect
}
from
'react-redux'
;
import
{
connect
}
from
'react-redux'
;
import
{
getTransaction
}
from
'../../apis/Functions/users'
;
import
{
getTransaction
}
from
'../../apis/Functions/users'
;
import
{
getImagesHome
}
from
'../../apis/Functions/General'
;
import
{
getImagesHome
}
from
'../../apis/Functions/General'
;
import
{
getPriceTable
}
from
'../../apis/Functions/Home'
;
import
I18n
from
'../../helper/i18/i18n'
;
import
I18n
from
'../../helper/i18/i18n'
;
import
HomeView
from
'./HomeView'
;
import
HomeView
from
'./HomeView'
;
import
{
getListCategoryProduct
}
from
'../../apis/Functions/Transaction'
;
import
{
getListCategoryProduct
}
from
'../../apis/Functions/Transaction'
;
import
{
hideLoading
,
showLoading
}
from
'../../actions/loadingAction'
;
import
_
from
'lodash'
;
const
Home
=
(
props
)
=>
{
const
Home
=
(
props
)
=>
{
const
[
data
,
setData
]
=
useState
({
total_deposit
:
0
,
total_withdraw
:
0
});
const
[
data
,
setData
]
=
useState
({
total_deposit
:
0
,
total_withdraw
:
0
});
const
[
dataPrice
,
setDataPrice
]
=
useState
([
const
[
dataPrice
,
setDataPrice
]
=
useState
([]);
{
const
[
dataPriceFilter
,
setDataPriceFilter
]
=
useState
([]);
name
:
'GCEM21'
,
change
:
0.2
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
false
,
},
{
name
:
'GCEM21'
,
change
:
0.5
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
true
,
},
{
name
:
'GCEM21'
,
change
:
0.1
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
false
,
},
{
name
:
'GCEM21'
,
change
:
0.6
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
true
,
},
{
name
:
'GCEM21'
,
change
:
0.3
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
false
,
},
{
name
:
'GCEM21'
,
change
:
0.9
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
false
,
},
{
name
:
'GCEM21'
,
change
:
0.2
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
false
,
},
{
name
:
'GCEM21'
,
change
:
0.3
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
true
,
},
{
name
:
'GCEM21'
,
change
:
0.5
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
true
,
},
{
name
:
'GCEM21'
,
change
:
0.1
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
false
,
},
{
name
:
'GCEM21'
,
change
:
0.7
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
true
,
},
{
name
:
'GCEM21'
,
change
:
0.4
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
true
,
},
{
name
:
'GCEM21'
,
change
:
0.5
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
false
,
},
{
name
:
'GCEM21'
,
change
:
0.5
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
false
,
},
{
name
:
'GCEM21'
,
change
:
0.8
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
false
,
},
{
name
:
'GCEM21'
,
change
:
0.3
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
true
,
},
{
name
:
'GCEM21'
,
change
:
0.4
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
false
,
},
{
name
:
'GCEM21'
,
change
:
0.5
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
true
,
},
{
name
:
'GCEM21'
,
change
:
0.4
,
changePercent
:
0.1
,
openPrice
:
1777.2
,
closePrice
:
17778.3
,
highPrice
:
1778.9
,
lowPrice
:
1777
,
time
:
'Gold (Globex): June 2021'
,
isUp
:
false
,
},
]);
const
[
listImage
,
setListImage
]
=
useState
([]);
const
[
listImage
,
setListImage
]
=
useState
([]);
const
[
filters
,
setFilters
]
=
useState
([]);
const
[
filters
,
setFilters
]
=
useState
([]);
const
[
filterId
,
setFilterId
]
=
useState
(
-
1
);
const
[
filterId
,
setFilterId
]
=
useState
(
-
1
);
useEffect
(()
=>
{
useEffect
(()
=>
{
getData
();
getData
();
initSocket
();
},
[]);
useEffect
(()
=>
{
const
newList
=
filterId
==
-
1
?
[...
dataPrice
]
:
_
.
filter
([...
dataPrice
],
item
=>
item
.
category_id
==
filterId
);
setDataPriceFilter
(
newList
);
},
[
dataPrice
]);
const
initSocket
=
()
=>
{
let
io
=
require
(
'socket.io-client'
);
let
io
=
require
(
'socket.io-client'
);
let
socket
=
io
.
connect
(
'http://222.252.22.174:8087'
,
{
let
socket
=
io
.
connect
(
'http://222.252.22.174:8087'
,
{
transports
:
[
'websocket'
],
transports
:
[
'websocket'
],
...
@@ -232,14 +35,16 @@ const Home = (props) => {
...
@@ -232,14 +35,16 @@ const Home = (props) => {
reconnect
:
true
,
reconnect
:
true
,
});
});
socket
.
on
(
'response-update-price'
,
(
message
)
=>
{
socket
.
on
(
'response-update-price'
,
(
message
)
=>
{
console
.
log
(
'received message'
,
message
);
receivedMessage
(
message
);
});
});
},
[])
;
}
;
const
onR
eceivedMessage
=
(
message
)
=>
{
const
r
eceivedMessage
=
(
message
)
=>
{
console
.
log
(
message
);
setDataPrice
(
message
);
};
};
const
getData
=
async
()
=>
{
const
getData
=
async
()
=>
{
props
.
showLoading
();
const
res
=
await
getTransaction
({});
const
res
=
await
getTransaction
({});
if
(
res
.
data
.
code
==
200
&&
res
.
data
.
data
)
{
if
(
res
.
data
.
code
==
200
&&
res
.
data
.
data
)
{
setData
(
res
.
data
.
data
);
setData
(
res
.
data
.
data
);
...
@@ -268,18 +73,32 @@ const Home = (props) => {
...
@@ -268,18 +73,32 @@ const Home = (props) => {
}
else
{
}
else
{
Alert
.
alert
(
I18n
.
t
(
'Notification'
),
res
.
data
.
message
);
Alert
.
alert
(
I18n
.
t
(
'Notification'
),
res
.
data
.
message
);
}
}
const
resPriceHome
=
await
getPriceTable
({});
if
(
resPriceHome
.
data
.
code
==
200
&&
resPriceHome
.
data
.
data
)
{
setDataPrice
(
resPriceHome
.
data
.
data
);
setDataPriceFilter
(
resPriceHome
.
data
.
data
);
}
else
{
Alert
.
alert
(
I18n
.
t
(
'Notification'
),
I18n
.
t
(
'Can_not_get_data'
));
}
props
.
hideLoading
();
console
.
log
(
'filterId'
,
filterId
);
};
const
changeFilter
=
(
id
)
=>
{
setFilterId
(
id
);
const
newList
=
id
==
-
1
?
[...
dataPrice
]
:
_
.
filter
([...
dataPrice
],
item
=>
item
.
category_id
==
id
);
setDataPriceFilter
(
newList
);
console
.
log
(
id
,
newList
);
};
};
return
(
return
<
HomeView
<
HomeView
data
=
{
data
}
data
=
{
data
}
dataPrice
=
{
dataPrice
}
dataPrice
=
{
dataPriceFilter
}
listImage
=
{
listImage
}
listImage
=
{
listImage
}
filterId
=
{
filterId
}
filterId
=
{
filterId
}
filters
=
{
filters
}
filters
=
{
filters
}
setFilterId
=
{
setFilterId
}
setFilterId
=
{
changeFilter
}
/
>
/>
;
);
};
};
const
mapStateToProps
=
(
state
)
=>
{
const
mapStateToProps
=
(
state
)
=>
{
...
@@ -287,4 +106,4 @@ const mapStateToProps = (state) => {
...
@@ -287,4 +106,4 @@ const mapStateToProps = (state) => {
user
:
state
.
userReducer
,
user
:
state
.
userReducer
,
};
};
};
};
export
default
connect
(
mapStateToProps
,
{})(
Home
);
export
default
connect
(
mapStateToProps
,
{
showLoading
,
hideLoading
})(
Home
);
src/Screens/Home/HomeView.js
View file @
8d03e0b3
import
React
from
'react'
;
import
React
from
'react'
;
import
{
import
{
View
,
View
,
Text
,
ImageBackground
,
ImageBackground
,
StyleSheet
,
StyleSheet
,
ScrollView
,
ScrollView
,
}
from
'react-native'
;
}
from
'react-native'
;
import
HeaderHome
from
'../../components/Header/HeaderHome'
;
import
HeaderHome
from
'../../components/Header/HeaderHome'
;
import
Footer
from
'./Footer'
;
import
{
getFontXD
}
from
'../../Config/Functions'
;
import
{
HEIGHT
,
HEIGHTXD
,
toPriceVnd
,
getFontXD
}
from
'../../Config/Functions'
;
import
R
from
'../../assets/R'
;
import
R
from
'../../assets/R'
;
import
AppText
from
'../../components/AppText'
;
import
SwiperComponent
from
'./SwiperComponent'
;
import
SwiperComponent
from
'./SwiperComponent'
;
import
PriceListView
from
'./PriceListView'
;
import
PriceListView
from
'./PriceListView'
;
...
...
src/Screens/Home/ItemPrice.js
View file @
8d03e0b3
...
@@ -47,12 +47,12 @@ const ItemPrice = (props) => {
...
@@ -47,12 +47,12 @@ const ItemPrice = (props) => {
justifyContent
:
'space-between'
,
justifyContent
:
'space-between'
,
alignItems
:
'center'
,
alignItems
:
'center'
,
}}
>
}}
>
<
Image
source
=
{
item
.
is
U
p
?
R
.
images
.
iconTriangleUp
:
R
.
images
.
iconTriangleDown
}
style
=
{
styles
.
imgIcon
}
/
>
<
Image
source
=
{
item
.
is
_u
p
?
R
.
images
.
iconTriangleUp
:
R
.
images
.
iconTriangleDown
}
style
=
{
styles
.
imgIcon
}
/
>
<
Text
style
=
{[
styles
.
txtBlack
,
{
flexWrap
:
'wrap'
,
color
:
item
.
is
U
p
?
R
.
colors
.
green
:
R
.
colors
.
red2
}]}
>
<
Text
style
=
{[
styles
.
txtBlack
,
{
flexWrap
:
'wrap'
,
color
:
item
.
is
_u
p
?
R
.
colors
.
green
:
R
.
colors
.
red2
}]}
>
{
item
.
change
}
{
item
.
change
}
<
/Text
>
<
/Text
>
<
/View
>
<
/View
>
<
Text
style
=
{[
styles
.
txtMoney
,
{
color
:
item
.
is
Up
?
R
.
colors
.
green
:
R
.
colors
.
red2
}]}
>
{
`
${
item
.
change
}
%`
}
<
/Text
>
<
Text
style
=
{[
styles
.
txtMoney
,
{
color
:
item
.
is
_up
?
R
.
colors
.
green
:
R
.
colors
.
red2
}]}
>
{
`
${
item
.
change_percent
}
%`
}
<
/Text
>
<
/View
>
<
/View
>
<
/Block
>
<
/Block
>
<
Block
padding
=
{[
0
,
0
]}
space
=
{
'between'
}
flex
=
{
1
}
>
<
Block
padding
=
{[
0
,
0
]}
space
=
{
'between'
}
flex
=
{
1
}
>
...
@@ -73,9 +73,9 @@ const ItemPrice = (props) => {
...
@@ -73,9 +73,9 @@ const ItemPrice = (props) => {
<
Text
style
=
{[
styles
.
txtBlack
,
{
flexWrap
:
'wrap'
}]}
<
Text
style
=
{[
styles
.
txtBlack
,
{
flexWrap
:
'wrap'
}]}
ellipsizeMode
=
'tail'
>
ellipsizeMode
=
'tail'
>
{
item
.
open
P
rice
}
{
item
.
open
_p
rice
}
<
/Text
>
<
/Text
>
<
Image
source
=
{
item
.
is
U
p
?
R
.
images
.
iconTriangleUp
:
R
.
images
.
iconTriangleDown
}
style
=
{
styles
.
imgIcon
}
/
>
<
Image
source
=
{
item
.
is
_u
p
?
R
.
images
.
iconTriangleUp
:
R
.
images
.
iconTriangleDown
}
style
=
{
styles
.
imgIcon
}
/
>
<
/View
>
<
/View
>
<
View
<
View
style
=
{{
style
=
{{
...
@@ -84,7 +84,7 @@ const ItemPrice = (props) => {
...
@@ -84,7 +84,7 @@ const ItemPrice = (props) => {
justifyContent
:
'space-between'
,
justifyContent
:
'space-between'
,
alignItems
:
'center'
,
alignItems
:
'center'
,
}}
>
}}
>
<
Text
style
=
{[
styles
.
txtMoney
,
{
color
:
R
.
colors
.
gray
}]}
>
{
item
.
close
P
rice
}
<
/Text
>
<
Text
style
=
{[
styles
.
txtMoney
,
{
color
:
R
.
colors
.
gray
}]}
>
{
item
.
close
_p
rice
}
<
/Text
>
<
Image
source
=
{
R
.
images
.
iconCheck2
}
style
=
{
styles
.
imgIcon
}
/
>
<
Image
source
=
{
R
.
images
.
iconCheck2
}
style
=
{
styles
.
imgIcon
}
/
>
<
/View
>
<
/View
>
<
/View
>
<
/View
>
...
@@ -104,7 +104,7 @@ const ItemPrice = (props) => {
...
@@ -104,7 +104,7 @@ const ItemPrice = (props) => {
justifyContent
:
'center'
,
justifyContent
:
'center'
,
}}
>
}}
>
<
Text
style
=
{[
styles
.
txtBlack
,
{
flexWrap
:
'wrap'
}]}
>
<
Text
style
=
{[
styles
.
txtBlack
,
{
flexWrap
:
'wrap'
}]}
>
{
item
.
high
P
rice
}
{
item
.
high
_p
rice
}
<
/Text
>
<
/Text
>
<
Text
style
=
{[
styles
.
txtGray
,
{
flexWrap
:
'wrap'
}]}
>
<
Text
style
=
{[
styles
.
txtGray
,
{
flexWrap
:
'wrap'
}]}
>
H
H
...
@@ -116,7 +116,7 @@ const ItemPrice = (props) => {
...
@@ -116,7 +116,7 @@ const ItemPrice = (props) => {
flexDirection
:
'row'
,
flexDirection
:
'row'
,
justifyContent
:
'center'
,
justifyContent
:
'center'
,
}}
>
}}
>
<
Text
style
=
{
styles
.
txtMoney
}
>
{
item
.
low
P
rice
}
<
/Text
>
<
Text
style
=
{
styles
.
txtMoney
}
>
{
item
.
low
_p
rice
}
<
/Text
>
<
Text
style
=
{[
styles
.
txtGray
,
{
flexWrap
:
'wrap'
}]}
>
<
Text
style
=
{[
styles
.
txtGray
,
{
flexWrap
:
'wrap'
}]}
>
L
L
<
/Text
>
<
/Text
>
...
...
src/Screens/Home/PriceListView.js
View file @
8d03e0b3
import
React
,
{
useState
}
from
'react'
;
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
{
import
{
View
,
View
,
Text
,
Text
,
...
...
src/apis/Functions/Home.js
0 → 100644
View file @
8d03e0b3
import
{
GetData
}
from
'../helpers'
;
import
url
from
'../url'
;
export
const
getPriceTable
=
async
(
body
)
=>
GetData
(
url
.
urlGetPriceTable
,
body
)
.
then
((
res
)
=>
res
)
.
catch
((
err
)
=>
err
);
src/apis/url.js
View file @
8d03e0b3
...
@@ -25,6 +25,7 @@ export default {
...
@@ -25,6 +25,7 @@ export default {
//Home
//Home
urlGetTransaction
:
root
+
'api/v1/customers/statistic-transaction'
,
urlGetTransaction
:
root
+
'api/v1/customers/statistic-transaction'
,
urlGetPriceTable
:
`
${
root
}
api/v1/customers/update-price-table`
,
//History
//History
urlGetListHistory
:
root
+
'api/v1/customers/get-list-transaction-history'
,
urlGetListHistory
:
root
+
'api/v1/customers/get-list-transaction-history'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment