feat: updating enterprise marketing link logic in footer

fix: Removing a diff thing i missed

fix: minor variable tweaks in webpack

fix: minor variable tweaks in webpack

src/components/App.jsx

@@ -13,7 +13,6 @@ import {
   faTwitterSquare,
   faYoutubeSquare,
   faLinkedin,
-  faGooglePlusSquare,
   faRedditSquare,
 } from '@fortawesome/free-brands-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -121,12 +120,6 @@ function PageContent({
       icon: <FontAwesomeIcon icon={faLinkedin} className="social-icon" size="2x" />,
       screenReaderText: 'Follow edX on LinkedIn',
     },
-    {
-      title: 'Google+',
-      url: configuration.GOOGLE_PLUS_URL,
-      icon: <FontAwesomeIcon icon={faGooglePlusSquare} className="social-icon" size="2x" />,
-      screenReaderText: 'Follow edX on Google+',
-    },
     {
       title: 'Reddit',
       url: configuration.REDDIT_URL,
@@ -134,6 +127,14 @@ function PageContent({
       screenReaderText: 'Subscribe to the edX subreddit',
     },
   ];
+  const enterpriseMarketingLinkData = {
+    url: configuration.ENTERPRISE_MARKETING_URL,
+    queryParams: {
+      utm_campaign: configuration.ENTERPRISE_MARKETING_UTM_CAMPAIGN,
+      utm_source: configuration.ENTERPRISE_MARKETING_UTM_SOURCE,
+      utm_medium: configuration.ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM,
+    },
+  };
 
   return (
     <div>
@@ -160,6 +161,7 @@ function PageContent({
         siteName={configuration.SITE_NAME}
         siteLogo={FooterLogo}
         marketingSiteBaseUrl={configuration.MARKETING_SITE_BASE_URL}
+        enterpriseMarketingLink={enterpriseMarketingLinkData}
         supportUrl={configuration.SUPPORT_URL}
         contactUrl={configuration.CONTACT_URL}
         openSourceUrl={configuration.OPEN_SOURCE_URL}
@@ -190,7 +192,6 @@ PageContent.propTypes = {
     TWITTER_URL: PropTypes.string.isRequired,
     YOU_TUBE_URL: PropTypes.string.isRequired,
     LINKED_IN_URL: PropTypes.string.isRequired,
-    GOOGLE_PLUS_URL: PropTypes.string.isRequired,
     REDDIT_URL: PropTypes.string.isRequired,
     APPLE_APP_STORE_URL: PropTypes.string.isRequired,
     GOOGLE_PLAY_URL: PropTypes.string.isRequired,
@@ -248,7 +249,6 @@ App.propTypes = {
     TWITTER_URL: PropTypes.string.isRequired,
     YOU_TUBE_URL: PropTypes.string.isRequired,
     LINKED_IN_URL: PropTypes.string.isRequired,
-    GOOGLE_PLUS_URL: PropTypes.string.isRequired,
     REDDIT_URL: PropTypes.string.isRequired,
     APPLE_APP_STORE_URL: PropTypes.string.isRequired,
     GOOGLE_PLAY_URL: PropTypes.string.isRequired,

src/environment.js

@@ -13,6 +13,10 @@ export const configuration = {
   LANGUAGE_PREFERENCE_COOKIE_NAME: process.env.LANGUAGE_PREFERENCE_COOKIE_NAME,
   SITE_NAME: process.env.SITE_NAME,
   MARKETING_SITE_BASE_URL: process.env.MARKETING_SITE_BASE_URL,
+  ENTERPRISE_MARKETING_URL: process.env.ENTERPRISE_MARKETING_URL,
+  ENTERPRISE_MARKETING_UTM_CAMPAIGN: process.env.ENTERPRISE_MARKETING_UTM_CAMPAIGN,
+  ENTERPRISE_MARKETING_UTM_SOURCE: process.env.ENTERPRISE_MARKETING_UTM_SOURCE,
+  ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM: process.env.ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM,
   SUPPORT_URL: process.env.SUPPORT_URL,
   CONTACT_URL: process.env.CONTACT_URL,
   OPEN_SOURCE_URL: process.env.OPEN_SOURCE_URL,
@@ -22,7 +26,6 @@ export const configuration = {
   TWITTER_URL: process.env.TWITTER_URL,
   YOU_TUBE_URL: process.env.YOU_TUBE_URL,
   LINKED_IN_URL: process.env.LINKED_IN_URL,
-  GOOGLE_PLUS_URL: process.env.GOOGLE_PLUS_URL,
   REDDIT_URL: process.env.REDDIT_URL,
   APPLE_APP_STORE_URL: process.env.APPLE_APP_STORE_URL,
   GOOGLE_PLAY_URL: process.env.GOOGLE_PLAY_URL,

webpack/webpack.dev.config.js

@@ -121,6 +121,10 @@ module.exports = Merge.smart(commonConfig, {
       LANGUAGE_PREFERENCE_COOKIE_NAME: 'openedx-language-preference',
       SITE_NAME: 'edX',
       MARKETING_SITE_BASE_URL: 'http://localhost:18000',
+      ENTERPRISE_MARKETING_URL: 'http://example.com',
+      ENTERPRISE_MARKETING_UTM_CAMPAIGN: 'my_campaign',
+      ENTERPRISE_MARKETING_UTM_SOURCE: 'edX profile',
+      ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM: 'Footer',
       SUPPORT_URL: 'http://localhost:18000/support',
       CONTACT_URL: 'http://localhost:18000/contact',
       OPEN_SOURCE_URL: 'http://localhost:18000/openedx',
@@ -130,7 +134,6 @@ module.exports = Merge.smart(commonConfig, {
       TWITTER_URL: 'https://twitter.com',
       YOU_TUBE_URL: 'https://www.youtube.com',
       LINKED_IN_URL: 'https://www.linkedin.com',
-      GOOGLE_PLUS_URL: 'https://plus.google.com',
       REDDIT_URL: 'https://www.reddit.com',
       APPLE_APP_STORE_URL: 'https://www.apple.com/ios/app-store/',
       GOOGLE_PLAY_URL: 'https://play.google.com/store',

webpack/webpack.prod.config.js

@@ -151,6 +151,10 @@ module.exports = Merge.smart(commonConfig, {
       LANGUAGE_PREFERENCE_COOKIE_NAME: null,
       SITE_NAME: null,
       MARKETING_SITE_BASE_URL: null,
+      ENTERPRISE_MARKETING_URL: null,
+      ENTERPRISE_MARKETING_UTM_CAMPAIGN: null,
+      ENTERPRISE_MARKETING_UTM_SOURCE: null,
+      ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM: null,
       SUPPORT_URL: null,
       CONTACT_URL: null,
       OPEN_SOURCE_URL: null,
@@ -160,7 +164,6 @@ module.exports = Merge.smart(commonConfig, {
       TWITTER_URL: null,
       YOU_TUBE_URL: null,
       LINKED_IN_URL: null,
-      GOOGLE_PLUS_URL: null,
       REDDIT_URL: null,
       APPLE_APP_STORE_URL: null,
       GOOGLE_PLAY_URL: null,