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
86794957
Commit
86794957
authored
Sep 01, 2018
by
Florent Chehab
Browse files
Updated names and generation of frontend
parent
d569450d
Pipeline
#26848
passed with stages
in 2 minutes and 5 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
backend/generate/api_config.yml
View file @
86794957
# THIS FILE IS USED TO GENERATE OTHER VERY IMPORTANT FILES
# BOTH IN THE FRONTEND AND IN THE BACKEND !
# TAKE CARE WHEN MODYFING IT ;)
# model : the model name (may be null)
# viewset : the viewset name for the api
# api_end_pont : the main part of the url for making request to the api
# This string will also be used for naming variables in JS !!
# So no weird characters there please...
# versionned: boolean to specify wether this model is versionned or not
# api_attr : to specify some attributes that may be captured
# and used in the viewset
# requires_testing: boolean to tell if this viewset is only availble in
# a testing environment.
-
model
:
Country
-
model
:
Country
viewset
:
CountryViewSet
viewset
:
CountryViewSet
import_location
:
location
import_location
:
location
...
@@ -23,7 +39,7 @@
...
@@ -23,7 +39,7 @@
-
model
:
UserData
-
model
:
UserData
viewset
:
UserDataViewSet
viewset
:
UserDataViewSet
import_location
:
user
import_location
:
user
api_end_point
:
user
_d
ata
api_end_point
:
user
D
ata
api_name
:
user-data-detail
api_name
:
user-data-detail
...
@@ -62,19 +78,19 @@
...
@@ -62,19 +78,19 @@
-
model
:
CountryTaggedItem
-
model
:
CountryTaggedItem
viewset
:
CountryTaggedItemViewSet
viewset
:
CountryTaggedItemViewSet
import_location
:
location
import_location
:
location
api_end_point
:
countries
_t
agged
_i
tems
api_end_point
:
countries
T
agged
I
tems
versionned
:
true
versionned
:
true
-
model
:
CountryScholarship
-
model
:
CountryScholarship
viewset
:
CountryScholarshipViewSet
viewset
:
CountryScholarshipViewSet
import_location
:
location
import_location
:
location
api_end_point
:
countries
_s
cholarships
api_end_point
:
countries
S
cholarships
versionned
:
true
versionned
:
true
-
model
:
CountryDri
-
model
:
CountryDri
viewset
:
CountryDriViewSet
viewset
:
CountryDriViewSet
import_location
:
location
import_location
:
location
api_end_point
:
countries
_d
ri
api_end_point
:
countries
D
ri
versionned
:
true
versionned
:
true
...
@@ -82,7 +98,7 @@
...
@@ -82,7 +98,7 @@
-
model
:
CityTaggedItem
-
model
:
CityTaggedItem
viewset
:
CityTaggedItemViewSet
viewset
:
CityTaggedItemViewSet
import_location
:
location
import_location
:
location
api_end_point
:
cities
_t
agged
_i
tems
api_end_point
:
cities
T
agged
I
tems
versionned
:
true
versionned
:
true
...
@@ -90,37 +106,37 @@
...
@@ -90,37 +106,37 @@
-
model
:
UniversityTaggedItem
-
model
:
UniversityTaggedItem
viewset
:
UniversityTaggedItemViewSet
viewset
:
UniversityTaggedItemViewSet
import_location
:
university
import_location
:
university
api_end_point
:
universities
_t
agged
_i
tems
api_end_point
:
universities
T
agged
I
tems
versionned
:
true
versionned
:
true
-
model
:
UniversityScholarship
-
model
:
UniversityScholarship
viewset
:
UniversityScholarshipViewSet
viewset
:
UniversityScholarshipViewSet
import_location
:
university
import_location
:
university
api_end_point
:
universities
_s
cholarships
api_end_point
:
universities
S
cholarships
versionned
:
true
versionned
:
true
-
model
:
UniversityInfo
-
model
:
UniversityInfo
viewset
:
UniversityInfoViewSet
viewset
:
UniversityInfoViewSet
import_location
:
university
import_location
:
university
api_end_point
:
universities
_i
nfo
api_end_point
:
universities
I
nfo
versionned
:
true
versionned
:
true
-
model
:
UniversitySemestersDates
-
model
:
UniversitySemestersDates
viewset
:
UniversitySemestersDatesViewSet
viewset
:
UniversitySemestersDatesViewSet
import_location
:
university
import_location
:
university
api_end_point
:
universities
_s
emesters
_d
ates
api_end_point
:
universities
S
emesters
D
ates
versionned
:
true
versionned
:
true
-
model
:
UniversityDri
-
model
:
UniversityDri
viewset
:
UniversityDriViewSet
viewset
:
UniversityDriViewSet
import_location
:
university
import_location
:
university
api_end_point
:
universities
_d
ri
api_end_point
:
universities
D
ri
versionned
:
true
versionned
:
true
-
model
:
null
-
model
:
null
viewset
:
UniversityModulesViewSet
viewset
:
UniversityModulesViewSet
import_location
:
university
import_location
:
university
api_end_point
:
universit
y_a
ll
api_end_point
:
universit
iesA
ll
api_attr
:
(?P<univ_id>[0-9]+)
api_attr
:
(?P<univ_id>[0-9]+)
api_name
:
university_details
api_name
:
university_details
...
@@ -129,13 +145,13 @@
...
@@ -129,13 +145,13 @@
-
model
:
CampusTaggedItem
-
model
:
CampusTaggedItem
viewset
:
CampusTaggedItemViewSet
viewset
:
CampusTaggedItemViewSet
import_location
:
university
import_location
:
university
api_end_point
:
campuses
_t
agged
_i
tems
api_end_point
:
campuses
T
agged
I
tems
versionned
:
true
versionned
:
true
-
model
:
null
-
model
:
null
viewset
:
MainCampusViewSet
viewset
:
MainCampusViewSet
import_location
:
university
import_location
:
university
api_end_point
:
main
_c
ampuses
api_end_point
:
main
C
ampuses
read_only
:
true
read_only
:
true
...
@@ -143,36 +159,36 @@
...
@@ -143,36 +159,36 @@
-
model
:
Recommendation
-
model
:
Recommendation
viewset
:
RecommendationViewSet
viewset
:
RecommendationViewSet
import_location
:
user
import_location
:
user
api_end_point
:
user
_r
ecommendations
api_end_point
:
user
R
ecommendations
-
model
:
RecommendationList
-
model
:
RecommendationList
viewset
:
RecommendationListViewSet
viewset
:
RecommendationListViewSet
import_location
:
user
import_location
:
user
api_end_point
:
user
_r
ecommendation
_l
ists
api_end_point
:
user
R
ecommendation
L
ists
-
model
:
PreviousDeparture
-
model
:
PreviousDeparture
viewset
:
PreviousDepartureViewSet
viewset
:
PreviousDepartureViewSet
import_location
:
user
import_location
:
user
api_end_point
:
universities
_p
revious
_d
epartures
api_end_point
:
universities
P
revious
D
epartures
-
model
:
PreviousDepartureFeedback
-
model
:
PreviousDepartureFeedback
viewset
:
PreviousDepartureFeedbackViewSet
viewset
:
PreviousDepartureFeedbackViewSet
import_location
:
user
import_location
:
user
api_end_point
:
universities
_p
revious
_d
eparture
_f
eedback
api_end_point
:
universities
P
revious
D
eparture
F
eedback
-
model
:
PendingModeration
-
model
:
PendingModeration
viewset
:
PendingModerationViewSet
viewset
:
PendingModerationViewSet
import_location
:
my_model
import_location
:
my_model
api_end_point
:
pending
_m
oderation
api_end_point
:
pending
M
oderation
-
model
:
Version
-
model
:
Version
viewset
:
VersionViewSet
viewset
:
VersionViewSet
import_location
:
my_model
import_location
:
my_model
api_end_point
:
version
api_end_point
:
version
s
api_attr
:
(?P<content_type_id>[0-9]+)/(?P<object_pk>[0-9A-Za-z]+)
api_attr
:
(?P<content_type_id>[0-9]+)/(?P<object_pk>[0-9A-Za-z]+)
api_name
:
versions
-l
ist
api_name
:
versions
L
ist
ignore_in_admin
:
true
ignore_in_admin
:
true
-
model
:
ForTestingModeration
-
model
:
ForTestingModeration
...
...
frontend/generate/generate_frontend_files.py
View file @
86794957
...
@@ -44,11 +44,13 @@ with open(join(current_dir, '../../backend/generate/api_config.yml'), 'r') as f:
...
@@ -44,11 +44,13 @@ with open(join(current_dir, '../../backend/generate/api_config.yml'), 'r') as f:
contexts
=
[]
contexts
=
[]
for
api
in
api_config
:
for
api
in
api_config
:
if
"requires_testing"
in
api
and
api
[
"requires_testing"
]:
continue
name
=
api
[
'viewset'
].
split
(
'ViewSet'
)[
0
]
name
=
api
[
'viewset'
].
split
(
'ViewSet'
)[
0
]
name
=
name
[
0
].
lower
()
+
name
[
1
:]
name
=
name
[
0
].
lower
()
+
name
[
1
:]
contexts
.
append
({
contexts
.
append
({
"name"
:
name
,
"name"
:
api
[
"api_end_point"
]
,
"api_end_point"
:
API_BASE
+
api
[
"api_end_point"
]
+
'/'
"api_end_point"
:
API_BASE
+
api
[
"api_end_point"
]
+
'/'
,
})
})
...
...
frontend/src/components/App.js
View file @
86794957
...
@@ -27,7 +27,7 @@ import {
...
@@ -27,7 +27,7 @@ import {
}
from
'
react-router-dom
'
;
}
from
'
react-router-dom
'
;
import
{
import
{
countr
y
FetchData
,
countr
ies
FetchData
,
}
from
'
../generated/actions
'
;
}
from
'
../generated/actions
'
;
...
@@ -181,7 +181,7 @@ const mapStateToProps = (state) => {
...
@@ -181,7 +181,7 @@ const mapStateToProps = (state) => {
const
mapDispatchToProps
=
(
dispatch
)
=>
{
const
mapDispatchToProps
=
(
dispatch
)
=>
{
return
{
return
{
fetchData
:
{
fetchData
:
{
countries
:
()
=>
dispatch
(
countr
y
FetchData
())
countries
:
()
=>
dispatch
(
countr
ies
FetchData
())
}
}
};
};
};
};
...
...
frontend/src/components/map/UnivMakers.js
View file @
86794957
...
@@ -7,8 +7,8 @@ import { Map, TileLayer, Marker, Popup, LayersControl, FeatureGroup, Circle, Lay
...
@@ -7,8 +7,8 @@ import { Map, TileLayer, Marker, Popup, LayersControl, FeatureGroup, Circle, Lay
import
{
import
{
universitiesFetchData
,
universitiesFetchData
,
universitiesInvalidated
,
universitiesInvalidated
,
mainCampusFetchData
,
mainCampus
es
FetchData
,
mainCampusInvalidated
mainCampus
es
Invalidated
}
from
'
../../generated/actions
'
;
}
from
'
../../generated/actions
'
;
...
@@ -18,11 +18,11 @@ class UnivMarkers extends Component {
...
@@ -18,11 +18,11 @@ class UnivMarkers extends Component {
render
()
{
render
()
{
let
universities
=
this
.
props
.
universities
.
fetched
.
data
;
let
universities
=
this
.
props
.
universities
.
fetched
.
data
;
let
mainCampus
=
this
.
props
.
mainCampus
.
fetched
.
data
;
let
mainCampus
es
=
this
.
props
.
mainCampus
es
.
fetched
.
data
;
let
selected_main_campus
=
[];
let
selected_main_campus
=
[];
for
(
let
main_campus_pk
in
mainCampus
)
{
for
(
let
main_campus_pk
in
mainCampus
es
)
{
let
campus
=
mainCampus
[
main_campus_pk
]
let
campus
=
mainCampus
es
[
main_campus_pk
]
let
univ
=
universities
[
campus
.
university
]
let
univ
=
universities
[
campus
.
university
]
if
(
univ
&&
campus
)
{
if
(
univ
&&
campus
)
{
selected_main_campus
.
push
({
selected_main_campus
.
push
({
...
@@ -51,7 +51,7 @@ class UnivMarkers extends Component {
...
@@ -51,7 +51,7 @@ class UnivMarkers extends Component {
const
mapStateToProps
=
(
state
)
=>
{
const
mapStateToProps
=
(
state
)
=>
{
return
{
return
{
universities
:
state
.
universities
,
universities
:
state
.
universities
,
mainCampus
:
state
.
mainCampus
mainCampus
es
:
state
.
mainCampus
es
};
};
};
};
...
...
frontend/src/components/map/UnivMap.js
View file @
86794957
import
React
from
'
react
'
;
import
React
from
'
react
'
;
import
MyComponent
from
'
../MyComponent
'
import
MyComponent
from
'
../MyComponent
'
import
{
connect
}
from
"
react-redux
"
;
import
{
connect
}
from
"
react-redux
"
;
import
Loading
from
'
../other/Loading
'
;
import
{
Map
,
TileLayer
,
LayersControl
,
LayerGroup
}
from
'
react-leaflet
'
;
import
{
Map
,
TileLayer
,
Marker
,
Popup
,
LayersControl
,
FeatureGroup
,
Circle
,
LayerGroup
}
from
'
react-leaflet
'
;
// import MarkerClusterGroup from 'react-leaflet-markercluster';
import
{
import
{
universit
y
FetchData
,
universit
ies
FetchData
,
mainCampusFetchData
,
mainCampus
es
FetchData
,
}
from
'
../../generated/actions
'
;
}
from
'
../../generated/actions
'
;
import
UnivMarkers
from
'
./UnivMakers
'
;
import
UnivMarkers
from
'
./UnivMakers
'
;
...
@@ -107,7 +106,7 @@ class UnivMap extends MyComponent {
...
@@ -107,7 +106,7 @@ class UnivMap extends MyComponent {
const
mapStateToProps
=
(
state
)
=>
{
const
mapStateToProps
=
(
state
)
=>
{
return
{
return
{
universities
:
state
.
universities
,
universities
:
state
.
universities
,
mainCampus
:
state
.
mainCampus
,
mainCampus
es
:
state
.
mainCampus
es
,
map
:
state
.
app
.
mainMap
map
:
state
.
app
.
mainMap
};
};
};
};
...
@@ -115,8 +114,8 @@ const mapStateToProps = (state) => {
...
@@ -115,8 +114,8 @@ const mapStateToProps = (state) => {
const
mapDispatchToProps
=
(
dispatch
)
=>
{
const
mapDispatchToProps
=
(
dispatch
)
=>
{
return
{
return
{
fetchData
:
{
fetchData
:
{
universities
:
()
=>
dispatch
(
universit
y
FetchData
()),
universities
:
()
=>
dispatch
(
universit
ies
FetchData
()),
mainCampus
:
()
=>
dispatch
(
mainCampusFetchData
())
mainCampus
es
:
()
=>
dispatch
(
mainCampus
es
FetchData
())
},
},
saveMainMap
:
(
pos
)
=>
dispatch
(
saveMainMapPosition
(
pos
)),
saveMainMap
:
(
pos
)
=>
dispatch
(
saveMainMapPosition
(
pos
)),
};
};
...
...
frontend/src/reducers/index.js
View file @
86794957
import
{
combineReducers
}
from
'
redux
'
;
import
{
combineReducers
}
from
'
redux
'
;
import
{
import
{
universit
y
Reducers
,
universit
ies
Reducers
,
mainCampusReducers
,
mainCampus
es
Reducers
,
countr
y
Reducers
,
countr
ies
Reducers
,
countr
y
ElReducers
,
countr
ies
ElReducers
,
universit
y
ElReducers
universit
ies
ElReducers
}
from
'
../generated/combinedReducers
'
;
}
from
'
../generated/combinedReducers
'
;
import
{
import
{
...
@@ -17,11 +17,11 @@ const appReducers = combineReducers({
...
@@ -17,11 +17,11 @@ const appReducers = combineReducers({
})
})
const
rootReducer
=
combineReducers
({
const
rootReducer
=
combineReducers
({
countries
:
countr
y
Reducers
,
countries
:
countr
ies
Reducers
,
countr
y
El
:
countr
y
ElReducers
,
countr
ies
El
:
countr
ies
ElReducers
,
universities
:
universit
y
Reducers
,
universities
:
universit
ies
Reducers
,
universit
y
El
:
universit
y
ElReducers
,
universit
ies
El
:
universit
ies
ElReducers
,
mainCampus
:
mainCampusReducers
,
mainCampus
es
:
mainCampus
es
Reducers
,
app
:
appReducers
app
:
appReducers
})
})
...
...
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