浏览代码

add header navbar, fix social media arrangement

master
azri 3 个月前
父节点
当前提交
1fee86bf1e

+ 1
- 1
src/components/Header/Header.jsx 查看文件

29
 const Header = () => {
29
 const Header = () => {
30
 
30
 
31
     return (
31
     return (
32
-        <Container sx={{display:"none"}}>
32
+        <Container>
33
             <Box sx={{color:"white", px:23}}>
33
             <Box sx={{color:"white", px:23}}>
34
                 <Box sx={{display:"flex", gap:1}}>
34
                 <Box sx={{display:"flex", gap:1}}>
35
                     <InstagramIcon style={headerStyle.icon} />
35
                     <InstagramIcon style={headerStyle.icon} />

+ 1
- 1
src/components/Navbar/Navbar.jsx 查看文件

282
       >
282
       >
283
 
283
 
284
         {/* Conditionally render the Header */}
284
         {/* Conditionally render the Header */}
285
-        {/* {showHeader && <Header />} */}
285
+        {showHeader && <Header />}
286
 
286
 
287
         <Toolbar sx={{
287
         <Toolbar sx={{
288
           px: {
288
           px: {

+ 8
- 1
src/components/NewsLetter/NewsLetter.jsx 查看文件

33
         }}
33
         }}
34
       >
34
       >
35
 
35
 
36
-        <Box sx={{ width: {xs:"80%", md:"35%"}, backgroundColor: "rgba(255,255,255, 0.5)", padding: 10, textAlign:"center", color:"black" }}>
36
+        <Box sx={{ 
37
+          width: {xs:"80%", md:"40%"}, 
38
+          backgroundColor: "rgba(255,255,255, 0.5)", 
39
+          px: 15,
40
+          py: 10,
41
+          textAlign:"center", 
42
+          color:"black" 
43
+        }}>
37
 
44
 
38
           <Typography variant='h3'>
45
           <Typography variant='h3'>
39
             Let's Stay in touch
46
             Let's Stay in touch

+ 17
- 3
src/components/ProductSelected/ProductSelected.jsx 查看文件

26
       //sort
26
       //sort
27
       selectedProducts = selectedProducts.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt));
27
       selectedProducts = selectedProducts.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt));
28
       setFilterProducts(selectedProducts)
28
       setFilterProducts(selectedProducts)
29
-      
29
+
30
     }
30
     }
31
 
31
 
32
   }, [products])
32
   }, [products])
73
               }}
73
               }}
74
             />
74
             />
75
 
75
 
76
-            <Button sx={{ position: "absolute", top: 20, left: 20, boxShadow: 0 }} variant="contained">
76
+            <Button sx={{ 
77
+              position: "absolute", 
78
+              top:{
79
+                xs:0,
80
+                sm:0,
81
+                md:20
82
+              }, 
83
+              left: {
84
+                xs:0,
85
+                sm:0,
86
+                md:20
87
+              }, 
88
+              boxShadow: 0,
89
+              fontSize:10
90
+            }} variant="contained">
77
               NEW
91
               NEW
78
             </Button>
92
             </Button>
79
 
93
 
80
-            <Box sx={{ pb: 5, pt: 3 }}>
94
+            <Box sx={{ pt: 3 }}>
81
               <Typography variant="body1" sx={{ fontWeight: "400", mb: 1 }}>
95
               <Typography variant="body1" sx={{ fontWeight: "400", mb: 1 }}>
82
                 {collection_name}
96
                 {collection_name}
83
               </Typography>
97
               </Typography>

+ 1
- 1
src/components/SocialMedia/SocialMedia.jsx 查看文件

15
     <Box
15
     <Box
16
       sx={{
16
       sx={{
17
         display: 'flex',
17
         display: 'flex',
18
-        flexDirection: { xs: 'column', sm: 'row' }, // Stack on small screens
18
+        flexDirection: 'row', // Stack on small screens
19
         justifyContent: 'center',
19
         justifyContent: 'center',
20
         gap: 8,
20
         gap: 8,
21
         padding: 2,
21
         padding: 2,

+ 2
- 2
src/pages/Home.jsx 查看文件

41
       </Box>
41
       </Box>
42
 
42
 
43
       <VideoAds width={"100%"} height={{
43
       <VideoAds width={"100%"} height={{
44
-        xs: 350,
44
+        xs: 250,
45
         md: 500,
45
         md: 500,
46
         lg: 750,
46
         lg: 750,
47
       }} />
47
       }} />
59
         }
59
         }
60
       }}>
60
       }}>
61
 
61
 
62
-        <Box sx={{ flexGrow: 1, mt: 10 }}>
62
+        <Box sx={{ flexGrow: 1, mt: 5 }}>
63
           <Grid container spacing={2}>
63
           <Grid container spacing={2}>
64
             <Grid size={12}>
64
             <Grid size={12}>
65
               <ProductType title={'CLOTHING'} link={'/collection/clothing'} img_url={AmberClothing}/>
65
               <ProductType title={'CLOTHING'} link={'/collection/clothing'} img_url={AmberClothing}/>

正在加载...
取消
保存