Browse Source

done mobile view

cart-api-guide
azri 6 days ago
parent
commit
5bbfe458d5

+ 5
- 5
src/components/BillingForm/BillingForm.jsx View File

169
         p: 2,
169
         p: 2,
170
         mb: 10
170
         mb: 10
171
       }}>
171
       }}>
172
-        <Grid size={6}>
172
+        <Grid size={{xs:12, md:6}} sx={{mb:{xs:10, md:0}}}>
173
           <Typography variant="body2" sx={{ fontWeight: "bold", mb: 5 }}>SHIPPING ADDRESS</Typography>
173
           <Typography variant="body2" sx={{ fontWeight: "bold", mb: 5 }}>SHIPPING ADDRESS</Typography>
174
           <Box sx={{ display: "flex", flexDirection: "column" }}>
174
           <Box sx={{ display: "flex", flexDirection: "column" }}>
175
             <Typography variant="body2" sx={{ fontWeight: "400" }}>Mr. David Olson</Typography>
175
             <Typography variant="body2" sx={{ fontWeight: "400" }}>Mr. David Olson</Typography>
181
             <Link sx={{ color: "black", textDecoration: "underline", fontSize: 15 }}>CHANGE SHIPPING ADDRESS</Link>
181
             <Link sx={{ color: "black", textDecoration: "underline", fontSize: 15 }}>CHANGE SHIPPING ADDRESS</Link>
182
           </Box>
182
           </Box>
183
         </Grid>
183
         </Grid>
184
-        <Grid size={6}>
184
+        <Grid size={{xs:12, md:6}}>
185
           <Typography variant="body2" sx={{ fontWeight: "bold", mb: 5 }}>BILLING ADDRESS</Typography>
185
           <Typography variant="body2" sx={{ fontWeight: "bold", mb: 5 }}>BILLING ADDRESS</Typography>
186
           <Box sx={{ display: "flex", flexDirection: "column" }}>
186
           <Box sx={{ display: "flex", flexDirection: "column" }}>
187
             <Typography variant="body2" sx={{ fontWeight: "400" }}>Mr. David Olson</Typography>
187
             <Typography variant="body2" sx={{ fontWeight: "400" }}>Mr. David Olson</Typography>
204
         p: 2,
204
         p: 2,
205
         mb: 10
205
         mb: 10
206
       }}>
206
       }}>
207
-        <Grid size={6}>
207
+        <Grid size={{xs:12, md:6}} sx={{mb:{xs:10, md:0}}}>
208
           <Typography variant="body2" sx={{ fontWeight: "bold", mb: 5 }}>EXPRESS DELIVERY (Free)</Typography>
208
           <Typography variant="body2" sx={{ fontWeight: "bold", mb: 5 }}>EXPRESS DELIVERY (Free)</Typography>
209
           <Box sx={{ display: "flex", flexDirection: "column" }}>
209
           <Box sx={{ display: "flex", flexDirection: "column" }}>
210
             <Typography variant="body2" sx={{ fontWeight: "400" }}>Delivered in 3-4 business days</Typography>
210
             <Typography variant="body2" sx={{ fontWeight: "400" }}>Delivered in 3-4 business days</Typography>
211
           </Box>
211
           </Box>
212
         </Grid>
212
         </Grid>
213
-        <Grid size={6}>
213
+        <Grid size={{xs:12, md:6}}>
214
           <Typography variant="body2" sx={{ fontWeight: "bold", mb: 5 }}>BILLING ADDRESS</Typography>
214
           <Typography variant="body2" sx={{ fontWeight: "bold", mb: 5 }}>BILLING ADDRESS</Typography>
215
           <Box sx={{ display: "flex", flexDirection: "column" }}>
215
           <Box sx={{ display: "flex", flexDirection: "column" }}>
216
             <Typography variant="body2" sx={{ fontWeight: "400", mb: 5 }}>Caibre Premium Packaging</Typography>
216
             <Typography variant="body2" sx={{ fontWeight: "400", mb: 5 }}>Caibre Premium Packaging</Typography>
228
         p: 2,
228
         p: 2,
229
         mb: 5
229
         mb: 5
230
       }}>
230
       }}>
231
-        <Grid size={6}>
231
+        <Grid size={{xs:12, md:6}}>
232
           <Typography variant="body2" sx={{ fontWeight: "400", mb: 5 }}>PAYMENT METHOD</Typography>
232
           <Typography variant="body2" sx={{ fontWeight: "400", mb: 5 }}>PAYMENT METHOD</Typography>
233
           <Grid container spacing={2}>
233
           <Grid container spacing={2}>
234
 
234
 

+ 5
- 4
src/components/ConfirmOrder/ConfirmOrder.jsx View File

161
 
161
 
162
       <Box>
162
       <Box>
163
         <Grid container>
163
         <Grid container>
164
-          <Grid size={6} sx={{ borderRight: "1px solid rgba(0,0,0,0.2)" }}>
164
+          <Grid size={{xs:12, md:6}} sx={{ borderRight: "1px solid rgba(0,0,0,0.2)", mb:{xs:2, md:0} }}>
165
             <Typography variant='body1' sx={{ fontWeight: "500", mb: 5 }}>PAYMENT METHOD</Typography>
165
             <Typography variant='body1' sx={{ fontWeight: "500", mb: 5 }}>PAYMENT METHOD</Typography>
166
-            <Box sx={{ display: "flex", flexDirection: "row" }}>
167
-              <Typography variant='body2' sx={{ mr: 5 }}>PAYMENT METHOD</Typography>
166
+            <Box sx={{ display: "flex", flexDirection: {xs:"column", md:"row"} }}>
167
+              <Typography variant='body2' sx={{ mr: 5 }}>Credit Card Number</Typography>
168
               <Typography variant="body2" sx={{ display: 'flex' }}>
168
               <Typography variant="body2" sx={{ display: 'flex' }}>
