passport, build, cls fix

efdevcon · Oct 31, 2024 · 4a50b1e · 4a50b1e
1 parent 60bb0dd
commit 4a50b1e
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 7 deletions.
diff --git a/devcon/src/assets/icons/app-icons.svg b/devcon/src/assets/icons/app-icons.svg
diff --git a/devcon/src/components/common/layouts/header/Header.tsx b/devcon/src/components/common/layouts/header/Header.tsx
@@ -7,7 +7,7 @@ import { Strip } from './strip'
 import css from './header.module.scss'
 import { useIsScrolled } from 'hooks/useIsScrolled'
 import HeaderLogo from './HeaderLogo'
-import DevaBot from 'lib/components/ai/overlay'
+// import DevaBot from 'lib/components/ai/overlay'
 import { useOnOutsideClick } from 'hooks/useOnOutsideClick'
 
 type HeaderProps = {
@@ -26,7 +26,7 @@ export const Header = React.memo(({ withStrip, withHero, className, isApp }: Hea
   useOnOutsideClick(ref, () => setSearchOpen(false))
 
   // Add this line to check for the query parameter
-  const showDevaBot = router.query.showDevaBot === 'true'
+  // const showDevaBot = router.query.showDevaBot === 'true'
 
   // Prevent page scroll when menu is open
   useEffect(() => {
@@ -59,7 +59,7 @@ export const Header = React.memo(({ withStrip, withHero, className, isApp }: Hea
               <HeaderLogo />
             </Link>
 
-            {showDevaBot && <DevaBot />}
+            {/* {showDevaBot && <DevaBot />} */}
 
             <Menu
               isApp={isApp}

diff --git a/devcon/src/components/common/layouts/header/menu/navigation/Navigation.tsx b/devcon/src/components/common/layouts/header/menu/navigation/Navigation.tsx
@@ -10,6 +10,7 @@ import useNavigationData from '../../useNavigationData'
 import IconCalendar from 'assets/icons/calendar.svg'
 import IconWatch from 'assets/icons/on_demand_video.svg'
 import { Button } from 'lib/components/button'
+import AppIcons from 'assets/icons/app-icons.svg'
 
 const Mobile = (props: any) => {
   const [openItem, setOpenItem] = React.useState<string | undefined>()
@@ -64,7 +65,7 @@ const Mobile = (props: any) => {
                   >
                     <>
                       {i.title}
-                      {i.highlight === 'app' && <IconCalendar style={{ fontSize: '1em' }} />}
+                      {i.highlight === 'app' && <AppIcons style={{ fontSize: '1em' }} />}
                       {i.highlight === 'livestream' ||
                         (i.highlight === 'archive' && <IconWatch style={{ fontSize: '1em' }} />)}
                     </>
@@ -154,6 +155,25 @@ export const Navigation = (props: any) => {
               )
             }
 
+            if (i.highlight === 'app') {
+              return (
+                <Link to={i.url}>
+                  <Button
+                    color="purple-2"
+                    className="shadow lg shrink-0 !py-1 flex gap-2 items-center !rounded-2xl"
+                    fill
+                  >
+                    <AppIcons
+                      className="mx-0.5 mr-1 transform scale-[140%] icon"
+                      style={{ width: 'auto', height: 'auto', fontSize: '20px' }}
+                    />
+                    {i.title}
+                    {/* <IconCalendar className="icon shrink-0" style={{ fontSize: '12px' }} /> */}
+                  </Button>
+                </Link>
+              )
+            }
+
             return (
               <Link to={i.url} className={className}>
                 <>

diff --git a/devcon/src/components/common/layouts/header/useNavigationData.ts b/devcon/src/components/common/layouts/header/useNavigationData.ts
@@ -312,7 +312,13 @@ const useNavigationData = () => {
         title: intl('navigation_archive'),
         url: 'https://archive.devcon.org',
         type: 'page',
-        highlight: 'archive',
+        // highlight: 'archive',
+      },
+      {
+        title: 'Devcon App',
+        url: 'https://app.devcon.org',
+        type: 'page',
+        highlight: 'app',
       },
     ],
     footer: {
@@ -410,7 +416,7 @@ const useNavigationData = () => {
           type: 'page',
         },
         {
-          title: 'DIPs & Community Hubs',
+          title: 'DIPs',
           url: '/dips',
           type: 'page',
         },

diff --git a/devcon/src/pages/index.tsx b/devcon/src/pages/index.tsx
@@ -526,7 +526,7 @@ export default pageHOC(function Index(props: any) {
             </div>
           </div> */}
 
-          <div className="pt-8">
+          <div className="pt-8 z-[1]">
             <CLSSection
               title={pages.community_led_sessions?.title}
               body={pages.community_led_sessions?.body}