Merge pull request #180 from NEARBuilders/develop

Projects
NEARBuilders · Apr 22, 2024 · 812f0d3 · 812f0d3
2 parents a04c38c + fd960a3
commit 812f0d3
Show file tree

Hide file tree

Showing 148 changed files with 5,627 additions and 5,349 deletions.
diff --git a/.github/workflows/release.yml → .github/workflows/release-mainnet.yml b/.github/workflows/release.yml → .github/workflows/release-mainnet.yml
@@ -9,6 +9,7 @@ jobs:
     uses: nearbuilders/bos-workspace/.github/workflows/deploy.yml@main
     with:
       deploy-env: "mainnet"
+      bw-legacy: false
       app-name: "builddao"
       deploy-account-address: ${{ vars.BOS_SIGNER_ACCOUNT_ID }}
       signer-account-address: ${{ vars.BOS_SIGNER_ACCOUNT_ID }}

diff --git a/.github/workflows/testnet.yml → .github/workflows/release-testnet.yml b/.github/workflows/testnet.yml → .github/workflows/release-testnet.yml
@@ -5,13 +5,15 @@ on:
     branches: [develop]
 
 jobs:
-  deploy-testnet:
+  deploy-staging:
     uses: nearbuilders/bos-workspace/.github/workflows/deploy.yml@main
     with:
+      build-env: "testnet"
       deploy-env: "testnet"
+      bw-legacy: false
       app-name: "builddao"
-      deploy-account-address: ${{ vars.BOS_TESTNET_SIGNER_ACCOUNT_ID }}
-      signer-account-address: ${{ vars.BOS_TESTNET_SIGNER_ACCOUNT_ID }}
-      signer-public-key: ${{ vars.BOS_TESTNET_SIGNER_PUBLIC_KEY }}
+      deploy-account-address: builddao.testnet
+      signer-account-address: builddao.testnet
+      signer-public-key: ed25519:6ycWXZES2zEGPurZqP35AUQx92aAzuS7r9ea1GcSQQiT
     secrets:
       SIGNER_PRIVATE_KEY: ${{ secrets.BOS_TESTNET_SIGNER_PRIVATE_KEY }}
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "apps/devs.near"]
+	path = apps/devs.near
+	url = https://github.com/NEARBuilders/devs.near
+	branch = develop
diff --git a/README.md b/README.md
@@ -1,28 +1,30 @@
-# Build DAO
+# Build DAO Gateway
 
 Let's connect, collaborate, and create solutions together!
 
