Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rex Dri
Rex Dri
Commits
8354d08a
Commit
8354d08a
authored
Sep 03, 2018
by
Florent Chehab
Browse files
Loading currencies added
parent
9936114a
Changes
2
Hide whitespace changes
Inline
Side-by-side
frontend/src/components/App.js
View file @
8354d08a
...
@@ -22,12 +22,12 @@ import MyComponent from './MyComponent'
...
@@ -22,12 +22,12 @@ import MyComponent from './MyComponent'
// import route Components here
// import route Components here
import
{
import
{
BrowserRouter
as
Router
,
Route
,
Route
,
}
from
'
react-router-dom
'
;
}
from
'
react-router-dom
'
;
import
{
import
{
countriesFetchData
,
countriesFetchData
,
currenciesFetchData
,
}
from
'
../generated/actions
'
;
}
from
'
../generated/actions
'
;
...
@@ -174,14 +174,16 @@ App.propTypes = {
...
@@ -174,14 +174,16 @@ App.propTypes = {
const
mapStateToProps
=
(
state
)
=>
{
const
mapStateToProps
=
(
state
)
=>
{
return
{
return
{
countries
:
state
.
countries
countries
:
state
.
countries
,
currencies
:
state
.
currencies
}
}
};
};
const
mapDispatchToProps
=
(
dispatch
)
=>
{
const
mapDispatchToProps
=
(
dispatch
)
=>
{
return
{
return
{
fetchData
:
{
fetchData
:
{
countries
:
()
=>
dispatch
(
countriesFetchData
())
countries
:
()
=>
dispatch
(
countriesFetchData
()),
currencies
:
()
=>
dispatch
(
currenciesFetchData
()),
}
}
};
};
};
};
...
...
frontend/src/reducers/index.js
View file @
8354d08a
...
@@ -5,7 +5,8 @@ import {
...
@@ -5,7 +5,8 @@ import {
mainCampusesReducers
,
mainCampusesReducers
,
countriesReducers
,
countriesReducers
,
countriesElReducers
,
countriesElReducers
,
universitiesElReducers
universitiesElReducers
,
currenciesReducers
,
}
from
'
../generated/combinedReducers
'
;
}
from
'
../generated/combinedReducers
'
;
import
{
import
{
...
@@ -21,6 +22,7 @@ const rootReducer = combineReducers({
...
@@ -21,6 +22,7 @@ const rootReducer = combineReducers({
countriesEl
:
countriesElReducers
,
countriesEl
:
countriesElReducers
,
universities
:
universitiesReducers
,
universities
:
universitiesReducers
,
universitiesEl
:
universitiesElReducers
,
universitiesEl
:
universitiesElReducers
,
currencies
:
currenciesReducers
,
mainCampuses
:
mainCampusesReducers
,
mainCampuses
:
mainCampusesReducers
,
app
:
appReducers
app
:
appReducers
})
})
...
...
Write
Preview
Supports
Markdown
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