Merge pull request #760 from bugout-dev/land

Land

frontend/pages/team/index.js

@@ -147,15 +147,6 @@ const Team = () => {
             hiking. A practicing Python wizard. Also likes to cook and play
             the guitar in between data witchcraft.`}
           />
-          <TeamCard
-            avatarURL={assets["centipede"]}
-            name={"Yhtyyar Sahatov"}
-            atName={"@Yhtiyar"}
-            content={`Wunderkind. Interested in Math, NLP. Loves
-            programming language parsing and Algorithms & Data structures.
-            Implementing his own dialect of LISP programming language for
-            scientific calculations.`}
-          />
           <TeamCard
             avatarURL={assets["scarab"]}
             name={"Kellan Wampler"}
@@ -164,6 +155,15 @@ const Team = () => {
             Enjoys soduku and its variants. Follows artificial intelligence scene for 
             Chess and Go. Experiments with grilling recipes.`}
           />
+          <TeamCard
+            avatarURL={assets["firefly"]}
+            name={"Ishkhan Balgudanian"}
+            atName={"@ishihssihshihishsi"}
+            content={`Lighter. Designer to the bone. Constantly
+            working on self-development. Sometimes plays guitar
+            and ukulele. Loves meat, went from well done to blue
+            rare in a few months.`}
+          />
         </Flex>
       </Stack>
       <Stack mb={12} w="100%">
@@ -201,15 +201,6 @@ const Team = () => {
             new to master. Enjoys being close to the sea. Loves yoga, 
             dogs and dancing. Can walk 30km when under stress.`}
           />
-          <TeamCard
-            avatarURL={assets["firefly"]}
-            name={"Ishkhan Balgudanian"}
-            atName={"@ishihssihshihishsi"}
-            content={`Lighter. Designer to the bone. Constantly
-            working on self-development. Sometimes plays guitar
-            and ukulele. Loves meat, went from well done to blue
-            rare in a few months.`}
-          />
         </Flex>
       </Stack>
     </Flex>

frontend/src/components/AppNavbar.js

@@ -172,6 +172,11 @@ const AppNavbar = () => {
                                 <MenuItem
                                   key={`menu-${idx}`}
                                   as={"a"}
+                                  target={
+                                    child.type === PAGETYPE.EXTERNAL
+                                      ? "_blank"
+                                      : "_self"
+                                  }
                                   m={0}
                                   color="white"
                                   fontWeight="400"

frontend/src/components/Footer.js

@@ -17,6 +17,7 @@ import {
   PRIMARY_MOON_LOGO_URL,
   SITEMAP,
   BACKGROUND_COLOR,
+  PAGETYPE,
 } from "../core/constants";
 import moment from "moment";
 import { AWS_ASSETS_PATH } from "../core/constants";
@@ -166,7 +167,16 @@ const Footer = () => {
                           href={linkItem.path}
                           key={`footer-list-link-item-${linkItemIndex}-col-${colIndex}`}
                         >
-                          <Link {...LINKS_SIZES}>{linkItem.title}</Link>
+                          <Link
+                            {...LINKS_SIZES}
+                            target={
+                              linkItem.type === PAGETYPE.EXTERNAL
+                                ? "_blank"
+                                : "_self"
+                            }
+                          >
+                            {linkItem.title}
+                          </Link>
                         </RouterLink>
                       );
                     })}

frontend/src/components/LandingBarMobile.js

@@ -125,6 +125,11 @@ const LandingBarMobile = () => {
                             color="white"
                             key={`menu-${idx}`}
                             as={"a"}
+                            target={
+                              child.type === PAGETYPE.EXTERNAL
+                                ? "_blank"
+                                : "_self"
+                            }
                             m={0}
                             fontSize="sm"
                             _focus={{ backgroundColor: "black.300" }}

frontend/src/components/LandingNavbar.js

@@ -103,6 +103,11 @@ const LandingNavbar = () => {
                               <MenuItem
                                 key={`menu-${idx}`}
                                 as={"a"}
+                                target={
+                                  child.type === PAGETYPE.EXTERNAL
+                                    ? "_blank"
+                                    : "_self"
+                                }
                                 m={0}
                                 color="white"
                                 fontWeight="400"