| @@ -1,20 +1,20 @@ | |||
| import React, { useEffect, lazy, Suspense, useRef, useState } from 'react'; | |||
| import './App.css'; | |||
| import { Route, Routes, useLocation, useNavigate } from 'react-router-dom'; | |||
| import { Route, Routes, useNavigate } from 'react-router-dom'; | |||
| import Navigation from './components/shared/Navigation'; | |||
| import CookieBanner from './components/shared/CookieBanner'; | |||
| import Footer from './components/shared/Footer'; | |||
| import Loader from './components/shared/Loader'; | |||
| import ScrollToTop from './components/root/ScrollToTop'; | |||
| import ReactGA from 'react-ga4'; | |||
| import { useCookies, Cookies } from 'react-cookie'; | |||
| import { useCookies } from 'react-cookie'; | |||
| import routes from './routes'; | |||
| const Home = lazy(() => import('./pages/Home')); | |||
| const Portfolio = lazy(() => import('./pages/Portfolio')); | |||
| const Services = lazy(() => import('./pages/Services')); | |||
| const Careers = lazy(() => import('./pages/Careers')); | |||
| const DiligentLife = lazy(() => import('./pages/DiligentLife')); | |||
| const Culture = lazy(() => import('./pages/Culture')); | |||
| const DiligentMinds = lazy(() => import('./pages/DiligentMinds')); | |||
| const EventsTimeline = lazy(() => import('./pages/EventsTimeline')); | |||
| const About = lazy(() => import('./pages/About')); | |||
| @@ -30,9 +30,8 @@ const CaseStudyResource = lazy(() => import('./pages/CaseStudyResource')); | |||
| const CaseStudyStrata = lazy(() => import('./pages/CaseStudyStrata')); | |||
| const PrivacyPolicy = lazy(() => import('./pages/PrivacyPolicy')); | |||
| const WorkWithUs = lazy(() => import('./pages/WorkWithUs')); | |||
| import NavigationNew from './components/shared/NavigationNew'; | |||
| import ArticlePage from './pages/ArticlePage'; | |||
| import NotFoundPage from './pages/NotFoundPage'; | |||
| const NotFoundPage = lazy(() => import('./pages/NotFoundPage')); | |||
| const ArticlePage = lazy(() => import('./pages/ArticlePage')); | |||
| // Navigation Links | |||
| const links = routes.filter(item => item.nav === true); | |||
| @@ -101,11 +100,11 @@ function App() { | |||
| <Route exact path="/portfolio" element={<Portfolio />} /> | |||
| <Route exact path="/process" element={<ProcessPage />} /> | |||
| <Route exact path="/careers" element={<Careers />}/> | |||
| {/* <Route exact path="/diligentlife" element={<DiligentLife />}/> | |||
| <Route exact path="/diligentminds" element={<DiligentMinds />}/> | |||
| {/* <Route exact path="/culture" element={<Culture />}/> */} | |||
| {/*<Route exact path="/diligentminds" element={<DiligentMinds />}/> | |||
| <Route exact path="/eventstimeline" element={<EventsTimeline />}/> */} | |||
| <Route exact path="/about" element={<About />}/> | |||
| {/* <Route exact path="/blog" element={<Blog />}/> */} | |||
| <Route exact path="/blog" element={<Blog />}/> | |||
| <Route exact path="/articles/:slug" element={<ArticlePage />} /> | |||
| <Route exact path="/contact" element={<ContactPage />}/> | |||
| <Route exact path="/casestudybi" element={<CaseStudyBI />}/> | |||
| @@ -49,8 +49,6 @@ export default function Navigation({ links, scrollToView, activeLinks, forwarded | |||
| <div className="mr-2 -my-2 md:hidden"> | |||
| <Popover.Button className="bg-white rounded-md p-2 inline-flex items-center justify-center text-dg-primary-900 focus:outline-none"> | |||
| <img src={menuIcon} alt="Menu" className="h-[30px]" /> | |||
| {/*<span className="sr-only">Open menu</span> | |||
| <div className="h-6 w-6" aria-hidden="true" />*/} | |||
| </Popover.Button> | |||
| </div> | |||
| <Popover.Group | |||
| @@ -58,7 +56,7 @@ export default function Navigation({ links, scrollToView, activeLinks, forwarded | |||
| className="hidden md:flex space-x-8 lg:space-x-10 items-center" | |||
| > | |||
| {links.map((item, index) => | |||
| (item.drop && item.drop > 0) ? ( | |||
| (item.drop && item.drop.length > 0) ? ( | |||
| <div> | |||
| <a | |||
| href={item.path} | |||
| @@ -21,7 +21,7 @@ import OrbitOnScroll from '../components/shared/graphics/OrbitOnScroll'; | |||
| import PageLayout from '../layout/PageLayout'; | |||
| import TimelineCard from '../components/TimelineCard'; | |||
| //import useAnalytics from '../hooks/useAnalytics'; | |||
| import VideoComponent from './../components/shared/VideoComponent'; | |||
| import VideoComponent from '../components/shared/VideoComponent'; | |||
| // eslint-disable-next-line no-underscore-dangle | |||
| const _data = { | |||
| @@ -74,7 +74,7 @@ const _data = { | |||
| }, | |||
| }; | |||
| export default function Careers({ forwardedRef }) { | |||
| export default function Culture({ forwardedRef }) { | |||
| const [clickedPosition, setClickedPosition] = useState(''); | |||
| const [cntCareers, setCntCareers] = useState(''); | |||
| const [isLoaded, setIsLoaded] = useState(''); | |||
| @@ -82,7 +82,7 @@ export default function Careers({ forwardedRef }) { | |||
| const api_url = process.env.REACT_APP_API_URL; | |||
| useEffect(() => { | |||
| document.title = 'Diligent Life'; | |||
| document.title = 'Culture'; | |||
| }, []); | |||
| //useAnalytics(); | |||
| @@ -14,7 +14,7 @@ import PrivacyPolicy from "./pages/PrivacyPolicy"; | |||
| import ProcessPage from "./pages/ProcessPage"; | |||
| import WorkWithUs from "./pages/WorkWithUs"; | |||
| import EventsTimeline from "./pages/EventsTimeline"; | |||
| import DiligentLife from "./pages/DiligentLife"; | |||
| import DiligentLife from "./pages/Culture"; | |||
| import DiligentMinds from "./pages/DiligentMinds"; | |||
| import Blog from './pages/Blog'; | |||
| const routes = [ | |||
| @@ -88,14 +88,15 @@ const routes = [ | |||
| exact: true, | |||
| nav:true, | |||
| drop: [ | |||
| // enable after we add content | |||
| // { | |||
| // path:'/diligentlife', | |||
| // path:'/culture', | |||
| // component: <DiligentLife />, | |||
| // title: 'Diligent Life', | |||
| // title: 'Culture', | |||
| // exact: true, | |||
| // nav:true, | |||
| // }, | |||
| //enable after we add content | |||
| // { | |||
| // path:"/diligentminds", | |||
| // component: <DiligentMinds />, | |||
| @@ -112,13 +113,13 @@ const routes = [ | |||
| // }, | |||
| ], | |||
| }, | |||
| // { | |||
| // path: '/blog', | |||
| // component: <Blog />, | |||
| // title: 'Blog', | |||
| // exact: true, | |||
| // nav:true, | |||
| // }, | |||
| { | |||
| path: '/blog', | |||
| component: <Blog />, | |||
| title: 'Blog', | |||
| exact: true, | |||
| nav:true, | |||
| }, | |||
| { | |||
| path: '/about', | |||
| component: <About/>, | |||