Merge pull request #6017 from topcoder-platform/develop

luizrrodrigues · web-flow · commit 59bdd548d93c · 2022-02-14T06:24:33.000-03:00
Release v1.15.4 : Discord
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -363,7 +363,7 @@ workflows:
           filters:
             branches:
               only:
-                - jan-fixes-2
+                - jan-updates-2
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         
diff --git a/__tests__/shared/components/Header/__snapshots__/index.jsx.snap b/__tests__/shared/components/Header/__snapshots__/index.jsx.snap
@@ -130,6 +130,11 @@ exports[`Default render 1`] = `
               ],
               "title": "Explore",
             },
+            Object {
+              "href": "https://discord.gg/topcoder",
+              "openNewTab": true,
+              "title": "Discord",
+            },
           ],
           "title": "COMMUNITY",
         },
diff --git a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
@@ -46,6 +46,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/challenges"
+              target="_self"
             >
               All Challenges
             </a>
@@ -55,6 +56,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/community/arena"
+              target="_self"
             >
               Competitive Programming
             </a>
@@ -64,6 +66,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/gigs"
+              target="_self"
             >
               Gig Work
             </a>
@@ -73,6 +76,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/community/practice"
+              target="_self"
             >
               Practice
             </a>
@@ -98,6 +102,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/thrive/tracks?track=Competitive%20Programming"
+              target="_self"
             >
               Competitive Programming
             </a>
@@ -107,6 +112,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science&tax="
+              target="_self"
             >
               Data Science
             </a>
@@ -116,6 +122,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/thrive/tracks?track=Design&tax="
+              target="_self"
             >
               Design
             </a>
@@ -125,6 +132,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/thrive/tracks?track=Development&tax="
+              target="_self"
             >
               Development
             </a>
@@ -134,6 +142,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/thrive/tracks?track=QA&tax="
+              target="_self"
             >
               QA
             </a>
@@ -159,6 +168,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/blog"
+              target="_self"
             >
               Blog
             </a>
@@ -168,6 +178,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/community/events"
+              target="_self"
             >
               Events Calendar
             </a>
@@ -177,6 +188,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://vanilla.topcoder-dev.com"
+              target="_self"
             >
               Forums
             </a>
@@ -186,6 +198,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/community/member-programs"
+              target="_self"
             >
               Programs
             </a>
@@ -195,6 +208,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/community/statistics"
+              target="_self"
             >
               Statistics
             </a>
@@ -204,6 +218,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/community/member-programs/topcoder-open"
+              target="_self"
             >
               TCO
             </a>
@@ -213,10 +228,21 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/thrive"
+              target="_self"
             >
               Thrive
             </a>
           </li>
+          <li
+            className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
+          >
+            <a
+              href="https://discord.gg/topcoder"
+              target="_blank"
+            >
+              Discord
+            </a>
+          </li>
         </ul>
       </div>
       <div
@@ -238,6 +264,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/thrive/tracks?track=Topcoder&tax=Getting%20Paid"
+              target="_self"
             >
               Getting Paid
             </a>
@@ -247,6 +274,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/thrive/tracks?track=Topcoder&tax=FAQ"
+              target="_self"
             >
               FAQ
             </a>
@@ -256,6 +284,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/thrive/tracks?track=Topcoder"
+              target="_self"
             >
               General Info
             </a>
@@ -265,6 +294,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="mailto:support@topcoder.com"
+              target="_self"
             >
               Website Help
             </a>
@@ -285,20 +315,12 @@ exports[`Matches shallow shapshot 1`] = `
         <ul
           className="src-shared-components-TopcoderFooter-___style__navi-col-links___CFs95"
         >
-          <li
-            className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
-          >
-            <a
-              href="https://www.topcoder-dev.com/community/admins"
-            >
-              Admins
-            </a>
-          </li>
           <li
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
               href="https://www.topcoder-dev.com/community/contact"
+              target="_self"
             >
               Contact Us
             </a>
@@ -308,6 +330,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://accounts-auth0.topcoder-dev.com?utm_source=community&utm_campaign=tc-footer&utm_medium=promotion&retUrl="
+              target="_self"
             >
               Join Community
             </a>
@@ -317,6 +340,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/community/learn"
+              target="_self"
             >
               About Community
             </a>
