Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Rex Dri
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Julien Jerphanion
Rex Dri
Commits
985357c2
Commit
985357c2
authored
Sep 03, 2018
by
Florent Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Saving selected universities to store ok
parent
6cc84c53
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
83 additions
and
23 deletions
+83
-23
frontend/src/actions/action-types.js
frontend/src/actions/action-types.js
+1
-0
frontend/src/actions/map.js
frontend/src/actions/map.js
+2
-2
frontend/src/actions/selectedUniversities.js
frontend/src/actions/selectedUniversities.js
+13
-0
frontend/src/components/search/Search.js
frontend/src/components/search/Search.js
+48
-17
frontend/src/index.js
frontend/src/index.js
+3
-1
frontend/src/reducers/index.js
frontend/src/reducers/index.js
+3
-3
frontend/src/reducers/selectedUniversities.js
frontend/src/reducers/selectedUniversities.js
+13
-0
No files found.
frontend/src/actions/action-types.js
View file @
985357c2
export
const
SAVE_MAIN_MAP_POSITION
=
'
SAVE_MAIN_MAP_POSITION
'
;
export
const
SAVE_SELECTED_UNIVERSITIES
=
'
SAVE_SELECTED_UNIVERSITIES
'
;
frontend/src/actions/map.js
View file @
985357c2
...
...
@@ -4,10 +4,10 @@ import {
}
from
"
./action-types
"
;
export
function
saveMainMapPosition
(
new_position
)
{
export
function
saveMainMapPosition
(
new_position
)
{
return
{
type
:
SAVE_MAIN_MAP_POSITION
,
new_position
};
}
frontend/src/actions/selectedUniversities.js
0 → 100644
View file @
985357c2
import
{
SAVE_SELECTED_UNIVERSITIES
}
from
"
./action-types
"
;
export
function
saveSelectedUniversities
(
new_selection
)
{
return
{
type
:
SAVE_SELECTED_UNIVERSITIES
,
new_selection
};
}
frontend/src/components/search/Search.js
View file @
985357c2
...
...
@@ -4,6 +4,7 @@ import DownshiftMultiple from './DownshiftMultiple';
import
MyComponent
from
'
../MyComponent
'
import
{
connect
}
from
"
react-redux
"
;
import
_
from
'
underscore
'
;
import
{
saveSelectedUniversities
}
from
'
../../actions/selectedUniversities
'
;
import
{
universitiesFetchData
,
...
...
@@ -24,33 +25,62 @@ class Search extends MyComponent {
}
joinCampus
(
campus
)
{
const
{
universities
,
countries
,
cities
}
=
this
.
getAllFetchedData
();
let
res
=
Object
.
assign
({},
campus
);
//copy for safety
res
.
university
=
universities
[
campus
.
university
];
res
.
city
=
cities
[
campus
.
city
]
res
.
country
=
countries
[
res
.
city
.
country
]
return
res
;
}
// getUnivFromCampus(campus) {
// const { universities } = this.props;
// return universities[campus.univ]
// }
// getCountryFromUniversity(univ) {
// const { countries } = this.props;
// return countries[univ.country]
// }
// getCountryFromCampus(campus) {
// const univ = this.getUnivFromCampus(campus);
// return this.getCountryFromUniversity(univ);
// }
getCountriesWhereThereAreUniversities
()
{
const
{
universities
,
mainCampuses
,
countries
,
cities
}
=
this
.
getAllFetchedData
();
const
{
mainCampuses
}
=
this
.
getAllFetchedData
();
let
res
=
[];
_
.
each
(
mainCampuses
,
(
campus
)
=>
{
let
univ
=
universities
[
campus
.
university
]
if
(
univ
&&
campus
)
{
let
city
=
cities
[
campus
.
city
]
let
country
=
countries
[
city
.
country
]
res
.
push
(
country
)
}
const
campusFull
=
this
.
joinCampus
(
campus
)
res
.
push
(
campusFull
.
country
)
});
return
_
.
uniq
(
res
,
false
,
_
.
iteratee
((
val
)
=>
{
return
val
.
iso_alpha2_code
})
);
return
_
.
uniq
(
res
,
false
,
(
c
)
=>
{
return
c
.
iso_alpha2_code
}
);
}
myRender
()
{
let
options
=
[];
this
.
getCountriesWhereThereAreUniversities
().
forEach
(
country
=>
{
options
.
push
({
id
:
country
.
iso_alpha2_code
,
label
:
country
.
name
});
updateSelectedUniversities
(
selection
)
{
const
{
mainCampuses
}
=
this
.
getAllFetchedData
();
const
listOfCountries
=
_
.
map
(
selection
,
(
s
)
=>
s
.
id
);
let
selected_universities
=
[]
_
.
each
(
mainCampuses
,
(
campus
)
=>
{
const
campusFull
=
this
.
joinCampus
(
campus
)
if
(
_
.
indexOf
(
listOfCountries
,
campusFull
.
country
.
iso_alpha2_code
)
>
-
1
)
{
selected_universities
.
push
(
campusFull
.
university
.
id
);
}
})
this
.
props
.
saveSelection
(
selected_universities
);
}
myRender
()
{
const
options
=
_
.
map
(
this
.
getCountriesWhereThereAreUniversities
(),
(
c
)
=>
{
return
{
id
:
c
.
iso_alpha2_code
,
label
:
c
.
name
}
})
return
(
<
DownshiftMultiple
options
=
{
options
}
onChange
=
{(
selection
)
=>
console
.
log
(
selection
)}
/
>
<
DownshiftMultiple
options
=
{
options
}
onChange
=
{(
selection
)
=>
this
.
updateSelectedUniversities
(
selection
)}
/
>
);
}
}
...
...
@@ -73,7 +103,8 @@ const mapDispatchToProps = (dispatch) => {
mainCampuses
:
()
=>
dispatch
(
mainCampusesFetchData
()),
cities
:
()
=>
dispatch
(
citiesFetchData
()),
countries
:
()
=>
dispatch
(
countriesFetchData
())
}
},
saveSelection
:
(
selectedUniversities
)
=>
dispatch
(
saveSelectedUniversities
(
selectedUniversities
)),
};
};
...
...
frontend/src/index.js
View file @
985357c2
...
...
@@ -11,7 +11,9 @@ import App from "./components/App";
const
MainReactEntry
=
()
=>
(
<
Provider
store
=
{
store
}
>
<
Router
>
<
Route
path
=
"
/:filter?
"
component
=
{
App
}
/
>
<
React
.
StrictMode
>
<
Route
path
=
"
/:filter?
"
component
=
{
App
}
/
>
<
/React.StrictMode
>
<
/Router
>
<
/Provider
>
);
...
...
frontend/src/reducers/index.js
View file @
985357c2
...
...
@@ -10,12 +10,12 @@ import {
citiesReducers
,
}
from
'
../generated/combinedReducers
'
;
import
{
saveMainMapPosition
}
from
'
./map
'
import
{
saveMainMapPosition
}
from
'
./map
'
import
{
saveSelectedUniversities
}
from
'
./selectedUniversities
'
const
appReducers
=
combineReducers
({
mainMap
:
saveMainMapPosition
,
selectedUniversities
:
saveSelectedUniversities
})
const
rootReducer
=
combineReducers
({
...
...
frontend/src/reducers/selectedUniversities.js
0 → 100644
View file @
985357c2
import
{
SAVE_SELECTED_UNIVERSITIES
}
from
'
../actions/action-types
'
export
function
saveSelectedUniversities
(
state
=
[],
action
)
{
switch
(
action
.
type
)
{
case
SAVE_SELECTED_UNIVERSITIES
:
return
{
selection
:
action
.
new_selection
,
}
default
:
return
state
;
}
}
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