Merge branch 'master' into tag_cache_fix

Author: marlonkeating

Dockerfile

@@ -1,5 +1,5 @@
 # https://hub.docker.com/r/nikolaik/python-nodejs
-FROM nikolaik/python-nodejs:python3.8-nodejs12	
+FROM nikolaik/python-nodejs:python3.8-nodejs12
 
 # Replace shell with bash so we can source files
 RUN rm /bin/sh && ln -s /bin/bash /bin/sh
@@ -62,7 +62,7 @@ ENV HEADER_ALERT="<p>You are invited to our upcoming event, St. Hat-trick's day!
 ENV SPONSORS_METADATA='[{"displayName":"Textio","url":"https://medium.com/democracylab-org/textio-engages-employees-to-accelerate-civic-innovation-5984609a95ce","thumbnailUrl":"https://d1agxr2dqkgkuy.cloudfront.net/img/textio_logo_315_trans.png","description":"Textio is the inventor of augmented writing. Textio transforms your rough ideas into powerful language by hitting Tab."},{"displayName":"HERE Technologies","url":"https://www.here.com/","thumbnailUrl":"https://d1agxr2dqkgkuy.cloudfront.net/img/here_technologies.png","description":"By building a digital representation of reality entirely built upon location data, we are radically transforming the way the world lives, moves and interacts"},{"displayName":"Amazon","url":"https://www.aboutamazon.com/our-communities/amazon-in-the-community","thumbnailUrl":"https://d1agxr2dqkgkuy.cloudfront.net/img/amazon_logo.png","description":"At Amazon, we focus on building long-term and innovative programs that will have a lasting, positive impact in communities around the world."}]'
 
 # Configure project description example link
-ENV PROJECT_DESCRIPTION_EXAMPLE_URL "https://www.democracylab.org/index/?section=AboutProject&id=1"
+ENV PROJECT_DESCRIPTION_EXAMPLE_URL "https://www.democracylab.org/projects/1"
 
 # Configure position description example link
 ENV POSITION_DESCRIPTION_EXAMPLE_URL "https://docs.google.com/document/d/142NH4uRblJP6XvKdmW4GiFwoOmVWY6BJfEjGrlSP3Uk/edit"

civic.json

@@ -16,6 +16,6 @@
   "partners": [],
   "data": [],
   "tags": [],
-  "links": ["https://www.democracylab.org/index/?section=AboutProject&id=1"],
+  "links": ["https://www.democracylab.org/projects/1"],
   "id": "https://raw.githubusercontent.com/DCgov/civic.json/master/schemas/schema-v1.json"
 }

civictechprojects/helpers/context_preload.py

@@ -9,7 +9,7 @@
 def about_project_preload(context, request):
     context = default_preload(context, request)
     query_args = url_params(request)
-    project_id = query_args['id'][0]
+    project_id = query_args['id']
     project_json = ProjectCache.get(project_id)
     if project_json is not None:
         context['title'] = project_json['project_name'] + ' | DemocracyLab'
@@ -24,7 +24,7 @@ def about_project_preload(context, request):
 def about_event_preload(context, request):
     context = default_preload(context, request)
     query_args = url_params(request)
-    event_id = query_args['id'][0]
+    event_id = query_args['id']
     event = Event.get_by_id_or_slug(event_id)
     event_json = event.hydrate_to_json()
     if event_json is not None:
@@ -40,7 +40,7 @@ def about_event_preload(context, request):
 def about_group_preload(context, request):
     context = default_preload(context, request)
     query_args = url_params(request)
-    group_id = query_args['id'][0]
+    group_id = query_args['id']
     group_json = GroupCache.get(group_id)
     if group_json is not None:
         context['title'] = group_json['group_name'] + ' | DemocracyLab'

civictechprojects/sitemaps.py

@@ -26,7 +26,7 @@ def items(self):
         return self.pages
 
     def location(self, page):
-        return '/index/?section=' + page
+        return section_path(page)
 
 
 class ProjectSitemap(Sitemap):

civictechprojects/urls.py

@@ -13,10 +13,12 @@
     1. Import the include() function: from django.conf.urls import url, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