169
                 {[...Array(12)].map((_, index) => (
169
                 {[...Array(12)].map((_, index) => (
170
                   <FiberManualRecordIcon sx={{ fontSize: 'inherit', verticalAlign: 'middle', mr: ((index + 1) % 4 == 0) ? 2 : 0 }} />
170
                   <FiberManualRecordIcon sx={{ fontSize: 'inherit', verticalAlign: 'middle', mr: ((index + 1) % 4 == 0) ? 2 : 0 }} />
173
               </Typography>
173
               </Typography>
174
             </Box>
174
             </Box>
175
           </Grid>
175
           </Grid>
176
-          <Grid size={6}>
176
+          <Grid size={{xs:12, md:6}} sx={{pl:{xs:0, md:2}, pb:2}}>
177
             <Typography variant='body1' sx={{ fontWeight: "500", mb: 5 }}>SHIPPING DETAILS</Typography>
177
             <Typography variant='body1' sx={{ fontWeight: "500", mb: 5 }}>SHIPPING DETAILS</Typography>
178
+            <Typography variant='body2' sx={{mb:3}}>Your will receive your order in 3-4 business days</Typography>
178
             <Button
179
             <Button
179
               variant="contained"
180
               variant="contained"
180
               color="common.black"
181
               color="common.black"

+ 4
- 2
src/components/Feature/Feature.jsx View File

17
     <Box
17
     <Box
18
       sx={{
18
       sx={{
19
         display: 'flex',
19
         display: 'flex',
20
+        flexDirection: { xs: 'column', sm: 'row' }, // Stack on small screens, horizontal on larger screens
20
         justifyContent: 'space-between',
21
         justifyContent: 'space-between',
21
         alignItems: 'center',
22
         alignItems: 'center',
22
         padding: 2,
23
         padding: 2,
23
-        mt:5
24
+        mt: 5,
25
+        gap: { xs: 4, sm: 0 }, // Add spacing between items on smaller screens
24
       }}
26
       }}
25
     >
27
     >
26
       {features.map((feature, index) => (
28
       {features.map((feature, index) => (
32
             alignItems: 'center',
34
             alignItems: 'center',
33
             textAlign: 'center',
35
             textAlign: 'center',
34
             flex: 1,
36
             flex: 1,
35
-            borderRight: index < features.length - 1 ? '1px solid #CFCFCF' : 'none', // Add right border except for the last item
37
+            borderRight: { sm: index < features.length - 1 ? '1px solid #CFCFCF' : 'none' }, // Only show right border on larger screens
36
             padding: 2,
38
             padding: 2,
37
           }}
39
           }}
38
         >
40
         >

+ 2
- 2
src/components/Filter/Filter.jsx View File

84
                     </Select>
84
                     </Select>
85
                 </FormControl>
85
                 </FormControl>
86
 
86
 
87
-                <FormControl sx={{ m: 1, display:"flex", flexDirection:"row" }} variant="standard">
87
+                <FormControl sx={{ m: 1, display:{xs:"none", sm:"none", md:"flex" }, flexDirection:"row" }} variant="standard">
88
                     <Typography variant="body2" sx={{mr:1, my:"auto"}}>Sort By</Typography>
88
                     <Typography variant="body2" sx={{mr:1, my:"auto"}}>Sort By</Typography>
89
                     <Select
89
                     <Select
90
                         labelId="demo-customized-select-label"
90
                         labelId="demo-customized-select-label"
99
                     </Select>
99
                     </Select>
100
                 </FormControl>
100
                 </FormControl>
101
 
101
 
102
-                <FormControl sx={{ m: 1, display:"flex", flexDirection:"row" }} variant="standard">
102
+                <FormControl sx={{ m: 1, display:{xs:"none", sm:"none", md:"flex" }, flexDirection:"row" }} variant="standard">
103
                     <Typography variant="body2" sx={{mr:1, my:"auto"}}>Show</Typography>
103
                     <Typography variant="body2" sx={{mr:1, my:"auto"}}>Show</Typography>
104
                     <Select
104
                     <Select
105
                         labelId="demo-customized-select-label"
105
                         labelId="demo-customized-select-label"

+ 10
- 5
src/components/Footer/Footer.jsx View File

9
       sx={{
9
       sx={{
10
         backgroundColor: 'background.default',
10
         backgroundColor: 'background.default',
11
         mb: 10,
11
         mb: 10,
12
-        mt: 15
12
+        mt: 15,
13
+        px:{
14
+          xs:2,
15
+          md:12,
16
+          lg:20
17
+        }
13
       }}
18
       }}
14
     >
19
     >
15
 
20
 
16
       <Grid container spacing={2} justifyContent="space-evenly">
21
       <Grid container spacing={2} justifyContent="space-evenly">
17
 
22
 
18
-        <Grid item xs={12} sm={6} md={3} sx={{ position: "relative" }}>
23
+        <Grid item size={{xs:12, sm:6, md:3}} sx={{ position: "relative" }}>
19
 
24
 
20
           <Typography variant="h5" sx={{
25
           <Typography variant="h5" sx={{
21
             color: 'primary.main', // Use primary color
26
             color: 'primary.main', // Use primary color
34
           <Typography variant="body2" sx={{ maxWidth: 250 }}><span style={{ fontWeight: "bold" }}>Address:</span> Lot G-77, Wangsa Walk Mall, Wangsa Avenue, No.9, Jalan Wangsa Perdana 1, Bandar Wangsa Maju, 53300 Kuala Lumpur, Malaysia</Typography>
39
           <Typography variant="body2" sx={{ maxWidth: 250 }}><span style={{ fontWeight: "bold" }}>Address:</span> Lot G-77, Wangsa Walk Mall, Wangsa Avenue, No.9, Jalan Wangsa Perdana 1, Bandar Wangsa Maju, 53300 Kuala Lumpur, Malaysia</Typography>
35
         </Grid>
40
         </Grid>
36
 
41
 
37
-        <Grid item xs={12} sm={6} md={3}>
42
+        <Grid item size={{xs:12, sm:6, md:3}}>
38
           <Typography variant="body1" sx={{ fontWeight: "bold", mb: 4 }}>
43
           <Typography variant="body1" sx={{ fontWeight: "bold", mb: 4 }}>
39
             Get Help
44
             Get Help
40
           </Typography>
45
           </Typography>
57
           </nav>
62
           </nav>
58
         </Grid>
63
         </Grid>
59
 
64
 
60
-        <Grid item xs={12} sm={6} md={3}>
65
+        <Grid item size={{xs:12, sm:6, md:3}}>
61
           <Typography variant="body1" sx={{ fontWeight: "bold", mb: 4 }}>
66
           <Typography variant="body1" sx={{ fontWeight: "bold", mb: 4 }}>
62
             Popular Categories
67
             Popular Categories
63
           </Typography>
68
           </Typography>
82
 
87
 
83
 
88
 
84
 
89
 
85
-        <Grid item xs={12} sm={6} md={3}>
90
+        <Grid item size={{xs:12, sm:6, md:3}}>
86
           <Typography variant="body1" sx={{ fontWeight: "bold", mb: 4 }}>
91
           <Typography variant="body1" sx={{ fontWeight: "bold", mb: 4 }}>
87
             Let’s stay in touch
92
             Let’s stay in touch
88
           </Typography>
93
           </Typography>

+ 72
- 39
src/components/Navbar/Navbar.jsx View File

14
 import { styled } from '@mui/material/styles';
14
 import { styled } from '@mui/material/styles';
15
 import { MenuItem, Select, FormControl, Badge } from '@mui/material';
15
 import { MenuItem, Select, FormControl, Badge } from '@mui/material';
16
 import MobileNav from "./components/MobileNav";
16
 import MobileNav from "./components/MobileNav";
17
-import { TrainRounded } from "@mui/icons-material";
18
-
19
-
20
-
17
+import MenuIcon from "@mui/icons-material/Menu";
18
+import CategoryIcon from '@mui/icons-material/Category';
19
+import HomeIcon from '@mui/icons-material/Home';
20
+import BrushIcon from '@mui/icons-material/Brush';
21
+import LoyaltyIcon from '@mui/icons-material/Loyalty';
21
 
22
 
22
 const LanguageSelect = styled(Select)(({ theme }) => ({
23
 const LanguageSelect = styled(Select)(({ theme }) => ({
23
   backgroundColor: 'black',
24
   backgroundColor: 'black',
57
   const [lastScrollPos, setLastScrollPos] = useState(0);
58
   const [lastScrollPos, setLastScrollPos] = useState(0);
58
   const [language, setLanguage] = useState('English');
59
   const [language, setLanguage] = useState('English');
59
 
60
 
61
+  const [open, setOpen] = React.useState(false);
62
+
63
+  const toggleDrawer = (newOpen) => () => {
64
+    setOpen(newOpen);
65
+  };
66
+
67
+  const navItem = [
68
+    {
69
+      title: "DISCOVER",
70
+      link: "/products",
71
+      icon: <CategoryIcon />
72
+    },
73
+    {
74
+      title: "HOME",
75
+      link: "/",
76
+      icon: <HomeIcon />
77
+    },
78
+    {
79
+      title: "BEAUTY",
80
+      link: "/products",
81
+      icon: <BrushIcon />
82
+    },
83
+    {
84
+      title: "SALE",
85
+      link: "/products",
86
+      icon: <LoyaltyIcon />
87
+    }
88
+  ]
89
+
60
   const handleChange = (event) => {
90
   const handleChange = (event) => {
61
     setLanguage(event.target.value);
91
     setLanguage(event.target.value);
62
   };
92
   };
83
       <AppBar position="fixed"
113
       <AppBar position="fixed"
84
         sx={{
114
         sx={{
85
           backgroundColor: {
115
           backgroundColor: {
86
-            xs: "rgba(0,0,0,0)",
87
-            md: "rgba(0,0,0,0.9)",
116
+            xs: showHeader ? "rgba(0,0,0,0)" : "background.black",// somehow the logic for scrolling header is the same so I just gonna use showHeader state
117
+            md: "rgba(0,0,0,0.9)", 
88
             lg: "background.black"
118
             lg: "background.black"
89
           },
119
           },
90
           boxShadow: {
120
           boxShadow: {
109
 
139
 
110
           {/* Left Section: Logo */}
140
           {/* Left Section: Logo */}
111
           <Box sx={{
141
           <Box sx={{
112
-            display:{
113
-              xs:"none",
114
-              md:"none",
115
-              lg:"block"
142
+            display: {
143
+              xs: "none",
144
+              md: "none",
145
+              lg: "block"
116
             }
146
             }
117
           }}>
147
           }}>
118
             <img src={logoSrc} alt="Logo"
148
             <img src={logoSrc} alt="Logo"
122
               }} />
152
               }} />
123
           </Box>
153
           </Box>
124
 
154
 
155
+          {/* SIDEBAR BUTTON */}
156
+          <Box sx={{
157
+            display: {
158
+              xs: "block",
159
+              md: "block",
160
+              lg: "none"
161
+            }
162
+          }}>
163
+
164
+            <IconButton
165
+              onClick={() => setOpen(true)}
166
+              sx={{
167
+                backgroundColor: "transparent",
168
+                color: "white",
169
+                "&:hover": {
170
+                  backgroundColor: "rgba(0, 0, 0, 0.1)",
171
+                },
172
+              }}
173
+            >
174
+              <MenuIcon fontSize="large" />
175
+            </IconButton>
176
+
177
+          </Box>
178
+
125
           {/* Center Section: Nav Items */}
179
           {/* Center Section: Nav Items */}
126
           <Box
180
           <Box
127
             sx={{
181
             sx={{
134
               gap: 2,
188
               gap: 2,
135
             }}
189
             }}
136
           >
190
           >
137
-            <Button
138
-              color="inherit"
139
-              onClick={() => {
140
-                window.location.href = "/products";
141
-              }}
142
-            >
143
-              DISCOVER
144
-            </Button>
145
-            <Button
146
-              color="inherit"
147
-              onClick={() => {
148
-                window.location.href = "/";
149
-              }}
150
-            >
151
-              HOME
152
-            </Button>
153
-            <Button
154
-              color="inherit"
155
-              onClick={() => {
156
-                window.location.href = "/products";
157
-              }}
158
-            >
159
-              BEAUTY
160
-            </Button>
161
-            <Button
191
+
192
+            {navItem.map(({ title, link }) => (<Button
162
               color="inherit"
193
               color="inherit"
163
               onClick={() => {
194
               onClick={() => {
164
-                window.location.href = "/products";
195
+                window.location.href = link;
165
               }}
196
               }}
166
             >
197
             >
167
-              SALE
168
-            </Button>
198
+              {title}
199
+            </Button>))}
200
+
169
           </Box>
201
           </Box>
170
 
202
 
171
           {/* Right Section: Search and Profile */}
203
           {/* Right Section: Search and Profile */}
213
 
245
 
214
         </Toolbar>
246
         </Toolbar>
215
       </AppBar>
247
       </AppBar>
216
-      {/* <MobileNav open={true} menu={[]}/> */}
248
+
249
+      <MobileNav open={open} menu={navItem} onClose={()=>{setOpen(false)}} />
217
     </>
250
     </>
218
   );
251
   );
219
 };
252
 };

+ 7
- 19
src/components/Navbar/components/MobileNav/MobileNav.jsx View File

1
 import React from "react";
1
 import React from "react";
2
 import { Drawer, Box, List, ListItem, ListItemButton, ListItemIcon, ListItemText, Divider } from "@mui/material";
2
 import { Drawer, Box, List, ListItem, ListItemButton, ListItemIcon, ListItemText, Divider } from "@mui/material";
3
-import logoSrc from "../../assets/svg/logo.svg";
4
-import InboxIcon from "@mui/icons-material/Inbox";
5
-import MailIcon from "@mui/icons-material/Mail";
3
+import logoSrc from "../../../../assets/svg/logo.svg";
6
 
4
 
7
-const MobileNav = ({ open, menu = [] }) => {
5
+const MobileNav = ({ open, onClose, menu = [] }) => {
8
   return (
6
   return (
9
     <Drawer
7
     <Drawer
10
       open={open}
8
       open={open}
11
-      onClose={() => {}}
9
+      onClose={onClose}
12
       sx={{
10
       sx={{
13
         "& .MuiDrawer-paper": {
11
         "& .MuiDrawer-paper": {
14
           backgroundColor: "black",
12
           backgroundColor: "black",
24
           justifyContent: "center",
22
           justifyContent: "center",
25
           alignItems: "center",
23
           alignItems: "center",
26
           height: 80,
24
           height: 80,
27
-          borderBottom: "1px solid white",
28
         }}
25
         }}
29
       >
26
       >
30
         <img
27
         <img
40
       {/* Main Navigation */}
37
       {/* Main Navigation */}
41
       <Box sx={{ width: 250 }} role="presentation">
38
       <Box sx={{ width: 250 }} role="presentation">
42
         <List>
39
         <List>
43
-          {menu.map((text, index) => (
44
-            <ListItem key={text} disablePadding>
40
+          {menu.map(({title, link, icon}) => (
41
+            <ListItem key={title} disablePadding>
45
               <ListItemButton
42
               <ListItemButton
46
                 sx={{
43
                 sx={{
47
                   color: "white",
44
                   color: "white",
51
                   },
48
                   },
52
                 }}
49
                 }}
53
               >
50
               >
54
-                <ListItemIcon
55
-                  sx={{
56
-                    color: "white",
57
-                    "&:hover": {
58
-                      color: "black",
59
-                    },
60
-                  }}
61
-                >
62
-                  {index % 2 === 0 ? <InboxIcon /> : <MailIcon />}
63
-                </ListItemIcon>
64
-                <ListItemText primary={text} />
51
+                {icon}
52
+                <ListItemText sx={{ml:2}} primary={title} />
65
               </ListItemButton>
53
               </ListItemButton>
66
             </ListItem>
54
             </ListItem>
67
           ))}
55
           ))}

+ 1
- 1
src/components/NewsLetter/NewsLetter.jsx View File

31
         }}
31
         }}
32
       >
32
       >
33
 
33
 
34
-        <Box sx={{ width: "35%", backgroundColor: "rgba(255,255,255, 0.5)", padding: 10, textAlign:"center", color:"black" }}>
34
+        <Box sx={{ width: {xs:"80%", md:"35%"}, backgroundColor: "rgba(255,255,255, 0.5)", padding: 10, textAlign:"center", color:"black" }}>
35
 
35
 
36
           <Typography variant='h3'>
36
           <Typography variant='h3'>
37
             Let's Stay in touch
37
             Let's Stay in touch

+ 1
- 1
src/components/ProductHistoryList/ProductHistoryList.jsx View File

69
   return (
69
   return (
70
     <Box sx={{ mb: 5 }}>
70
     <Box sx={{ mb: 5 }}>
71
       <Grid container spacing={1} columns={12}>
71
       <Grid container spacing={1} columns={12}>
72
-        {images.map((image, index) => (<Grid item size={2} key={index}>
72
+        {images.map((image, index) => (<Grid item size={{xs:12, md:2}} key={index}>
73
           <Box
73
           <Box
74
             sx={{
74
             sx={{
75
               overflow: 'hidden',
75
               overflow: 'hidden',

+ 2
- 6
src/components/ProductList/ProductList.jsx View File

2
 import { Box, Typography, Button } from '@mui/material';
2
 import { Box, Typography, Button } from '@mui/material';
3
 import Grid from '@mui/material/Grid2';
3
 import Grid from '@mui/material/Grid2';
4
 
4
 
5
-const ProductList = ({ size }) => {
6
-
7
-
5
+const ProductList = ({ size = 99999 }) => {
8
 
6
 
9
   const images = [
7
   const images = [
10
     {
8
     {
64
 
62
 
65
           if (index < size) {
63
           if (index < size) {
66
 
64
 
67
-            return <Grid item size={4} key={index}>
65
+            return <Grid item size={{xs:6, sm:6, md:3}} key={index}>
68
               <Box
66
               <Box
69
                 onClick={()=>{ window.location.href = `/products/${image.id}` }}
67
                 onClick={()=>{ window.location.href = `/products/${image.id}` }}
70
                 sx={{
68
                 sx={{
104
                 </Box>
102
                 </Box>
105
               </Box>
103
               </Box>
106
             </Grid>
104
             </Grid>
107
-
108
-
109
           }
105
           }
110
 
106
 
111
         })}
107
         })}

+ 6
- 4
src/components/ProductSelected/ProductSelected.jsx View File

1
 import React from 'react';
1
 import React from 'react';
2
-import { Box, Typography, Button } from '@mui/material';
2
+import { Box, Typography, Button, useMediaQuery } from '@mui/material';
3
 import Grid from '@mui/material/Grid2';
3
 import Grid from '@mui/material/Grid2';
4
 
4
 
5
 const ProductSelected = () => {
5
 const ProductSelected = () => {
6
 
6
 
7
-
8
-
9
   const images = [
7
   const images = [
10
     {
8
     {
11
       url: 'https://via.placeholder.com/300',
9
       url: 'https://via.placeholder.com/300',
37
     }
35
     }
38
   ];
36
   ];
39
 
37
 
38
+  const isMobileScreen = useMediaQuery((theme) => theme.breakpoints.down('sm'))
39
+
40
+  const displayedImages = isMobileScreen ? images.slice(0, 2) : images;
41
+
40
   return (
42
   return (
41
     <Box sx={{ mb: 5 }}>
43
     <Box sx={{ mb: 5 }}>
42
       <Grid container spacing={1} columns={12}>
44
       <Grid container spacing={1} columns={12}>
43
-        {images.map((image, index) => (<Grid item size={3} key={index}>
45
+        {displayedImages.map((image, index) => (<Grid item size={{ xs: 6, md: 3 }} key={index}>
44
           <Box
46
           <Box
45
             sx={{
47
             sx={{
46
               overflow: 'hidden',
48
               overflow: 'hidden',

+ 1
- 1
src/components/ProductSuggestion/ProductSuggestion.jsx View File

39
   return (
39
   return (
40
     <Box sx={{ mb: 5 }}>
40
     <Box sx={{ mb: 5 }}>
41
       <Grid container spacing={1} columns={12}>
41
       <Grid container spacing={1} columns={12}>
42
-        {images.map((image, index) => (<Grid item size={3} key={index}>
42
+        {images.map((image, index) => (<Grid item size={{xs:12, md:3}} key={index}>
43
           <Box
43
           <Box
44
             sx={{
44
             sx={{
45
               overflow: 'hidden',
45
               overflow: 'hidden',

+ 42
- 12
src/components/ShippingForm/ShippingForm.jsx View File

43
       }}
43
       }}
44
     >
44
     >
45
       <Grid container>
45
       <Grid container>
46
-
47
-        <Grid item size={6} sx={{ gap: 3, display: 'flex', flexDirection: 'column' }}>
46
+        {/* Left Column */}
47
+        <Grid
48
+          item
49
+          size={{ xs: 12, md: 6 }}
50
+          sx={{
51
+            gap: 3,
52
+            display: 'flex',
53
+            flexDirection: 'column',
54
+            order: { xs: 2, md: 1 }, // Flip order on xs
55
+          }}
56
+        >
48
           <FieldContainer label="Title">
57
           <FieldContainer label="Title">
49
             <TextField variant="outlined" fullWidth required />
58
             <TextField variant="outlined" fullWidth required />
50
           </FieldContainer>
59
           </FieldContainer>
67
           </FieldContainer>
76
           </FieldContainer>
68
         </Grid>
77
         </Grid>
69
 
78
 
70
-        <Grid item size={6} sx={{ gap: 3, display: 'flex', flexDirection: 'column', px: 4, height: "100%" }}>
71
-
79
+        {/* Right Column */}
80
+        <Grid
81
+          item
82
+          size={{ xs: 12, md: 6 }}
83
+          sx={{
84
+            gap: 3,
85
+            display: 'flex',
86
+            flexDirection: 'column',
87
+            px: { xs: 0, md: 5 },
88
+            height: '100%',
89
+            py: { xs: 3, md: 0 },
90
+            order: { xs: 1, md: 2 }, // Flip order on xs
91
+          }}
92
+        >
72
           <Grid
93
           <Grid
73
             container
94
             container
74
             spacing={2}
95
             spacing={2}
75
-            sx={{ position: 'relative', width: '100%', backgroundColor: '#F7FBFF', textAlign: 'center' }}
96
+            sx={{
97
+              position: 'relative',
98
+              width: '100%',
99
+              backgroundColor: '#F7FBFF',
100
+              textAlign: 'center',
101
+            }}
76
           >
102
           >
77
             {/* First Section */}
103
             {/* First Section */}
78
             <Grid
104
             <Grid
79
               item
105
               item
80
               size={12}
106
               size={12}
81
-              sx={{ px: 5, py: 3, borderBottom: '1px solid #ddd', mx: "auto" }}
107
+              sx={{ px: 5, py: 3, borderBottom: '1px solid #ddd', mx: 'auto' }}
82
             >
108
             >
83
               <Typography variant="h6" sx={{ fontWeight: 500 }}>
109
               <Typography variant="h6" sx={{ fontWeight: 500 }}>
84
                 SHIPPING RESTRICTIONS AND DUTIES MAY APPLY
110
                 SHIPPING RESTRICTIONS AND DUTIES MAY APPLY
86
             </Grid>
112
             </Grid>
87
 
113
 
88
             {/* Second Section */}
114
             {/* Second Section */}
89
-            <Grid item size={12} sx={{ px: 5, py: 3, mx: "auto" }}>
115
+            <Grid item size={12} sx={{ px: 5, py: 3, mx: 'auto' }}>
90
               <Typography variant="h6" sx={{ fontWeight: 500 }}>
116
               <Typography variant="h6" sx={{ fontWeight: 500 }}>
91
                 NEED HELP?
117
                 NEED HELP?
92
               </Typography>
118
               </Typography>
93
-              <Typography variant="body2" sx={{ mb: 1 }}>CALL US: +44 (0)10 2345 6789</Typography>
94
-              <Typography variant="body2" sx={{ mb: 1 }}>EMAIL CUSTOMER CARE | SHIPPING INFORMATION</Typography>
95
-              <Typography variant="body2" sx={{ mb: 1 }}>RETURNS & EXCHANGES</Typography>
119
+              <Typography variant="body2" sx={{ mb: 1 }}>
120
+                CALL US: +44 (0)10 2345 6789
121
+              </Typography>
122
+              <Typography variant="body2" sx={{ mb: 1 }}>
123
+                EMAIL CUSTOMER CARE | SHIPPING INFORMATION
124
+              </Typography>
125
+              <Typography variant="body2" sx={{ mb: 1 }}>
126
+                RETURNS & EXCHANGES
127
+              </Typography>
96
             </Grid>
128
             </Grid>
97
           </Grid>
129
           </Grid>
98
-
99
         </Grid>
130
         </Grid>
100
-
101
       </Grid>
131
       </Grid>
102
 
132
 
103
       <FieldContainer label="Address Line 1">
133
       <FieldContainer label="Address Line 1">

+ 6
- 5
src/components/SocialMedia/SocialMedia.jsx View File

15
     <Box
15
     <Box
16
       sx={{
16
       sx={{
17
         display: 'flex',
17
         display: 'flex',
18
-        justifyContent: 'center',
18
+        flexDirection: { xs: 'column', sm: 'row' }, // Stack on small screens
19
+        justifyContent: { xs: 'center', sm: 'space-around' }, // Adjust spacing
19
         alignItems: 'center',
20
         alignItems: 'center',
20
-        gap: 5,
21
+        gap: { xs: 2, sm: 5 }, // Smaller gap on small screens
21
         padding: 2,
22
         padding: 2,
22
         py: 4,
23
         py: 4,
23
-        borderTop:"1px solid #CFCFCF",
24
-        borderBottom:"1px solid #CFCFCF"
24
+        borderTop: '1px solid #CFCFCF',
25
+        borderBottom: '1px solid #CFCFCF',
25
       }}
26
       }}
26
     >
27
     >
27
       {socialMedia.map((media, index) => (
28
       {socialMedia.map((media, index) => (
29
           key={index}
30
           key={index}
30
           sx={{
31
           sx={{
31
             display: 'flex',
32
             display: 'flex',
32
-            flexDirection: 'row',
33
+            flexDirection: { xs: 'column', sm: 'row' }, // Stack icon and text on small screens
33
             alignItems: 'center',
34
             alignItems: 'center',
34
             gap: 1,
35
             gap: 1,
35
           }}
36
           }}

+ 1
- 0
src/components/VideoAds/VideoAds.jsx View File

10
         overflow: 'hidden',
10
         overflow: 'hidden',
11
         width: width || '100%',
11
         width: width || '100%',
12
         height: height || '300px',
12
         height: height || '300px',
13
+        
13
       }}
14
       }}
14
     >
15
     >
15
       <video
16
       <video

+ 24
- 8
src/pages/Cart.jsx View File

40
 
40
 
41
   return (
41
   return (
42
     <>
42
     <>
43
-      <Box sx={{ px: 24, my: 10 }}>
43
+      <Box sx={{
44
+        px: {
45
+          xs: 2,
46
+          md: 12,
47
+          lg: 20
48
+        },
49
+        mb: {
50
+          xs: 0,
51
+          md: 5,
52
+          lg: 10
53
+        },
54
+        mt:10
55
+      }}>
44
 
56
 
45
 
57
 
46
         {/* Header */}
58
         {/* Header */}
47
-        <Grid container spacing={2} alignItems="center" sx={{ mb: 5 }}>
59
+        <Grid container spacing={2} alignItems="center" sx={{ mb: 5, flexDirection: { xs: 'column-reverse', lg: 'row' } }}> 
48
 
60
 
49
           {/* Type */}
61
           {/* Type */}
50
-          <Grid item size={2}>
62
+          <Grid item size={{xs:12, lg:2}}>
51
             <Typography variant="body2">
63
             <Typography variant="body2">
52
-              <p>Mens Fashion <span style={{ fontWeight: "bold", marginLeft: 10, display: "inline-block" }}>Shopping Bag</span></p>
64
+              <p>Mens Fashion <span style={{ fontWeight: "bold", display: "inline-block" }}>Shopping Bag</span></p>
53
             </Typography>
65
             </Typography>
54
           </Grid>
66
           </Grid>
55
 
67
 
56
-          <Grid item size={4} offset={{ xs: 3 }}>
68
+          <Grid item size={{xs:12, md:4}}>
57
             <Typography variant="h5" sx={{ fontWeight: "bold" }}>
69
             <Typography variant="h5" sx={{ fontWeight: "bold" }}>
58
               SHOPPING BAG
70
               SHOPPING BAG
59
             </Typography>
71
             </Typography>
135
         {/* INVOICES */}
147
         {/* INVOICES */}
136
         <Grid container spacing={2} sx={{ mb: 5 }}>
148
         <Grid container spacing={2} sx={{ mb: 5 }}>
137
 
149
 
138
-          <Grid item size={3} sx={{ ml: "auto" }}>
150
+          <Grid item size={{xs:12, sm:4, md:3}} sx={{ ml: "auto" }}>
139
             <Box
151
             <Box
140
               display="flex"
152
               display="flex"
141
               justifyContent="space-between"
153
               justifyContent="space-between"
178
 
190
 
179
         {/* BUY NOW */}
191
         {/* BUY NOW */}
180
         <Box sx={{ mb: 15 }}>
192
         <Box sx={{ mb: 15 }}>
181
-          <Box sx={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
193
+          <Box sx={{ display: "flex", justifyContent: "space-between", alignItems: "center", flexDirection:{xs:"column-reverse", md:"row" } }}>
182
             <Typography variant='body2'><span style={{ fontWeight: "bolder" }}>NEED HELP?</span> CALL US: +44 (0)10 2345 6789 | EMAIL CUSTOMER CARE | SHIPPING INFORMATION | RETURNS & EXCHANGES</Typography>
194
             <Typography variant='body2'><span style={{ fontWeight: "bolder" }}>NEED HELP?</span> CALL US: +44 (0)10 2345 6789 | EMAIL CUSTOMER CARE | SHIPPING INFORMATION | RETURNS & EXCHANGES</Typography>
183
             <Button
195
             <Button
184
               variant="contained"
196
               variant="contained"
185
               color="common.black"
197
               color="common.black"
186
-              onClick={()=>{window.location.href = "/checkout"}}
198
+              onClick={() => { window.location.href = "/checkout" }}
187
               sx={{
199
               sx={{
188
                 backgroundColor: (theme) => theme.palette.common.black,
200
                 backgroundColor: (theme) => theme.palette.common.black,
189
                 color: "white",
201
                 color: "white",
190
                 textTransform: "none",
202
                 textTransform: "none",
191
                 px: 8,
203
                 px: 8,
192
                 py: 2,
204
                 py: 2,
205
+                mb: {
206
+                  xs:5,
207
+                  md:0
208
+                },
193
                 "&:hover": {
209
                 "&:hover": {
194
                   backgroundColor: (theme) => theme.palette.grey[900],
210
                   backgroundColor: (theme) => theme.palette.grey[900],
195
                 },
211
                 },

+ 58
- 11
src/pages/Checkout.jsx View File

1
 import React, { useState } from 'react'
1
 import React, { useState } from 'react'
2
-import { Box, Button, IconButton, TextField, Typography } from '@mui/material'
2
+import { Box, Typography, Link } from '@mui/material'
3
 import SocialMedia from '../components/SocialMedia'
3
 import SocialMedia from '../components/SocialMedia'
4
 import Feature from '../components/Feature'
4
 import Feature from '../components/Feature'
5
 import LoginForm from '../components/LoginForm'
5
 import LoginForm from '../components/LoginForm'
13
 const Checkout = () => {
13
 const Checkout = () => {
14
 
14
 
15
   const [content, setContent] = useState(0);
15
   const [content, setContent] = useState(0);
16
+  const [showLoginForm, setShowLoginForm] = useState(true);
16
 
17
 
17
   return (
18
   return (
18
-    <Box sx={{ px: 24, my: 10 }}>
19
+    <Box sx={{
20
+      px: {
21
+        xs: 2,
22
+        md: 12,
23
+        lg: 20
24
+      },
25
+      mb: {
26
+        xs: 0,
27
+        md: 5,
28
+        lg: 10
29
+      },
30
+      mt: 10
31
+    }}>
19
 
32
 
20
       {/* Header */}
33
       {/* Header */}
21
       <Grid container spacing={2} sx={{ mb: 5 }}>
34
       <Grid container spacing={2} sx={{ mb: 5 }}>
50
       {/* Content */}
63
       {/* Content */}
51
       {(content == 0) && <Grid container sx={{ mb: 5 }}>
64
       {(content == 0) && <Grid container sx={{ mb: 5 }}>
52
 
65
 
53
-        <Grid item size={6} sx={{ borderRight: "1px solid rgba(0,0,0,0.2)", borderBottom: "1px solid rgba(0,0,0,0.2)", py: 4, textAlign: "center" }}>
66
+        <Grid item size={{ xs: 12, md: 6 }} sx={{ borderRight: "1px solid rgba(0,0,0,0.2)", borderBottom: "1px solid rgba(0,0,0,0.2)", py: 4, textAlign: "center", display: { xs: "none", md: "block" } }}>
54
 
67
 
55
           <Typography variant="body1" sx={{ fontWeight: "500" }}>EXISTING CUSTOMER</Typography>
68
           <Typography variant="body1" sx={{ fontWeight: "500" }}>EXISTING CUSTOMER</Typography>
56
 
69
 
57
         </Grid>
70
         </Grid>
58
 
71
 
59
-        <Grid item size={6} sx={{ textAlign: "center", py: 4, borderBottom: "1px solid rgba(0,0,0,0.2)" }}>
72
+        <Grid item size={{ xs: 12, md: 6 }} sx={{ textAlign: "center", py: 4, borderBottom: "1px solid rgba(0,0,0,0.2)", display: { xs: "none", md: "block" } }}>
60
 
73
 
61
           <Typography variant="body1" sx={{ fontWeight: "500" }}>NEW CUSTOMER</Typography>
74
           <Typography variant="body1" sx={{ fontWeight: "500" }}>NEW CUSTOMER</Typography>
62
 
75
 
63
         </Grid>
76
         </Grid>
64
 
77
 
65
-        <Grid item size={6} sx={{ borderRight: "1px solid rgba(0,0,0,0.2)", py: 4, textAlign: "center", px: 8 }}>
78
+        <Grid
79
+          item
80
+          size={{ xs: 12, md: 6 }}
81
+          sx={{
82
+            borderRight: { xs: "none", md: "1px solid rgba(0,0,0,0.2)" },
83
+            py: 4,
84
+            textAlign: "center",
85
+            px: 8,
86
+            display: {
87
+              xs: showLoginForm ? "block" : "none",
88
+              md: "block"
89
+            }
90
+          }}>
91
+
92
+          <Typography variant="h6" sx={{ fontWeight: "500", mb: 3, display: { xs: "block", md: "none" } }}>EXISTING CUSTOMER</Typography>
66
 
93
 
67
           <Typography variant="body2">Make purchases faster using previously saved details. Track previous orders and easily request returns from the website.</Typography>
94
           <Typography variant="body2">Make purchases faster using previously saved details. Track previous orders and easily request returns from the website.</Typography>
68
 
95
 
69
           <LoginForm />
96
           <LoginForm />
70
 
97
 
98
+          <Typography variant="body1" sx={{ fontWeight: "400", mt: 5, display: { xs: "block", md: "none" } }}>Didnt have any Account? <Link onClick={() => { setShowLoginForm(false) }} sx={{ textDecoration: "underline" }}> here</Link> to subcribe now.</Typography>
99
+
100
+
71
         </Grid>
101
         </Grid>
72
 
102
 
73
-        <Grid item size={6} sx={{ textAlign: "center", py: 4, px: 8 }}>
103
+        <Grid
104
+          item
105
+          size={{ xs: 12, md: 6 }}
106
+          sx={{
107
+            textAlign: "center",
108
+            py: 4,
109
+            px: 8,
110
+            display: {
111
+              xs: showLoginForm ? "none" : "block",
112
+              md: "block"
113
+            }
114
+          }}>
115
+
116
+          <Typography variant="h6" sx={{ fontWeight: "500", mb: 3, display: { xs: "block", md: "none" } }}>NEW CUSTOMER</Typography>
74
 
117
 
75
           <Typography variant="body2">You’ll need an account to purchase watches, track and review orders, and manage your personal details.</Typography>
118
           <Typography variant="body2">You’ll need an account to purchase watches, track and review orders, and manage your personal details.</Typography>
76
 
119
 
77
           <SignUpForm />
120
           <SignUpForm />
78
 
121
 
122
+          <Typography variant="body1" sx={{ fontWeight: "400", mt: 5, display: { xs: "block", md: "none" } }}>Already have an Account? <Link onClick={() => { setShowLoginForm(true) }} sx={{ textDecoration: "underline" }}> here</Link> to subcribe now.</Typography>
123
+
79
         </Grid>
124
         </Grid>
80
 
125
 
81
 
126
 
83
 
128
 
84
       {(content == 1) && <Grid container sx={{ mb: 5 }}>
129
       {(content == 1) && <Grid container sx={{ mb: 5 }}>
85
         <Grid item size={12}>
130
         <Grid item size={12}>
86
-          <ShippingForm/>
131
+          <ShippingForm />
87
         </Grid>
132
         </Grid>
88
       </Grid>}
133
       </Grid>}
89
 
134
 
90
       {(content == 2) && <Grid container sx={{ mb: 5 }}>
135
       {(content == 2) && <Grid container sx={{ mb: 5 }}>
91
         <Grid item size={12}>
136
         <Grid item size={12}>
92
-          <BillingForm/>
137
+          <BillingForm />
93
         </Grid>
138
         </Grid>
94
       </Grid>}
139
       </Grid>}
95
 
140
 
96
       {(content == 3) && <Grid container sx={{ mb: 5 }}>
141
       {(content == 3) && <Grid container sx={{ mb: 5 }}>
97
         <Grid item size={12}>
142
         <Grid item size={12}>
98
-          <ConfirmOrder/>
143
+          <ConfirmOrder />
99
         </Grid>
144
         </Grid>
100
       </Grid>}
145
       </Grid>}
101
 
146
 
102
 
147
 
103
-      <SocialMedia />
104
-      <Feature />
148
+      <Box sx={{display: {xs:"none", md:"block"}  }}>
149
+        <SocialMedia />
150
+        <Feature />
151
+      </Box>
105
 
152
 
106
     </Box>
153
     </Box>
107
   )
154
   )

+ 61
- 27
src/pages/Home.jsx View File

17
   return (
17
   return (
18
     <>
18
     <>
19
       <Carousel />
19
       <Carousel />
20
-      <Box sx={{ px: 24, mb: 10 }}>
21
-
22
-        <Box sx={{
23
-          display: "flex",
24
-          position: "relative",
25
-          py: 5
20
+      <Box sx={{
21
+        px: {
22
+          xs: 2,
23
+          md: 12,
24
+          lg: 20
25
+        },
26
+        mb: {
27
+          xs: 0,
28
+          md: 5,
29
+          lg: 10
30
+        }
31
+      }}>
32
+
33
+        <Grid container sx={{
34
+          py:{
35
+            xs:3,
36
+            md:3,
37
+            lg:6
38
+          }
26
         }}>
39
         }}>
27
-          <Box
28
-            sx={{
29
-              display: "flex",
30
-              alignItems: "center",
31
-              justifyContent: "center",
32
-              mx: "auto"
33
-            }}
34
-          >
35
-            <KeyboardArrowLeftIcon sx={{ mr: 3, color: "#B7B7B7" }} /> {/* Icon at the start */}
36
-            <Typography variant="h4" sx={{ mx: "auto" }}>
40
+
41
+          {/* OFFSET PURPOSE */}
42
+          <Grid size={{xs:12, md:2}} sx={{display:"flex", alignItems:"center" }}></Grid>
43
+
44
+          <Grid size={{xs:12, md:4}} sx={{mx:"auto", display:"flex", alignItems:"center", justifyContent:"center" }}>
45
+            {/* Icon at the start */}
46
+            <KeyboardArrowLeftIcon sx={{ mr: 3, color: "#B7B7B7" }} />
47
+            <Typography variant="h4">
37
               NEW IN
48
               NEW IN
38
             </Typography>
49
             </Typography>
39
-            <KeyboardArrowRightIcon sx={{ ml: 3, color: "#B7B7B7" }} /> {/* Icon at the end */}
40
-          </Box>
50
+            {/* Icon at the end */}
51
+            <KeyboardArrowRightIcon sx={{ ml: 3, color: "#B7B7B7" }} />
52
+          </Grid>
41
 
53
 
42
-          <Link href="#" sx={{ position: "absolute", right: 0, textDecoration: "underline" }}>VIEW ALL</Link>
54
+          <Grid size={{xs:12, md:2}} sx={{display:"flex", alignItems:"center", py:{xs:2, md:0} }}>
55
+            <Link href="#" sx={{ color:"#000", textDecoration: "underline", m:{xs:"auto auto auto auto", md:"0 0 0 auto"}}}>VIEW ALL</Link>
56
+          </Grid>
57
+
58
+        </Grid>
43
 
59
 
44
-        </Box>
45
         <ProductSelected />
60
         <ProductSelected />
61
+        
46
       </Box>
62
       </Box>
47
 
63
 
48
-      <VideoAds width={"100%"} height={700} />
49
-
50
-      <Box sx={{ px: 24, mb: 10 }}>
51
-
64
+      <VideoAds width={"100%"} height={{
65
+        xs: 350,
66
+        md: 500,
67
+        lg: 750,
68
+      }} />
69
+
70
+      <Box sx={{
71
+        px: {
72
+          xs: 2,
73
+          md: 12,
74
+          lg: 20
75
+        },
76
+        mb: {
77
+          xs: 2,
78
+          md: 5,
79
+          lg: 10
80
+        }
81
+      }}>
52
 
82
 
53
         <Box sx={{ flexGrow: 1, mt: 10 }}>
83
         <Box sx={{ flexGrow: 1, mt: 10 }}>
54
           <Grid container spacing={2}>
84
           <Grid container spacing={2}>
55
             <Grid size={12}>
85
             <Grid size={12}>
56
               <ProductType />
86
               <ProductType />
57
             </Grid>
87
             </Grid>
58
-            <Grid size={6}>
88
+            <Grid size={{xs:12, md:6}}>
59
               <ProductType />
89
               <ProductType />
60
             </Grid>
90
             </Grid>
61
-            <Grid size={6}>
91
+            <Grid size={{xs:12, md:6}}>
62
               <ProductType />
92
               <ProductType />
63
             </Grid>
93
             </Grid>
64
             <Grid size={12}>
94
             <Grid size={12}>
71
 
101
 
72
       <NewsLetter />
102
       <NewsLetter />
73
 
103
 
74
-      <Box sx={{ px: 24, my: 10 }}>
104
+      <Box sx={{ px:{
105
+        xs:2,
106
+        md:12,
107
+        lg:20
108
+      }, mb: 10 }}>
75
 
109
 
76
         <SocialMedia />
110
         <SocialMedia />
77
         <Feature />
111
         <Feature />

+ 26
- 5
src/pages/Products/Product.jsx View File

2
 import { Box, Typography } from '@mui/material';
2
 import { Box, Typography } from '@mui/material';
3
 import { useParams } from 'react-router-dom';
3
 import { useParams } from 'react-router-dom';
4
 import Grid from '@mui/material/Grid2';
4
 import Grid from '@mui/material/Grid2';
5
+import logoSrc from "../../assets/svg/logo.svg";
5
 import ImageView from '../../components/ImageView/ImageView';
6
 import ImageView from '../../components/ImageView/ImageView';
6
 import ProductDetails from '../../components/ProductDetails';
7
 import ProductDetails from '../../components/ProductDetails';
7
 import ProductSuggestion from '../../components/ProductSuggestion';
8
 import ProductSuggestion from '../../components/ProductSuggestion';
19
 
20
 
20
   return (
21
   return (
21
 
22
 
22
-    <Box sx={{ mt: 10, px: 24 }}>
23
-      <Grid container spacing={0}>
24
-        <Grid size={6}>
23
+    <Box sx={{
24
+      px: {
25
+        xs: 2,
26
+        md: 12,
27
+        lg: 20
28
+      },
29
+      mb: {
30
+        xs: 0,
31
+        md: 5,
32
+        lg: 10
33
+      }
34
+    }}>
35
+      <Grid container spacing={0} sx={{ mt: 10, mb:5 }}>
36
+
37
+        <Grid size={12} sx={{ backgroundColor: "#000", textAlign:"center", display:{xs:"block", md:"none"} }}>
38
+          <img src={logoSrc} alt="Logo"
39
+            style={{
40
+              width: 150,
41
+              height: 50
42
+            }} />
43
+        </Grid>
44
+
45
+        <Grid size={{ xs: 12, md: 6 }}>
25
           <Box sx={{ paddingRight: 1 }}>
46
           <Box sx={{ paddingRight: 1 }}>
26
             <Box>
47
             <Box>
27
               <ImageView />
48
               <ImageView />
29
           </Box>
50
           </Box>
30
         </Grid>
51
         </Grid>
31
 
52
 
32
-        <Grid size={6} xs>
53
+        <Grid size={{ xs: 12, md: 6 }}>
33
           <Box>
54
           <Box>
34
             <Box>
55
             <Box>
35
               <ProductDetails />
56
               <ProductDetails />
59
         textAlign: "center"
80
         textAlign: "center"
60
       }}>
81
       }}>
61
         <Typography variant='body1' sx={{ fontWeight: "400", mb: 4 }}>
82
         <Typography variant='body1' sx={{ fontWeight: "400", mb: 4 }}>
62
-          RECENTLY VIEWED 
83
+          RECENTLY VIEWED
63
         </Typography>
84
         </Typography>
64
 
85
 
65
         <ProductHistoryList />
86
         <ProductHistoryList />

+ 13
- 2
src/pages/Products/index.jsx View File

10
   return (
10
   return (
11
     <>
11
     <>
12
       <PageTitle />
12
       <PageTitle />
13
-      <Box sx={{ px: 24, mb:10 }}>
13
+      <Box sx={{
14
+        px: {
15
+          xs: 2,
16
+          md: 12,
17
+          lg: 20
18
+        },
19
+        mb: {
20
+          xs: 0,
21
+          md: 5,
22
+          lg: 10
23
+        }
24
+      }}>
14
         <Filter />
25
         <Filter />
15
-        <ProductList size={5}/>
26
+        <ProductList />
16
         <SocialMedia />
27
         <SocialMedia />
17
         <Feature />
28
         <Feature />
18
       </Box>
29
       </Box>

Loading…
Cancel
Save