diff --git a/site/src/App.tsx b/site/src/App.tsx
index e4509de..66fcea5 100644
--- a/site/src/App.tsx
+++ b/site/src/App.tsx
@@ -1,6 +1,6 @@
import NavBar from './components/Navbar'
import Gallery from "./components/Gallery";
-import Content from "./components/Content";
+// import Content from "./components/Content";
import CustomFooter from "./components/CustomFooter";
@@ -9,9 +9,8 @@ import './styles/App.css'
function App() {
return (
<>
-
-
-
+
+
>
)
diff --git a/site/src/components/Gallery.tsx b/site/src/components/Gallery.tsx
index 23c44ac..f9db414 100644
--- a/site/src/components/Gallery.tsx
+++ b/site/src/components/Gallery.tsx
@@ -1,32 +1,32 @@
import ImageList from '@mui/material/ImageList';
import ImageListItem from '@mui/material/ImageListItem';
-import structures from "../data";
+import {realPhotos} from "../data";
import Box from '@mui/material/Box';
import Container from '@mui/material/Container';
import ImageListItemBar from '@mui/material/ImageListItemBar';
-const imgData = structures.slice(0, -1);
+const imgData = realPhotos.slice(0,3)
function Gallery() {
return (
-
+
- {imgData.map((item) => (
-
+ gap={5}>
+ {imgData.map((item,index) => (
+
diff --git a/site/src/components/Navbar.tsx b/site/src/components/Navbar.tsx
index 8498b22..8c1fc61 100644
--- a/site/src/components/Navbar.tsx
+++ b/site/src/components/Navbar.tsx
@@ -20,10 +20,9 @@ const StyledToolbar = styled(Toolbar)(({ theme }) => ({
alignItems: 'center',
justifyContent: 'space-between',
flexShrink: 0,
- borderRadius: `calc(${theme.shape.borderRadius}px + 8px)`,
+ borderRadius: `calc(${theme.shape.borderRadius}/2px)`,
border: '1px solid',
borderColor: theme.palette.divider,
- padding: '8px 12px',
}));
@@ -39,7 +38,6 @@ const StyledMenuItem =styled(MenuItem)(({}) => ({
'&:hover': {
backgroundColor: 'rgba(69, 146, 223, 0.45)',
},
-
}));
interface ComponentProps {
active: string;
@@ -57,20 +55,20 @@ function NavBar({ active }: ComponentProps) {
sx={{
boxShadow: 0,
bgcolor: 'transparent',
- mt: '28px',
+ mt: '10px',
}}
>
-
+
- Самые высокие здания и сооружения
+ Сайт - портфолио
-
+
Главная
- Список зданий
+ Цены на оперативную память
Контакты
diff --git a/site/src/data.tsx b/site/src/data.tsx
index c05a95b..e3cc580 100644
--- a/site/src/data.tsx
+++ b/site/src/data.tsx
@@ -1,21 +1,23 @@
-import IrlPhoto0 from "./images/photos/image0.png";
-import IrlPhoto1 from "./images/photos/image1.png";
-import IrlPhoto2 from "./images/photos/image2.png";
-import IrlPhoto3 from "./images/photos/image3.png";
-import IrlPhoto4 from "./images/photos/image4.png";
-import IrlPhoto5 from "./images/photos/image5.png";
-import IrlPhoto7 from "./images/photos/image7.png";
-import Playback from "./images/photos/playback.mp4";
+import irlPhoto0 from "./images/photos/image0.png";
+import irlPhoto1 from "./images/photos/image1.png";
+import irlPhoto2 from "./images/photos/image2.png";
+import irlPhoto3 from "./images/photos/image3.png";
+import irlPhoto4 from "./images/photos/image4.png";
+import irlPhoto5 from "./images/photos/image5.png";
+import irlPhoto6 from "./images/photos/image6.png";
+import irlPhoto7 from "./images/photos/image7.png";
+import playbackVideo from "./images/photos/playback.mp4";
const realPhotos = [
- IrlPhoto0,
- IrlPhoto1,
- IrlPhoto2,
- IrlPhoto3,
- IrlPhoto4,
- IrlPhoto5,
- IrlPhoto7
-]
+ { img: irlPhoto0, title: "Sunset" },
+ { img: irlPhoto1, title: "building with louds on bg" },
+ { img: irlPhoto2, title: "moon" },
+ { img: irlPhoto3, title: "dragonfly" },
+ { img: irlPhoto4, title: "maple leaves" },
+ { img: irlPhoto5, title: "sea" },
+ { img: irlPhoto6, title: "sunset" },
+ { img: irlPhoto7, title: "mmm green" }
+];
//import sideards photos
import SidecardPhoto0 from "./images/sidecards/AQ_monitor.png";
@@ -89,5 +91,4 @@ const mainCards = [
]
-
-export default {sidecardData, realPhotos, Playback, mainCards};
\ No newline at end of file
+export { realPhotos, sidecardData, mainCards, playbackVideo };
\ No newline at end of file
diff --git a/site/src/images/photos/image6.png b/site/src/images/photos/image6.png
new file mode 100644
index 0000000..8375fa6
Binary files /dev/null and b/site/src/images/photos/image6.png differ