Merge pull request #51 from GenaDrop/stagging

Stagging to main
GenaDrop · Dec 21, 2023 · e05fa38 · e05fa38
2 parents 2bc29a7 + ccf9ae1
commit e05fa38
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 10 deletions.
diff --git a/apps/BosGenaDrop/widget/CPlanet/DropsFund/Contest/Card.jsx b/apps/BosGenaDrop/widget/CPlanet/DropsFund/Contest/Card.jsx
@@ -26,14 +26,15 @@ const nearGreen = (
 );
 
 const Root = styled.div`
-  height: 196px;
-  max-width: 932px;
+  height: 186px;
+  max-width: 1000px;
   display: flex;
   padding: 16px;
   background: ${(p) => (p.selected ? "#E4FFF0" : p.notOwner ? "#FFF8F8" : "#fff")};
   border: 1px solid ${(p) => (p.selected ? "#3BD07F" : p.notOwner ? "#F777" :  "#eaeaea")};
   @media (max-width: 500px) {
     width: 90% !important;
+    max-width: 90% !important;
     margin-left: auto;
     margin-right: auto;
     margin-bottom: 20px;
@@ -67,6 +68,7 @@ const Image = styled.div`
 const Header = styled.div`  
   .headerName {
     display: flex;
+    flex-wrap: wrap;
     align-items: center;
   }
   .dots {
@@ -147,6 +149,7 @@ const StartedButton = styled.div`
   flex-direction: column;
   justify-content: space-between;
   align-items: center;
+  width: 132px;
   .bannedUser {
     display: flex;
     margin-top: 5px;
@@ -353,7 +356,7 @@ return (
     selected={
       props.winners ? props.winners?.some((data) => data === props.owner) : ""
     }
-    notOwner={props?.owner !== nftData?.owner ? true: false}
+    notOwner={props?.owner === nftData?.owner ? false: true}
   >
     <Image>
       <img src={props?.content?.image_url} alt="" />

diff --git a/apps/BosGenaDrop/widget/CPlanet/DropsFund/Contest/Content.jsx b/apps/BosGenaDrop/widget/CPlanet/DropsFund/Contest/Content.jsx
@@ -16,16 +16,22 @@ const searchSvg = (
   </svg>
 );
 
+
 const Root = styled.div`
   display: flex;
   align-items: center;
   margin-top: 40px;
+  width: 100%;
+  max-width: 1000px;
+  @media (max-width: 1000px) {
+    max-width: 100% !important;
+  }
 `;
 
 const Search = styled.div`
   display: flex;
-  width: 776px;
   padding: 5px 16px;
+  width: 1000px;
   justify-content: space-between;
   align-items: center;
   border-radius: 8px;
@@ -60,7 +66,12 @@ const Filter = styled.div`
 const Cards = styled.div`
   display: flex;
   flex-direction: column;
+  max-width: 1000px;
+  width: 100%;
   margin-top: 20px;
+  @media (max-width: 900px) {
+    max-width: 100% !important;
+  }
 `;
 
 const NoItem = styled.div`

diff --git a/apps/BosGenaDrop/widget/CPlanet/DropsFund/Contest/Index.jsx b/apps/BosGenaDrop/widget/CPlanet/DropsFund/Contest/Index.jsx
@@ -46,6 +46,7 @@ const ExploreContainer = styled.div`
   .searchContainer {
     display: flex;
     margin-top: 32px;
+    width: 100%;
     flex-wrap: wrap;
     align-items: center;
     gap: 20px;
@@ -57,8 +58,8 @@ const Search = styled.div`
   display: flex;
   padding: 5px 16px;
   justify-content: space-between;
-  width: 1180px;
   align-items: center;
+  flex: 1;
   border-radius: 8px;
   border: 1px solid #efefef;
   height: 48px;

diff --git a/build/BosGenaDrop/src/CPlanet/DropsFund/Contest/Card.jsx b/build/BosGenaDrop/src/CPlanet/DropsFund/Contest/Card.jsx
@@ -26,14 +26,15 @@ const nearGreen = (
 );
 
 const Root = styled.div`
-  height: 196px;
-  max-width: 932px;
+  height: 186px;
+  max-width: 1000px;
   display: flex;
   padding: 16px;
   background: ${(p) => (p.selected ? "#E4FFF0" : p.notOwner ? "#FFF8F8" : "#fff")};
   border: 1px solid ${(p) => (p.selected ? "#3BD07F" : p.notOwner ? "#F777" :  "#eaeaea")};
   @media (max-width: 500px) {
     width: 90% !important;
+    max-width: 90% !important;
     margin-left: auto;
     margin-right: auto;
     margin-bottom: 20px;
@@ -67,6 +68,7 @@ const Image = styled.div`
 const Header = styled.div`  
   .headerName {
     display: flex;
+    flex-wrap: wrap;
     align-items: center;
   }
   .dots {
@@ -147,6 +149,7 @@ const StartedButton = styled.div`
   flex-direction: column;
   justify-content: space-between;
   align-items: center;
+  width: 132px;
   .bannedUser {
     display: flex;
     margin-top: 5px;
@@ -353,7 +356,7 @@ return (
     selected={
       props.winners ? props.winners?.some((data) => data === props.owner) : ""
     }
-    notOwner={props?.owner !== nftData?.owner ? true: false}
+    notOwner={props?.owner === nftData?.owner ? false: true}
   >
     <Image>
       <img src={props?.content?.image_url} alt="" />

diff --git a/build/BosGenaDrop/src/CPlanet/DropsFund/Contest/Content.jsx b/build/BosGenaDrop/src/CPlanet/DropsFund/Contest/Content.jsx
@@ -16,16 +16,22 @@ const searchSvg = (
   </svg>
 );
 
+
 const Root = styled.div`
   display: flex;
   align-items: center;
   margin-top: 40px;
+  width: 100%;
+  max-width: 1000px;
+  @media (max-width: 1000px) {
+    max-width: 100% !important;
+  }
 `;
 
 const Search = styled.div`
   display: flex;
-  width: 776px;
   padding: 5px 16px;
+  width: 1000px;
   justify-content: space-between;
   align-items: center;
   border-radius: 8px;
@@ -60,7 +66,12 @@ const Filter = styled.div`
 const Cards = styled.div`
   display: flex;
   flex-direction: column;
+  max-width: 1000px;
+  width: 100%;
   margin-top: 20px;
+  @media (max-width: 900px) {
+    max-width: 100% !important;
+  }
 `;
 
 const NoItem = styled.div`

diff --git a/build/BosGenaDrop/src/CPlanet/DropsFund/Contest/Index.jsx b/build/BosGenaDrop/src/CPlanet/DropsFund/Contest/Index.jsx
@@ -46,6 +46,7 @@ const ExploreContainer = styled.div`
   .searchContainer {
     display: flex;
     margin-top: 32px;
+    width: 100%;
     flex-wrap: wrap;
     align-items: center;
     gap: 20px;
@@ -57,8 +58,8 @@ const Search = styled.div`
   display: flex;
   padding: 5px 16px;
   justify-content: space-between;
-  width: 1180px;
   align-items: center;
+  flex: 1;
   border-radius: 8px;
   border: 1px solid #efefef;
   height: 48px;