瀏覽代碼

merge seo and case study fix

GA
Pavle Golubovic 3 年之前
父節點
當前提交
87976cda5c

+ 1
- 1
frontend/package.json 查看文件

@@ -1,6 +1,6 @@
{
"name": "frontend",
"version": "1.0.12",
"version": "1.0.13",
"private": true,
"dependencies": {
"@faceless-ui/slider": "^1.1.14",

+ 2
- 0
frontend/src/App.js 查看文件

@@ -38,6 +38,7 @@ 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 ScrollToTop from './components/root/ScrollToTop';

// Navigation Links
const links = [
@@ -104,6 +105,7 @@ function App() {

return (
<div>
<ScrollToTop />
<Navigation
links={links}
scrollToView={scrollToView}

+ 2
- 2
frontend/src/components/PortfolioSection.jsx 查看文件

@@ -9,10 +9,10 @@ const _data = {
cards: [
{
id: 0,
title: 'Bi Healthcare Solution System',
title: 'BI Healthcare Solution System',
imgUrl:
'https://lh6.googleusercontent.com/D7N87i3udAln4YBp5SbaSI-9r2pVnnT5K2VT6p0G3dQanVgTMC2tdgz71PWOYco-7yQ=w2400',
alt: 'Bi Healthcare Solution System',
alt: 'BI Healthcare Solution System',
link: '/casestudybi',
},
{

+ 2
- 2
frontend/src/components/shared/TechNuggets.jsx 查看文件

@@ -2,9 +2,9 @@ import React from 'react';

const TechNuggets = ({ tech }) => {
return (
<div className="flex gap-2 mt-2">
<div className="flex gap-2 mt-2 flex-wrap">
{tech.map((item, index) => (
<div className="px-4 py-2 text-white text-title-24 font-medium bg-[#9FA2DD] rounded-lg" key={index}>{item}</div>
<div className="px-4 py-1 text-white text-p whitespace-nowrap font-medium bg-[#9FA2DD] rounded-lg" key={index}>{item}</div>
))}
</div>
);

+ 0
- 2
frontend/src/index.js 查看文件

@@ -5,7 +5,6 @@ import App from './App';
import reportWebVitals from './reportWebVitals';

import { BrowserRouter } from 'react-router-dom';
import ScrollToTop from './components/root/ScrollToTop';

if (module.hot) module.hot.accept()

@@ -13,7 +12,6 @@ if (module.hot) module.hot.accept()
ReactDOM.render(
<React.StrictMode>
<BrowserRouter>
{/* <ScrollToTop /> */}
<App />
</BrowserRouter>
</React.StrictMode>,

+ 4
- 4
frontend/src/pages/CaseStudyBI.jsx 查看文件

@@ -23,7 +23,7 @@ const numbers = [
title: 'Users',
},
{
value: 100,
value: '1,6m',
static: '+',
title: 'Transactions per Year',
},
@@ -32,7 +32,7 @@ const numbers = [
const _data = {
heading: {
subheading: 'Case Study',
heading: 'Bi Healthcare Solution',
heading: 'BI Healthcare Solution',
imgUrl:
'https://lh3.googleusercontent.com/QkLcHNOGmWIB2t3fwZd69ZwJpHOYcTTAPmPs4zbjErDbp9nXbTw0vhktPCuCM2EWZUU=w2400',
paragraph:
@@ -236,12 +236,12 @@ export default function CaseStudyBI() {

{/* Technologies Section */}
<section id="technologies" className="flex flex-col justify-center mt-16">
<div className="my-8 flex flex-col justify-center w-full max-w-custom m-auto px-8 xl:px-0">
<div className="my-8 flex flex-col w-full max-w-custom m-auto px-8 xl:px-0">
<div className="w-full">
<h3 className="h3-heading">Technologies</h3>
</div>
<TechNuggets
tech={['.Net', 'Power BI', 'Power Automate', 'MSSQL', 'Data Factory']}
tech={['Azure Data Factory','Azure SQL Server', 'Microsoft Power BI', '.Net Core', 'Azure App Services', 'Microsoft Power Automate','Azure Logic Apps','Azure Active Directory']}
/>
</div>
</section>

+ 6
- 6
frontend/src/pages/CaseStudyCentralized.jsx 查看文件

@@ -142,7 +142,7 @@ export default function CaseStudyCentralized() {
</div>
</section>

{/* <Wrapper padding={' py-90p'}>
<Wrapper padding={' py-90p'}>
<motion.section
id="status-numbers"
className="flex flex-col md:flex-row items-start justify-between w-full gap-90p px-90p"
@@ -161,7 +161,7 @@ export default function CaseStudyCentralized() {
</div>
))}
</motion.section>
</Wrapper> */}
</Wrapper>

{/* About the Client Section */}
<section id="client" className="flex flex-col items-center justify-center mt-16">
@@ -240,13 +240,13 @@ export default function CaseStudyCentralized() {
</div>
</section>

{/* Technologies Section */}
<section id="technologies" className="flex flex-col items-center mt-16">
<div className="my-8 flex flex-col items-center w-full max-w-custom m-auto px-8 xl:px-0">
{/*Technologies Section */}
<section id="technologies" className="flex flex-col mt-16">
<div className="my-8 flex flex-col w-full max-w-custom m-auto px-8 xl:px-0">
<div className="w-full">
<h3 className="h3-heading">Technologies</h3>
</div>
<TechNuggets tech={['.Net']} />
<TechNuggets tech={['.Net','MS SQL Server','JQuery','Power BI']} />
</div>
</section>


+ 6
- 7
frontend/src/pages/CaseStudyFinantial.jsx 查看文件

@@ -226,16 +226,15 @@ export default function CaseStudyFinantial() {
</div>
</section>

{/* Technologies Section */}
<section
id="technologies"
className="flex flex-col items-center justify-center mt-16"
>
<div className="my-8 flex flex-col justify-center items-center w-full max-w-custom m-auto px-8 xl:px-0">
{/* Technologies Section */}
<section id="technologies" className="flex flex-col mt-16">
<div className="my-8 flex flex-col w-full max-w-custom m-auto px-8 xl:px-0">
<div className="w-full">
<h3 className="h3-heading">Technologies</h3>
</div>
<TechNuggets tech={['.Net', 'Angular', 'MSSQL']} />
<TechNuggets
tech={['.Net','Service-Oriented Architecture (SOA)', 'MS SQL Server', 'MS MVC', 'Event-Driven Architecture (EDA)']}
/>
</div>
</section>


+ 6
- 15
frontend/src/pages/CaseStudyResource.jsx 查看文件

@@ -9,6 +9,7 @@ import dataFactory from './../assets/icons/caseStudy/data-factory.svg';
import { useEffect } from 'react';
import { motion } from 'framer-motion';
import Wrapper from '../layout/Wrapper';
import TechNuggets from '../components/shared/TechNuggets';

const numbers = [
{
@@ -232,24 +233,14 @@ export default function CaseStudyResource() {
</section>

{/* Technologies Section */}
<section
id="technologies"
className="flex flex-col items-center justify-center mt-16"
>
<div className="my-8 flex flex-col justify-center items-center w-full max-w-custom m-auto px-8 xl:px-0">
<section id="technologies" className="flex flex-col mt-16">
<div className="my-8 flex flex-col w-full max-w-custom m-auto px-8 xl:px-0">
<div className="w-full">
<h3 className="h3-heading">Technologies</h3>
</div>
<div className="grid grid-cols-4 justify-center justify-items-center gap-8 xl:flex xl:flex-row items-center xl:justify-start xl:gap-16 w-full mt-8">
{_data.technologies.map(technology => (
<img
key={technology.id}
src={technology.link}
alt="Technology's image"
className="w-12 md:w-16 lg:w-20"
/>
))}
</div>
<TechNuggets
tech={['.Net', 'MS SQL Server', 'React Native', 'React.JS']}
/>
</div>
</section>


+ 6
- 15
frontend/src/pages/CaseStudyStrata.jsx 查看文件

@@ -10,6 +10,7 @@ import mssql from './../assets/icons/caseStudy/MSSQL.svg';
import { useEffect } from 'react';
import { motion } from 'framer-motion';
import Wrapper from '../layout/Wrapper';
import TechNuggets from '../components/shared/TechNuggets';

const numbers = [
{
@@ -230,24 +231,14 @@ export default function CaseStudyStrata() {
</section>

{/* Technologies Section */}
<section
id="technologies"
className="flex flex-col items-center justify-center mt-16"
>
<div className="my-8 flex flex-col justify-center items-center w-full max-w-custom m-auto px-8 xl:px-0">
<section id="technologies" className="flex flex-col mt-16">
<div className="my-8 flex flex-col w-full max-w-custom m-auto px-8 xl:px-0">
<div className="w-full">
<h3 className="h3-heading">Technologies</h3>
</div>
<div className="grid grid-cols-4 justify-center justify-items-center gap-8 xl:flex xl:flex-row items-center xl:justify-start xl:gap-16 w-full mt-8">
{_data.technologies.map(technology => (
<img
key={technology.id}
src={technology.link}
alt="Technology's image"
className="w-12 md:w-16 lg:w-20"
/>
))}
</div>
<TechNuggets
tech={['.Net (Razor MVC)','JQuery', 'MS SQL Server', 'React Native']}
/>
</div>
</section>


+ 2
- 2
frontend/src/pages/CaseStudyTicketing.jsx 查看文件

@@ -243,9 +243,9 @@ export default function CaseStudyTicketing() {
{/* Technologies Section */}
<section
id="technologies"
className="flex flex-col items-center justify-center mt-16"
className="flex flex-col mt-16"
>
<div className="my-8 flex flex-col justify-center items-center w-full max-w-custom m-auto px-8 xl:px-0">
<div className="my-8 flex flex-col w-full max-w-custom m-auto px-8 xl:px-0">
<div className="w-full">
<h3 className="h3-heading">Technologies</h3>
</div>

+ 2
- 8
frontend/src/pages/Home.jsx 查看文件

@@ -45,6 +45,8 @@ export default function Home({scrollToView, forwardedRef}) {
// tab: '',
// contactRef: contactRef
// };

//set Tab Title
useEffect(() => {
document.title = 'Diligent Software';
},[]);
@@ -69,14 +71,6 @@ export default function Home({scrollToView, forwardedRef}) {
});
}, []);

useEffect(() => {
const url = window.location.pathname;
const h = window.document.body.offsetHeight;

}, [contactRef, cnt])

if (!isLoaded) {
return (
<div className="z-50 w-full h-screen bg-white dark:bg-dg-primary-1700 overflow-hidden dark:text-white flex items-center justify-center text-3xl font-semibold">

+ 2
- 2
frontend/src/pages/Portfolio.jsx 查看文件

@@ -24,10 +24,10 @@ const _data = {
cards: [
{
id: 0,
title: 'Bi Healthcare Solution System',
title: 'BI Healthcare Solution System',
imgUrl:
'https://lh6.googleusercontent.com/D7N87i3udAln4YBp5SbaSI-9r2pVnnT5K2VT6p0G3dQanVgTMC2tdgz71PWOYco-7yQ=w2400',
alt: 'Bi Healthcare Solution System',
alt: 'BI Healthcare Solution System',
link: '/casestudybi',
},
{

Loading…
取消
儲存