PROD-1551 #comment merge dev and remove all

references to the self service app and typescript #time 15m

src/App.jsx

@@ -63,11 +63,7 @@ const App = () => {
         <NavBar
           default
           noThrow
-          profileUrl={
-            location.pathname.includes("/self-service")
-              ? "/self-service/account/"
-              : `/profile/${_.get(auth, "profile.handle", "")}`
-          }
+          profileUrl={`/profile/${_.get(auth, "profile.handle", "")}`}
           hideSwitchTools={isNavigationDisabled}
           path="/*"
         />

src/components/NavBar/index.jsx

@@ -19,17 +19,13 @@ import { Link, useLocation } from "@reach/router";
 import TCLogo from "../../assets/images/tc-logo.svg";
 import {
   getLoginUrl,
-  getSelfServiceLoginUrl,
-  getSelfServiceSignupUrl,
 } from "../../utils";
-import { BUTTON_TYPE } from "constants/";
 import "./styles.css";
 import { useMediaQuery } from "react-responsive";
 import NotificationsMenu from "../NotificationsMenu";
-import Button from "../Button";
 
 const NavBar = ({ hideSwitchTools, profileUrl }) => {
-  const [isSelfService, setIsSelfService] = useState(false);
+
   // all menu options
   const menu = useSelector((state) => state.menu.categories);
   // flat list of all apps
@@ -43,8 +39,7 @@ const NavBar = ({ hideSwitchTools, profileUrl }) => {
 
   const routerLocation = useLocation();
 
-  const loginUrl = isSelfService ? getSelfServiceLoginUrl() : getLoginUrl();
-  const signupUrl = isSelfService ? getSelfServiceSignupUrl() : "";
+  const loginUrl = getLoginUrl();
 
   // Check app title with route activated
   useEffect(() => {
@@ -53,7 +48,6 @@ const NavBar = ({ hideSwitchTools, profileUrl }) => {
     );
     setActiveApp(activeApp);
 
-    setIsSelfService(routerLocation.pathname.indexOf("/self-service") !== -1);
   }, [routerLocation, apps]);
 
   // Change micro-app callback
@@ -64,14 +58,42 @@ const NavBar = ({ hideSwitchTools, profileUrl }) => {
     [setActiveApp]
   );
 
-  const renderTopcoderLogo =
-    hideSwitchTools && !isSelfService ? (
+  // if the consuming app has requested that we disable the navigation
+  // don't make the logo a link
+  let renderTopcoderLogo
+  if (hideSwitchTools) {
+
+    renderTopcoderLogo = (
       <img src={TCLogo} alt="Topcoder Logo" />
-    ) : (
-      <Link to={isSelfService ? "/self-service" : "/"}>
+    )
+
+  } else {
+
+    renderTopcoderLogo = (
+      <Link to={"/"}>
         <img src={TCLogo} alt="Topcoder Logo" />
       </Link>
-    );
+    )
+  }
+
+  const renderTitle = activeApp?.title || ""
+
+  const renderProfile = (
+    <>
+      <NotificationsMenu />
+      <UserMenu
+        profileUrl={profileUrl}
+        profile={auth.profile}
+        hideSwitchTools={hideSwitchTools}
+      />
+    </>
+  )
+
+  const renderLogin = (
+    <a href={loginUrl} className="navbar-login">
+      Log in
+    </a>
+  )
 
   return (
     <div className="navbar">
@@ -85,7 +107,7 @@ const NavBar = ({ hideSwitchTools, profileUrl }) => {
             {renderTopcoderLogo}
             <div className="navbar-divider"></div>
             <div className="navbar-app-title">
-              {activeApp ? activeApp.title : ""}
+              {renderTitle}
             </div>
           </Fragment>
         )}
@@ -102,22 +124,7 @@ const NavBar = ({ hideSwitchTools, profileUrl }) => {
         {isMobile ? (
           <Fragment>
             {auth.isInitialized &&
-              (auth.tokenV3 ? (
-                auth.profile && (
-                  <Fragment>
-                    <NotificationsMenu />
-                    <UserMenu
-                      profileUrl={profileUrl}
-                      profile={auth.profile}
-                      hideSwitchTools={hideSwitchTools}
-                    />
-                  </Fragment>
-                )
-              ) : (
-                <a href={loginUrl} className="navbar-login">
-                  Login
-                </a>
-              ))}
+              (auth.tokenV3 ? (auth.profile && (renderProfile)) : (renderLogin))}
           </Fragment>
         ) : (
           <Fragment>
@@ -128,33 +135,7 @@ const NavBar = ({ hideSwitchTools, profileUrl }) => {
               </Fragment>
             )}
             {auth.isInitialized &&
-              (auth.tokenV3 ? (
-                auth.profile && (
-                  <Fragment>
-                    {!isSelfService && <NotificationsMenu />}
-                    <UserMenu
-                      profileUrl={profileUrl}
-                      profile={auth.profile}
-                      hideSwitchTools={hideSwitchTools}
-                    />
-                  </Fragment>
-                )
-              ) : (
-                <Fragment>
-                  <a href={loginUrl} className="navbar-login">
-                    Login
-                  </a>
-                  {isSelfService && (
-                    <Button
-                      href={signupUrl}
-                      className="navbar-signup"
-                      type={BUTTON_TYPE.SECONDARY}
-                    >
-                      SIGN UP
-                    </Button>
-                  )}
-                </Fragment>
-              ))}
+              (auth.tokenV3 ? (auth.profile && (renderProfile)) : (renderLogin))}
           </Fragment>
         )}
       </div>

src/components/NavBar/styles.css

@@ -9,12 +9,20 @@
   position: relative;
   z-index: 1;
   font-family: "Roboto", Arial, Helvetica, sans-serif;
-}
-.navbar {
   padding: 0 24px;
   background-color: #0C0C0C;
 }
 