@@ -326,6 +350,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/community/changelog"
+              target="_self"
             >
               Changelog
             </a>
@@ -335,6 +360,7 @@ exports[`Matches shallow shapshot 1`] = `
           >
             <a
               href="https://www.topcoder-dev.com/contact-us/"
+              target="_self"
             >
               Talk to Sales
             </a>
@@ -445,6 +471,34 @@ exports[`Matches shallow shapshot 1`] = `
               />
             </svg>
           </a>
+          <a
+            href="https://discord.gg/topcoder"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            <svg
+              height="24"
+              viewBox="0 0 24 24"
+              width="24"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <title>
+                Join Topcoder Discord
+              </title>
+              <g
+                fill="#AAA"
+                fillRule="evenodd"
+              >
+                <path
+                  d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10S2 17.514 2 12 6.486 2 12 2zm0-2C5.373 0 0 5.373 0 12s5.373 12 12 12 12-5.373 12-12S18.627 0 12 0z"
+                />
+                <path
+                  d="M17.005 7.829A10.65 10.65 0 0 0 14.359 7a.04.04 0 0 0-.043.02c-.114.205-.24.473-.33.683a9.808 9.808 0 0 0-2.971 0 6.938 6.938 0 0 0-.335-.683.042.042 0 0 0-.042-.02 10.62 10.62 0 0 0-2.646.828.038.038 0 0 0-.018.015c-1.685 2.541-2.147 5.02-1.92 7.467a.045.045 0 0 0 .017.031 10.742 10.742 0 0 0 3.246 1.656.042.042 0 0 0 .045-.015c.25-.345.473-.708.664-1.09a.042.042 0 0 0-.022-.058 7.07 7.07 0 0 1-1.014-.488.042.042 0 0 1-.004-.07c.068-.05.136-.105.201-.159a.04.04 0 0 1 .042-.005c2.128.98 4.431.98 6.533 0a.04.04 0 0 1 .043.005c.065.054.133.108.202.16a.042.042 0 0 1-.004.07c-.324.19-.66.352-1.014.487a.042.042 0 0 0-.022.058c.195.382.418.745.663 1.09.01.014.029.02.046.015a10.707 10.707 0 0 0 3.251-1.656.042.042 0 0 0 .017-.03c.271-2.83-.454-5.288-1.922-7.467a.033.033 0 0 0-.017-.016zm-6.483 5.642c-.62 0-1.13-.528-1.13-1.177 0-.648.5-1.176 1.13-1.176.634 0 1.14.532 1.13 1.176 0 .649-.5 1.177-1.13 1.177zm3.956 0c-.62 0-1.13-.528-1.13-1.177 0-.648.5-1.176 1.13-1.176.635 0 1.14.532 1.13 1.176 0 .649-.495 1.177-1.13 1.177z"
+                  fillRule="nonzero"
+                />
+              </g>
+            </svg>
+          </a>
         </div>
       </div>
     </div>
@@ -486,9 +540,9 @@ exports[`Matches shallow shapshot 1`] = `
         className="src-shared-components-TopcoderFooter-___style__mobile-navi-col___3BcW4"
       >
         <a
-          href="https://www.topcoder-dev.com/community/admins"
+          href="https://www.topcoder-dev.com/community/contact"
         >
-          ABOUT
+          Contact Us
         </a>
       </div>
     </div>
@@ -585,6 +639,34 @@ exports[`Matches shallow shapshot 1`] = `
           />
         </svg>
       </a>