-from django.conf.urls import url
+from django.conf.urls import url, include
 from django.views.generic import TemplateView
+from django.contrib import admin
 from django.contrib.sitemaps.views import sitemap
 from common.helpers.error_handlers import handle500
+from common.urls import v1_urls, v2_urls
 from .sitemaps import ProjectSitemap, SectionSitemap, GroupSitemap, EventSitemap
 
 
@@ -39,22 +41,18 @@
     ),
     url(r'^robots\.txt$', views.robots, name='robots'),
     url(r'^googlebb20bcf8545e7046.html$', TemplateView.as_view(template_name="googlebb20bcf8545e7046.html")),
-    url(r'^groups/create/$', views.group_create, name='group_create'),
-    url(r'^groups/approve/(?P<group_id>[0-9]+)/$', views.approve_group, name='approve_group'),
-    url(r'^groups/edit/(?P<group_id>[0-9]+)/$', views.group_edit, name='group_edit'),
-    url(r'^groups/delete/(?P<group_id>[0-9]+)/$', views.group_delete, name='group_delete'),
-    url(r'^groups/(?P<group_id>[0-9]+)/add_project/$', views.group_add_project, name='group_add_project'),
-    url(r'^groups/(?P<group_id>[0-9]+)/remove_project/$', views.group_delete_project, name='group_remove_project'),
-    url(r'^events/create/$', views.event_create, name='event_create'),
-    url(r'^events/approve/(?P<event_id>[0-9]+)/$', views.approve_event, name='approve_event'),
-    url(r'^events/edit/(?P<event_id>[0-9]+)/$', views.event_edit, name='event_edit'),
-    url(r'^events/delete/(?P<event_id>[0-9]+)/$', views.event_delete, name='event_delete'),
-    url(r'^events/(?P<event_id>[0-9]+)/add_project/$', views.event_add_project, name='event_add_project'),
-    url(r'^events/(?P<event_id>[0-9]+)/remove_project/$', views.event_delete_project, name='event_remove_project'),
-    url(r'^projects/edit/(?P<project_id>[0-9]+)/$', views.project_edit, name='project_edit'),
-    url(r'^projects/delete/(?P<project_id>[0-9]+)/$', views.project_delete, name='project_delete'),
-    url(r'^projects/signup/$', views.project_create, name='project_create'),
-    url(r'^projects/approve/(?P<project_id>[0-9]+)/$', views.approve_project, name='approve_project'),
+    url(r'^api/groups/create/$', views.group_create, name='group_create'),
+    url(r'^api/groups/approve/(?P<group_id>[0-9]+)/$', views.approve_group, name='approve_group'),
+    url(r'^api/groups/edit/(?P<group_id>[0-9]+)/$', views.group_edit, name='group_edit'),
+    url(r'^api/groups/delete/(?P<group_id>[0-9]+)/$', views.group_delete, name='group_delete'),
+    url(r'^api/events/create/$', views.event_create, name='event_create'),
+    url(r'^api/events/approve/(?P<event_id>[0-9]+)/$', views.approve_event, name='approve_event'),
+    url(r'^api/events/edit/(?P<event_id>[0-9]+)/$', views.event_edit, name='event_edit'),
+    url(r'^api/events/delete/(?P<event_id>[0-9]+)/$', views.event_delete, name='event_delete'),
+    url(r'^api/projects/edit/(?P<project_id>[0-9]+)/$', views.project_edit, name='project_edit'),
+    url(r'^api/projects/delete/(?P<project_id>[0-9]+)/$', views.project_delete, name='project_delete'),
+    url(r'^api/projects/create/$', views.project_create, name='project_create'),
+    url(r'^api/projects/approve/(?P<project_id>[0-9]+)/$', views.approve_project, name='approve_project'),
     url(
         r'^presign_s3/upload/project/thumbnail/$',
         views.presign_project_thumbnail_upload,
@@ -73,18 +71,21 @@
     url(r'^api/my_groups', views.my_groups),
     url(r'^api/tags/groups', views.group_tags_counts),
     url(r'^api/tags', views.tags),
-    url(r'^index/$', views.index),
+    url(r'^admin/', admin.site.urls),
+    url(r'^contact/democracylab$', views.contact_democracylab, name='contact_democracylab'),
+    url(r'^contact/project/(?P<project_id>[0-9]+)/$', views.contact_project_owner, name='contact_project_owner'),
+    url(r'^contact/volunteers/(?P<project_id>[0-9]+)/$', views.contact_project_volunteers, name='contact_project_volunteers'),
+    url(r'^contact/volunteer/(?P<application_id>[0-9]+)/$', views.contact_project_volunteer, name='contact_project_volunteer'),
+    url(r'^contact/group/(?P<group_id>[0-9]+)/$', views.contact_group_owner, name='contact_group_owner'),
+    url(r'', include(v2_urls)),
+    url(r'', include(v1_urls)),
     url(r'^api/team$', views.team, name='team'),
     url(r'^api/project/(?P<project_id>[0-9]+)/$', views.get_project, name='get_project'),
     url(r'^api/group/(?P<group_id>[0-9]+)/invite$', views.invite_project_to_group, name='invite_project_to_group'),
     url(r'^api/invite/(?P<invite_id>[0-9]+)/approve$', views.accept_group_invitation, name='accept_group_invitation'),
     url(r'^api/invite/(?P<invite_id>[0-9]+)/reject$', views.reject_group_invitation, name='reject_group_invitation'),
     url(r'^api/group/(?P<group_id>[0-9]+)/$', views.get_group, name='get_group'),
     url(r'^api/event/(?P<event_id>.*)/$', views.get_event, name='get_event'),
-    url(r'^contact/project/(?P<project_id>[0-9]+)/$', views.contact_project_owner, name='contact_project_owner'),
-    url(r'^contact/volunteers/(?P<project_id>[0-9]+)/$', views.contact_project_volunteers, name='contact_project_volunteers'),
-    url(r'^contact/volunteer/(?P<application_id>[0-9]+)/$', views.contact_project_volunteer, name='contact_project_volunteer'),
-    url(r'^contact/group/(?P<group_id>[0-9]+)/$', views.contact_group_owner, name='contact_group_owner'),
     url(r'^volunteer/(?P<project_id>[0-9]+)/$', views.volunteer_with_project, name='volunteer_with_project'),
     url(r'^volunteer/leave/(?P<project_id>[0-9]+)/$', views.leave_project, name='leave_project'),
     url(r'^volunteer/approve/(?P<application_id>[0-9]+)/$', views.accept_project_volunteer, name='accept_project_volunteer'),
@@ -94,8 +95,7 @@
     url(r'^volunteer/demote/(?P<application_id>[0-9]+)/$', views.demote_project_volunteer, name='demote_project_volunteer'),
     url(r'^volunteer/renew/(?P<application_id>[0-9]+)/$', views.renew_volunteering_with_project, name='renew_volunteering_with_project'),
     url(r'^volunteer/conclude/(?P<application_id>[0-9]+)/$', views.conclude_volunteering_with_project, name='conclude_volunteering_with_project'),
-    url(r'^alert/create/$', views.add_alert, name='add_alert'),
-    url(r'^contact/democracylab$', views.contact_democracylab, name='contact_democracylab')
+    url(r'^alert/create/$', views.add_alert, name='add_alert')
 
 ]
 

