(DO NOT MERGE YET) Fellowships work #996
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mmmavis
requested review from
cadecairos,
gideonthomas and
gvn
as code owners
* Set stage for fellowships pages w/ django template
* Adding some stub urls for the fellowships site. * Update some of the urls a bit more
* Test commit * Find out which url is it resolving to * Fix stuff * Remove debugging stuff
Fellowships support page
* updated fellowships homepage
cadecairos
reviewed
Mar 1, 2018
| @@ -30,6 +30,9 @@ | |||
|
|
|||
| urlpatterns = list(filter(None, [ | |||
| url(r'^admin/', include(admin.site.urls)), | |||
| url(r'^soc/', include('social_django.urls', namespace='social')) | |||
| if settings.SOCIAL_SIGNIN else '', | |||
| url(r'^fellowships/', include('networkapi.fellows.urls')), | |||
There was a problem hiding this comment.
on line 47 below, there's this code:
url(r'^soc/', include('social_django.urls', namespace='social')),
# Don't remove this redirect until Fellowships pages are live
url(r'^fellowships/$', RedirectView.as_view(
url='https://advocacy.mozilla.org/open-web-fellows'
))
if settings.SOCIAL_SIGNIN else None,There are two things we need to look at here:
Firstly, we'll want to update the route pattern to something like this
url(r'^fellowship/(?P<path>.*)', RedirectView.as_view(
url='/fellowships/%(path)s',
query_string=True
)),Secondly the line with
if settings.SOCIAL_SIGNIN else None,should actually follow
url(r'^soc/', include('social_django.urls', namespace='social'))... but there are two of the above url configs in the file, so lets de-dupe that!
* Related to #1116 - content changes to apply page
* Fixed #1128 - fixed broken 'see work' link
* redirected /fellowship to /fellowships * removed an extra line
cadecairos
suggested changes
Mar 6, 2018
cadecairos
reviewed
Mar 6, 2018
source/js/fellowships.js
Outdated
|
|
||
| let pulseApiDomain = ``; | ||
| let pulseDomain = ``; | ||
| const DIRECOTRY_PAGE_FILTER_OPTIONS = {'program_year': `2017`}; |
There was a problem hiding this comment.
DIRECOTRY_PAGE_FILTER_OPTIONS => DIRECTORY_PAGE_FILTER_OPTIONS
cadecairos
reviewed
Mar 6, 2018
source/js/fellowships.js
Outdated
| let queryString = Object.entries(params).map(pair => pair.map(encodeURIComponent).join(`=`)).join(`&`); | ||
| let req = new XMLHttpRequest(); | ||
|
|
||
| req.addEventListener(`load`, () => { |
There was a problem hiding this comment.
This could be a one-liner:
req.addEventListener(load, () => callback.call(this, JSON.parse(req.response)));
Do we really need to bind the callback to this?
* code improvement * removed a few empty files
cadecairos
approved these changes
Mar 6, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'm opening up a PR to see if review app for the
fellowshipsbranch works.