+This repository holds the front-end widgets for [Build DAO Gateway](https://nearbuilders.org/). This project is configured as a [bos-workspace](https://github.com/nearbuilders/bos-workspace).
+
 ## Setup & Development
 
-Install packages:
+1. Initialize submodules and install packages:
 
-```
-yarn
+```cmd
+yarn run init
 ```
 
-Start development version:
+2. Start development version in mainnet:
 
-```
+```cmd
 yarn dev
 ```
 
-This will start both the gateway and http server for loading your local components.
+Or start the development version in testnet:
 
-To view your local developments, either visit them through a gateway ${gateway_url}/flags
-
-For example, to use this local gateway, use:
+```cmd
+yarn dev:testnet
+```
 
-- Set the flag (something like http://127.0.0.1:4040/api/loader) at localhost:3000/flags
+This will start a gateway at http://127.0.0.1:8080 which will render your local widgets. The entry point for this app is [buildhub.near/widget/app](http://127.0.0.1:8080/buildhub.near/widget/app).
 
 ### Community Page
 

diff --git a/apps/builddao/aliases.mainnet.json b/apps/builddao/aliases.mainnet.json
@@ -0,0 +1,6 @@
+{
+  "devs": "devs.near",
+  "mob": "mob.near",
+  "near": "near",
+  "socialdb": "social.near"
+}
diff --git a/apps/builddao/aliases.testnet.json b/apps/builddao/aliases.testnet.json
@@ -0,0 +1,6 @@
+{
+  "devs": "neardevs.testnet",
+  "mob": "mike.testnet",
+  "near": "discom.testnet",
+  "socialdb": "v1.social08.testnet"
+}
diff --git a/apps/builddao/bos.config.json b/apps/builddao/bos.config.json
@@ -1,3 +1,10 @@
 {
-  "appAccount": "buildhub.near"
+  "account": "buildhub.near",
+  "aliases": ["./aliases.mainnet.json"],
+  "overrides": {
+    "testnet": {
+      "account": "builddao.testnet",
+      "aliases": ["./aliases.testnet.json"]
+    }
+  }
 }
diff --git a/apps/builddao/data.json b/apps/builddao/data.json
@@ -0,0 +1,3 @@
+{
+  "buildhub.near": {}
+}
diff --git a/apps/builddao/widget/Comment/Comment.jsx b/apps/builddao/widget/Comment/Comment.jsx
@@ -19,7 +19,7 @@ const extractNotifyAccountId = (item) => {
   return `${accountId}/post/main` === item.path ? accountId : undefined;
 };
 
-const link = `/mob.near/widget/MainPage.N.Comment.Page?accountId=${accountId}&blockHeight=${blockHeight}${groupIdLinkPart}`;
+const link = `/${alias_mob}/widget/MainPage.N.Comment.Page?accountId=${accountId}&blockHeight=${blockHeight}${groupIdLinkPart}`;
 
 const item = {
   type: "social",
@@ -231,7 +231,7 @@ return (
       <div className="right">
         <div className="mb-3">
           <Widget
-            src="buildhub.near/widget/components.post.Header"
+            src="${config_account}/widget/components.post.Header"
             props={{
               accountId,
               blockHeight,
@@ -248,7 +248,7 @@ return (
               style={{ minHeight: "100px" }}
             />
           }
-          src="mob.near/widget/MainPage.N.Post.Content"
+          src="${alias_mob}/widget/MainPage.N.Post.Content"
           props={{ content, raw }}
         />
         {blockHeight !== "now" ? (
@@ -257,7 +257,7 @@ return (
               <div key="comment">
                 <Widget
                   loading=""
-                  src="mob.near/widget/N.CommentButton"
+                  src="${alias_mob}/widget/N.CommentButton"
                   props={{
                     disabled: permissions.disableComment,
                     onClick: () =>
@@ -268,23 +268,23 @@ return (
             )}
             <Widget
               loading=""
-              src="mob.near/widget/N.RepostButton"
+              src="${alias_mob}/widget/N.RepostButton"
               props={{
                 item,
                 disabled: true,
               }}
             />
             <Widget
               loading=""
-              src="mob.near/widget/N.LikeButton"
+              src="${alias_mob}/widget/N.LikeButton"
               props={{
                 notifyAccountId,
                 item,
               }}
             />
             <Widget
               loading=""
-              src="mob.near/widget/MainPage.N.Post.ShareButton"
+              src="${alias_mob}/widget/MainPage.N.Post.ShareButton"
               props={{ accountId, blockHeight, postType: "comment", groupId }}
             />
           </div>
@@ -296,7 +296,7 @@ return (
     {state.showReply && (
       <div className="mb-2" key="reply">
         <Widget
-          src="buildhub.near/widget/Comment.Compose"
+          src="${config_account}/widget/Comment.Compose"
           props={{
             initialText: `@${accountId}, `,
             notifyAccountId: extractNotifyAccountId(parentItem),

diff --git a/apps/builddao/widget/Comment/Compose.jsx b/apps/builddao/widget/Comment/Compose.jsx
@@ -73,7 +73,7 @@ State.init({
 return (
   <>
     <Widget
-      src="devs.near/widget/Common.Compose"
+      src="${alias_devs}/widget/Common.Compose"
       props={{
         placeholder: "Reply",
         initialText: props.initialText,
@@ -125,7 +125,7 @@ return (
       <div className="px-3">
         <Widget
           key="post-preview"
-          src="buildhub.near/widget/Comment.Comment"
+          src="${config_account}/widget/Comment.Comment"
           props={{
             item,
             accountId: context.accountId,

diff --git a/apps/builddao/widget/Comment/Feed.jsx b/apps/builddao/widget/Comment/Feed.jsx
@@ -18,7 +18,7 @@ const renderItem = (a) =>
     <Widget
       key={JSON.stringify(a)}
       loading={<div className="w-100 mb-2" style={{ minHeight: "200px" }} />}
-      src="buildhub.near/widget/Comment.Comment"
+      src="${config_account}/widget/Comment.Comment"
       props={{
         accountId: a.accountId,
         blockHeight: a.blockHeight,
@@ -56,7 +56,7 @@ const ShowMore = styled.div`
 return (
   <Widget
     loading={false}
-    src="mob.near/widget/FilteredIndexFeed"
+    src="${alias_mob}/widget/FilteredIndexFeed"
     props={{
       loading: false,
       index,

diff --git a/apps/builddao/widget/Compose.jsx b/apps/builddao/widget/Compose.jsx
@@ -1,4 +1,4 @@
-const { Button } = VM.require("buildhub.near/widget/components") || {
+const { Button } = VM.require("${config_account}/widget/components") || {
   Button: () => <></>,
 };
 
@@ -102,7 +102,7 @@ return (
     >
       <div>
         <Widget
-          src="devs.near/widget/Common.Compose"
+          src="${alias_devs}/widget/Common.Compose"
           props={{
             placeholder: "What's happening?",
             onChange: state.onChange,
@@ -159,7 +159,7 @@ return (
         <div className="px-3">
           <Widget
             key="post-preview"
-            src="buildhub.near/widget/components.Post"
+            src="${config_account}/widget/components.Post"
             props={{
               accountId: context.accountId,
               content: state.content || { type: "md", text: "" },
@@ -171,7 +171,7 @@ return (
       )}
     </div>
     <Widget
-      src="near/widget/DIG.Toast"
+      src="${alias_near}/widget/DIG.Toast"
       props={{
         title: "Post Submitted Successfully",
         type: "success",

diff --git a/apps/builddao/widget/Feed.jsx b/apps/builddao/widget/Feed.jsx
@@ -1,11 +1,11 @@
-const { Feed } = VM.require("devs.near/widget/Feed") || {
+const { Feed } = VM.require("${alias_devs}/widget/Feed") || {
   Feed: () => <></>,
 };
-const { Post, Button } = VM.require("buildhub.near/widget/components") || {
+const { Post, Button } = VM.require("${config_account}/widget/components") || {
   Post: () => <></>,
   Button: () => <></>,
 };
-const { Header } = VM.require("buildhub.near/widget/components.Header") || {
+const { Header } = VM.require("${config_account}/widget/components.Header") || {
   Header: () => <></>,
 };
 
@@ -26,7 +26,7 @@ const LoginContainer = styled.div`
   margin-bottom: 1rem;
 `;
 
-const { name: feedName, template, requiredHashtags, customActions } = props;
+const { feedName, template, requiredHashtags, customActions } = props;
 
 // for modals
 const [item, setItem] = useState(null);
@@ -56,7 +56,7 @@ return (
     <Header>{feedName} Feed</Header>
     {/* Modals */}
     <Widget
-      src="buildhub.near/widget/components.modals.CreateProposal"
+      src="${config_account}/widget/components.modals.CreateProposal"
       loading=""
       props={{
         showModal: showProposeModal,
@@ -82,7 +82,7 @@ return (
             style={{ height: 400 }}
           ></div>
         }
-        src="buildhub.near/widget/Compose"
+        src="${config_account}/widget/Compose"
         props={{
           draftKey: feedName,
           template: template,
@@ -110,7 +110,7 @@ return (
           accountId={p.accountId}
           blockHeight={p.blockHeight}
           noBorder={true}
-          currentPath={`/buildhub.near/widget/app?page=feed`}
+          currentPath={`/${config_account}/widget/app?page=feed`}
           customActions={customActions}
           modalToggles={modalToggles}
           setItem={setItem}

diff --git a/apps/builddao/widget/MetadataEditor.jsx b/apps/builddao/widget/MetadataEditor.jsx
@@ -109,7 +109,7 @@ return (
         </label>
         <CustomImageUpload>
           <Widget
-            src="mob.near/widget/ImageEditorTabs"
+            src="${alias_mob}/widget/ImageEditorTabs"
             props={{
               image: state.image,
               onChange: (image) => State.update({ image }),
@@ -124,7 +124,7 @@ return (
           {options.backgroundImage.label ?? "Background image"}
         </label>
         <Widget
-          src="mob.near/widget/ImageEditorTabs"
+          src="${alias_mob}/widget/ImageEditorTabs"
           props={{
             image: state.backgroundImage,
             onChange: (backgroundImage) => State.update({ backgroundImage }),
@@ -158,7 +158,7 @@ return (
       <CustomTagEditor className="mb-3">
         <label className="mb-2">{options.tags.label ?? "Tags"}</label>
         <Widget
-          src="mob.near/widget/TagsEditor"
+          src="${alias_mob}/widget/TagsEditor"
           props={{
             initialTagsObject: metadata.tags,
             tagsPattern: options.tags.pattern,

diff --git a/apps/builddao/widget/N/Compose.jsx b/apps/builddao/widget/N/Compose.jsx
@@ -94,7 +94,7 @@ return (
   >
     <div>
       <Widget
-        src="devs.near/widget/Common.Compose"
+        src="${alias_devs}/widget/Common.Compose"
         props={{
           placeholder: "What's happening?",
           onChange: state.onChange,
@@ -147,7 +147,7 @@ return (
       <div className="px-3">
         <Widget
           key="post-preview"
-          src="buildhub.near/widget/components.Post"
+          src="${config_account}/widget/components.Post"
           props={{
             accountId: context.accountId,
             content: state.content || { type: "md", text: "" },

diff --git a/apps/builddao/widget/Notification/Item/Left.jsx b/apps/builddao/widget/Notification/Item/Left.jsx
@@ -1,5 +1,5 @@
-const { href } = VM.require("buildhub.near/widget/lib.url") || {
-  href: () => {}
+const { href } = VM.require("${config_account}/widget/lib.url") || {
+  href: () => {},
 };
 
 if (!props.type) {

diff --git a/apps/builddao/widget/Notification/Item/Right.jsx b/apps/builddao/widget/Notification/Item/Right.jsx
@@ -1,5 +1,5 @@
-const { href } = VM.require("buildhub.near/widget/lib.url") || {
-  href: () => {}
+const { href } = VM.require("${config_account}/widget/lib.url") || {
+  href: () => {},
 };
 
 if (!props.type) {
@@ -15,8 +15,8 @@ return (
         page: props.page,
         proposalId: props.params.proposalId,
         tab: props.params.tab,
-        daoId: props.params.daoId
-      }
+        daoId: props.params.daoId,
+      },
     })}
   >
     View

diff --git a/apps/builddao/widget/Notification/Item/buildhub.jsx b/apps/builddao/widget/Notification/Item/buildhub.jsx
@@ -2,21 +2,21 @@ const { value } = props;
 
 return (
   <Widget
-    src="mob.near/widget/Notification.Item.LR"
+    src="${alias_mob}/widget/Notification.Item.LR"
     props={{
       L: (
         <Widget
-          src="buildhub.near/widget/notification.Item.Left"
+          src="${config_account}/widget/notification.Item.Left"
           props={{ ...value }}
         />
       ),
       R: (
         <Widget
-          src="buildhub.near/widget/notification.Item.Right"
+          src="${config_account}/widget/notification.Item.Right"
           props={{ ...value }}
         />
       ),
-      ...props
+      ...props,
     }}
   />
 );