+      <a
+        href="https://discord.gg/topcoder"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        <svg
+          height="24"
+          viewBox="0 0 24 24"
+          width="24"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <title>
+            Join Topcoder Discord
+          </title>
+          <g
+            fill="#AAA"
+            fillRule="evenodd"
+          >
+            <path
+              d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10S2 17.514 2 12 6.486 2 12 2zm0-2C5.373 0 0 5.373 0 12s5.373 12 12 12 12-5.373 12-12S18.627 0 12 0z"
+            />
+            <path
+              d="M17.005 7.829A10.65 10.65 0 0 0 14.359 7a.04.04 0 0 0-.043.02c-.114.205-.24.473-.33.683a9.808 9.808 0 0 0-2.971 0 6.938 6.938 0 0 0-.335-.683.042.042 0 0 0-.042-.02 10.62 10.62 0 0 0-2.646.828.038.038 0 0 0-.018.015c-1.685 2.541-2.147 5.02-1.92 7.467a.045.045 0 0 0 .017.031 10.742 10.742 0 0 0 3.246 1.656.042.042 0 0 0 .045-.015c.25-.345.473-.708.664-1.09a.042.042 0 0 0-.022-.058 7.07 7.07 0 0 1-1.014-.488.042.042 0 0 1-.004-.07c.068-.05.136-.105.201-.159a.04.04 0 0 1 .042-.005c2.128.98 4.431.98 6.533 0a.04.04 0 0 1 .043.005c.065.054.133.108.202.16a.042.042 0 0 1-.004.07c-.324.19-.66.352-1.014.487a.042.042 0 0 0-.022.058c.195.382.418.745.663 1.09.01.014.029.02.046.015a10.707 10.707 0 0 0 3.251-1.656.042.042 0 0 0 .017-.03c.271-2.83-.454-5.288-1.922-7.467a.033.033 0 0 0-.017-.016zm-6.483 5.642c-.62 0-1.13-.528-1.13-1.177 0-.648.5-1.176 1.13-1.176.634 0 1.14.532 1.13 1.176 0 .649-.5 1.177-1.13 1.177zm3.956 0c-.62 0-1.13-.528-1.13-1.177 0-.648.5-1.176 1.13-1.176.635 0 1.14.532 1.13 1.176 0 .649-.495 1.177-1.13 1.177z"
+              fillRule="nonzero"
+            />
+          </g>
+        </svg>
+      </a>
     </div>
     <div
       className="src-shared-components-TopcoderFooter-___style__bottom___JLB31"
diff --git a/config/default.js b/config/default.js
@@ -405,6 +405,11 @@ module.exports = {
             },
           ],
         },
+        {
+          title: 'Discord',
+          href: 'https://discord.gg/topcoder',
+          openNewTab: true,
+        },
       ],
     },
   ],
diff --git a/config/production.js b/config/production.js
@@ -186,6 +186,11 @@ module.exports = {
             },
           ],
         },
+        {
+          title: 'Discord',
+          href: 'https://discord.gg/topcoder',
+          openNewTab: true,
+        },
       ],
     },
   ],
diff --git a/src/shared/components/Contentful/ContentSlider/ContentSlider.jsx b/src/shared/components/Contentful/ContentSlider/ContentSlider.jsx
@@ -49,7 +49,7 @@ class ContentSlider extends Component {
           className={theme.controlLeft}
         >
           {arrowRightImage && <img src={arrowRightImage.fields.file.url} alt="Slider left arrow" />}
-          {!arrowRightImage && (arrowTheme === 'Gray' ? <GrayArrowNext /> : <WhiteArrowNext />)}
+          {!arrowRightImage && (arrowTheme === 'Gray' ? <GrayArrowPrev /> : <WhiteArrowPrev />)}
         </a>
       ),
       renderCenterRightControls: ({ nextSlide }) => (
@@ -61,7 +61,7 @@ class ContentSlider extends Component {
           className={theme.controlRight}
         >
           {arrowLeftImage && <img src={arrowLeftImage.fields.file.url} alt="Slider right arrow" />}
-          {!arrowLeftImage && (arrowTheme === 'Gray' ? <GrayArrowPrev /> : <WhiteArrowPrev />)}
+          {!arrowLeftImage && (arrowTheme === 'Gray' ? <GrayArrowNext /> : <WhiteArrowNext />)}
         </a>
       ),
     };