civictechprojects/views.py

@@ -1,3 +1,4 @@
+import re
 from django.shortcuts import redirect
 from django.http import HttpResponse, HttpResponseForbidden, JsonResponse
 from django.core.exceptions import PermissionDenied
@@ -121,7 +122,7 @@ def group_edit(request, group_id):
     if request.is_ajax():
         return JsonResponse(group.hydrate_to_json())
     else:
-        return redirect('/index/?section=AboutGroup&id=' + group_id)
+        return redirect(section_url(FrontEndSection.AboutGroup, {'id': group_id}))
 
 
 # TODO: Pass csrf token in ajax call so we can check for it
@@ -148,39 +149,6 @@ def get_group(request, group_id):
     else:
         return HttpResponse(status=404)
 
-@csrf_exempt
-def group_add_project(request, group_id):
-    body = json.loads(request.body)
-    group = Group.objects.get(id=group_id)
-
-    if group is not None and body["project_ids"] is not None:
-        if not is_creator_or_staff(get_request_contributor(request), group):
-            return HttpResponseForbidden()
-
-        projects = Project.objects.filter(id__in=body["project_ids"])
-
-        for project in projects:
-            ProjectRelationship.create(group, project)
-
-        return HttpResponse(status=204)
-    else:
-        return HttpResponse(status=404)
-
-def group_delete_project(request, group_id):
-    body = json.loads(request.body)
-    group = Group.objects.get(id=group_id)
-    project = Project.objects.get(id=body["project_id"])
-
-    if group is not None and project is not None:
-        if is_creator_or_staff(get_request_contributor(request), group):
-            relationship = ProjectRelationship.objects.get(relationship_project=project.id, relationship_group=group.id)
-
-            if relationship is not None:
-                relationship.delete()
-                return HttpResponse(status=204)
-
-    return HttpResponse(status=404)
-
 
 def approve_group(request, group_id):
     group = Group.objects.get(id=group_id)
