Skip to content

Commit

Permalink
UI: The user interface has been changed with some new informations
Browse files Browse the repository at this point in the history
  • Loading branch information
Ningsang-Jabegu committed Feb 17, 2024
1 parent 3faa5d3 commit d9314a2
Show file tree
Hide file tree
Showing 22 changed files with 343 additions and 269 deletions.
19 changes: 5 additions & 14 deletions src/component/About.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ const StyledContainer = styled(Container)({
padding: "0",
height: "auto",
width: "100vw",
// background: "#EFEEEF",
display: "flex",
justifyContent: "center",
alignItems: "flex-end",
"@media (min-width:600px)": {
padding: "0",
padding: "5vw 0 0 0",
height: "auto",
width: "100%",
textAlign: "center",
Expand All @@ -28,38 +27,30 @@ const Title = styled(Typography)({
fontSize: "clamp(2rem, 4vw, 4rem)",
margin: "1rem 0",
"@media (min-width:600px)": {
margin: "3rem 0",
margin: "0 0 5vw 0",
},
});

const Body = styled(Typography)({
// Use this when text is added
// color: "#2B2B60",
// textAlign: "justify",
// fontSize: "clamp(1rem, 2vw, 1.5rem)",
// lineHeight: "1.5",
// '@media (min-width:600px)': {
// textAlign: "center"
// }

});

const StyledImage = styled("img")({
width: "100%",
height: "auto",
marginBottom: "-.4rem", // To hide the small space below the image
marginBottom: "-.4rem",
});

export default function OurStory() {
return (
<StyledContainer id="a" maxWidth={false}>
<StyledContainer id="a" maxWidth={false} >
<Grid container spacing={6} padding={0}>
<Grid item xs={12} md={12} paddingLeft={0} paddingTop={0}>
<Title component="h2" variant="h4">
About Our Team
</Title>
<Body variant="body1">
<StyledImage src={ourTeam} alt=" We Inventrix " />{" "}
{/* Use StyledImage here */}
</Body>
</Grid>
</Grid>
Expand Down
8 changes: 1 addition & 7 deletions src/component/ContactUs.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const StyledContainer = styled(Container)({
alignItems: "center",
'@media (min-width:600px)': {
padding: "0",
// height: "auto",
width:"100%",
textAlign: "center"
},
Expand Down Expand Up @@ -43,14 +42,9 @@ const SubTitle = styled(Typography)({
});

const Body = styled(Typography)({
// Use this when text is added
color: "#2B2B60",
// textAlign: "justify",
fontSize: "clamp(1rem, 2vw, 1.5rem)",
lineHeight: "1.5",
'@media (min-width:600px)': {
// textAlign: "center"
}
});

const HasTags = styled(Typography)({
Expand All @@ -64,7 +58,7 @@ const HasTags = styled(Typography)({
const StyledImage = styled('img')({
width: '100%',
height: 'auto',
marginBottom:'-.4rem' // To hide the small space below the image
marginBottom:'-.4rem'
});

export default function ContactUs() {
Expand Down
22 changes: 12 additions & 10 deletions src/component/FAQ.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@ import ExpandMoreIcon from "@mui/icons-material/ExpandMore";

const StyledContainer = styled(Container)({
padding: "5rem 1.5rem",
minheight: "100vh",
width: "100%",
background: "#226a49",
display: "flex",
justifyContent: "center",
alignItems: "center",
// zIndex:"-1",
"@media (min-width:600px)": {
padding: "10rem",
padding: "10rem 5vw",
textAlign: "center",
},
});
Expand All @@ -28,8 +26,8 @@ const Title = styled(Typography)({
color: "#EFEEEF",
textAlign: "center",
fontWeight: 700,
fontSize: "clamp(2rem, 4vw, 4rem)", // Use clamp() here
margin: "0 0 3rem 0",
fontSize: "clamp(2rem, 4vw, 4rem)",
margin: "0 0 5vw 0",
});

const StyleAccordion = styled(Accordion)({
Expand All @@ -39,7 +37,7 @@ const StyleAccordion = styled(Accordion)({
const Body = styled(Typography)({
color: "#EFEEEF",
textAlign: "left",
fontSize: "clamp(1rem, 2vw, 1.5rem)", // And here
fontSize: "clamp(1rem, 2vw, 1.5rem)",
lineHeight: "1.5",
"@media (min-width:600px)": {
textAlign: "left",
Expand All @@ -50,7 +48,7 @@ const Question = styled(Typography)({
color: "#2B2B60",
textAlign: "left",
fontWeight: "600",
fontSize: "clamp(1rem, 2vw, 1.3rem)", // And here
fontSize: "clamp(1rem, 2vw, 1.3rem)",
lineHeight: "1.5",
"@media (min-width:600px)": {
textAlign: "left",
Expand All @@ -61,7 +59,7 @@ const Answer = styled(Typography)({
color: "#2B2B60",
textAlign: "left",
fontWeight: "400",
fontSize: "clamp(1rem, 2vw, 1.2rem)", // And here
fontSize: "clamp(1rem, 2vw, 1.2rem)",
lineHeight: "1.5",
margin: "0 .5rem ",
"@media (min-width:600px)": {
Expand All @@ -78,13 +76,17 @@ export default function FAQ() {
};

return (
<StyledContainer id="faq" maxWidth={false}>
<StyledContainer
id="faq"
maxWidth={false}
sx={{ minHeight: { sm: "100%", md: "100vh" } }}
>
<Grid container spacing={6}>
<Grid item xs={12} md={12}>
<Title component="h2" variant="h4">
Frequently asked questions
</Title>
<Body>
<Body sx={{ width: { sm: "90vw" } }}>
<StyleAccordion
expanded={expanded === "panel1"}
onChange={handleChange("panel1")}
Expand Down
22 changes: 11 additions & 11 deletions src/component/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const StyledContainer = styled(Container)({
width: "100%",
"@media (min-width:600px)": {
gap: "0.5rem",
padding: "5rem 5rem .7rem 5rem",
padding: "2.5vw 5vw",
textAlign: "left",
},
});
Expand Down Expand Up @@ -58,10 +58,15 @@ const LogoSide = styled(Box)({
const LowerFooter = styled(Box)({
display: "flex",
justifyContent: "space-between",
flexDirection:"column",
alignItems: "center",
paddingTop: "1rem",
marginTop: "1rem",
width: "100%",
borderTop: "1px solid #226a49",
"@media (min-width:600px)": {
flexDirection:"row",
},
});

const FooterTitle = styled(Typography)({
Expand Down Expand Up @@ -94,7 +99,7 @@ const FooterLink = styled(Link)({

function Copyright() {
return (
<Typography variant="body2" color="text.secondary" mt={1}>
<Typography variant="body2" color="text.secondary" sx={{order:{xs:"3", sm:"3"}}}>
<FooterBody>
{"© " +
new Date().getFullYear() +
Expand Down Expand Up @@ -237,6 +242,7 @@ export default function Footer() {
useFlexGap
sx={{
color: "text.secondary",
order:{xs:"1",sm:"1"}
}}
>
<IconButton
Expand Down Expand Up @@ -280,9 +286,9 @@ export default function Footer() {
</IconButton>
</Stack>

<Copyright />
<Copyright/>

<div>
<Box sx={{order:{xs:"2", sm:"2"}}}>
<FooterLink color="text.secondary" href="/privacy">
Privacy Policy
</FooterLink>
Expand All @@ -292,13 +298,7 @@ export default function Footer() {
<FooterLink color="text.secondary" href="/terms">
Terms of Service
</FooterLink>
</div>

{/* <ScrollLink to="os" smooth={true} duration={2000}>
<Typography variant="body2" sx={footerLinkStyle}>
Back to Top
</Typography>
</ScrollLink> */}
</Box>
</LowerFooter>
</StyledContainer>
);
Expand Down
20 changes: 9 additions & 11 deletions src/component/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ function Header() {
width: "100%",
}}
>
<Container maxWidth="xl" sx={{
// zIndex: '5'
}}>
<Container maxWidth="xl">
<Toolbar
variant="regular"
sx={(theme) => ({
Expand Down Expand Up @@ -105,63 +103,63 @@ function Header() {
onClick={() => scrollToSection("os")}
sx={{ py: "6px", px: "12px" }}
>
<Typography variant="body2" color="#2B2B60" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
<Typography variant="body2" color="#123648" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
Our Story
</Typography>
</MenuItem>
<MenuItem
onClick={() => scrollToSection("pwas")}
sx={{ py: "6px", px: "12px" }}
>
<Typography variant="body2" color="#2B2B60" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
<Typography variant="body2" color="#123648" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
Problem We are Solving
</Typography>
</MenuItem>
<MenuItem
onClick={() => scrollToSection("mc")}
sx={{ py: "6px", px: "12px" }}
>
<Typography variant="body2" color="#2B2B60" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
<Typography variant="body2" color="#123648" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
Material Composition
</Typography>
</MenuItem>
<MenuItem
onClick={() => scrollToSection("mp")}
sx={{ py: "6px", px: "12px" }}
>
<Typography variant="body2" color="#2B2B60" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
<Typography variant="body2" color="#123648" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
Manufacturing Process
</Typography>
</MenuItem>
<MenuItem
onClick={() => scrollToSection("oi")}
sx={{ py: "6px", px: "12px" }}
>
<Typography variant="body2" color="#2B2B60" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
<Typography variant="body2" color="#123648" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
Our Impact
</Typography>
</MenuItem>
<MenuItem
onClick={() => scrollToSection("p")}
sx={{ py: "6px", px: "12px" }}
>
<Typography variant="body2" color="#2B2B60" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
<Typography variant="body2" color="#123648" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
Product
</Typography>
</MenuItem>
<MenuItem
onClick={() => scrollToSection("faq")}
sx={{ py: "6px", px: "12px" }}
>
<Typography variant="body2" color="#2B2B60" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
<Typography variant="body2" color="#123648" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
FAQ
</Typography>
</MenuItem>
<MenuItem
onClick={() => scrollToSection("a")}
sx={{ py: "6px", px: "12px" }}
>
<Typography variant="body2" color="#2B2B60" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
<Typography variant="body2" color="#123648" fontWeight="600" fontSize="clamp(.8rem, 1vw, 1rem)">
About
</Typography>
</MenuItem>
Expand Down
4 changes: 0 additions & 4 deletions src/component/MainSlider.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ function MainSlider() {
<div>
<Box
sx={{
// maxWidth: "100vw",
// minHeight: "70vh",
position: "relative",
}}
id="ms"
Expand All @@ -109,7 +107,6 @@ function MainSlider() {
<div
key={step.label}
style={{
// aspectRatio: "16/9",
height: "100%",
overflow: "hidden",
}}
Expand All @@ -122,7 +119,6 @@ function MainSlider() {
width: "100%",
display: "block",
overflow: "hidden",
// minWidth: "100%",
margin: "auto",
objectFit: "fill",
objectPosition: "center",
Expand Down
11 changes: 4 additions & 7 deletions src/component/ManufacturingProcess.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ import ManufacturingProcessChart from "../image/designedImages/manufacturing.png
const StyledContainer = styled(Container)({
padding: "5rem 1.5rem",
width: "100%",
// background: "#226a49",
display: "flex",
justifyContent: "center",
alignItems: "center",
"@media (min-width:600px)": {
padding: "5rem 15rem 9rem 15rem",
padding: "5vw 5vw",
textAlign: "center",
minHeight: "100vh",
},
Expand All @@ -24,10 +23,7 @@ const Title = styled(Typography)({
textAlign: "center",
fontWeight: 700,
fontSize: "clamp(2rem, 4vw, 4rem)", // Use clamp() here
// margin: "3rem 0",
"@media (min-width:600px)": {
marginBottom: "6rem"
},
margin: "0 0 5vw 0",
});

const Body = styled(Typography)({
Expand Down Expand Up @@ -58,7 +54,7 @@ const ImageName = styled(Typography)({

export default function ManufacturingProcess() {
return (
<StyledContainer id="mp" maxWidth={false}>
<StyledContainer id="mp" maxWidth={false} sx={{minHeight: { sm: "100%", md: "100vh" }}}>
<Grid container spacing={6}>
<Grid item xs={12} md={12}>
<Title component="h2" variant="h4">
Expand All @@ -68,6 +64,7 @@ export default function ManufacturingProcess() {
<StyledImage
alt="Manufacturing Composition"
src={ManufacturingProcessChart}
sx={{minWidth:{sm:"calc(100% )",md:"calc(100% )"}}}
/>
</Body>
</Grid>
Expand Down
Loading

0 comments on commit d9314a2

Please sign in to comment.