diff --git a/src/shared/components/TopcoderFooter/icons/icon-discord.svg b/src/shared/components/TopcoderFooter/icons/icon-discord.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Join Topcoder Discord</title>
+    <g id="Discord" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="04-2-Join-Discord" transform="translate(-1334.000000, -1277.000000)" fill="#AAAAAA">
+            <g id="Footer" transform="translate(0.000000, 1036.000000)">
+                <g id="Stacked-Group" transform="translate(1189.000000, 241.000000)">
+                    <g id="icon-discord" transform="translate(145.000000, 0.000000)">
+                        <path d="M12,2 C17.514,2 22,6.486 22,12 C22,17.514 17.514,22 12,22 C6.486,22 2,17.514 2,12 C2,6.486 6.486,2 12,2 Z M12,0 C5.373,0 0,5.373 0,12 C0,18.627 5.373,24 12,24 C18.627,24 24,18.627 24,12 C24,5.373 18.627,0 12,0 Z" id="icon"></path>
+                        <g id="logo/discord" transform="translate(6.000000, 7.000000)" fill-rule="nonzero">
+                            <g id="Stacked-Group">
+                                <path d="M11.005049,0.828945437 C10.176473,0.44526264 9.28795046,0.162582067 8.35894485,0.000679161682 C8.34202654,-0.00244551376 8.32512654,0.00536321832 8.31641105,0.0209810521 C8.20213922,0.226091881 8.07556317,0.493675707 7.98692514,0.703995376 C6.98771953,0.55302791 5.99364068,0.55302791 5.0149238,0.703995376 C4.92626747,0.489000705 4.79509564,0.226091881 4.68031114,0.0209810521 C4.67159564,0.00588430553 4.65469564,-0.00192442655 4.63777733,0.000679161682 C3.7092844,0.162064675 2.82076188,0.444745249 1.99167317,0.828945437 C1.98449571,0.832068264 1.97834359,0.837279137 1.9742605,0.844042183 C0.288920395,3.38506299 -0.172764706,5.86362725 0.0537225701,8.31146214 C0.0547473729,8.32343606 0.0614086826,8.33489259 0.070632274,8.34217303 C1.1825715,9.16626691 2.25967457,9.66656607 3.31677596,9.9981771 C3.33369427,10.003388 3.35161962,9.99714232 3.36238581,9.98308035 C3.61244356,9.63846062 3.83534778,9.27508544 4.02646608,8.89295482 C4.03774495,8.87057764 4.02697876,8.84402436 4.00392664,8.83517327 C3.65036327,8.69981994 3.3136999,8.53479051 2.98985343,8.3473839 C2.96423794,8.33228715 2.96218723,8.29531214 2.98575202,8.27760995 C3.05390132,8.22607406 3.12206892,8.17245012 3.18714216,8.11830879 C3.1989154,8.10842291 3.21532103,8.10633487 3.22916328,8.11258052 C5.35669563,9.09287122 7.66000261,9.09287122 9.76243214,8.11258052 C9.77627439,8.10581748 9.79268003,8.10790552 9.80496594,8.1177914 C9.87005749,8.17193273 9.93820678,8.22607406 10.0068688,8.27760995 C10.0304335,8.29531214 10.0288955,8.33228715 10.00328,8.3473839 C9.67943355,8.53843073 9.34277018,8.69981994 8.98869413,8.83465588 C8.96564202,8.84350697 8.9553885,8.87057764 8.96666737,8.89295482 C9.16188708,9.27454957 9.3847913,9.63792475 9.63023496,9.98256296 C9.64048848,9.99714232 9.65892651,10.003388 9.67584482,9.9981771 C10.738073,9.66656607 11.8151687,9.16626691 12.9271081,8.34217303 C12.936849,8.33489259 12.9430011,8.32395345 12.9440264,8.31197954 C13.2150856,5.48201402 12.4900152,3.02377586 11.021949,0.844559575 C11.0183603,0.837279137 11.0122265,0.832068264 11.005049,0.828945437 Z M4.52167624,6.47058824 C3.90194517,6.47058824 3.39130435,5.9425739 3.39130435,5.29411765 C3.39130435,4.64566139 3.89204237,4.11764706 4.52167624,4.11764706 C5.15625265,4.11764706 5.66195093,4.65029757 5.65203041,5.29411765 C5.65203041,5.9425739 5.15129239,6.47058824 4.52167624,6.47058824 Z M8.47818051,6.47058824 C7.85846703,6.47058824 7.34782609,5.9425739 7.34782609,5.29411765 C7.34782609,4.64566139 7.84854651,4.11764706 8.47818051,4.11764706 C9.11277478,4.11764706 9.61845546,4.65029757 9.60855266,5.29411765 C9.60855266,5.9425739 9.11277478,6.47058824 8.47818051,6.47058824 Z" id="Shape"></path>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/shared/components/TopcoderFooter/index.jsx b/src/shared/components/TopcoderFooter/index.jsx