@@ -234,7 +202,7 @@ def event_edit(request, event_id):
     if request.is_ajax():
         return JsonResponse(event.hydrate_to_json())
     else:
-        return redirect('/index/?section=AboutEvent&id=' + event_id)
+        return redirect(section_url(FrontEndSection.AboutEvent, {'id': event_id}))
 
 
 # TODO: Pass csrf token in ajax call so we can check for it
@@ -262,38 +230,6 @@ def get_event(request, event_id):
     return JsonResponse(event.hydrate_to_json()) if event else HttpResponse(status=404)
 
 
-def event_add_project(request, event_id):
-    body = json.loads(request.body)
-    event = Event.objects.get(id=event_id)
-
-    if event is not None and body["project_ids"] is not None:
-        if not is_creator_or_staff(get_request_contributor(request), event):
-            return HttpResponseForbidden()
-
-        projects = Project.objects.filter(id__in=body["project_ids"])
-
-        for project in projects:
-            ProjectRelationship.create(event, project)
-
-        return HttpResponse(status=204)
-    else:
-        return HttpResponse(status=404)
-
-def event_delete_project(request, event_id):
-    body = json.loads(request.body)
-    event = Event.objects.get(id=event_id)
-    project = Project.objects.get(id=body["project_id"])
-
-    if event is not None and project is not None:
-        if is_creator_or_staff(get_request_contributor(request), event):
-            relationship = ProjectRelationship.objects.get(relationship_project=project.id, relationship_event=event.id)
-
-            if relationship is not None:
-                relationship.delete()
-                return HttpResponse(status=204)
-
-    return HttpResponse(status=404)
-
 # TODO: Pass csrf token in ajax call so we can check for it
 @csrf_exempt
 def project_create(request):
@@ -323,7 +259,7 @@ def project_edit(request, project_id):
     if request.is_ajax():
         return JsonResponse(project.hydrate_to_json())
     else:
-        return redirect('/index/?section=AboutProject&id=' + project_id)
+        return redirect(section_url(FrontEndSection.AboutProject, {'id': project_id}))
 
 
 # TODO: Pass csrf token in ajax call so we can check for it
@@ -364,7 +300,7 @@ def approve_project(request, project_id):
             SitemapPages.update()
             notify_project_owners_project_approved(project)
             messages.success(request, 'Project Approved')
-            return redirect('/index/?section=AboutProject&id=' + str(project.id))
+            return redirect(section_url(FrontEndSection.AboutProject, {'id': project_id}))
         else:
             return HttpResponseForbidden()
     else:
@@ -391,7 +327,7 @@ def approve_event(request, event_id):
 
 @ensure_csrf_cookie
 @xframe_options_exempt
-def index(request):
+def index(request, id=None):
     page_url = request.get_full_path()
     clean_url = get_clean_url(page_url)
     if clean_url != page_url:
@@ -1271,6 +1207,7 @@ def reject_group_invitation(request, invite_id):
 
 #This will ask Google if the recaptcha is valid and if so send email, otherwise return an error.
 #TODO: Return text strings to be displayed on the front end so we know specifically what happened
