Merge pull request #55 from GenaDrop/stagging

Stagging to main
GenaDrop · Jan 2, 2024 · a6c03af · a6c03af
2 parents 1edbaed + aae0b29
commit a6c03af
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 28 deletions.
diff --git a/apps/BosGenaDrop/widget/CPlanet/DAO/Index.jsx b/apps/BosGenaDrop/widget/CPlanet/DAO/Index.jsx
@@ -273,12 +273,6 @@ const NotDAO = styled.div`
 `
 
 const profile = Social.get(`${daoId}/profile/**`, "final");
-console.log(profile)
-if(!profile) {
-  return (
-    <NotDAO className="">This is Not a Valid DAO</NotDAO>
-  )
-}
 
 
 const accounts = [daoId];
@@ -295,6 +289,13 @@ policy &&
 members = [...new Set(members)];
 // --
 
+if(!members.length) {
+  return (
+    <NotDAO className="">This is Not a Valid DAO</NotDAO>
+  )
+}
+
+
 function makeAccountIdShorter(accountId) {
   if (accountId.length > shortenLength) {
     return accountId.slice(0, shortenLength) + "...";

diff --git a/apps/BosGenaDrop/widget/CPlanet/DropsFund/Contest/Card.jsx b/apps/BosGenaDrop/widget/CPlanet/DropsFund/Contest/Card.jsx
@@ -41,6 +41,12 @@ const Root = styled.div`
     flex-wrap: wrap;
     height: 100%;
   }
+  .cardContent {
+    width: 70%;
+    @media (max-width: 500px) {
+      width: 100%;
+    }
+  }
 `;
 
 const Image = styled.div`
@@ -139,7 +145,7 @@ const CardBody = styled.div`
   }
   @media (max-width: 500px) {
     .desc {
-      min-width: 100%;
+      min-width: inherit;
     }
   }
 `;
@@ -240,7 +246,7 @@ const StartedButton = styled.div`
     border-radius: 32px;
     text-transform: uppercase;
     font-family: Helvetica Neue;
-    margin-bottom: 40px;
+    margin-bottom: 10px;
   }
   .disabled:hover {
     background: none;
@@ -363,7 +369,6 @@ function makeDescriptionShorter(desc) {
 }
 
 
-
 return (
   <Root
     selected={
@@ -431,7 +436,13 @@ return (
           {props.isOpen ? "Not Started" : "Contest Ended"}
         </button>
       )}
-      <button className="proposal">VIEW PROPOSAL</button>
+      {
+        props.isClosed && props?.councilMember && (
+            <a href={`https://app.astrodao.com/dao/${props.daoId}/proposals`} target="_blank">
+          <button className="proposal">CREATE PROPOSAL</button>
+            </a>
+        )
+      }
       {props?.owner !== nftData?.owner ? (
         <div className="bannedUser">
           {redFlag}

diff --git a/apps/BosGenaDrop/widget/CPlanet/DropsFund/Contest/Content.jsx b/apps/BosGenaDrop/widget/CPlanet/DropsFund/Contest/Content.jsx
@@ -122,6 +122,7 @@ const searchInputHandler = (e) => {
   setFilteredValue(searched)
 };
 
+const isUserInCouncil = props?.councilMembers?.includes(context?.accountId)
 
 return (
   <>
@@ -145,6 +146,8 @@ return (
             owner: data[0],
             content: data[1],
             isOpen: props.isOpen,
+            daoId: props.daoId,
+            councilMember: isUserInCouncil,
             winners: props.winners,
             isClosed: props.isClosed,
             contestId: props.contestId,
@@ -159,6 +162,8 @@ return (
             content: data[1],
             isOpen: props.isOpen,
             winners: props.winners,
+            daoId: props.daoId,
+            councilMember: isUserInCouncil,
             isClosed: props.isClosed,
             contestId: props.contestId,
           }}

diff --git a/apps/BosGenaDrop/widget/CPlanet/DropsFund/Contest/Single.jsx b/apps/BosGenaDrop/widget/CPlanet/DropsFund/Contest/Single.jsx
@@ -259,7 +259,6 @@ const contest = Near.view("fund-v2.genadrop.near", "get_contest_detail", {
   subscribe: true,
 });
 
-console.log(contest)
 
 const contestArts = Near.view("fund-v2.genadrop.near", "get_contest_arts", {
   contest_id: Number(contestId),
@@ -301,6 +300,13 @@ const getUsdValue = (price) => {
   }
 };
 
+const policy = Near.view(contest?.dao_id, "get_policy");
+const councilMembers = policy &&
+policy?.roles?.filter(
+  (data) => data?.name === "council" || data?.name === "Council"
+)[0]?.kind?.Group;
+
+
 
 return (
   <Container>
@@ -350,14 +356,14 @@ return (
             </div>
           </div>
           <div className="amountSec">
-            <span>Prize per winner</span>
+            <span>Prize per Place</span>
             <div className="amount">
               <img
                 src="https://ipfs.near.social/ipfs/bafkreierjvmroeb6tnfu3ckrfmet7wpx7k3ubjnc6gcdzauwqkxobnu57e"
                 alt=""
               />
-              <p className="first-span">1000</p>
-              <span className="last-span">$1686.01</span>
+              <p className="first-span">{contest?.places ? contest?.prize / contest.places ?? 0 : 0}</p>
+              <span className="last-span">{getUsdValue(contest?.places ? contest?.prize / contest.places ?? 0: 0)}</span>
             </div>
           </div>
           <div className="amountSec">
@@ -394,7 +400,9 @@ return (
             usersArts: contestArts,
             isOpen,
             winners: contest.winners,
+            daoId: contest.dao_id,
             isClosed,
+            councilMembers: councilMembers,
             userSubmitted,
             contestId,
           }}

diff --git a/build/BosGenaDrop/src/CPlanet/DAO/Index.jsx b/build/BosGenaDrop/src/CPlanet/DAO/Index.jsx
@@ -273,12 +273,6 @@ const NotDAO = styled.div`
 `
 
 const profile = Social.get(`${daoId}/profile/**`, "final");
-console.log(profile)
-if(!profile) {
-  return (
-    <NotDAO className="">This is Not a Valid DAO</NotDAO>
-  )
-}
 
 
 const accounts = [daoId];
@@ -295,6 +289,13 @@ policy &&
 members = [...new Set(members)];
 // --
 
+if(!members.length) {
+  return (
+    <NotDAO className="">This is Not a Valid DAO</NotDAO>
+  )
+}
+
+
 function makeAccountIdShorter(accountId) {
   if (accountId.length > shortenLength) {
     return accountId.slice(0, shortenLength) + "...";

diff --git a/build/BosGenaDrop/src/CPlanet/DropsFund/Contest/Card.jsx b/build/BosGenaDrop/src/CPlanet/DropsFund/Contest/Card.jsx
@@ -41,6 +41,12 @@ const Root = styled.div`
     flex-wrap: wrap;
     height: 100%;
   }
+  .cardContent {
+    width: 70%;
+    @media (max-width: 500px) {
+      width: 100%;
+    }
+  }
 `;
 
 const Image = styled.div`
@@ -139,7 +145,7 @@ const CardBody = styled.div`
   }
   @media (max-width: 500px) {
     .desc {
-      min-width: 100%;
+      min-width: inherit;
     }
   }
 `;
@@ -240,7 +246,7 @@ const StartedButton = styled.div`
     border-radius: 32px;
     text-transform: uppercase;
     font-family: Helvetica Neue;
-    margin-bottom: 40px;
+    margin-bottom: 10px;
   }
   .disabled:hover {
     background: none;
@@ -363,7 +369,6 @@ function makeDescriptionShorter(desc) {
 }
 
 
-
 return (
   <Root
     selected={
@@ -431,7 +436,13 @@ return (
           {props.isOpen ? "Not Started" : "Contest Ended"}
         </button>
       )}
-      <button className="proposal">VIEW PROPOSAL</button>
+      {
+        props.isClosed && props?.councilMember && (
+            <a href={`https://app.astrodao.com/dao/${props.daoId}/proposals`} target="_blank">
+          <button className="proposal">CREATE PROPOSAL</button>
+            </a>
+        )
+      }
       {props?.owner !== nftData?.owner ? (
         <div className="bannedUser">
           {redFlag}

diff --git a/build/BosGenaDrop/src/CPlanet/DropsFund/Contest/Content.jsx b/build/BosGenaDrop/src/CPlanet/DropsFund/Contest/Content.jsx
@@ -122,6 +122,7 @@ const searchInputHandler = (e) => {
   setFilteredValue(searched)
 };
 
+const isUserInCouncil = props?.councilMembers?.includes(context?.accountId)
 
 return (
   <>
@@ -145,6 +146,8 @@ return (
             owner: data[0],
             content: data[1],
             isOpen: props.isOpen,
+            daoId: props.daoId,
+            councilMember: isUserInCouncil,
             winners: props.winners,
             isClosed: props.isClosed,
             contestId: props.contestId,
@@ -159,6 +162,8 @@ return (
             content: data[1],
             isOpen: props.isOpen,
             winners: props.winners,
+            daoId: props.daoId,
+            councilMember: isUserInCouncil,
             isClosed: props.isClosed,
             contestId: props.contestId,
           }}

diff --git a/build/BosGenaDrop/src/CPlanet/DropsFund/Contest/Single.jsx b/build/BosGenaDrop/src/CPlanet/DropsFund/Contest/Single.jsx
@@ -259,7 +259,6 @@ const contest = Near.view("fund-v2.genadrop.near", "get_contest_detail", {
   subscribe: true,
 });
 
-console.log(contest)
 
 const contestArts = Near.view("fund-v2.genadrop.near", "get_contest_arts", {
   contest_id: Number(contestId),
@@ -301,6 +300,13 @@ const getUsdValue = (price) => {
   }
 };
 
+const policy = Near.view(contest?.dao_id, "get_policy");
+const councilMembers = policy &&
+policy?.roles?.filter(
+  (data) => data?.name === "council" || data?.name === "Council"
+)[0]?.kind?.Group;
+
+
 
 return (
   <Container>
@@ -350,14 +356,14 @@ return (
             </div>
           </div>
           <div className="amountSec">
-            <span>Prize per winner</span>
+            <span>Prize per Place</span>
             <div className="amount">
               <img
                 src="https://ipfs.near.social/ipfs/bafkreierjvmroeb6tnfu3ckrfmet7wpx7k3ubjnc6gcdzauwqkxobnu57e"
                 alt=""
               />
-              <p className="first-span">1000</p>
-              <span className="last-span">$1686.01</span>
+              <p className="first-span">{contest?.places ? contest?.prize / contest.places ?? 0 : 0}</p>
+              <span className="last-span">{getUsdValue(contest?.places ? contest?.prize / contest.places ?? 0: 0)}</span>
             </div>
           </div>
           <div className="amountSec">
@@ -394,7 +400,9 @@ return (
             usersArts: contestArts,
             isOpen,
             winners: contest.winners,
+            daoId: contest.dao_id,
             isClosed,
+            councilMembers: councilMembers,
             userSubmitted,
             contestId,
           }}