Skip to content

Commit

Permalink
Upgrade develop to main (#385)
Browse files Browse the repository at this point in the history
* Landing page (#290)

* Add new landing page

* Use new landing page

---------

Co-authored-by: Zeeshan Ahmad <itexpert120@outlook.com>

* Ft: New `buildhub` app (#303)

* renamed new folder to `buildhub`

* added github job

* added mainnet job

* prettier update

* set new and old

---------

Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com>

* Fix: builddao.testnet public key

* small change to trigger build

* small change to trigger build

* fix: gateway reference in testnet

* Fix notification issues (#304)

* Fix notifications count not resetting

* Supress console.logs

* Fix black background on notifications page

* Revert changes to post and comment

* Remove console logs and navbar from viewer for now

* Remove white bg

* Added commit modal bypass for all (#313)

* Added commit modal bypass for all

* Removed injectedConfig

* clean features

* changelog

---------

Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com>

* App.js formatting fix

* Fix: Propose UI stuck partway through process (#302)

* Bug Fix 244

* "cleanup"

* New modal design implementation

* new-changes

* refactored code

* resolved comments

* latest-changes

* Initialize with essential routes (#312)

* Initialize with essential routes

* Move home to /page

* Add navbar

* Add footer to all pages

* Fix fmt?

* fix links

---------

Co-authored-by: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com>
Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com>

* Test button Fix (#315)

* test-btn-fix

* toggle gateway urls

* New changes in design implemented

* Network button implementation

* rename vertical

* fix codeowners

* Projects feed new (#319)

* Sidebar

* Initialize Projects page

* Add CSS file

* Align projects page with new design

* Rename to kebab case

* Align card design with new figma

* Add List view

* 100vh height

* New projects feed updates & organization (#320)

* reorganizing

* formatting

* adds label

* Shift to pascal case

* Add state for projects view

* Rename folder structure

* Fix links

* Resolve comments

---------

Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com>

* fix-network-links (#323)

* Resource page new (#325)

* Resources Page V0

* Resources Page V0 cleanup

* Header Removed

* Remaining Projects Routes (#328)

* Project Routes

* Refactor StarProjects

* Use star app logic for handling starring projects

* Resolve comments

* Project-new (#329)

* Remove "Error" from project-data helper

* Added route to index page for Project

* Created layout

* Added this to store entire project details with it's layout

* Added changes to index file

* Added overview

* Added Metadata

* Added activity and updated links

* Updated link to project details

* Used recent falbackUrl

* Added new fallbackUrl

* Updated links back to "projects"

* Added the rest of the pages and retructured project component

* Rearranged folder structure

* renamed routes to meet

* Prettier

* Fixed link to Metadata

* Navigation new (#331)

* Move navbar to new app and fix default route for sidebar

* Navbar changes to adapt to new style

* Revert some changes for now

* Add activity page

* Notifications Page (#336)

* Notifications Page

* Notifications Items fix

* Comments Resolved

* Tests for Login and Logout (#333)

* test-btn-fix

* toggle gateway urls

* New changes in design implemented

* Network button implementation

* Login and Logout tests

* Resource page new (#335)

* Resources Page V0

* Resources Page V0 cleanup

* Header Removed

* Adding new resources

* Move activity to new app pattern (#337)

* Move create project to separate page, edit support and refactoring (#321)

* moved create project to page, added roles and edit support

* show success modal after project is created

* fmt

* rebased and added reusable view container

* bug fixes

* add logs

* css update

* update login container css

* Fixed task editor and minor UI updates (#339)

* fixed task editor

* remove logs

* fmt

* Fix projects visibility on testnet (#342)

* Fix projects visibility

* fmt

* Convert starredProjects to star (#346)

* convert starredProjects to star

* notify account

* fmt

---------

Co-authored-by: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com>

* sets new index (#344)

* yarn.lock

* update bos-workspace

* downgrade to .20

* latest

* bos-workspace no bos-cli

* Add feed to project page (#356)

* Add feed to project page

* Change editor

* resolve comments

* Resolve comment

* use config_index

---------

Co-authored-by: Megha <100185149+Megha-Dev-19@users.noreply.github.com>

* Fix search in projects (#359)

* Project creation form fixes (#360)

* Add indicators for required fields

* Add prefix to inputfield

* Align typeahead with our input field style

* Resolve commits

* Fix projects bugs (#364)

* fix tags structure

* added border and error state

* add border to list card

* add autocomplete to projects

* fmt

---------

Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com>

* Add form bounty template

* Image uploader module (#361)

* test-btn-fix

* toggle gateway urls

* New changes in design implemented

* Network button implementation

* Login and Logout tests

* Image Uploader module

* Implemented Files component

* run prettier format on commit (#369)

* Responsiveness and Adding Missing Pages (#365)

* Landing Page Update 3.0

* Responsiveness

* Add Inspect and Profile Page to new app

* Comments Resolved

* update yarn

* Fix red flashes, init to [] rather than {} and hide open roles (#370)

* fix red flashes, init to [] rather than {} and hide open roles

* fix formatting

* Fix red flash (#371)

* fix red flashes, init to [] rather than {} and hide open roles

* fix formatting

* default empty array

* Move proposals related files and fix notification roles selector (#377)

* move proposals related files

* minor fixes

* fix pre-commit command

* Fixes authentication tests (#381)

* remove Dummy

* cleans up auth tests

* fmt

* Refactors Project Card (#382)

* remove Dummy

* cleans up auth tests

* fmt

* tests to validate navigation

* combines and replaces two cards

* fmt

* Landing Page Refactor (#383)

* Landing Page Update 4.0

* URL Update

* fix links

* fmt

---------

Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com>

---------

Co-authored-by: Muhammad Saad Iqbal <saadiqbal.dev@outlook.com>
Co-authored-by: Zeeshan Ahmad <itexpert120@outlook.com>
Co-authored-by: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com>
Co-authored-by: Jiku Godwill Nsanwi <65053264+Jikugodwill@users.noreply.github.com>
Co-authored-by: Marpureddy Saswat <91129111+Eren-Yeaager@users.noreply.github.com>
Co-authored-by: heroes-bounty[bot] <167169790+heroes-bounty[bot]@users.noreply.github.com>
  • Loading branch information
7 people authored Jun 14, 2024
1 parent d2baf9c commit bf1196c
Show file tree
Hide file tree
Showing 207 changed files with 12,435 additions and 2,721 deletions.
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
Validating CODEOWNERS rules …
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

0 comments on commit bf1196c

Please sign in to comment.