+#TODO: Figure out why changing the endpoint to /api/contact/democracylab results in CSRF issues
 @csrf_exempt
 def contact_democracylab(request):
     #first prepare all the data from the request body
@@ -1319,3 +1256,14 @@ def team(request):
 
     return JsonResponse(response)
 
+
+def redirect_v1_urls(request):
+    page_url = request.get_full_path()
+    print(page_url)
+    clean_url = get_clean_url(page_url)
+    print('Redirecting v1 url: ' + clean_url)
+    section_match = re.findall(r'/index/\?section=(\w+)', clean_url)
+    section_name = section_match[0] if len(section_match) > 0 else FrontEndSection.Home
+    section_id_match = re.findall(r'&id=([\w-]+)', clean_url)
+    section_id = section_id_match[0] if len(section_id_match) > 0 else ''
+    return redirect(section_url(section_name, {'id': section_id}))

common/components/chrome/MainHeader.jsx

@@ -25,12 +25,14 @@ import NavDropdown from "react-bootstrap/NavDropdown";
 import Dropdown from "react-bootstrap/Dropdown";
 import Button from "react-bootstrap/Button";
 import UserIcon from "../svg/user-circle-solid.svg";
+import { Dictionary } from "../types/Generics.jsx";
 
 type State = {|
   showMyProjects: boolean,
   showMyGroups: boolean,
   showMyEvents: boolean,
   showHeader: boolean,
+  loginUrl: string,
 |};
 
 class MainHeader extends React.Component<{||}, State> {
@@ -52,6 +54,7 @@ class MainHeader extends React.Component<{||}, State> {
       showMyEvents:
         myEvents &&
         (!_.isEmpty(myEvents.owned_events) || CurrentUser.isStaff()),
+      loginUrl: url.logInThenReturn(),
     };
   }
   // may need activeSection: NavigationStore.getSection() in calculateState, check that
@@ -98,7 +101,7 @@ class MainHeader extends React.Component<{||}, State> {
           <Button
             className="MainHeader-showmobile MainHeader-login-button"
             variant="outline-primary"
-            href={url.section(Section.LogIn, url.getPreviousPageArg())}
+            href={this.state.loginUrl}
           >
             Log In
           </Button>
@@ -147,7 +150,7 @@ class MainHeader extends React.Component<{||}, State> {
             ) : (
               <Nav.Link
                 className="MainHeader-showmobile"
-                href={url.section(Section.LogIn, url.getPreviousPageArg())}
+                href={this.state.loginUrl}
               >
                 Log In
               </Nav.Link>
@@ -199,7 +202,7 @@ class MainHeader extends React.Component<{||}, State> {
         <Button
           className="MainHeader-showdesktop MainHeader-login-button"
           variant="outline-primary"
-          href={url.section(Section.LogIn, url.getPreviousPageArg())}
+          href={this.state.loginUrl}
         >
           Log In
         </Button>
@@ -210,8 +213,7 @@ class MainHeader extends React.Component<{||}, State> {
   //TODO: Refactor these to reduce duplication
   //TODO: Allow multiple arguments for url.section to handle url.getPreviousPageArg() - options object?
   _renderNavLink(section, text, classes = "") {
-    const urlArgs = url.arguments(url.section(section));
-    if (urlArgs.section === this.state.activeSection) {
+    if (section === this.state.activeSection) {
       classes += " MainHeader-active";
     }
     return (
@@ -221,8 +223,7 @@ class MainHeader extends React.Component<{||}, State> {
     );
   }
   _renderNavDropdownItem(section, text, classes = "") {
-    const urlArgs = url.arguments(url.section(section));
-    if (urlArgs.section === this.state.activeSection) {
+    if (section === this.state.activeSection) {
       classes += " MainHeader-active";
     }
     return (

common/components/common/groups/ContactGroupButton.jsx

@@ -133,9 +133,7 @@ class ContactGroupButton extends React.PureComponent<Props, State> {
         type="button"
         disabled={this.state.buttonDisabled}
         title={this.state.buttonTitle}
-        href={`/index/?section=LogIn&prev=${
-          window.location.href.split("?section=")[1]
-        }`}
+        href={url.logInThenReturn()}
       >
         Sign in to Contact Group
       </Button>