Merge pull request #389 from topcoder-platform/dev

LPU release

Author: kkartunov

src/lib/app-context/app-context.functions.ts

@@ -18,6 +18,8 @@ export const buildContext = (newConfig: Partial<NavigationAppProps>, prevContext
     fullFooter = prevContext.toolConfig?.fullFooter,
     showSalesCta = prevContext.toolConfig?.showSalesCta,
     profileCompletionData = prevContext.auth?.profileCompletionData,
+    signupUtmCodes = prevContext.signupUtmCodes,
+    simplifiedNav = prevContext.simplifiedNav,
   } = {...newConfig, user: undefined}
 
   const hasUserProp = hasOwnProperty(newConfig, 'user') && newConfig['user'] !== 'auto'
@@ -45,6 +47,8 @@ export const buildContext = (newConfig: Partial<NavigationAppProps>, prevContext
       fullFooter,
       showSalesCta,
     },
+    signupUtmCodes,
+    simplifiedNav,
     supportMeta,
     integrations,
   }

src/lib/app-context/app-context.model.ts

@@ -8,4 +8,6 @@ export interface AppContext {
   toolConfig: ToolConfig
   navigationHandler: NavigationHandler
   supportMeta?: SupportMeta
+  signupUtmCodes?: string
+  simplifiedNav?: boolean
 }

src/lib/components/user-area/UserArea.svelte

@@ -80,7 +80,14 @@
 
   function onSignIn(signup?: any) {
     const locationHref = `${window.location.origin}${window.location.pathname}`
-    window.location.href = `${AUTH0_AUTHENTICATOR_URL}?retUrl=${encodeURIComponent(locationHref)}${signup === true ? '&mode=signUp' : ''}`;
+
+    const signupUrl = [
+      `${AUTH0_AUTHENTICATOR_URL}?retUrl=${encodeURIComponent(locationHref)}`,
+      signup === true ? '&mode=signUp' : '',
+      $ctx.signupUtmCodes,
+    ].filter(Boolean).join('&')
+
+    window.location.href = signupUrl;
   }
 
   function onSignUp() {

src/lib/marketing-navigation/MarketingNavigation.svelte

@@ -44,6 +44,7 @@
     menuItems={menuItems}
     isMobile={$isMobile}
     navigationHandler={navigationHandler}
+    simplifiedNav={$ctx.simplifiedNav}
   >
     <UserArea slot="auth" />
   </NavigationBar>

src/lib/marketing-navigation/components/NavigationBar.svelte

@@ -11,23 +11,26 @@
   export let activeRoute: NavMenuItem;
   export let isMobile: boolean = false;
   export let navigationHandler: NavigationHandler | undefined;
+  export let simplifiedNav: boolean = false;
 </script>
 
 <TopNavbar style={style} minVersionLogo={isMobile}>
-  {#if isMobile}
-    <MobileNavigation
-      menuItems={[...menuItems]}
-      activeRoute={activeRoute}
-      activeRoutePath={activeRoutePath}
-    />
-  {:else}
-    <LinksMenu
-      menuItems={menuItems}
-      style={style}
-      activeRoute={activeRoute}
-      activeRoutePath={activeRoutePath}
-      navigationHandler={navigationHandler}
-    />
+  {#if !simplifiedNav}
+    {#if isMobile}
+      <MobileNavigation
+        menuItems={[...menuItems]}
+        activeRoute={activeRoute}
+        activeRoutePath={activeRoutePath}
+      />
+    {:else}
+      <LinksMenu
+        menuItems={menuItems}
+        style={style}
+        activeRoute={activeRoute}
+        activeRoutePath={activeRoutePath}
+        navigationHandler={navigationHandler}
+      />
+    {/if}
   {/if}
 
   <svelte:fragment slot="right">

src/main.ts

@@ -35,6 +35,8 @@ export type NavigationAppProps = {
   supportMeta?: SupportMeta
 
   integrations?: {[key: string]: 'disable'}
+  signupUtmCodes?: string
+  simplifiedNav?: boolean
 }
 
 export type TcUniNavMethods = 'init' | 'update' | 'destroy'

types/src/lib/app-context/app-context.functions.d.ts

@@ -18,6 +18,8 @@ export declare const buildContext: (newConfig: Partial<NavigationAppProps>, prev
         fullFooter: any;
         showSalesCta: any;
     };
+    signupUtmCodes: any;
+    simplifiedNav: any;
     supportMeta: any;
     integrations: any;
 };

types/src/lib/app-context/app-context.model.d.ts

@@ -7,4 +7,6 @@ export interface AppContext {
     toolConfig: ToolConfig;
     navigationHandler: NavigationHandler;
     supportMeta?: SupportMeta;
+    signupUtmCodes?: string;
+    simplifiedNav?: boolean;
 }

types/src/main.d.ts

@@ -20,6 +20,8 @@ export declare type NavigationAppProps = {
     integrations?: {
         [key: string]: 'disable';
     };
+    signupUtmCodes?: string;
+    simplifiedNav?: boolean;
 };
 export declare type TcUniNavMethods = 'init' | 'update' | 'destroy';
 export declare type TcUniNavFn = (method: TcUniNavMethods, targetId: string, config: NavigationAppProps) => void;