+.navbar .logo-no-link {
+  margin-top: -3px;
+}
+
+@media (max-width: 1023px) {
+  .navbar .logo-no-link {
+    margin-top: 0;
+  }
+}
+
 .navbar-left {
   display: flex;
   flex-direction: row;

src/components/UserMenu/index.jsx

@@ -69,7 +69,7 @@ const UserMenu = ({ profile, profileUrl }) => {
                       to={`${profileUrl}`}
                       onClick={closeMenu}
                     >
-                      {profileUrl.startsWith('/self-service') ? 'Account' : 'Profile'}
+                      Account
                     </Link>
                   </li>
                   <li>

src/constants/apps.js

@@ -88,7 +88,7 @@ export const APP_CATEGORIES = [
     apps: [
       {
         title: "Profile App",
-        path: "/profile/",
+        path: "/account/",
         isExact: false,
         menu: [],
       },

src/utils/index.js

@@ -36,27 +36,6 @@ export const getBusinessLoginUrl = () =>
     window.location.href.match(/[^?]*/)[0]
   )}`;
 
-/**
- * Returns login URL using which the user should be redirected to self service
- * dashboard page after login.
- *
- * @returns {string}
- */
-export const getSelfServiceLoginUrl = () =>
-  `${config.URL.AUTH}?retUrl=${encodeURIComponent(
-    `${window.location.origin}/self-service`
-  )}&regSource=selfService&mode=login`;
-
-/**
- * Returns Sign up URL for self service app.
- *
- * @returns {string}
- */
-export const getSelfServiceSignupUrl = () =>
-  `${config.URL.AUTH}?retUrl=${encodeURIComponent(
-    `${window.location.origin}/self-service`
-  )}&regSource=selfService&mode=signUp`;
-
 /**
  * Logout user from Topcoder
  */

tsconfig.json

@@ -1,34 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "es5",
-        "lib": [
-            "dom",
-            "dom.iterable",
-            "esnext"
-        ],
-        "allowJs": true,
-        "skipLibCheck": true,
-        "esModuleInterop": true,
-        "allowSyntheticDefaultImports": true,
-        "strict": true,
-        "strictNullChecks": true,
-        "forceConsistentCasingInFileNames": true,
-        "noFallthroughCasesInSwitch": true,
-        "module": "esnext",
-        "moduleResolution": "node",
-        "resolveJsonModule": true,
-        "isolatedModules": true,
-        "noEmit": true,
-        "jsx": "react-jsx",
-        "typeRoots": [
-            "./types",
-            "./node_modules/@types"
-        ]
-    },
-    "include": [
-        "src"
-    ],
-    "exclude": [
-        "**/*.test.*"
-    ]
-}