Skip to content

Commit

Permalink
weekly promotion of develop to main (#458)
Browse files Browse the repository at this point in the history
* Fixes git history (#429) (#430)

* Landing page (#290)

* Add new landing page

* Use new landing page

---------



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

* renamed new folder to `buildhub`

* added github job

* added mainnet job

* prettier update

* set new and old

---------



* 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

---------



* 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

---------




* 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

---------



* 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

---------



* 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

---------



* 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

---------



* 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

---------



* Upgrade the gateway to new app and some fixes (#386)

* Upgrade the gateway to new app and some fixes

* Fix project card

* fmt

* Update release-new-mainnet.yml

* Login/Logout Page Update / Profile.Index Update (#389)

* Landing Page Update 4.0

* URL Update

* Login Logout Page Design Update

* fix conflict

* fix links for signin, signout

---------



* fix landing page links (#394)

* Defaults fallback for Object.keys (fix red flash on projects page) (#396)

* increment

* adds fallbacks

* fmt

* Ft: Project quick view (#388)

* added canvas

* add UI

* css update

* fix tests and add mobile responsiveness

* fix potlock search (#397)

* added changelog

* Fix project creation w/ tests (#402)

* init tests

* fmt

* rename test

* fmt

* clean test

* formatting

* working as-is test

* fmt

* fix upload image

* fmt

* complete editor tests

* projects tests

* fmt

* remove unused

* Add resources tests (#425)

* Add resources tests

* Resolve comments

* Delete project (#417)

* added delete project

* Fix project creation w/ tests (#402)

* init tests

* fmt

* rename test

* fmt

* clean test

* formatting

* working as-is test

* fmt

* fix upload image

* fmt

* complete editor tests

* projects tests

* fmt

* remove unused

* added delete project

* added delete project test

* add edit project test

* fix tests

* added delete project test

* add edit project test

* fix tests

---------



* Landing page regression tests (#416)

* test-btn-fix

* toggle gateway urls

* New changes in design implemented

* Network button implementation

* Login and Logout tests

* Image Uploader module

* Implemented Files component

* lp-reg-tests

* start project and explore projects changes in redirection

* added the assertion for login and changed the structure

* added wait

* connect-btn-test-fix

* added wait for create project title

---------



* fix transfer proposal (#427)

* Navbar reg tests (#424)

* test-btn-fix

* toggle gateway urls

* New changes in design implemented

* Network button implementation

* Login and Logout tests

* Image Uploader module

* Implemented Files component

* lp-reg-tests

* start project and explore projects changes in redirection

* added the assertion for login and changed the structure

* added wait

* connect-btn-test-fix

* added wait for create project title

* navbar-reg-tests

* added page visiblity assertions

* fixed source btn locator

---------



* Fix overflow activity feed (#420)

* Fix overflow activity feed

* Sidebar style update

* Move fix to CSS

* increment version

---------

Co-authored-by: Muhammad Saad Iqbal <[email protected]>
Co-authored-by: Zeeshan Ahmad <[email protected]>
Co-authored-by: Megha-Dev-19 <[email protected]>
Co-authored-by: Jiku Godwill Nsanwi <[email protected]>
Co-authored-by: Marpureddy Saswat <[email protected]>
Co-authored-by: heroes-bounty[bot] <167169790+heroes-bounty[bot]@users.noreply.github.com>

* Fixes git history (#429)

* Landing page (#290)

* Add new landing page

* Use new landing page

---------

Co-authored-by: Zeeshan Ahmad <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Elliot Braem <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Upgrade the gateway to new app and some fixes (#386)

* Upgrade the gateway to new app and some fixes

* Fix project card

* fmt

* Update release-new-mainnet.yml

* Login/Logout Page Update / Profile.Index Update (#389)

* Landing Page Update 4.0

* URL Update

* Login Logout Page Design Update

* fix conflict

* fix links for signin, signout

---------

Co-authored-by: Elliot Braem <[email protected]>

* fix landing page links (#394)

* Defaults fallback for Object.keys (fix red flash on projects page) (#396)

* increment

* adds fallbacks

* fmt

* Ft: Project quick view (#388)

* added canvas

* add UI

* css update

* fix tests and add mobile responsiveness

* fix potlock search (#397)

* added changelog

* Fix project creation w/ tests (#402)

* init tests

* fmt

* rename test

* fmt

* clean test

* formatting

* working as-is test

* fmt

* fix upload image

* fmt

* complete editor tests

* projects tests

* fmt

* remove unused

* Add resources tests (#425)

* Add resources tests

* Resolve comments

* Delete project (#417)

* added delete project

* Fix project creation w/ tests (#402)

* init tests

* fmt

* rename test

* fmt

* clean test

* formatting

* working as-is test

* fmt

* fix upload image

* fmt

* complete editor tests

* projects tests

* fmt

* remove unused

* added delete project

* added delete project test

* add edit project test

* fix tests

* added delete project test

* add edit project test

* fix tests

---------

Co-authored-by: Elliot Braem <[email protected]>

* Landing page regression tests (#416)

* test-btn-fix

* toggle gateway urls

* New changes in design implemented

* Network button implementation

* Login and Logout tests

* Image Uploader module

* Implemented Files component

* lp-reg-tests

* start project and explore projects changes in redirection

* added the assertion for login and changed the structure

* added wait

* connect-btn-test-fix

* added wait for create project title

---------

Co-authored-by: Elliot Braem <[email protected]>

* fix transfer proposal (#427)

* Navbar reg tests (#424)

* test-btn-fix

* toggle gateway urls

* New changes in design implemented

* Network button implementation

* Login and Logout tests

* Image Uploader module

* Implemented Files component

* lp-reg-tests

* start project and explore projects changes in redirection

* added the assertion for login and changed the structure

* added wait

* connect-btn-test-fix

* added wait for create project title

* navbar-reg-tests

* added page visiblity assertions

* fixed source btn locator

---------

Co-authored-by: Elliot Braem <[email protected]>

* Fix overflow activity feed (#420)

* Fix overflow activity feed

* Sidebar style update

* Move fix to CSS

* increment version

---------

Co-authored-by: Muhammad Saad Iqbal <[email protected]>
Co-authored-by: Zeeshan Ahmad <[email protected]>
Co-authored-by: Megha-Dev-19 <[email protected]>
Co-authored-by: Jiku Godwill Nsanwi <[email protected]>
Co-authored-by: Marpureddy Saswat <[email protected]>
Co-authored-by: heroes-bounty[bot] <167169790+heroes-bounty[bot]@users.noreply.github.com>

* Fixes git history (#429) (#430)

* Landing page (#290)

* Add new landing page

* Use new landing page

---------



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

* renamed new folder to `buildhub`

* added github job

* added mainnet job

* prettier update

* set new and old

---------



* 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

---------



* 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

---------




* 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

---------



* 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

---------



* 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

---------



* 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

---------



* 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

---------



* Upgrade the gateway to new app and some fixes (#386)

* Upgrade the gateway to new app and some fixes

* Fix project card

* fmt

* Update release-new-mainnet.yml

* Login/Logout Page Update / Profile.Index Update (#389)

* Landing Page Update 4.0

* URL Update

* Login Logout Page Design Update

* fix conflict

* fix links for signin, signout

---------



* fix landing page links (#394)

* Defaults fallback for Object.keys (fix red flash on projects page) (#396)

* increment

* adds fallbacks

* fmt

* Ft: Project quick view (#388)

* added canvas

* add UI

* css update

* fix tests and add mobile responsiveness

* fix potlock search (#397)

* added changelog

* Fix project creation w/ tests (#402)

* init tests

* fmt

* rename test

* fmt

* clean test

* formatting

* working as-is test

* fmt

* fix upload image

* fmt

* complete editor tests

* projects tests

* fmt

* remove unused

* Add resources tests (#425)

* Add resources tests

* Resolve comments

* Delete project (#417)

* added delete project

* Fix project creation w/ tests (#402)

* init tests

* fmt

* rename test

* fmt

* clean test

* formatting

* working as-is test

* fmt

* fix upload image

* fmt

* complete editor tests

* projects tests

* fmt

* remove unused

* added delete project

* added delete project test

* add edit project test

* fix tests

* added delete project test

* add edit project test

* fix tests

---------



* Landing page regression tests (#416)

* test-btn-fix

* toggle gateway urls

* New changes in design implemented

* Network button implementation

* Login and Logout tests

* Image Uploader module

* Implemented Files component

* lp-reg-tests

* start project and explore projects changes in redirection

* added the assertion for login and changed the structure

* added wait

* connect-btn-test-fix

* added wait for create project title

---------



* fix transfer proposal (#427)

* Navbar reg tests (#424)

* test-btn-fix

* toggle gateway urls

* New changes in design implemented

* Network button implementation

* Login and Logout tests

* Image Uploader module

* Implemented Files component

* lp-reg-tests

* start project and explore projects changes in redirection

* added the assertion for login and changed the structure

* added wait

* connect-btn-test-fix

* added wait for create project title

* navbar-reg-tests

* added page visiblity assertions

* fixed source btn locator

---------



* Fix overflow activity feed (#420)

* Fix overflow activity feed

* Sidebar style update

* Move fix to CSS

* increment version

---------

Co-authored-by: Muhammad Saad Iqbal <[email protected]>
Co-authored-by: Zeeshan Ahmad <[email protected]>
Co-authored-by: Megha-Dev-19 <[email protected]>
Co-authored-by: Jiku Godwill Nsanwi <[email protected]>
Co-authored-by: Marpureddy Saswat <[email protected]>
Co-authored-by: heroes-bounty[bot] <167169790+heroes-bounty[bot]@users.noreply.github.com>

* Added styles to handle fullscreen on near.social and properly display on near.org as well (#441)

* Added styles to handle fullscreen on near.social and properly display on near.org as well

* fix tests

* Added fix for everthing gateway as well

* fmt

---------

Co-authored-by: Megha-Dev-19 <[email protected]>

* fix: gateway url, swap

* Fixes flaky tests (#453)

* fixes images, resource, and redirects

* fmt

* editor test

* fmt

* fix title for activity feeds

* Activity page tests (#454)

* fixed nav tabs page viewing assertion

* resolved all comments

---------

Co-authored-by: Megha <[email protected]>

* Fix failing tests, add share post link tests (#455)

* fix failing tests, add share post link tests

* fix tests

* minor fixes

* fix flakiness

* show loader on create of a project (#461)

* Hid project location and team size when it's empty (#463)

* Hid project location when it's empty

* hid teamSize if empty

---------

Co-authored-by: Elliot Braem <[email protected]>

* added upload statuses (#464)

* Added logic to handle various upload phases

* Update apps/old/widget/components/UploadField.jsx

Co-authored-by: Megha <[email protected]>

* accepted variable name change

---------

Co-authored-by: Megha <[email protected]>

* Adds web4 contract (#457)

* init

* tests pass, init

* tests pass

* configures workflow

* update web component

* sets default workflow wd

* upgrade versions

* add network

* adds metadata

* fmt

* updates contract for testnet social db

* set title

* linked to new app Index (#467)

Co-authored-by: Elliot Braem <[email protected]>

* Fix task project ID for new project title (#471)

* fix tests

---------

Co-authored-by: Elliot Braem <[email protected]>
Co-authored-by: Muhammad Saad Iqbal <[email protected]>
Co-authored-by: Zeeshan Ahmad <[email protected]>
Co-authored-by: Megha-Dev-19 <[email protected]>
Co-authored-by: Jiku Godwill Nsanwi <[email protected]>
Co-authored-by: Marpureddy Saswat <[email protected]>
Co-authored-by: heroes-bounty[bot] <167169790+heroes-bounty[bot]@users.noreply.github.com>
  • Loading branch information
8 people authored Jul 8, 2024
1 parent 02e84d4 commit 228d960
Show file tree
Hide file tree
Showing 20 changed files with 6,667 additions and 32 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/web4-deploy-production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Deploy to production
on:
push:
branches: [main]
paths:
- web4contract/**

defaults:
run:
working-directory: ./web4contract

jobs:
test:
uses: ./.github/workflows/web4-test.yml

deploy-staging:
name: Deploy to production
needs: [test]
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install cargo-near CLI
run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/cargo-near/releases/download/cargo-near-v0.6.2/cargo-near-installer.sh | sh
- name: Deploy to production
run: |
cargo near deploy "${{ vars.BOS_DEPLOY_ACCOUNT_ID }}" \
without-init-call \
network-config "mainnet" \
sign-with-plaintext-private-key \
--signer-public-key "${{ vars.BOS_SIGNER_PUBLIC_KEY }}" \
--signer-private-key "${{ secrets.BOS_BUILDDAO_SIGNER_PRIVATE_KEY }}" \
send
58 changes: 58 additions & 0 deletions .github/workflows/web4-deploy-staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Deploy to staging
on:
pull_request:
paths:
- web4contract/**

defaults:
run:
working-directory: ./web4contract

jobs:
test:
uses: ./.github/workflows/web4-test.yml

deploy-staging:
name: Deploy to staging subaccount
permissions:
pull-requests: write
needs: [test]
runs-on: ubuntu-latest
env:
NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID: gh-${{ github.event.number }}.${{ vars.BOS_TESTNET_SIGNER_ACCOUNT_ID }}

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install near CLI
run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/near-cli-rs/releases/download/v0.11.1/near-cli-rs-installer.sh | sh
- name: Create staging account
if: github.event.action == 'opened' || github.event.action == 'reopened'
run: |
near account create-account fund-myself "${{ env.NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID }}" '10 NEAR' \
use-manually-provided-public-key "${{ vars.BOS_TESTNET_SIGNER_PUBLIC_KEY }}" \
sign-as "${{ vars.BOS_TESTNET_SIGNER_ACCOUNT_ID }}" \
network-config "testnet" \
sign-with-plaintext-private-key \
--signer-public-key "${{ vars.BOS_TESTNET_SIGNER_PUBLIC_KEY }}" \
--signer-private-key "${{ secrets.BOS_BUILDDAO_TESTNET_SIGNER_PRIVATE_KEY }}" \
send
- name: Install cargo-near CLI
run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/cargo-near/releases/download/cargo-near-v0.6.2/cargo-near-installer.sh | sh
- name: Deploy to staging
run: |
cargo near deploy "${{ env.NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID }}" \
without-init-call \
network-config "testnet" \
sign-with-plaintext-private-key \
--signer-public-key "${{ vars.BOS_TESTNET_SIGNER_PUBLIC_KEY }}" \
--signer-private-key "${{ secrets.BOS_BUILDDAO_TESTNET_SIGNER_PRIVATE_KEY }}" \
send
- name: Comment on pull request
env:
GH_TOKEN: ${{ github.token }}
run: |
gh pr comment "${{ github.event.number }}" --body "Staging contract is deployed to ["'`'"${{ env.NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID }}"'`'" account](https://explorer.testnet.near.org/accounts/${{ env.NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID }})"
36 changes: 36 additions & 0 deletions .github/workflows/web4-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Test
on:
workflow_call:

defaults:
run:
working-directory: ./web4contract

jobs:
code-formatting:
name: Code Formatting
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- run: cargo fmt --check

code-linter:
name: Code Linter
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Run cargo clippy
run: |
rustup component add clippy
cargo clippy --all-features --workspace --tests -- --warn clippy::all --warn clippy::nursery
tests:
name: Tests
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Run cargo test
run: cargo test
31 changes: 31 additions & 0 deletions .github/workflows/web4-undeploy-staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Undeploy staging
on:
pull_request:
types: [closed]
paths:
- web4contract/**

defaults:
run:
working-directory: ./web4contract

jobs:
cleanup-staging:
name: Cleanup staging account
runs-on: ubuntu-latest
env:
NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID: gh-${{ github.event.number }}.${{ vars.BOS_TESTNET_SIGNER_ACCOUNT_ID }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install near CLI
run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/near-cli-rs/releases/download/v0.11.1/near-cli-rs-installer.sh | sh
- name: Remove staging account
run: |
near account delete-account "${{ env.NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID }}" \
beneficiary "${{ vars.BOS_TESTNET_SIGNER_ACCOUNT_ID }}" \
network-config "testnet" \
sign-with-plaintext-private-key \
--signer-public-key "${{ vars.BOS_TESTNET_SIGNER_PUBLIC_KEY }}" \
--signer-private-key "${{ secrets.BOS_BUILDDAO_TESTNET_SIGNER_PRIVATE_KEY }}" \
send
17 changes: 17 additions & 0 deletions apps/new/widget/Index.metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "Build DAO",
"description": "Support Systems for Open Web Projects",
"linktree": {
"website": "nearbuilders.org"
},
"image": {
"ipfs_cid": "bafkreie5hd6cfckrpyx6nmtgwzlmsd356nh2e6pqeryond3b54ejqeszqi"
},
"tags": {
"build": "",
"dao": "",
"public-goods": "",
"open-source": "",
"app": ""
}
}
30 changes: 17 additions & 13 deletions apps/new/widget/page/project/tabs/Overview.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,23 @@ return (
</p>
</div>
<div className="d-flex gap-5">
<div className="section">
<p className="heading">Location</p>
<p className="description d-flex align-items-center gap-2">
<MapIcon /> {location ?? "No Location"}
</p>
</div>
<div className="section">
<p className="heading">Team Size</p>
<p className="description d-flex align-items-center gap-2">
<i className="bi bi-person"></i>
{teamSize || "unspecified"}
</p>
</div>
{location && (
<div className="section">
<p className="heading">Location</p>
<p className="description d-flex align-items-center gap-2">
<MapIcon /> {location ?? "No Location"}
</p>
</div>
)}
{teamSize && (
<div className="section">
<p className="heading">Team Size</p>
<p className="description d-flex align-items-center gap-2">
<i className="bi bi-person"></i>
{teamSize || "unspecified"}
</p>
</div>
)}
</div>
<div className="section">
<p className="heading">Contributors</p>
Expand Down
7 changes: 5 additions & 2 deletions apps/new/widget/page/project/tabs/Task.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ const { normalize } = VM.require("${alias_devs}/widget/lib.stringUtils") || {
normalize: () => {},
};

const { getProjectMeta } = VM.require("${alias_new}/widget/lib.projects") || {
const { getProjectMeta, getProjectIdFromPath } = VM.require(
"${alias_new}/widget/lib.projects",
) || {
getProjectMeta: () => {},
getProjectIdFromPath: () => {},
};

const { id } = props;
Expand Down Expand Up @@ -136,7 +139,7 @@ const Wrapper = styled.div`
}
`;

const projectID = normalize(project?.title, "-");
const projectID = getProjectIdFromPath(id);

const StatusValues = {
PROPOSED: "proposed",
Expand Down
8 changes: 7 additions & 1 deletion apps/new/widget/page/projects/Editor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,15 @@ const [projectIdForSocialDB, setProjectId] = useState(null); // for edit changes
const [contributorSearchTerm, setContributorSearch] = useState("");
const [showDeleteModal, setShowDeleteModal] = useState(false);
const [showDeleteSuccessModal, setShowDeleteSuccessModal] = useState(false);
const [onCreateLoader, setCreateLoader] = useState(false);

function removeWhiteSpace(str) {
return str.replace(/\s/g, "-").toLowerCase();
}

function convertArrayToObject(array) {
const obj = {};
array.forEach((value, index) => {
(array ?? []).forEach((value, index) => {
obj[value] = "";
});
return obj;
Expand Down Expand Up @@ -568,6 +569,7 @@ const DeleteConfirmationModal = () => {
};

function onCreateProject() {
setCreateLoader(true);
const projectID = isEditScreen ? projectIdForSocialDB : normalize(title, "-");
const project = {
title,
Expand Down Expand Up @@ -651,8 +653,10 @@ function onCreateProject() {
} else {
Social.set(data, {
onCommit: () => {
setCreateLoader(false);
setShowSuccessModal(true);
},
onCancel: () => setCreateLoader(false),
});
}
}
Expand Down Expand Up @@ -759,6 +763,7 @@ const DeleteProjectBtn = () => {
<Button
variant="outline"
className="destructive"
loading={showDeleteModal}
onClick={() => setShowDeleteModal(true)}
>
Delete Project
Expand Down Expand Up @@ -943,6 +948,7 @@ const SecondScreen = () => {
variant="primary"
onClick={onCreateProject}
disabled={invalidContributorFound}
loading={onCreateLoader}
>
{isEditScreen ? "Save Changes" : "Create"}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion apps/old/widget/components/Button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ function Button({
return (
<StyledButton
id={id}
disabled={disabled}
disabled={disabled || loading}
key={`Button-${type ?? "Normal"}-${variant ?? "Default"}-${id}`}
className={className}
variant={variant}
Expand Down
62 changes: 53 additions & 9 deletions apps/old/widget/components/UploadField.jsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,47 @@
const initialMsg = (
<>
<i className="bi bi-cloud-upload"></i>
<div className="d-flex flex-column gap-2">
<p>Choose a file or drag & drop it here.</p>
<p className="secondary">JPEG, PNG, PDF, and MP4 formats, up to 50 MB.</p>
</div>
</>
);

const [img, setImg] = useState("");
const [msg, setMsg] = useState("Upload");
const [displayText, setDisplayText] = useState(initialMsg);

const SpinningIcon = styled.i`
animation: spin 0.8s linear infinite;
@keyframes spin {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
`;
const uploadFile = (files) => {
setMsg("Uploading...");
setDisplayText(
<>
<SpinningIcon className="bi bi-arrow-repeat" />
<p>Uploading...</p>
</>,
);
asyncFetch("https://ipfs.near.social/add", {
method: "POST",
headers: { Accept: "application/json" },
body: files[0],
})
.catch((e) => {
console.error(e);
setMsg("Failed to upload");
console.error("Upload error:", e);
setDisplayText(
<>
<i className="bi bi-exclamation-triangle text-danger"></i>
<p>Failed to upload. Please try again.</p>
</>,
);
})
.then((res) => {
setImg(res.body.cid);
Expand All @@ -18,6 +50,22 @@ const uploadFile = (files) => {
ipfs_cid: res.body.cid,
});
}
if (res.body.cid) {
setDisplayText(
<>
<i className="bi bi-check-circle text-success"></i>
<p>Upload successful!</p>
</>,
);
setTimeout(() => setDisplayText(""), 1500);
} else {
setDisplayText(
<>
<i className="bi bi-exclamation-triangle text-danger"></i>
<p>Failed to upload. Please try again.</p>
</>,
);
}
});
};

Expand Down Expand Up @@ -102,11 +150,7 @@ const UploadedImage = styled.img`

return (
<UploadContainer background={background}>
<i class="bi bi-cloud-upload"></i>
<div className="d-flex flex-column gap-2">
<p>Choose a file or drag & drop it here.</p>
<p className="secondary">JPEG, PNG, PDF, and MP4 formats, up to 50 MB.</p>
</div>
{msg}
<ButtonContainer>
<Button>
<Files
Expand Down
2 changes: 1 addition & 1 deletion apps/old/widget/components/User.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const Overlay = (props) => (
<Link
className="link-dark text-truncate d-inline-flex mw-100"
to={href({
widgetSrc: "${config_index}",
widgetSrc: "${alias_new}/widget/Index",
params: {
page: "profile",
accountId,
Expand Down
Loading

0 comments on commit 228d960

Please sign in to comment.