cleanup project structure

batiaev · Aug 13, 2023 · b5daf13 · b5daf13
1 parent 4120df8
commit b5daf13
Show file tree

Hide file tree

Showing 36 changed files with 130 additions and 79 deletions.
diff --git a/docs/404.html b/docs/404.html
diff --git a/...ext/static/chunks/209-f7cf61b1a26c7712.js → ...ext/static/chunks/209-0d4a757918228658.js b/...ext/static/chunks/209-f7cf61b1a26c7712.js → ...ext/static/chunks/209-0d4a757918228658.js
diff --git a/...ext/static/chunks/245-b3824839c26fa16b.js → ...ext/static/chunks/245-87dcd0aa9aa64e0d.js b/...ext/static/chunks/245-b3824839c26fa16b.js → ...ext/static/chunks/245-87dcd0aa9aa64e0d.js
diff --git a/...ext/static/chunks/736-023d9b0cac12a13f.js → ...ext/static/chunks/736-7d2e920f1ac1db93.js b/...ext/static/chunks/736-023d9b0cac12a13f.js → ...ext/static/chunks/736-7d2e920f1ac1db93.js
diff --git a/docs/_next/static/chunks/pages/404-27e9246bb488be15.js b/docs/_next/static/chunks/pages/404-27e9246bb488be15.js
diff --git a/docs/_next/static/chunks/pages/404-e5c6b7ec0ac2177f.js b/docs/_next/static/chunks/pages/404-e5c6b7ec0ac2177f.js
diff --git a/...tic/chunks/pages/_app-316bd88a213d4492.js → ...tic/chunks/pages/_app-b46c2512201b8f4b.js b/...tic/chunks/pages/_app-316bd88a213d4492.js → ...tic/chunks/pages/_app-b46c2512201b8f4b.js
diff --git a/...ic/chunks/pages/index-6509f5b8a216d293.js → ...ic/chunks/pages/index-576bb0cbe394eac2.js b/...ic/chunks/pages/index-6509f5b8a216d293.js → ...ic/chunks/pages/index-576bb0cbe394eac2.js
diff --git a/docs/_next/static/chunks/pages/talks-bbc8f24879626f58.js b/docs/_next/static/chunks/pages/talks-bbc8f24879626f58.js
diff --git a/docs/_next/static/chunks/pages/talks-db621924ce7936b9.js b/docs/_next/static/chunks/pages/talks-db621924ce7936b9.js
diff --git a/docs/_next/static/jnfG8MLwnxj0pnXLuW8Vn/_buildManifest.js b/docs/_next/static/jnfG8MLwnxj0pnXLuW8Vn/_buildManifest.js
diff --git a/...tic/xUFsxjRoFsdzHLYFPkPiO/_ssgManifest.js → ...tic/jnfG8MLwnxj0pnXLuW8Vn/_ssgManifest.js b/...tic/xUFsxjRoFsdzHLYFPkPiO/_ssgManifest.js → ...tic/jnfG8MLwnxj0pnXLuW8Vn/_ssgManifest.js
diff --git a/docs/_next/static/xUFsxjRoFsdzHLYFPkPiO/_buildManifest.js b/docs/_next/static/xUFsxjRoFsdzHLYFPkPiO/_buildManifest.js
diff --git a/docs/images/revolut.gif b/docs/images/revolut.gif
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/talks.html b/docs/talks.html
diff --git a/pages/404.tsx b/pages/404.tsx
@@ -1,12 +1,12 @@
 import React from 'react'
 import Container from '@mui/material/Container'
 
-import Contact from '../src/Contact'
+import Contact from '../src/scenes/Contact'
 import Card from '@mui/material/Card'
 import CardContent from '@mui/material/CardContent'
 import Typography from '@mui/material/Typography'
 import CardActions from '@mui/material/CardActions'
