Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade develop to main #385

Merged
merged 49 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
5e326a9
Landing page (#290)
saadiqbal-dev May 16, 2024
af1bdd1
Ft: New `buildhub` app (#303)
Megha-Dev-19 May 17, 2024
942fdfb
Fix: builddao.testnet public key
elliotBraem May 17, 2024
64f6b0f
small change to trigger build
elliotBraem May 17, 2024
66a2d4f
small change to trigger build
elliotBraem May 17, 2024
07b8e9c
fix: gateway reference in testnet
elliotBraem May 17, 2024
6df0869
Fix notification issues (#304)
itexpert120 May 20, 2024
2b4cb90
Added commit modal bypass for all (#313)
Jikugodwill May 21, 2024
a351f1c
App.js formatting fix
itexpert120 May 21, 2024
d55b47b
Fix: Propose UI stuck partway through process (#302)
Eren-Yeaager May 21, 2024
0c95cab
Initialize with essential routes (#312)
itexpert120 May 21, 2024
31e50d4
Test button Fix (#315)
Eren-Yeaager May 21, 2024
d79a0af
rename vertical
elliotBraem May 22, 2024
aedce5b
fix codeowners
elliotBraem May 23, 2024
519a5a8
Projects feed new (#319)
itexpert120 May 27, 2024
82390ee
fix-network-links (#323)
Megha-Dev-19 May 27, 2024
f6ca536
Resource page new (#325)
saadiqbal-dev May 28, 2024
c83ead3
Remaining Projects Routes (#328)
itexpert120 May 30, 2024
3a628bd
Project-new (#329)
Jikugodwill May 30, 2024
c9f9baa
Navigation new (#331)
itexpert120 May 30, 2024
7feb01f
Notifications Page (#336)
saadiqbal-dev Jun 1, 2024
a9ee026
Tests for Login and Logout (#333)
Eren-Yeaager Jun 1, 2024
fe80a25
Resource page new (#335)
saadiqbal-dev Jun 1, 2024
f487e09
Move activity to new app pattern (#337)
itexpert120 Jun 3, 2024
ba97eef
Move create project to separate page, edit support and refactoring (#…
Megha-Dev-19 Jun 4, 2024
0fd04aa
Fixed task editor and minor UI updates (#339)
Megha-Dev-19 Jun 4, 2024
56033bc
Fix projects visibility on testnet (#342)
Megha-Dev-19 Jun 4, 2024
d6c7e27
Convert starredProjects to star (#346)
elliotBraem Jun 5, 2024
618174b
sets new index (#344)
elliotBraem Jun 5, 2024
0bd247c
yarn.lock
elliotBraem Jun 5, 2024
e710dc1
update bos-workspace
elliotBraem Jun 5, 2024
e854992
downgrade to .20
elliotBraem Jun 5, 2024
79368f6
latest
elliotBraem Jun 5, 2024
63b6889
bos-workspace no bos-cli
elliotBraem Jun 5, 2024
ff85ea5
Add feed to project page (#356)
itexpert120 Jun 6, 2024
b11bf24
Fix search in projects (#359)
itexpert120 Jun 6, 2024
29279bc
Project creation form fixes (#360)
itexpert120 Jun 10, 2024
c0d03ca
Fix projects bugs (#364)
Megha-Dev-19 Jun 10, 2024
c0f67fb
Add form bounty template
heroes-bounty[bot] Jun 10, 2024
fb22f21
Image uploader module (#361)
Eren-Yeaager Jun 11, 2024
eafe4a4
run prettier format on commit (#369)
Megha-Dev-19 Jun 11, 2024
801ad4b
Responsiveness and Adding Missing Pages (#365)
saadiqbal-dev Jun 11, 2024
1b5ef70
Fix red flashes, init to [] rather than {} and hide open roles (#370)
elliotBraem Jun 11, 2024
835abf6
Fix red flash (#371)
elliotBraem Jun 11, 2024
297fec3
Move proposals related files and fix notification roles selector (#377)
Megha-Dev-19 Jun 12, 2024
a456139
Fixes authentication tests (#381)
elliotBraem Jun 12, 2024
cd4c5ca
Refactors Project Card (#382)
elliotBraem Jun 13, 2024
7066d01
Landing Page Refactor (#383)
saadiqbal-dev Jun 14, 2024
9e615cd
Merge branch 'main' into develop
elliotBraem Jun 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 131 additions & 0 deletions .github/ISSUE_TEMPLATE/BOUNTY.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
name: "Simple Bounty"
description: "Use this template to create a HEROES Simple Bounty via Github bot"
title: "Bounty: "
labels: ["bounty"]
assignees: heroes-bot-test
body:
- type: markdown
attributes:
value: |
Hi! Let's set up your bounty! Please don't change the template - @heroes-bot-test won't be able to help you.

- type: dropdown
id: type
attributes:
label: What talent are you looking for?
options:
- Marketing
- Development
- Design
- Other
- Content
- Research
- Audit

- type: textarea
id: description
attributes:
label: What you need to be done?

- type: dropdown
id: tags
attributes:
label: Tags
description: Add tags that match the topic of the work
multiple: true
options:
- API
- Blockchain
- Community
- CSS
- DAO
- dApp
- DeFi
- Design
- Documentation
- HTML
- Javascript
- NFT
- React
- Rust
- Smart contract
- Typescript
- UI/UX
- web3
- Translation
- Illustration
- Branding
- Copywriting
- Blogging
- Editing
- Video Creation
- Social Media
- Graphic Design
- Transcription
- Product Design
- Artificial Intelligence
- Quality Assurance
- Risk Assessment
- Security Audit
- Bug Bounty
- Code Review
- Blockchain Security
- Smart Contract Testing
- Penetration Testing
- Vulnerability Assessment
- BOS
- News
- Hackathon
- NEARCON2023
- NEARWEEK

- type: input
id: deadline
attributes:
label: Deadline
description: "Set a deadline for your bounty. Please enter the date in format: DD.MM.YYYY"
placeholder: "19.05.2027"

- type: dropdown
id: currencyType
attributes:
label: Currency
description: What is the currency you want to pay?
options:
- USDC.e
- USDT.e
- DAI
- wNEAR
- USDt
- XP
- marmaj
- NEKO
- JUMP
- USDC
- NEARVIDIA
default: 0
validations:
required: true

- type: input
id: currencyAmount
attributes:
label: Amount
description: How much it will be cost?

- type: markdown
attributes:
value: "## Advanced settings"

- type: checkboxes
id: kyc
attributes:
label: KYC
description: "Use HEROES' KYC Verification, only applicants who passed HEROES' KYC can apply and work on this bounty!"
options:
- label: Use KYC Verification

- type: markdown
attributes:
value: |
### This cannot be changed once the bounty is live!
18 changes: 0 additions & 18 deletions .github/workflows/release-mainnet.yml

This file was deleted.

20 changes: 20 additions & 0 deletions .github/workflows/release-new-mainnet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Deploy Components to Mainnet

on:
push:
branches: [main]
paths:
- apps/new/**

jobs:
deploy-new-mainnet:
uses: nearbuilders/bos-workspace/.github/workflows/deploy.yml@main
with:
deploy-env: "mainnet"
bw-legacy: false
app-name: "new"
deploy-account-address: "builddao.near"
signer-account-address: "builddao.near"
signer-public-key: ""
secrets:
SIGNER_PRIVATE_KEY: ${{ secrets.BOS_BUILDDAO_SIGNER_PRIVATE_KEY }}
21 changes: 21 additions & 0 deletions .github/workflows/release-new-testnet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Deploy Components to Testnet

on:
push:
branches: [develop]
paths:
- apps/new/**

jobs:
deploy-new-testnet:
uses: nearbuilders/bos-workspace/.github/workflows/deploy.yml@main
with:
build-env: "testnet"
deploy-env: "testnet"
bw-legacy: false
app-name: "new"
deploy-account-address: "builddao.testnet"
signer-account-address: "builddao.testnet"
signer-public-key: "ed25519:6ycWXZES2zEGPurZqP35AUQx92aAzuS7r9ea1GcSQQiT"
secrets:
SIGNER_PRIVATE_KEY: ${{ secrets.BOS_BUILDDAO_TESTNET_SIGNER_PRIVATE_KEY }}
20 changes: 20 additions & 0 deletions .github/workflows/release-old-mainnet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
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 }}
21 changes: 21 additions & 0 deletions .github/workflows/release-old-testnet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
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 }}
19 changes: 0 additions & 19 deletions .github/workflows/release-testnet.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ yarn-error.log*
target
neardev
data.json
/test-results
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Change Log

## Version v1.x.x - 2024-MM-DD

### Features

- Enabled commit modal bypass. #260

### Bug Fixes

-

### Refactor and chores

-

## Version v1.0.0 - 2024-05-14

### Features
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
- @Megha-Dev-19 @itexpert120 @Jikugodwill @elliotBraem @saadiqbal-dev
* @Megha-Dev-19 @itexpert120 @Jikugodwill @elliotBraem @saadiqbal-dev
4 changes: 3 additions & 1 deletion aliases.mainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"mob": "mob.near",
"near": "near",
"socialdb": "social.near",
"gateway_url": "https://nearbuilders.org"
"gateway_url": "https://nearbuilders.org",
"new": "builddao.near",
"old": "buildhub.near"
}
4 changes: 3 additions & 1 deletion aliases.testnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"mob": "mike.testnet",
"near": "discom.testnet",
"socialdb": "v1.social08.testnet",
"gateway_url": "https://test.nearbuilders.org"
"gateway_url": "https://test.nearbuilders.org",
"new": "builddao.testnet",
"old": "buildhub.testnet"
}
3 changes: 0 additions & 3 deletions apps/builddao/data.json

This file was deleted.

69 changes: 0 additions & 69 deletions apps/builddao/widget/components/UploadField.jsx

This file was deleted.

Loading
Loading