added all, updated members page

near-ndc · Apr 5, 2024 · c46c912 · c46c912
1 parent 455f56e
commit c46c912
Show file tree

Hide file tree

Showing 4 changed files with 270 additions and 309 deletions.
diff --git a/apps/astraplusplus/widget/CreateDAO/Step4.jsx b/apps/astraplusplus/widget/CreateDAO/Step4.jsx
@@ -44,7 +44,7 @@ for (const role of initialAnswers.policy.roles) {
 const initialState = {
   roles: initialAnswers.policy.roles.length
     ? initialAnswers.policy.roles.map((r) => r.name)
-    : ["council"],
+    : ["council", "all"],
   members: initialMembers.length
     ? initialMembers
     : [{ role: "council", name: accountId }]
@@ -219,9 +219,10 @@ return (
           <div>
             <h3 className="h6 fw-bold">Add Groups</h3>
             <p className="text-black-50 fw-light small">
-              Adding groups to DAO during creation is not supported using web
-              based wallets. Anyway, you can add more groups later in DAO
-              settings
+              You can add members and assign them various roles, with
+              permissions customizable in the next step. The 'All' group
+              includes everyone; you can remove it if you wish to limit
+              interactions to selected individuals within your DAO.
             </p>
           </div>
           <Widget
@@ -367,7 +368,7 @@ return (
                     placeholder: "Role",
                     size: "lg",
                     options: state.answers.roles
-                      .filter((r) => r !== null && r !== "")
+                      .filter((r) => r !== null && r !== "" && r !== "all")
                       .map((r) => ({
                         title: r,
                         value: r

diff --git a/apps/astraplusplus/widget/CreateDAO/Step6.jsx b/apps/astraplusplus/widget/CreateDAO/Step6.jsx
@@ -216,11 +216,13 @@ return (
             }}
           />
         </div>
-        {state.members.Group && Array.isArray(state.members.Group)
-          ? state.members.Group.map((i) => (
-              <div className="border-bottom p-2">{i}</div>
-            ))
-          : state.members}
+        <div className="text-truncate w-100">
+          {state.members.Group && Array.isArray(state.members.Group)
+            ? state.members.Group.map((i) => (
+                <div className="border-bottom p-2">{i}</div>
+              ))
+            : state.members}
+        </div>
       </div>
       <div
         className="d-flex flex-column gap-2 p-4 flex-1"

diff --git a/apps/astraplusplus/widget/DAO/Members/MembersGroup.jsx b/apps/astraplusplus/widget/DAO/Members/MembersGroup.jsx
@@ -1,7 +1,7 @@
 const data = props.data;
 const policy = props.policy;
 const currentPage = props.page ?? 1;
-const resPerPage = props.resPerPage ?? 20;
+const resPerPage = props.resPerPage ?? 21;
 const isCongressDaoID = props.isCongressDaoID ?? false;
 const isVotingBodyDao = props.isVotingBodyDao ?? false;
 const accountId = props.accountId ?? context.accountId;
@@ -375,10 +375,10 @@ const Table = ({ title, tableData, showExpand }) => {
                   Spam Votes
                   <i class="bi bi-arrow-down"></i>
                 </th>
-                <th>
+                {/* <th>
                   Proposals <br />
                   Accepted/ Created
-                </th>
+                </th> */}
               </tr>
             </thead>
             <tbody style={{ position: "relative" }}>
@@ -389,14 +389,16 @@ const Table = ({ title, tableData, showExpand }) => {
               {tableData?.map((item) => {
                 return (
                   <tr className={isCongressDaoID && "opacity-low"}>
-                    <td>
-                      <Widget
-                        src="mob.near/widget/Profile.ShortInlineBlock"
-                        props={{
-                          accountId: item.account,
-                          tooltip: true
-                        }}
-                      />
+                    <td style={{ maxWidth: "300px" }}>
+                      <div className="text-truncate w-100">
+                        <Widget
+                          src="mob.near/widget/Profile.ShortInlineBlock"
+                          props={{
+                            accountId: item.account,
+                            tooltip: true
+                          }}
+                        />
+                      </div>
                     </td>
                     {state.selectedView === viewTypes.LIST && (
                       <td className="role-tag-td">
@@ -407,33 +409,13 @@ const Table = ({ title, tableData, showExpand }) => {
                     <td> {item.approve}</td>
                     <td> {item.rejected}</td>
                     <td>{item.spamVotes ?? 0}</td>
-                    <td>
+                    {/* <td>
                       {item.acceptedProposals} / {item.totalProposals}
-                    </td>
+                    </td> */}
                     <td className="d-flex gap-2 align-items-center">
-                      <Widget
-                        src="nearui.near/widget/Input.Button"
-                        props={{
-                          children: (
-                            <a
-                              href={`#//*__@appAccount__*//widget/home?page=votinghistory`}
-                              target="_blank"
-                              rel="noopener noreferrer"
-                              style={{
-                                color: "rgb(68, 152, 224)"
-                              }}
-                            >
-                              <i class="bi bi-clock-history"></i>
-                            </a>
-                          ),
-                          size: "sm",
-                          variant: "icon info outline"
-                        }}
-                      />
                       {/* we don't show propose to mint and remove for congress dao */}
                       {!isCongressDaoID && !isVotingBodyDao && (
                         <div className="d-flex gap-2 align-items-center">
-                          <ProposeToMintSBT itemDetails={item} />
                           <ProposeToRemove user={item.account} />
                         </div>
                       )}
@@ -928,35 +910,11 @@ return (
                             }}
                           ></div>
                           {!isCongressDaoID && !isVotingBodyDao && (
-                            <div className="d-flex justify-content-between">
-                              <ProposeToMintSBT itemDetails={item} />
+                            <div className="d-flex justify-content-center">
+                              {/* <ProposeToMintSBT itemDetails={item} /> */}
                               <ProposeToRemove user={item.account} />
                             </div>
                           )}
-                          <Widget
-                            src="nearui.near/widget/Input.Button"
-                            props={{
-                              buttonProps: {
-                                style: {
-                                  width: "inherit"
-                                }
-                              },
-                              children: (
-                                <a
-                                  href={`#//*__@appAccount__*//widget/home?page=votinghistory`}
-                                  target="_blank"
-                                  rel="noopener noreferrer"
-                                  style={{
-                                    color: "rgb(68, 152, 224)"
-                                  }}
-                                >
-                                  View Voting History
-                                </a>
-                              ),
-                              variant: "info outline",
-                              size: "sm"
-                            }}
-                          />
                         </div>
                       );
                     })}