-import siteData from '../src/site.json'
+import siteData from '../src/data/site.json'
 
 export default function Error404() {
   return (

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -8,6 +8,7 @@ import CssBaseline from '@mui/material/CssBaseline'
 import Copyright from '../src/components/Copyright'
 import defaultTheme from '../src/styles/theme'
 import '../src/styles/global.css'
+import data from '../src/data/data.json'
 import createEmotionCache from '../utility/createEmotionCache'
 
 const clientSideEmotionCache = createEmotionCache()
@@ -20,44 +21,44 @@ export default function MyApp(props: AppProps) {
     <CacheProvider value={emotionCache}>
       <ThemeProvider theme={defaultTheme}>
         <Head>
-          <title>Anton Batiaev - CTO, Global Talent, MBA, Fintech Developer, Derivatives Trader</title>
+          <title>${data.name} - CTO, Global Talent, MBA, Fintech Developer, Derivatives Trader</title>
           <meta
             name="viewport"
             content="minimum-scale=1, initial-scale=1, width=device-width"
           />
           <meta
               property="description"
-              content="Anton Batiaev - CTO at WealthTech. MBA, UK Global Talent, Certified Java Developer, involved in software development since 2010.
-                Key skills: Java 17, Spring, Linux, Kafka, Disruptor, Docker etc"
+              content={`${data.name} - CTO at WealthTech. MBA, UK Global Talent, Certified Java Developer, involved in software development since 2010.
+                Key skills: Java 17, Spring, Linux, Kafka, Disruptor, Docker etc`}
           />
           <meta
             name="keywords"
-            content="cv, resume, Anton Batiaev, Batiaev, java developer, fintech,
-          full stack java developer, spring developer, Oracle Certified, Oracle Certified developer, derivatives developer, quantitive developer, derivative trader"
+            content={`cv, resume, ${data.name}, Batiaev, java developer, fintech,
+          full stack java developer, spring developer, Oracle Certified, Oracle Certified developer, derivatives developer, quantitive developer, derivative trader`}
           />
-          <meta name="author" content="Anton Batiaev" />
+          <meta name="author" content={data.name} />
 
-          <meta property="og:title" content="Anton Batiaev - Certified Java Developer" />
+          <meta property="og:title" content={`${data.name} - CTO at WealthTech`}/>
           <meta
             property="og:site_name"
-            content="Anton Batiaev - Certified Java Developer"
+            content={`${data.name} - CTO at WealthTech`}
           />
           <meta property="og:type" content="website" />
           <meta property="og:url" content="https://batiaev.com/" />
           <meta property="og:see_also" content="https://www.linkedin.com/in/batiaev/" />
           <meta property="og:image" content="https://batiaev.com/images/batiaev.webp" />
           <meta
             property="og:description"
-            content="Anton Batiaev - CTO at WealthTech. MBA, UK Global Talent, Certified Java Developer, involved in software development since 2010.
-                Key skills: Java 17, Spring, Linux, Kafka, Disruptor, Docker etc"
+            content={`${data.name} - CTO at WealthTech. MBA, UK Global Talent, Certified Java Developer, involved in software development since 2010.
+                Key skills: Java 17, Spring, Linux, Kafka, Disruptor, Docker etc`}
           />
 
-          <meta name="twitter:card" content="Anton Batiaev - Certified Java Developer" />
+          <meta name="twitter:card" content={`${data.name} - CTO at WealthTech`}/>
           <meta name="twitter:site" content="@batiaev_com" />
-          <meta name="twitter:title" content="Anton Batiaev - Certified Java Developer" />
+          <meta name="twitter:title" content={`${data.name} - CTO at WealthTech`}/>
           <meta
             name="twitter:description"
-            content="Anton Batiaev - Full Stack Certified Java Developer, involved in software development since 2010."
+            content={`${data.name} - CTO at WealthTech, involved in software development since 2010.`}
           />
           <meta name="twitter:creator" content="@batiaev_com" />
           <meta name="twitter:image" content="https://batiaev.com/images/batiaev.webp" />

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -1,31 +1,11 @@
 import React from 'react'
-import Container from '@mui/material/Container'
-
-import Intro from '../src/Intro'
-import Skills from '../src/Skills'
-import Services from '../src/Services'
-import Education from '../src/Education'
-import Experience from '../src/Experience'
-import Blog from '../src/Blog'
-import Contact from '../src/Contact'
-import Talks from '../src/Talks'
-import OpenSource from '../src/OpenSource'
+import Root from "../src/Root";
 
 export default function Index() {
   return (
     <>
       <header />
-      <Container component="main">
-        <Intro />
-        <Skills />
-        <Experience />
-        <Talks />
-        <Education />
-        <OpenSource />
-        <Services />
-        <Blog />
-        <Contact />
-      </Container>
+      <Root/>
     </>
   )
 }
diff --git a/pages/talks/index.tsx b/pages/talks/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import Container from '@mui/material/Container'
-import Talks from '../../src/Talks'
+import Talks from '../../src/scenes/Talks'
 
 export default function Index() {
   return (

diff --git a/public/images/revolut.gif b/public/images/revolut.gif
diff --git a/src/Root.tsx b/src/Root.tsx
@@ -0,0 +1,28 @@
+import React from 'react'
+import Container from '@mui/material/Container'
+
+import Intro from './scenes/Intro'
+import Skills from './scenes/Skills'
+import Services from './scenes/Services'
+import Education from './scenes/Education'
+import Experience from './scenes/Experience'
+import Blog from './scenes/Blog'
+import Contact from './scenes/Contact'
+import Talks from './scenes/Talks'
+import OpenSource from './scenes/OpenSource'
+
+export default function Root() {
+    return (
+        <Container component="main">
+            <Intro/>
+            <Skills/>
+            <Experience/>
+            <Talks/>
+            <Education/>
+            <OpenSource/>
+            <Services/>
+            <Blog/>
+            <Contact/>
+        </Container>
+    )
+}
diff --git a/src/components/Copyright.tsx b/src/components/Copyright.tsx
@@ -1,5 +1,5 @@
 import Link from '@mui/material/Link'
-import data from '../data.json'
+import data from '../data/data.json'
 
 export default function Copyright() {
   return (

diff --git a/src/components/Title.tsx b/src/components/Title.tsx
@@ -1,4 +1,7 @@
-export default function Title({text}) {
+type Props = {
+    text: string;
+};
+export default function Title({text}: Props) {
     return (
         <h2 className={'default-title'}>
             {text}

diff --git a/src/data.json → src/data/data.json b/src/data.json → src/data/data.json
@@ -136,7 +136,7 @@
       "id": 7,
       "title": "Chief Technology Officer (CTO)",
       "period": "Feb 2023 – present",
-      "duration": "5 mos",
+      "duration": "6 mos",
       "company": "Stealth WealthTech Startup",
       "city": "London",
       "logo": "/images/stealth.png",
@@ -151,7 +151,7 @@
       "duration": "3 yrs 4 mos",
       "company": "Revolut",
       "city": "London",
-      "logo": "/images/revolut.png",
+      "logo": "/images/revolut.gif",
       "url": "https://revolut.com/",
       "description": "Team Lead, design from scratch solutions for Wealth & Trading Risk calculation",
       "tags": []

diff --git a/src/site.json → src/data/site.json b/src/site.json → src/data/site.json