Pavle Golubovic 3 лет назад
Родитель
Сommit
c018f051a3
4 измененных файлов: 24 добавлений и 26 удалений
  1. 8
    9
      frontend/src/App.js
  2. 1
    3
      frontend/src/components/shared/Navigation.jsx
  3. 3
    3
      frontend/src/pages/Culture.jsx
  4. 12
    11
      frontend/src/routes.js

+ 8
- 9
frontend/src/App.js Просмотреть файл

import React, { useEffect, lazy, Suspense, useRef, useState } from 'react'; import React, { useEffect, lazy, Suspense, useRef, useState } from 'react';
import './App.css'; 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 Navigation from './components/shared/Navigation';
import CookieBanner from './components/shared/CookieBanner'; import CookieBanner from './components/shared/CookieBanner';
import Footer from './components/shared/Footer'; import Footer from './components/shared/Footer';
import Loader from './components/shared/Loader'; import Loader from './components/shared/Loader';
import ScrollToTop from './components/root/ScrollToTop'; import ScrollToTop from './components/root/ScrollToTop';
import ReactGA from 'react-ga4'; import ReactGA from 'react-ga4';
import { useCookies, Cookies } from 'react-cookie';
import { useCookies } from 'react-cookie';
import routes from './routes'; import routes from './routes';


const Home = lazy(() => import('./pages/Home')); const Home = lazy(() => import('./pages/Home'));
const Portfolio = lazy(() => import('./pages/Portfolio')); const Portfolio = lazy(() => import('./pages/Portfolio'));
const Services = lazy(() => import('./pages/Services')); const Services = lazy(() => import('./pages/Services'));
const Careers = lazy(() => import('./pages/Careers')); 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 DiligentMinds = lazy(() => import('./pages/DiligentMinds'));
const EventsTimeline = lazy(() => import('./pages/EventsTimeline')); const EventsTimeline = lazy(() => import('./pages/EventsTimeline'));
const About = lazy(() => import('./pages/About')); const About = lazy(() => import('./pages/About'));
const CaseStudyStrata = lazy(() => import('./pages/CaseStudyStrata')); const CaseStudyStrata = lazy(() => import('./pages/CaseStudyStrata'));
const PrivacyPolicy = lazy(() => import('./pages/PrivacyPolicy')); const PrivacyPolicy = lazy(() => import('./pages/PrivacyPolicy'));
const WorkWithUs = lazy(() => import('./pages/WorkWithUs')); 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 // Navigation Links
const links = routes.filter(item => item.nav === true); const links = routes.filter(item => item.nav === true);
<Route exact path="/portfolio" element={<Portfolio />} /> <Route exact path="/portfolio" element={<Portfolio />} />
<Route exact path="/process" element={<ProcessPage />} /> <Route exact path="/process" element={<ProcessPage />} />
<Route exact path="/careers" element={<Careers />}/> <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="/eventstimeline" element={<EventsTimeline />}/> */}
<Route exact path="/about" element={<About />}/> <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="/articles/:slug" element={<ArticlePage />} />
<Route exact path="/contact" element={<ContactPage />}/> <Route exact path="/contact" element={<ContactPage />}/>
<Route exact path="/casestudybi" element={<CaseStudyBI />}/> <Route exact path="/casestudybi" element={<CaseStudyBI />}/>

+ 1
- 3
frontend/src/components/shared/Navigation.jsx Просмотреть файл

<div className="mr-2 -my-2 md:hidden"> <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"> <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]" /> <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> </Popover.Button>
</div> </div>
<Popover.Group <Popover.Group
className="hidden md:flex space-x-8 lg:space-x-10 items-center" className="hidden md:flex space-x-8 lg:space-x-10 items-center"
> >
{links.map((item, index) => {links.map((item, index) =>
(item.drop && item.drop > 0) ? (
(item.drop && item.drop.length > 0) ? (
<div> <div>
<a <a
href={item.path} href={item.path}

frontend/src/pages/DiligentLife.jsx → frontend/src/pages/Culture.jsx Просмотреть файл

import PageLayout from '../layout/PageLayout'; import PageLayout from '../layout/PageLayout';
import TimelineCard from '../components/TimelineCard'; import TimelineCard from '../components/TimelineCard';
//import useAnalytics from '../hooks/useAnalytics'; //import useAnalytics from '../hooks/useAnalytics';
import VideoComponent from './../components/shared/VideoComponent';
import VideoComponent from '../components/shared/VideoComponent';


// eslint-disable-next-line no-underscore-dangle // eslint-disable-next-line no-underscore-dangle
const _data = { const _data = {
}, },
}; };


export default function Careers({ forwardedRef }) {
export default function Culture({ forwardedRef }) {
const [clickedPosition, setClickedPosition] = useState(''); const [clickedPosition, setClickedPosition] = useState('');
const [cntCareers, setCntCareers] = useState(''); const [cntCareers, setCntCareers] = useState('');
const [isLoaded, setIsLoaded] = useState(''); const [isLoaded, setIsLoaded] = useState('');
const api_url = process.env.REACT_APP_API_URL; const api_url = process.env.REACT_APP_API_URL;


useEffect(() => { useEffect(() => {
document.title = 'Diligent Life';
document.title = 'Culture';
}, []); }, []);


//useAnalytics(); //useAnalytics();

+ 12
- 11
frontend/src/routes.js Просмотреть файл

import ProcessPage from "./pages/ProcessPage"; import ProcessPage from "./pages/ProcessPage";
import WorkWithUs from "./pages/WorkWithUs"; import WorkWithUs from "./pages/WorkWithUs";
import EventsTimeline from "./pages/EventsTimeline"; import EventsTimeline from "./pages/EventsTimeline";
import DiligentLife from "./pages/DiligentLife";
import DiligentLife from "./pages/Culture";
import DiligentMinds from "./pages/DiligentMinds"; import DiligentMinds from "./pages/DiligentMinds";
import Blog from './pages/Blog'; import Blog from './pages/Blog';
const routes = [ const routes = [
exact: true, exact: true,
nav:true, nav:true,
drop: [ drop: [
// enable after we add content
// { // {
// path:'/diligentlife',
// path:'/culture',
// component: <DiligentLife />, // component: <DiligentLife />,
// title: 'Diligent Life',
// title: 'Culture',
// exact: true, // exact: true,
// nav:true, // nav:true,
// }, // },
//enable after we add content
// { // {
// path:"/diligentminds", // path:"/diligentminds",
// component: <DiligentMinds />, // component: <DiligentMinds />,
// }, // },
], ],
}, },
// {
// path: '/blog',
// component: <Blog />,
// title: 'Blog',
// exact: true,
// nav:true,
// },
{
path: '/blog',
component: <Blog />,
title: 'Blog',
exact: true,
nav:true,
},
{ {
path: '/about', path: '/about',
component: <About/>, component: <About/>,

Загрузка…
Отмена
Сохранить