Merge branch 'master' into create_project_publish_improvements

Author: marlonkeating

civictechprojects/sitemaps.py

@@ -16,7 +16,6 @@ class SectionSitemap(Sitemap):
         str(FrontEndSection.AboutUs.value),
         str(FrontEndSection.FindProjects.value),
         str(FrontEndSection.Donate.value),
-        str(FrontEndSection.Press.value),
         str(FrontEndSection.ContactUs.value),
         str(FrontEndSection.Companies.value)
     ]

common/components/chrome/MainFooter.jsx

@@ -14,7 +14,6 @@ const sectionsToShowFooter: $ReadOnlyArray<string> = [
   Section.FindProjects,
   Section.AboutProject,
   Section.AboutUs,
-  Section.Press,
   Section.Home,
 ];
 

common/components/chrome/MainHeader.jsx

@@ -132,10 +132,6 @@ class MainHeader extends React.Component<{||}, State> {
                 urlHelper.section(Section.ContactUs),
                 "Contact Us"
               )}
-              {this._renderNavDropdownItem(
-                urlHelper.section(Section.Press),
-                "News"
-              )}
             </NavDropdown>
             {window.BLOG_URL ? (
               <Nav.Link href={window.BLOG_URL}>Blog</Nav.Link>

common/components/controllers/SectionController.jsx

@@ -24,7 +24,6 @@ import EmailVerifiedController from "./EmailVerifiedController.jsx";
 import FlashMessage from "../chrome/FlashMessage.jsx";
 import DonateController from "./DonateController.jsx";
 import ThankYouController from "./ThankYouController.jsx";
-import PressController from "./PressController.jsx";
 import ContactUsController from "./ContactUsController.jsx";
 import CreateGroupController from "./CreateGroupController.jsx";
 import CreateEventController from "./CreateEventController.jsx";
@@ -105,8 +104,6 @@ class SectionController extends React.Component<{||}, State> {
         return <DonateController />;
       case Section.ThankYou:
         return <ThankYouController />;
-      case Section.Press:
-        return <PressController />;
       case Section.ContactUs:
         return <ContactUsController />;
       case Section.CreateGroup:

common/components/enums/Section.js

@@ -20,7 +20,6 @@ const Section = {
   EmailVerified: "EmailVerified",
   Donate: "Donate",
   ThankYou: "ThankYou",
-  Press: "Press",
   ContactUs: "ContactUs",
   CreateGroup: "CreateGroup",
   CreateEvent: "CreateEvent",

common/helpers/constants.py

@@ -23,7 +23,6 @@ class FrontEndSection(Enum):
     AboutUs = 'AboutUs'
     FindProjects = 'FindProjects'
     Donate = 'Donate'
-    Press = 'Press'
     ContactUs = 'ContactUs'
     Home = "Home"
     CreateProject = 'CreateProject'
@@ -49,7 +48,7 @@ class FrontEndSection(Enum):
     # deprecated
     CorporateHackathon = 'CorporateHackathon'
     PartnerWithUs = 'PartnerWithUs'
-
+    Press = 'Press'
 
 deprecated_page_redirects = {
     'CorporateEvent': FrontEndSection.Companies.value,

common/helpers/front_end.py

@@ -2,7 +2,7 @@
 from django.conf import settings
 from html import unescape
 from urllib import parse as urlparse
-from .constants import deprecated_page_redirects
+from .constants import deprecated_page_redirects, FrontEndSection
 from common.helpers.dictionaries import keys_omit
 
 
@@ -88,5 +88,8 @@ def get_clean_url(url):
 
 
 def redirect_from_deprecated_url(section_name):
+    # Redirect deprecated Press section
+    if section_name == FrontEndSection.Press.value:
+        return settings.BLOG_URL
     if section_name in deprecated_page_redirects:
         return section_url(deprecated_page_redirects[section_name])