Skip to content

Commit

Permalink
Hotfix/fix embed post (#81)
Browse files Browse the repository at this point in the history
* add build-and-test github action

* add test server heroku deploy

* update action names

* add pull request step for autodeploy

* add changelog file

* reference heroku api key

* NextJS scaffolding to get the project started. (#10)

* Update README.md

* Scaffolding for initial project

* Lint fixes

* update deps and add jest unit

* remove extra deploy step

* move test to separate dir

Co-authored-by: John <[email protected]>
Co-authored-by: Brian Patino <[email protected]>

* Update README.md (#11)

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

* add mongo directory and bboard_v1.json and update readme

* update bountyCriteria field, remove publicAddress, and add bountyImage

* Feature/mongo db integration (#14)

* add environment files

* add GET bountie API

* fix linting issues

* remove push github action

* update heroku api key

* add secret env

* update secrets

* add changelog entry

* Feature/escrow contract (#15)

* Update README.md

* v0.1.0 escrow contract

* gitignore merge

* configure yarn workspaces

* fix yarn lint command

Co-authored-by: John <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: Brian Patino <[email protected]>

* Issue-12:added uuid dependency for Bounty Resource Number creation (#13)

* Issue-12:added uuid dependency for Bounty Resource Number creation

* fix yarn.lock file

Co-authored-by: Brian Patino <[email protected]>

* Feature/netlify integration (#23)

* add .toml to react-app

* remove .github actions

* add mongodb-client-encryption

* add netlify status badge

* add netlify and nextjs build configs

* add bboard_v2.json withh mock data (#24)

* add bboard_v2.json withh mock data

* update CHANGELOG.md with description of mock json data

* update changelog

Co-authored-by: Brian Patino <[email protected]>

* update data model to separate dao member from bounty card

* add schema validation for mongo database with validation.js file

* update validation.js to validate bountyCard schema for primary key fields

* remove bounty from key fields of bboard_v3.json and validation.js

* Feature/documentation readme update (#44)

* update README.md with project overview, mvp description, and guidance for users

* update creating a bounty section in readme

* Front end mvp (#28)

* Bounty board front end mvp

* Fix node version error for deploy

* Adding back eslintconfig in package.json

* Fix for yarn version

* reward option type fix

* Configuring husky, close #38

* Making status optional for now

* Updated [id]/index to display correct fields, and updated mongoose validation to be consistent with consense validation fields

* Added [id]/edit conditional render to block edits on bounties that are not in draft state

* refactored previous commit to be logically cleaner by using toLowerCase instead of explicitly checking cases

* Small fix for default yarn lint command

* Updating husky pre-commit

* updated schema validation rules to be consistent with specification, plus requiring the status field. refactored variable names to pull from the correct form variable

* Added bounty.status state permissions to delete permissions in [id]/index. Created 400 error page

* Updating types and params

* Updating bounty type

* First attempt at single bounty filter

* Refactored single bounty view

* Starting filter and draft editing

* Removing POST because it is out of scope

* Yarn lock for react hook form

* Change of schema from date to string

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

* fix netlify deployment (#50)

* Initial chakra form implementation

* Troubleshooting the issue with mongo

* Troubleshooting the issue with mongo

* Bounty form styling and api refactoring

* Cleanup and removing features not needed in MVP

* Updating bounty schema

* Fixing missing package after merge

* Form refactoring to use scale

* Bounty props refactor and discord claim linking

* add final bounties schema (#41)

* add final bounties schema

* update final.json according to final_validation.js

* adjust to double value

* address review comments

* add postinstall step and remove 'guild' from 'guildName'

* add postinstall step for husky

* add precision field

* change to scale

* update to int

* Feature/degen integration sync (#52)

* add webhook integration

* add build for qa env file

* try different build

* add root build:qa script

* remove mongodb url credentials

* manually add configs

* move bounty publish to api

* remove api console log

* wait for publish bounty to finish

* feature/54 refactored ? Get Help to Need Help? on buttons below filter

* Added link functionality to Need Help? and Give us Feedback buttons in index.tsx under filter

* feature/54: Removed use of anchor tag in ColorModeButton due to breaking change and refactored to wrap component in Filter/index.tsx with an accessible link. Refactored prev discord info work

* Feature/54 netlify failed on linting error due to unused import. removed

* Feature/allow open bounty edit (#57)

* Feature/enhance toml env config (#58)

* fix webhook post and add conditional logging

* small fine tunning

* Feature/53 Pagination (#59)

* Implemented scrappy client side pagination. Button logic needs updating, as does button styling

* feature/53: fixed buggy next page and previous page logic. Implemented an API route to get # bounties in the collection

* feature/53: refactored onClick methods. Attempted to wire in Chakra, couldn't get onClick to fire.

* feature/53: implemented chakra styling over html buttons w Zberwaldt !

* feature/53 hand merged in Oktal's refactoring of paginated bounties to make it a child component of Bounties and the use of Button rather than chakra.button. refactored math

* update readme documentation with ux flow, and updated bot commands. (#51)

* update readme documentation with ux flow, and work-in-prog update on bot commands

* update README.md to change User Experience Flow and Bot Commands as suggested

* add frontend flow to match bot/discord commands in README.md, link to Bounty Board Workflow Notion Page

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

* Final front end tweaks (#61)

* Fix buttons missing once filters was removed (#63)

* Fix buttons missing

* Made buttons target new tab

* Made buttons target new tab

* Temp/resync branch (#65)

* Temp/release prep (#62) (#64)

* add build-and-test github action

* add test server heroku deploy

* update action names

* add pull request step for autodeploy

* add changelog file

* reference heroku api key

* NextJS scaffolding to get the project started. (#10)

* Update README.md

* Scaffolding for initial project

* Lint fixes

* update deps and add jest unit

* remove extra deploy step

* move test to separate dir

Co-authored-by: John <[email protected]>
Co-authored-by: Brian Patino <[email protected]>

* Update README.md (#11)

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

* add mongo directory and bboard_v1.json and update readme

* update bountyCriteria field, remove publicAddress, and add bountyImage

* Feature/mongo db integration (#14)

* add environment files

* add GET bountie API

* fix linting issues

* remove push github action

* update heroku api key

* add secret env

* update secrets

* add changelog entry

* Feature/escrow contract (#15)

* Update README.md

* v0.1.0 escrow contract

* gitignore merge

* configure yarn workspaces

* fix yarn lint command

Co-authored-by: John <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: Brian Patino <[email protected]>

* Issue-12:added uuid dependency for Bounty Resource Number creation (#13)

* Issue-12:added uuid dependency for Bounty Resource Number creation

* fix yarn.lock file

Co-authored-by: Brian Patino <[email protected]>

* Feature/netlify integration (#23)

* add .toml to react-app

* remove .github actions

* add mongodb-client-encryption

* add netlify status badge

* add netlify and nextjs build configs

* add bboard_v2.json withh mock data (#24)

* add bboard_v2.json withh mock data

* update CHANGELOG.md with description of mock json data

* update changelog

Co-authored-by: Brian Patino <[email protected]>

* update data model to separate dao member from bounty card

* add schema validation for mongo database with validation.js file

* update validation.js to validate bountyCard schema for primary key fields

* remove bounty from key fields of bboard_v3.json and validation.js

* Feature/documentation readme update (#44)

* update README.md with project overview, mvp description, and guidance for users

* update creating a bounty section in readme

* Front end mvp (#28)

* Bounty board front end mvp

* Fix node version error for deploy

* Adding back eslintconfig in package.json

* Fix for yarn version

* reward option type fix

* Configuring husky, close #38

* Making status optional for now

* Updated [id]/index to display correct fields, and updated mongoose validation to be consistent with consense validation fields

* Added [id]/edit conditional render to block edits on bounties that are not in draft state

* refactored previous commit to be logically cleaner by using toLowerCase instead of explicitly checking cases

* Small fix for default yarn lint command

* Updating husky pre-commit

* updated schema validation rules to be consistent with specification, plus requiring the status field. refactored variable names to pull from the correct form variable

* Added bounty.status state permissions to delete permissions in [id]/index. Created 400 error page

* Updating types and params

* Updating bounty type

* First attempt at single bounty filter

* Refactored single bounty view

* Starting filter and draft editing

* Removing POST because it is out of scope

* Yarn lock for react hook form

* Change of schema from date to string

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

* fix netlify deployment (#50)

* Initial chakra form implementation

* Troubleshooting the issue with mongo

* Troubleshooting the issue with mongo

* Bounty form styling and api refactoring

* Cleanup and removing features not needed in MVP

* Updating bounty schema

* Fixing missing package after merge

* Form refactoring to use scale

* Bounty props refactor and discord claim linking

* add final bounties schema (#41)

* add final bounties schema

* update final.json according to final_validation.js

* adjust to double value

* address review comments

* add postinstall step and remove 'guild' from 'guildName'

* add postinstall step for husky

* add precision field

* change to scale

* update to int

* Feature/degen integration sync (#52)

* add webhook integration

* add build for qa env file

* try different build

* add root build:qa script

* remove mongodb url credentials

* manually add configs

* move bounty publish to api

* remove api console log

* wait for publish bounty to finish

* feature/54 refactored ? Get Help to Need Help? on buttons below filter

* Added link functionality to Need Help? and Give us Feedback buttons in index.tsx under filter

* feature/54: Removed use of anchor tag in ColorModeButton due to breaking change and refactored to wrap component in Filter/index.tsx with an accessible link. Refactored prev discord info work

* Feature/54 netlify failed on linting error due to unused import. removed

* Feature/allow open bounty edit (#57)

* Feature/enhance toml env config (#58)

* fix webhook post and add conditional logging

* small fine tunning

* Feature/53 Pagination (#59)

* Implemented scrappy client side pagination. Button logic needs updating, as does button styling

* feature/53: fixed buggy next page and previous page logic. Implemented an API route to get # bounties in the collection

* feature/53: refactored onClick methods. Attempted to wire in Chakra, couldn't get onClick to fire.

* feature/53: implemented chakra styling over html buttons w Zberwaldt !

* feature/53 hand merged in Oktal's refactoring of paginated bounties to make it a child component of Bounties and the use of Button rather than chakra.button. refactored math

* update readme documentation with ux flow, and updated bot commands. (#51)

* update readme documentation with ux flow, and work-in-prog update on bot commands

* update README.md to change User Experience Flow and Bot Commands as suggested

* add frontend flow to match bot/discord commands in README.md, link to Bounty Board Workflow Notion Page

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

* Final front end tweaks (#61)

* add prod details

* Fix buttons missing once filters was removed (#63)

* Fix buttons missing

* Made buttons target new tab

* Made buttons target new tab

Co-authored-by: Oktal <[email protected]>
Co-authored-by: John <[email protected]>
Co-authored-by: paulapivat <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: Behold3th <[email protected]>
Co-authored-by: @PaulApivat <[email protected]>
Co-authored-by: Behold <[email protected]>
Co-authored-by: Oktalize <[email protected]>

Co-authored-by: Oktal <[email protected]>
Co-authored-by: John <[email protected]>
Co-authored-by: paulapivat <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: Behold3th <[email protected]>
Co-authored-by: @PaulApivat <[email protected]>
Co-authored-by: Behold <[email protected]>
Co-authored-by: Oktalize <[email protected]>

* feature/66 removed listing of complete bounties

* allow more characters

* allow more characters (#69)

Co-authored-by: Oktal <[email protected]>
Co-authored-by: John <[email protected]>
Co-authored-by: paulapivat <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: Behold3th <[email protected]>
Co-authored-by: @PaulApivat <[email protected]>
Co-authored-by: Behold <[email protected]>
Co-authored-by: Oktalize <[email protected]>

* Temp/sync branches (#72)

* Temp/release prep (#62) (#64)

* add build-and-test github action

* add test server heroku deploy

* update action names

* add pull request step for autodeploy

* add changelog file

* reference heroku api key

* NextJS scaffolding to get the project started. (#10)

* Update README.md

* Scaffolding for initial project

* Lint fixes

* update deps and add jest unit

* remove extra deploy step

* move test to separate dir

Co-authored-by: John <[email protected]>
Co-authored-by: Brian Patino <[email protected]>

* Update README.md (#11)

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

* add mongo directory and bboard_v1.json and update readme

* update bountyCriteria field, remove publicAddress, and add bountyImage

* Feature/mongo db integration (#14)

* add environment files

* add GET bountie API

* fix linting issues

* remove push github action

* update heroku api key

* add secret env

* update secrets

* add changelog entry

* Feature/escrow contract (#15)

* Update README.md

* v0.1.0 escrow contract

* gitignore merge

* configure yarn workspaces

* fix yarn lint command

Co-authored-by: John <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: Brian Patino <[email protected]>

* Issue-12:added uuid dependency for Bounty Resource Number creation (#13)

* Issue-12:added uuid dependency for Bounty Resource Number creation

* fix yarn.lock file

Co-authored-by: Brian Patino <[email protected]>

* Feature/netlify integration (#23)

* add .toml to react-app

* remove .github actions

* add mongodb-client-encryption

* add netlify status badge

* add netlify and nextjs build configs

* add bboard_v2.json withh mock data (#24)

* add bboard_v2.json withh mock data

* update CHANGELOG.md with description of mock json data

* update changelog

Co-authored-by: Brian Patino <[email protected]>

* update data model to separate dao member from bounty card

* add schema validation for mongo database with validation.js file

* update validation.js to validate bountyCard schema for primary key fields

* remove bounty from key fields of bboard_v3.json and validation.js

* Feature/documentation readme update (#44)

* update README.md with project overview, mvp description, and guidance for users

* update creating a bounty section in readme

* Front end mvp (#28)

* Bounty board front end mvp

* Fix node version error for deploy

* Adding back eslintconfig in package.json

* Fix for yarn version

* reward option type fix

* Configuring husky, close #38

* Making status optional for now

* Updated [id]/index to display correct fields, and updated mongoose validation to be consistent with consense validation fields

* Added [id]/edit conditional render to block edits on bounties that are not in draft state

* refactored previous commit to be logically cleaner by using toLowerCase instead of explicitly checking cases

* Small fix for default yarn lint command

* Updating husky pre-commit

* updated schema validation rules to be consistent with specification, plus requiring the status field. refactored variable names to pull from the correct form variable

* Added bounty.status state permissions to delete permissions in [id]/index. Created 400 error page

* Updating types and params

* Updating bounty type

* First attempt at single bounty filter

* Refactored single bounty view

* Starting filter and draft editing

* Removing POST because it is out of scope

* Yarn lock for react hook form

* Change of schema from date to string

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

* fix netlify deployment (#50)

* Initial chakra form implementation

* Troubleshooting the issue with mongo

* Troubleshooting the issue with mongo

* Bounty form styling and api refactoring

* Cleanup and removing features not needed in MVP

* Updating bounty schema

* Fixing missing package after merge

* Form refactoring to use scale

* Bounty props refactor and discord claim linking

* add final bounties schema (#41)

* add final bounties schema

* update final.json according to final_validation.js

* adjust to double value

* address review comments

* add postinstall step and remove 'guild' from 'guildName'

* add postinstall step for husky

* add precision field

* change to scale

* update to int

* Feature/degen integration sync (#52)

* add webhook integration

* add build for qa env file

* try different build

* add root build:qa script

* remove mongodb url credentials

* manually add configs

* move bounty publish to api

* remove api console log

* wait for publish bounty to finish

* feature/54 refactored ? Get Help to Need Help? on buttons below filter

* Added link functionality to Need Help? and Give us Feedback buttons in index.tsx under filter

* feature/54: Removed use of anchor tag in ColorModeButton due to breaking change and refactored to wrap component in Filter/index.tsx with an accessible link. Refactored prev discord info work

* Feature/54 netlify failed on linting error due to unused import. removed

* Feature/allow open bounty edit (#57)

* Feature/enhance toml env config (#58)

* fix webhook post and add conditional logging

* small fine tunning

* Feature/53 Pagination (#59)

* Implemented scrappy client side pagination. Button logic needs updating, as does button styling

* feature/53: fixed buggy next page and previous page logic. Implemented an API route to get # bounties in the collection

* feature/53: refactored onClick methods. Attempted to wire in Chakra, couldn't get onClick to fire.

* feature/53: implemented chakra styling over html buttons w Zberwaldt !

* feature/53 hand merged in Oktal's refactoring of paginated bounties to make it a child component of Bounties and the use of Button rather than chakra.button. refactored math

* update readme documentation with ux flow, and updated bot commands. (#51)

* update readme documentation with ux flow, and work-in-prog update on bot commands

* update README.md to change User Experience Flow and Bot Commands as suggested

* add frontend flow to match bot/discord commands in README.md, link to Bounty Board Workflow Notion Page

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

* Final front end tweaks (#61)

* add prod details

* Fix buttons missing once filters was removed (#63)

* Fix buttons missing

* Made buttons target new tab

* Made buttons target new tab

Co-authored-by: Oktal <[email protected]>
Co-authored-by: John <[email protected]>
Co-authored-by: paulapivat <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: Behold3th <[email protected]>
Co-authored-by: @PaulApivat <[email protected]>
Co-authored-by: Behold <[email protected]>
Co-authored-by: Oktalize <[email protected]>

Co-authored-by: Oktal <[email protected]>
Co-authored-by: John <[email protected]>
Co-authored-by: paulapivat <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: Behold3th <[email protected]>
Co-authored-by: @PaulApivat <[email protected]>
Co-authored-by: Behold <[email protected]>
Co-authored-by: Oktalize <[email protected]>

* feature/66 removed listing of complete bounties

* allow more characters (#69)

Co-authored-by: Oktal <[email protected]>
Co-authored-by: John <[email protected]>
Co-authored-by: paulapivat <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: Behold3th <[email protected]>
Co-authored-by: @PaulApivat <[email protected]>
Co-authored-by: Behold <[email protected]>
Co-authored-by: Oktalize <[email protected]>

* Feature/fix qa envs (#76)

* fix env variables

* reference correct dev vs prod envs

* add more specific entries

* wip

* set build ENV

* cleanup

* Feature/add metadata (#73)

* add general high-level and bounty status queries for mongo shell (#78)

* adjust hashID in embed (#77)

* Update build system

 * enhance lint system by directly using ESLint
 * clean up codebase by explicitly naming variables
 * allow nodejs version greator than 14
 * remove prettier since eslint --fix handles the formating

* bug fixes

Co-authored-by: Oktal <[email protected]>
Co-authored-by: John <[email protected]>
Co-authored-by: paulapivat <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: João Henrique Costa <[email protected]>
Co-authored-by: Behold3th <[email protected]>
Co-authored-by: @PaulApivat <[email protected]>
Co-authored-by: Behold <[email protected]>
Co-authored-by: Oktalize <[email protected]>
  • Loading branch information
10 people authored Aug 27, 2021
1 parent bdee47c commit 7810e9f
Show file tree
Hide file tree
Showing 42 changed files with 1,359 additions and 1,223 deletions.
73 changes: 73 additions & 0 deletions mongo/bounties/bounty_queries.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// GENERAL HIGH LEVEL QUERIES

// How many Bounties were created in Season 1?

db.bounties.find({ season: 1 }).count();

// How much BANK was allocated for Bounties in Season 1? (TBD: aggregation framework)

// (sort amount of BANK allocated in Season 1 in Descending order)

db.bounties.find({ season: 1 }).sort({ "reward.amount": -1 });

// Number of Bounties at the start of the season? vs end of season? (TBD)

// (sort bounties by createdAt, descending)

db.bounties.find({ season: 1 }).sort({ createdAt: -1 });

// Who claimed the most bounties? (TBD)

// (display claimedBy.discordHandle to eyeball)

db.bounties.find({}, { "claimedBy.discordHandle": 1 }).pretty();

// Who completed/submitted the most bounties? (TBD)

// (display submittedBy.discordHandle to eyeball)

db.bounties.find({}, { "submittedBy.discordHandle": 1 }).pretty();

// Which guild completed the most bounties? (TBD, need to add new data fields to answer this question)

// BOUNTY STATUS QUERIES

// How many Bounties were completed on time? (need to add new data fields to consider timeliness)

// How many Bounties expired? (need to add new data fields to consider expiration)

// How many Bounties were expired? (past tense)

db.bounties.find({ "statusHistory.status": "Deleted" }).count();

// How many Bounties current status is 'deleted'?

db.bounties.find({ status: "Deleted" }).count();

// How many Bounties are (currently) open?

db.bounties.find({ status: "Open" }).count();

// How many Bounties were drafted? (might not be meaningful as 'draft' turns into 'open')

db.bounties.find({ "statusHistory.status": "Draft" }).count();

// How many Bounties are (currently) in 'Draft'?

db.bounties.find({ status: "Draft" }).count();

// How many Bounties are (currently) 'In-Progress'?

db.bounties.find({ status: "In-Progress" }).count();

// How many Bounties were 'In-Progress' at one point in time?

db.bounties.find({ "statusHistory.status": "In-Progress" }).count();

// How many Bounties were 'In-Review' at one point in time?

db.bounties.find({ "statusHistory.status": "In-Review" }).count();

// How many Bounties are (currently) 'In-Review'?

db.bounties.find({ status: "In-Review" }).count();
5 changes: 3 additions & 2 deletions packages/react-app/.env.prod
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
BUILD_ENV=production
MONGODB_DB=bountyboard
MONGODB_URI=
#PROD_MONGODB_URI=

NEXT_PUBLIC_DISCORD_SERVER_ID=834499078434979890
NEXT_PUBLIC_DISCORD_CHANNEL_BOUNTY_BOARD_ID=850402063741091880
Expand All @@ -10,4 +11,4 @@ NEXT_PUBLIC_DAO_CURRENT_SEASON_END_DATE=2021-08-31T04:00:00.000Z

# URLs
NEXT_PUBLIC_DAO_BOUNTY_BOARD_URL=https://bountyboard.bankless.community
DISCORD_BOUNTY_BOARD_WEBHOOK=
#PROD_DISCORD_BOUNTY_BOARD_WEBHOOK=
5 changes: 3 additions & 2 deletions packages/react-app/.env.qa
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
BUILD_ENV=development
MONGODB_DB=bountyboard
MONGODB_URI=
#DEV_MONGODB_URI=

NEXT_PUBLIC_DISCORD_SERVER_ID=851552281249972254
NEXT_PUBLIC_DISCORD_CHANNEL_BOUNTY_BOARD_ID=869964294865977425
Expand All @@ -10,4 +11,4 @@ NEXT_PUBLIC_DAO_CURRENT_SEASON_END_DATE=2021-08-31T04:00:00.000Z

# URLs
NEXT_PUBLIC_DAO_BOUNTY_BOARD_URL=https://develop--bounty-board-29081e.netlify.app/
DISCORD_BOUNTY_BOARD_WEBHOOK=https://discord.com/api/webhooks/873289859308073070/cj4sCbAABT3CpOC5f-5XTbJvkDimqEGAye-CFUYGos6V_euKo9jlKXhpJu051ZoNkora
#DEV_DEV_DISCORD_BOUNTY_BOARD_WEBHOOK=
39 changes: 38 additions & 1 deletion packages/react-app/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,43 @@
"argsIgnorePattern": "^_"
}
],
"react/no-unescaped-entities": 1
"react/no-unescaped-entities": 1,
"brace-style": ["error", "1tbs", { "allowSingleLine": true }],
"comma-dangle": ["error", "always-multiline"],
"comma-spacing": "error",
"comma-style": "error",
"curly": ["error", "multi-line", "consistent"],
"dot-location": ["error", "property"],
"handle-callback-err": "off",
"indent": ["error", "tab"],
"max-nested-callbacks": ["error", { "max": 4 }],
"max-statements-per-line": ["error", { "max": 2 }],
"no-console": "off",
"no-empty-function": "error",
"no-floating-decimal": "error",
"no-inline-comments": "error",
"no-multi-spaces": "error",
"no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 1, "maxBOF": 0 }],
"no-shadow": ["error", { "allow": ["err", "resolve", "reject"] }],
"no-trailing-spaces": ["error", { "skipBlankLines": true, "ignoreComments": true }],
"no-var": "error",
"object-curly-spacing": ["error", "always"],
"prefer-const": "error",
"quotes": ["error", "single"],
"semi": ["error", "always"],
"space-before-blocks": "error",
"space-before-function-paren": [
"error",
{
"anonymous": "never",
"named": "never",
"asyncArrow": "always"
}
],
"space-in-parens": "error",
"space-infix-ops": "error",
"space-unary-ops": "error",
"spaced-comment": "error",
"yoda": "error"
}
}
4 changes: 0 additions & 4 deletions packages/react-app/.prettierignore

This file was deleted.

4 changes: 0 additions & 4 deletions packages/react-app/.prettierrc

This file was deleted.

10 changes: 0 additions & 10 deletions packages/react-app/.prettierrc.js

This file was deleted.

7 changes: 7 additions & 0 deletions packages/react-app/docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# CHANGELOG

## 1.0.0-beta2 (2021-08-26)

1. Use QA specific environment variables
2. Add metadata to display preview in discord link
3. Adjust hashID for discordjs webhook message
4. Update ESLint config with cleaner controls and update build system

## 1.0.0-beta (2021-08-12)

1. Add github and heroku actions integration, initialize react-create app
Expand Down
11 changes: 5 additions & 6 deletions packages/react-app/next-seo.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const title = 'Bankless Bounty Board';
const description =
'Bankless Bounty Board';
const url = 'https://bountyboard.bankless.community';
export const title = 'Bankless Bounty Board'
const description = 'Bankless Bounty Board'
const url = 'https://bountyboard.bankless.community'

const SEO = {
title,
Expand All @@ -27,6 +26,6 @@ const SEO = {
site: '@banklessdao',
},
additionalLinkTags: [{ rel: 'icon', href: '/favicon.png' }],
};
}

export default SEO;
export default SEO
11 changes: 8 additions & 3 deletions packages/react-app/next.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
module.exports = {
distDir: 'dist',
webpack5: true,
}
distDir: 'dist',
webpack5: true,
eslint: {
// Warning: This allows production builds to successfully complete even if
// your project has ESLint errors.
ignoreDuringBuilds: true,
},
};
33 changes: 15 additions & 18 deletions packages/react-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bounty-board/react-app",
"version": "1.0.0-beta",
"version": "1.0.0-beta2",
"homepage": ".",
"description": "This web app displays the bounties that are available for DAO members to claim.",
"repository": "https://github.com/BanklessDAO/bounty-board",
Expand All @@ -12,20 +12,20 @@
"extends": "react-app"
},
"scripts": {
"dev": "next dev",
"dev": "yarn lint && next dev",
"build": "next build",
"start": "next start",
"build:qa": "env-cmd -f .env.qa next build",
"build:prod": "env-cmd -f .env.prod next build",
"build:qa": "env-cmd -f .env.qa yarn build",
"build:prod": "env-cmd -f .env.prod yarn build",
"prebuild": "yarn lint",
"type-check": "tsc --pretty --noEmit --skipLibCheck --esModuleInterop --strict --jsx preserve",
"export": "next export",
"lint": "next lint",
"format": "prettier --write src"
"lint": "eslint src --ext js,jsx,ts,tsx",
"format": "eslint src --ext js,jsx,ts,tsx --fix"
},
"lint-staged": {
"*.@(ts|tsx)": [
"yarn run type-check",
"yarn lint src --fix -d",
"yarn format"
]
},
Expand All @@ -36,9 +36,15 @@
"@fontsource/lexend": "^4.5.0",
"@hookform/resolvers": "^2.7.1",
"@netlify/plugin-nextjs": "^3.8.0",
"@types/node": "^16.4.7",
"@types/nprogress": "^0.2.0",
"@types/react": "^17.0.14",
"@typescript-eslint/eslint-plugin": "^4.28.3",
"env-cmd": "^10.1.0",
"eslint": "^7.30.0",
"eslint-config-next": "^11.0.1",
"framer-motion": "^4.1.17",
"lint-staged": "^11.0.0",
"mongodb-client-encryption": "^1.2.6",
"mongoose": "^5.13.4",
"next": "^11.0.0",
Expand All @@ -49,20 +55,11 @@
"react-hook-form": "^7.12.2",
"react-icons": "^4.2.0",
"swr": "^0.5.6",
"typescript": "^4.3.5",
"yup": "^0.32.9"
},
"devDependencies": {
"@types/node": "^16.4.7",
"@types/nprogress": "^0.2.0",
"@types/react": "^17.0.14",
"eslint": "^7.30.0",
"eslint-config-next": "^11.0.1",
"lint-staged": "^11.0.0",
"prettier": "^2.3.2",
"typescript": "^4.3.5"
},
"engines": {
"yarn": "1.x",
"node": "~14.17.0"
"node": ">=14.17.0"
}
}
Binary file added packages/react-app/public/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/react-app/public/preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 29 additions & 29 deletions packages/react-app/src/components/global/Footer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
import { Box, Flex, HStack, Text } from '@chakra-ui/react'
import AccessibleLink from '../../../components/parts/AccessibleLink'
import ColorModeButton from '../../../components/parts/ColorModeButton'
import { Box, Flex, HStack, Text } from '@chakra-ui/react';
import AccessibleLink from '../../../components/parts/AccessibleLink';
import ColorModeButton from '../../../components/parts/ColorModeButton';

import { discordSupportChannelUrl } from '../../../constants/discordInfo'
import { feedbackUrl } from '../../../constants/discordInfo'
import { discordSupportChannelUrl } from '../../../constants/discordInfo';
import { feedbackUrl } from '../../../constants/discordInfo';

const Footer = (): JSX.Element => {
return (
<Flex
as="footer"
px={8}
py={10}
width="full"
justifyContent="space-between"
>
<Box>
{/* <Text fontSize="xs" color="grey">
return (
<Flex
as="footer"
px={8}
py={10}
width="full"
justifyContent="space-between"
>
<Box>
{/* <Text fontSize="xs" color="grey">
Mirror Substack Discord Twitter Github
</Text> */}
<HStack>
<AccessibleLink href={feedbackUrl} isExternal={true}>
<ColorModeButton>Give us Feedback</ColorModeButton>
</AccessibleLink>
<HStack>
<AccessibleLink href={feedbackUrl} isExternal={true}>
<ColorModeButton>Give us Feedback</ColorModeButton>
</AccessibleLink>

<AccessibleLink href={discordSupportChannelUrl} isExternal={true}>
<ColorModeButton>Need Help?</ColorModeButton>
</AccessibleLink>
</HStack>
</Box>
<AccessibleLink href={discordSupportChannelUrl} isExternal={true}>
<ColorModeButton>Need Help?</ColorModeButton>
</AccessibleLink>
</HStack>
</Box>

<Text>&copy; {new Date().getFullYear()} Bankless DAO</Text>
</Flex>
)
}
<Text>&copy; {new Date().getFullYear()} Bankless DAO</Text>
</Flex>
);
};

export default Footer
export default Footer;
24 changes: 12 additions & 12 deletions packages/react-app/src/components/global/Header/Logo.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React from 'react'
import { Box, BoxProps, Image, Link as ChakraLink } from '@chakra-ui/react'
import Link from 'next/link'
import React from 'react';
import { Box, BoxProps, Image, Link as ChakraLink } from '@chakra-ui/react';
import Link from 'next/link';

export default function Logo(props: BoxProps): JSX.Element {
return (
<Box {...props}>
<Link href={'/'}>
<ChakraLink isExternal={false}>
<Image alt="Bankless DAO" src="/logo.svg" />
</ChakraLink>
</Link>
</Box>
)
return (
<Box {...props}>
<Link href={'/'}>
<ChakraLink isExternal={false}>
<Image alt="Bankless DAO" src="/logo.png" />
</ChakraLink>
</Link>
</Box>
);
}
Loading

0 comments on commit 7810e9f

Please sign in to comment.