Merge pull request #572 from PotLock/refactor/bw-v1

Upgrades to bos-workspace v1
PotLock · May 20, 2024 · ab5a6b5 · ab5a6b5
2 parents f2927f3 + 3db39c7
commit ab5a6b5
Show file tree

Hide file tree

Showing 111 changed files with 1,103 additions and 4,183 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -14,11 +14,11 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 20
-          cache: "npm"
+          cache: "yarn"
       - name: Install dependencies
-        run: npm ci
+        run: yarn install --frozen-lockfile
       - name: Run code formatting check
-        run: npm run fmt:check
+        run: yarn run fmt:check
   playwright-tests:
     name: Playwright tests
     runs-on: ubuntu-latest
@@ -27,11 +27,10 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 20
-          cache: "npm"
+          cache: "yarn"
       - name: Install dependencies
         run: |
-          npm ci
-          npm install bos-workspace
+          yarn add bos-workspace
           npx playwright install-deps
           npx playwright install
       - name: Run tests

diff --git a/README.md b/README.md
@@ -7,16 +7,16 @@ This repository holds the front-end widgets for [PotLock](https://app.potlock.or
 1. Install packages
 
 ```cmd
-npm install
+yarn install
 ```
 
 2. Start dev environment
 
 ```cmd
-npm run dev
+yarn dev
 ```
 
-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 [potlock.near/widget/Index](http://127.0.0.1:8080/potlock.near/widget/Index).
+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 [potlock.near/widget/Index](http://127.0.0.1:8080/potlock.near/widget/Index).
 
 ## Testing framework
 

diff --git a/apps/potlock/aliases.mainnet.json b/apps/potlock/aliases.mainnet.json
@@ -0,0 +1,8 @@
+{
+  "potlock_new": "potlock.near",
+  "devs": "devs.near",
+  "mob": "mob.near",
+  "near": "near",
+  "socialdb": "social.near",
+  "gateway_url": "https://nearbuilders.org"
+}
diff --git a/apps/potlock/aliases.testnet.json b/apps/potlock/aliases.testnet.json
@@ -0,0 +1,8 @@
+{
+  "potlock_new": "potlock.testnet",
+  "devs": "neardevs.testnet",
+  "mob": "mike.testnet",
+  "near": "discom.testnet",
+  "socialdb": "v1.social08.testnet",
+  "gateway_url": "https://test.nearbuilders.org"
+}
diff --git a/apps/potlock/bos.config.json b/apps/potlock/bos.config.json
@@ -1,3 +1,10 @@
 {
-  "appAccount": "potlock.near"
+  "account": "old.potlock.near",
+  "aliases": ["./aliases.mainnet.json"],
+  "overrides": {
+    "testnet": {
+      "account": "old.potlock.testnet",
+      "aliases": ["./aliases.testnet.json"]
+    }
+  }
 }
diff --git a/apps/potlock/data.json b/apps/potlock/data.json
@@ -0,0 +1,3 @@
+{
+  "old.potlock.near": {}
+}
diff --git a/apps/potlock/widget/Cart/AddToCart.jsx b/apps/potlock/widget/Cart/AddToCart.jsx
@@ -1,7 +1,7 @@
 const { handleCallback, item, text } = props;
 
 const { addItemsToCart, removeItemsFromCart, itemExistsInCart } = VM.require(
-  "potlock.near/widget/SDK.cart"
+  "${config_account}/widget/SDK.cart"
 ) ?? {
   addItemsToCart: () => {},
   removeItemsFromCart: () => {},
@@ -12,7 +12,7 @@ const existsInCart = itemExistsInCart(item);
 
 return (
   <Widget
-    src={"potlock.near/widget/Components.Button"}
+    src={"${config_account}/widget/Components.Button"}
     props={{
       type: "tertiary",
       text: text || (existsInCart ? "Remove from cart" : "Add to cart"),

diff --git a/apps/potlock/widget/Cart/BreakdownSummary.jsx b/apps/potlock/widget/Cart/BreakdownSummary.jsx
@@ -9,16 +9,16 @@ const {
   chef,
   chefFeeBasisPoints,
 } = props;
-const { basisPointsToPercent } = VM.require("potlock.near/widget/utils") || {
+const { basisPointsToPercent } = VM.require("${config_account}/widget/utils") || {
   basisPointsToPercent: () => 0,
 };
 
-const { SUPPORTED_FTS } = VM.require("potlock.near/widget/constants") || {
+const { SUPPORTED_FTS } = VM.require("${config_account}/widget/constants") || {
   SUPPORTED_FTS: {},
 };
 
 let DonateSDK =
-  VM.require("potlock.near/widget/SDK.donate") ||
+  VM.require("${config_account}/widget/SDK.donate") ||
   (() => ({
     getConfig: () => {},
   }));

diff --git a/apps/potlock/widget/Cart/CartModalItem.jsx b/apps/potlock/widget/Cart/CartModalItem.jsx
@@ -63,7 +63,7 @@ if (!profile) return "";
 return (
   <ItemContainer>
     <Widget
-      src="mob.near/widget/ProfileImage"
+      src="${alias_mob}/widget/ProfileImage"
       props={{
         accountId: props.projectId,
         style: {

diff --git a/apps/potlock/widget/Cart/Checkout.jsx b/apps/potlock/widget/Cart/Checkout.jsx
@@ -5,7 +5,7 @@ const IPFS_BASE_URL = "https://nftstorage.link/ipfs/";
 //   IPFS_BASE_URL + "bafkreifuvrxly3wuy4xdmavmdeb2o47nv6pzxwz3xmy6zvkxv76e55lj3y";
 
 const { getCart, getCartItemCount, removeItemsFromCart } = VM.require(
-  "potlock.near/widget/SDK.cart"
+  "${config_account}/widget/SDK.cart"
 ) || {
   getCart: () => {},
   getCartItemCount: () => 0,
@@ -220,7 +220,7 @@ const twitterIntent = useMemo(() => {
   const twitterIntentBase = "https://twitter.com/intent/tweet?text=";
 
   // if more than one recipient, share the Explore Projects page; otherwise, share the project page
-  let url = DEFAULT_GATEWAY + `potlock.near/widget/Index?referrerId=${context.accountId}`;
+  let url = DEFAULT_GATEWAY + `${config_account}/widget/Index?referrerId=${context.accountId}`;
   if (recipientIds.length === 1) {
     url = url + `&tab=project&projectId=${recipientIds[0]}`;
   } else {
@@ -273,7 +273,7 @@ return (
         <Title>Thanks for donating!</Title>
         {twitterIntent && (
           <Widget
-            src={"potlock.near/widget/Components.Button"}
+            src={"${config_account}/widget/Components.Button"}
             props={{
               href: twitterIntent,
               target: "_blank",
@@ -287,7 +287,7 @@ return (
           />
         )}
         <Widget
-          src={"potlock.near/widget/Components.Button"}
+          src={"${config_account}/widget/Components.Button"}
           props={{
             href: props.hrefWithParams(`?tab=projects`),
             type: twitterIntent ? "secondary" : "primary",
@@ -307,7 +307,7 @@ return (
         ) : (
           props.checkoutSuccessTxHash && (
             <Widget
-              src={"potlock.near/widget/Components.Button"}
+              src={"${config_account}/widget/Components.Button"}
               props={{
                 href: `https://nearblocks.io/txns/${props.checkoutSuccessTxHash}`,
                 target: "_blank",
@@ -329,7 +329,7 @@ return (
           <ActionsContainer>
             <InnerContainer>
               <Widget
-                src={"potlock.near/widget/Inputs.Checkbox"}
+                src={"${config_account}/widget/Inputs.Checkbox"}
                 props={{
                   id: "masterSelector",
                   disabled: numCartItems === 0,
@@ -380,7 +380,7 @@ return (
               const checked = state.selectedProjectIds.includes(projectId);
               return (
                 <Widget
-                  src={"potlock.near/widget/Cart.CheckoutItem"}
+                  src={"${config_account}/widget/Cart.CheckoutItem"}
                   props={{
                     ...props,
                     cartItem: cart[projectId],
@@ -413,7 +413,7 @@ return (
         </ColumnLeft>
         <ColumnRight>
           <Widget
-            src={"potlock.near/widget/Cart.CheckoutBreakdown"}
+            src={"${config_account}/widget/Cart.CheckoutBreakdown"}
             props={{
               ...props,
               projectId: projectId,

diff --git a/apps/potlock/widget/Cart/CheckoutBreakdown.jsx b/apps/potlock/widget/Cart/CheckoutBreakdown.jsx
@@ -1,21 +1,21 @@
-const { yoctosToNear } = VM.require("potlock.near/widget/utils") || { yoctosToNear: () => "" };
-const { SUPPORTED_FTS } = VM.require("potlock.near/widget/constants") || {
+const { yoctosToNear } = VM.require("${config_account}/widget/utils") || { yoctosToNear: () => "" };
+const { SUPPORTED_FTS } = VM.require("${config_account}/widget/constants") || {
   SUPPORTED_FTS: {},
 };
 
-const { getCart, clearCart } = VM.require("potlock.near/widget/SDK.cart") || {
+const { getCart, clearCart } = VM.require("${config_account}/widget/SDK.cart") || {
   getCart: () => {},
   clearCart: () => {},
 };
 
 const cart = getCart();
 
-const PotSDK = VM.require("potlock.near/widget/SDK.pot") || {
+const PotSDK = VM.require("${config_account}/widget/SDK.pot") || {
   asyncGetDonationsForDonor: () => {},
 };
 
 let DonateSDK =
-  VM.require("potlock.near/widget/SDK.donate") ||
+  VM.require("${config_account}/widget/SDK.donate") ||
   (() => ({
     asyncGetDonationsForDonor: () => {},
     getContractId: () => "",
@@ -280,7 +280,7 @@ return (
         </TotalContainer>
       )}
     <Widget
-      src={"potlock.near/widget/Components.Button"}
+      src={"${config_account}/widget/Components.Button"}
       props={{
         type: "primary",
         text: `Process Donation`,

diff --git a/apps/potlock/widget/Cart/CheckoutItem.jsx b/apps/potlock/widget/Cart/CheckoutItem.jsx
@@ -1,11 +1,13 @@
-const { basisPointsToPercent } = VM.require("potlock.near/widget/utils") || {
+const { basisPointsToPercent } = VM.require("${config_account}/widget/utils") || {
   basisPointsToPercent: () => 0,
 };
-const { SUPPORTED_FTS } = VM.require("potlock.near/widget/constants") || {
+const { SUPPORTED_FTS } = VM.require("${config_account}/widget/constants") || {
   SUPPORTED_FTS: {},
 };
 
-const { removeItemsFromCart, updateItemInCart } = VM.require("potlock.near/widget/SDK.cart") || {
+const { removeItemsFromCart, updateItemInCart } = VM.require(
+  "${config_account}/widget/SDK.cart"
+) || {
   removeItemsFromCart: () => {},
   updateItemInCart: () => {},
 };
@@ -171,7 +173,7 @@ return (
   <ItemContainer>
     <ItemLeft>
       <Widget
-        src={"potlock.near/widget/Inputs.Checkbox"}
+        src={"${config_account}/widget/Inputs.Checkbox"}
         props={{
           id: "selector-" + projectId,
           checked,
@@ -182,7 +184,7 @@ return (
     <ItemRight>
       <ImageContainer>
         <Widget
-          src="mob.near/widget/ProfileImage"
+          src="${alias_mob}/widget/ProfileImage"
           props={{
             accountId: projectId,
             style: {
@@ -203,7 +205,7 @@ return (
             {profile.name ?? ""}
           </Title>
           <Widget
-            src={"potlock.near/widget/Pots.Tag"}
+            src={"${config_account}/widget/Pots.Tag"}
             props={{
               ...props,
               backgroundColor: isPotDonation ? "#FEF6EE" : "#F6F5F3",
@@ -219,7 +221,7 @@ return (
         </Row>
         <Description>{profile.description ?? ""}</Description>
         <Widget
-          src={"potlock.near/widget/Inputs.Text"}
+          src={"${config_account}/widget/Inputs.Text"}
           props={{
             label: "Amount",
             placeholder: "0",
@@ -241,7 +243,7 @@ return (
             },
             preInputChildren: (
               <Widget
-                src={"potlock.near/widget/Inputs.Select"}
+                src={"${config_account}/widget/Inputs.Select"}
                 props={{
                   noLabel: true,
                   placeholder: "",
@@ -277,7 +279,7 @@ return (
           }}
         />
         <Widget
-          src={"potlock.near/widget/Cart.BreakdownSummary"}
+          src={"${config_account}/widget/Cart.BreakdownSummary"}
           props={{
             ...props,
             ftIcon: itemToken.icon,

diff --git a/apps/potlock/widget/Cart/Modal.jsx b/apps/potlock/widget/Cart/Modal.jsx
@@ -1,5 +1,5 @@
 const { getCartItemCount, getCart, removeItemsFromCart } = VM.require(
-  "potlock.near/widget/SDK.cart"
+  "${config_account}/widget/SDK.cart"
 ) ?? {
   getCartItemCount: () => 0,
   getCart: () => {},
@@ -131,7 +131,7 @@ const CartModal = ({ Trigger }) => {
               (Object.keys(cart) ?? []).map((projectId) => {
                 return (
                   <Widget
-                    src={"potlock.near/widget/Cart.CartModalItem"}
+                    src={"${config_account}/widget/Cart.CartModalItem"}
                     props={{
                       ...props,
                       projectId,
@@ -148,13 +148,13 @@ const CartModal = ({ Trigger }) => {
             )}
             <ButtonContainer>
               <Widget
-                src={"potlock.near/widget/Components.Button"}
+                src={"${config_account}/widget/Components.Button"}
                 props={{
                   type: "primary",
                   text: "Proceed to donate",
                   disabled: numCartItems === 0,
                   href: href({
-                    widgetSrc: "potlock.near/widget/Index",
+                    widgetSrc: "${config_account}/widget/Index",
                     params: { tab: "cart", referrerId: props.referrerId },
                   }),
                   style: {
@@ -164,7 +164,7 @@ const CartModal = ({ Trigger }) => {
                 }}
               />
               <Widget
-                src={"potlock.near/widget/Components.Button"}
+                src={"${config_account}/widget/Components.Button"}
                 props={{
                   type: numCartItems === 0 ? "primary" : "secondary",
                   text: "Continue shopping",

diff --git a/apps/potlock/widget/Cart/NavItem.jsx b/apps/potlock/widget/Cart/NavItem.jsx
@@ -1,8 +1,8 @@
-const { getCartItemCount } = VM.require("potlock.near/widget/SDK.cart") ?? {
+const { getCartItemCount } = VM.require("${config_account}/widget/SDK.cart") ?? {
   getCartItemCount: () => 0,
 };
 
-const { CartModal } = VM.require("potlock.near/widget/Cart.Modal") ?? {
+const { CartModal } = VM.require("${config_account}/widget/Cart.Modal") ?? {
   CartModal: () => <></>,
 };
 

diff --git a/apps/potlock/widget/Components/AccountsList.jsx b/apps/potlock/widget/Components/AccountsList.jsx
@@ -49,7 +49,7 @@ return (
         <MembersListItem>
           <MembersListItemLeft>
             <Widget
-              src="mob.near/widget/ProfileImage"
+              src="${alias_mob}/widget/ProfileImage"
               props={{
                 accountId,
                 style: {

diff --git a/apps/potlock/widget/Components/AccountsStack.jsx b/apps/potlock/widget/Components/AccountsStack.jsx
@@ -46,7 +46,7 @@ return (
     {accounts.map((accountId, idx) => {
       return (
         <Widget
-          src="mob.near/widget/ProfileImage"
+          src="${alias_mob}/widget/ProfileImage"
           props={{
             accountId,
             style: {

diff --git a/apps/potlock/widget/Components/Banner.jsx b/apps/potlock/widget/Components/Banner.jsx
@@ -1,10 +1,10 @@
 let PotFactorySDK =
-  VM.require("potlock.near/widget/SDK.potfactory") ||
+  VM.require("${config_account}/widget/SDK.potfactory") ||
   (() => ({
     getPots: () => {},
   }));
 
-const PotSDK = VM.require("potlock.near/widget/SDK.pot") || {
+const PotSDK = VM.require("${config_account}/widget/SDK.pot") || {
   asyncGetConfig: () => {},
 };