diff --git a/.eslintignore b/.eslintignore index 290c9003..d1638636 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1 @@ -workspaces/ -build/ -apps/ \ No newline at end of file +build/ \ No newline at end of file diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 24085eb6..ff5383e0 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -30,9 +30,9 @@ jobs: cache: "yarn" - name: Install dependencies run: | - yarn add bos-workspace - npx playwright install-deps - npx playwright install + yarn add bos-workspace@1.0.0-alpha.32 + yarn playwright install-deps + yarn playwright install - name: Run tests run: | - npx playwright test \ No newline at end of file + yarn playwright test \ No newline at end of file diff --git a/.github/workflows/release-new-mainnet.yml b/.github/workflows/release-mainnet.yml similarity index 87% rename from .github/workflows/release-new-mainnet.yml rename to .github/workflows/release-mainnet.yml index a4304e0c..b7191df5 100644 --- a/.github/workflows/release-new-mainnet.yml +++ b/.github/workflows/release-mainnet.yml @@ -4,15 +4,15 @@ on: push: branches: [main] paths: - - apps/new/** + - widget/** jobs: - deploy-new-mainnet: + deploy-mainnet: uses: nearbuilders/bos-workspace/.github/workflows/deploy.yml@main with: deploy-env: "mainnet" bw-legacy: false - app-name: "new" + app-name: "builddao.near" deploy-account-address: "builddao.near" signer-account-address: "builddao.near" signer-public-key: "ed25519:ELLHoQ4DDwFCf8eHxcy1NDwd3qLvVzPxUzuXPBdX7cpQ" diff --git a/.github/workflows/release-old-mainnet.yml b/.github/workflows/release-old-mainnet.yml deleted file mode 100644 index 84144209..00000000 --- a/.github/workflows/release-old-mainnet.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Deploy Components to Mainnet - -on: - push: - branches: [main] - paths: - - apps/old/** - -jobs: - deploy-old-mainnet: - uses: nearbuilders/bos-workspace/.github/workflows/deploy.yml@main - with: - deploy-env: "mainnet" - bw-legacy: false - app-name: "old" - deploy-account-address: "buildhub.near" - signer-account-address: "buildhub.near" - signer-public-key: "ed25519:9xbjTrmijSb1WcGVimKULy132qND5r6GJjexmQCa6Jfy" - secrets: - SIGNER_PRIVATE_KEY: ${{ secrets.BOS_BUILDHUB_SIGNER_PRIVATE_KEY }} diff --git a/.github/workflows/release-old-testnet.yml b/.github/workflows/release-old-testnet.yml deleted file mode 100644 index c0173f7e..00000000 --- a/.github/workflows/release-old-testnet.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Deploy Components to Testnet - -on: - push: - branches: [develop] - paths: - - apps/old/** - -jobs: - deploy-old-testnet: - uses: nearbuilders/bos-workspace/.github/workflows/deploy.yml@main - with: - build-env: "testnet" - deploy-env: "testnet" - bw-legacy: false - app-name: "old" - deploy-account-address: "buildhub.testnet" - signer-account-address: "buildhub.testnet" - signer-public-key: "ed25519:C4PKraMoeA21tnKvPda2x4JtvYdQ8e7NFgr43hKnsSxe" - secrets: - SIGNER_PRIVATE_KEY: ${{ secrets.BOS_BUILDHUB_TESTNET_SIGNER_PRIVATE_KEY }} diff --git a/.github/workflows/release-new-testnet.yml b/.github/workflows/release-testnet.yml similarity index 88% rename from .github/workflows/release-new-testnet.yml rename to .github/workflows/release-testnet.yml index 8566f512..371975c6 100644 --- a/.github/workflows/release-new-testnet.yml +++ b/.github/workflows/release-testnet.yml @@ -4,16 +4,16 @@ on: push: branches: [develop] paths: - - apps/new/** + - widget/** jobs: - deploy-new-testnet: + deploy-testnet: uses: nearbuilders/bos-workspace/.github/workflows/deploy.yml@main with: build-env: "testnet" deploy-env: "testnet" bw-legacy: false - app-name: "new" + app-name: "builddao.testnet" deploy-account-address: "builddao.testnet" signer-account-address: "builddao.testnet" signer-public-key: "ed25519:6ycWXZES2zEGPurZqP35AUQx92aAzuS7r9ea1GcSQQiT" diff --git a/.gitignore b/.gitignore index e0ed2d14..f0798110 100644 --- a/.gitignore +++ b/.gitignore @@ -11,9 +11,7 @@ # production /build /dist - -# bos workspace -apps/builddao/data.json +data.json # misc .DS_Store diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 4468bab5..00000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "apps/devs.near"] - path = apps/devs.near - url = https://github.com/NEARBuilders/devs.near - branch = develop diff --git a/aliases.mainnet.json b/aliases.mainnet.json index 708cfe5e..8436c39c 100644 --- a/aliases.mainnet.json +++ b/aliases.mainnet.json @@ -6,5 +6,6 @@ "gateway_url": "https://nearbuilders.org", "new": "builddao.near", "old": "buildhub.near", - "potlock": "potlock.near" + "potlock": "potlock.near", + "every": "every.near" } diff --git a/aliases.testnet.json b/aliases.testnet.json index d09075f1..1ec8f40f 100644 --- a/aliases.testnet.json +++ b/aliases.testnet.json @@ -6,5 +6,6 @@ "gateway_url": "https://test.nearbuilders.org", "new": "builddao.testnet", "old": "buildhub.testnet", - "potlock": "potlock.testnet" + "potlock": "potlock.testnet", + "every": "allthethings.testnet" } diff --git a/apps/old/bos.config.json b/apps/old/bos.config.json deleted file mode 100644 index 52771c07..00000000 --- a/apps/old/bos.config.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "account": "buildhub.near", - "aliases": ["../../aliases.mainnet.json"], - "overrides": { - "testnet": { - "account": "buildhub.testnet", - "aliases": ["../../aliases.testnet.json"] - } - } -} diff --git a/apps/old/widget/MetadataEditor.jsx b/apps/old/widget/MetadataEditor.jsx deleted file mode 100644 index abfa6c67..00000000 --- a/apps/old/widget/MetadataEditor.jsx +++ /dev/null @@ -1,204 +0,0 @@ -const initialMetadata = props.initialMetadata ?? {}; -const onChange = props.onChange; -const options = props.options; - -State.init({ - initialMetadata, - metadata: initialMetadata, - reportedMetadata: initialMetadata, - linktree: initialMetadata.linktree ?? {}, - image: initialMetadata.image, - backgroundImage: initialMetadata.backgroundImage, - screenshots: initialMetadata.screenshots ?? {}, -}); - -const metadata = { - name: options.name ? state.metadata.name : undefined, - description: options.name ? state.metadata.description : undefined, - linktree: - options.linktree && Object.keys(state.linktree).length > 0 - ? state.linktree - : undefined, - image: - options.image && state.image && Object.keys(state.image).length > 0 - ? state.image - : undefined, - backgroundImage: - options.backgroundImage && - state.backgroundImage && - Object.keys(state.backgroundImage).length > 0 - ? state.backgroundImage - : undefined, - tags: options.tags ? state.metadata.tags : undefined, - screenshots: options.screenshots ? state.metadata.screenshots : undefined, -}; - -if ( - onChange && - JSON.stringify(state.reportedMetadata) !== JSON.stringify(metadata) -) { - State.update({ - reportedMetadata: metadata, - }); - onChange(metadata); -} - -const Container = styled.div` - color: #fff; -`; - -const CustomTagEditor = styled.div` - .form-control { - background: #23242b; - border: 1px solid rgba(255, 255, 255, 0.2); - } -`; - -const CustomImageUpload = styled.div` - .nav-link { - background: transparent; - color: #fff; - border: none; - } - - .nav.nav-tabs { - border: none; - } - - .nav-link.active { - color: #fff; - background: transparent; - border: 1px solid rgba(255, 255, 255, 0.2); - border-bottom: none; - } - - .p-2 { - border: none; - border: 1px solid rgba(255, 255, 255, 0.2) !important; - /* border-top: 0; */ - background: #23242b !important; - color: #fff !important; - } - - .form-control { - background: #23242b; - border: 1px solid rgba(255, 255, 255, 0.2); - } -`; - -return ( - - {options.name && ( -
- - -
- )} - {options.image && ( -
- - - State.update({ image }), - }} - /> - -
- )} - {options.backgroundImage && ( -
- - State.update({ backgroundImage }), - }} - /> -
- )} - {options.description && ( -
- - (supports markdown) -