From de9748a33c657a93c8c2c1062f7c95331d5183b4 Mon Sep 17 00:00:00 2001 From: OkunElya Date: Tue, 14 Apr 2026 10:04:37 +1000 Subject: [PATCH] main content done --- site/src/App.tsx | 5 +- site/src/components/BigCard.tsx | 81 +++++++++++++++++++++++++++++++ site/src/components/BuildCard.tsx | 53 -------------------- site/src/components/Content.tsx | 18 +++---- site/src/components/Gallery.tsx | 2 +- site/src/data.tsx | 2 +- 6 files changed, 95 insertions(+), 66 deletions(-) create mode 100644 site/src/components/BigCard.tsx delete mode 100644 site/src/components/BuildCard.tsx diff --git a/site/src/App.tsx b/site/src/App.tsx index 66fcea5..37ae8af 100644 --- a/site/src/App.tsx +++ b/site/src/App.tsx @@ -1,9 +1,11 @@ import NavBar from './components/Navbar' import Gallery from "./components/Gallery"; -// import Content from "./components/Content"; +import MainContent from "./components/Content"; import CustomFooter from "./components/CustomFooter"; +import {Container} from "@mui/material"; + import './styles/App.css' function App() { @@ -11,6 +13,7 @@ function App() { <> + ) diff --git a/site/src/components/BigCard.tsx b/site/src/components/BigCard.tsx new file mode 100644 index 0000000..5f4f777 --- /dev/null +++ b/site/src/components/BigCard.tsx @@ -0,0 +1,81 @@ +import Card from '@mui/material/Card'; +import CardActions from '@mui/material/CardActions'; +import CardContent from '@mui/material/CardContent'; +import CardHeader from '@mui/material/CardHeader'; +import CardMedia from '@mui/material/CardMedia'; +import Button from '@mui/material/Button'; +import Typography from '@mui/material/Typography'; +import Box from '@mui/material/Box'; +import { styled } from '@mui/material/styles'; +interface ComponentProps { + data: { + img: string, + title: string, + description: string[] + }, + cardNum: number; +} + + +const StyledTypography = styled(Typography)(({ theme }) => ({ + color: theme.palette.text.secondary, + textAlign: 'justify', + marginBottom: '1em', +})); + + +function BigCard({ data, cardNum }: ComponentProps) { + const reverseModifier = cardNum % 2 == 0 ? "-reverse" : ""; + + + let textA = data.description.slice(0, -data.description.length / 2); + let textB = data.description.slice(-data.description.length / 2); + + // if(reverseModifier){ + // [textA,textB] = [textB,textA]; + // } + return ( + + + + + {textA.map((item, ind) => ( + + {item} + + ))} + + + + + + + + + {textB.map((item, ind) => ( + + {item} + + ))} + + + + + + + + ) +} + +export default BigCard; \ No newline at end of file diff --git a/site/src/components/BuildCard.tsx b/site/src/components/BuildCard.tsx deleted file mode 100644 index 61c1afa..0000000 --- a/site/src/components/BuildCard.tsx +++ /dev/null @@ -1,53 +0,0 @@ -import Card from '@mui/material/Card'; -import CardActions from '@mui/material/CardActions'; -import CardContent from '@mui/material/CardContent'; -import CardMedia from '@mui/material/CardMedia'; -import Button from '@mui/material/Button'; -import Typography from '@mui/material/Typography'; -import Box from '@mui/material/Box'; -import { styled } from '@mui/material/styles'; -interface ComponentProps { - building: { - img: string, - title: string, - description: string[] - }, - cardNum: number; - } - - - const StyledTypography = styled(Typography)(({ theme }) => ({ - color: theme.palette.text.secondary, - textAlign: 'justify', - marginBottom: '1em', - })); - - -function BuildCard({ building,cardNum} : ComponentProps) { - return ( - - - - - - { building.title } - - { building.description.map((item, ind) => ( - - { item } - - ))} - - - - - - - ) -} - -export default BuildCard; \ No newline at end of file diff --git a/site/src/components/Content.tsx b/site/src/components/Content.tsx index 2d8c277..6416272 100644 --- a/site/src/components/Content.tsx +++ b/site/src/components/Content.tsx @@ -1,19 +1,17 @@ import Container from '@mui/material/Container'; import Grid from '@mui/material/Grid'; -import structures from "../data"; -import BuildCard from "./BuildCard" -const cardData = [structures[3], structures[6], structures[9], structures[7]] +import {mainCards} from "../data"; +import BigCard from "./BigCard" +const cardData = mainCards function Content() { return ( - - {cardData.map((item, index) => ( - - - - ))} - + {cardData.map((item, index) => ( + + + + ))} ); } diff --git a/site/src/components/Gallery.tsx b/site/src/components/Gallery.tsx index f9db414..e5ebbbb 100644 --- a/site/src/components/Gallery.tsx +++ b/site/src/components/Gallery.tsx @@ -9,7 +9,7 @@ const imgData = realPhotos.slice(0,3) function Gallery() { return ( - +