From 997734020523587a2dca4409e655f75027699d5e Mon Sep 17 00:00:00 2001 From: tescher Date: Tue, 20 Jun 2023 14:40:39 -0500 Subject: [PATCH] Develop into Main (#284) * Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](https://github.com/lquixada/cross-fetch/compare/v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](https://github.com/panva/jose/compare/v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 * Bump http-cache-semantics from 4.1.0 to 4.1.1 (#278) * Develop into Main (#279) * Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](https://github.com/lquixada/cross-fetch/compare/v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](https://github.com/panva/jose/compare/v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 --------- Signed-off-by: dependabot[bot] Signed-off-by: tescher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 * Bump http-cache-semantics from 4.1.0 to 4.1.1 Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/kornelski/http-cache-semantics/releases) - [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: http-cache-semantics dependency-type: indirect ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Signed-off-by: tescher Co-authored-by: tescher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 * Bump mongoose from 5.13.14 to 5.13.15 (#277) * Develop into Main (#279) * Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](https://github.com/lquixada/cross-fetch/compare/v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](https://github.com/panva/jose/compare/v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 --------- Signed-off-by: dependabot[bot] Signed-off-by: tescher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 * Bump mongoose from 5.13.14 to 5.13.15 Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.13.14 to 5.13.15. - [Release notes](https://github.com/Automattic/mongoose/releases) - [Changelog](https://github.com/Automattic/mongoose/blob/master/CHANGELOG.md) - [Commits](https://github.com/Automattic/mongoose/compare/5.13.14...5.13.15) --- updated-dependencies: - dependency-name: mongoose dependency-type: direct:production ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Signed-off-by: tescher Co-authored-by: tescher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 * Bump cookiejar from 2.1.3 to 2.1.4 (#276) * Develop into Main (#279) * Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](https://github.com/lquixada/cross-fetch/compare/v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](https://github.com/panva/jose/compare/v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 --------- Signed-off-by: dependabot[bot] Signed-off-by: tescher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 * Bump cookiejar from 2.1.3 to 2.1.4 Bumps [cookiejar](https://github.com/bmeck/node-cookiejar) from 2.1.3 to 2.1.4. - [Release notes](https://github.com/bmeck/node-cookiejar/releases) - [Commits](https://github.com/bmeck/node-cookiejar/commits) --- updated-dependencies: - dependency-name: cookiejar dependency-type: indirect ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Signed-off-by: tescher Co-authored-by: tescher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 * Bump decode-uri-component from 0.2.0 to 0.2.2 (#269) * Develop into Main (#279) * Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](https://github.com/lquixada/cross-fetch/compare/v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](https://github.com/panva/jose/compare/v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 --------- Signed-off-by: dependabot[bot] Signed-off-by: tescher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 * Bump json5 from 1.0.1 to 1.0.2 (#274) Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump express from 4.17.2 to 4.18.2 (#270) Bumps [express](https://github.com/expressjs/express) from 4.17.2 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.17.2...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump decode-uri-component from 0.2.0 to 0.2.2 Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Signed-off-by: tescher Co-authored-by: tescher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 * Main back into develop (#280) * Develop into Main (#279) * Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](https://github.com/lquixada/cross-fetch/compare/v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](https://github.com/panva/jose/compare/v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 --------- Signed-off-by: dependabot[bot] Signed-off-by: tescher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 * Bump json5 from 1.0.1 to 1.0.2 (#274) Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump express from 4.17.2 to 4.18.2 (#270) Bumps [express](https://github.com/expressjs/express) from 4.17.2 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.17.2...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] Signed-off-by: tescher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 * Sync dev with main (#281) * Develop into Main (#279) * Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](https://github.com/lquixada/cross-fetch/compare/v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](https://github.com/panva/jose/compare/v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher Co-authored-by: Mofejesu1 --------- Signed-off-by: dependabot[bot] Signed-off-by: tescher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 * Bump json5 from 1.0.1 to 1.0.2 (#274) Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump express from 4.17.2 to 4.18.2 (#270) Bumps [express](https://github.com/expressjs/express) from 4.17.2 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.17.2...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] Signed-off-by: tescher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 * Feature/repeating bounties (#283) * Remove templates from lsiting * Add repeats in the display * Update package.json with Node ^18.x.0 To get Vercel to work Signed-off-by: tescher * Fixes for dependency version issues (#285) --------- Signed-off-by: dependabot[bot] Signed-off-by: tescher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 --- .vscode/settings.json | 3 +- package.json | 4 + packages/react-app/package.json | 10 +- packages/react-app/setupTests.ts | 11 + .../pages/Bounties/Bounty/index.tsx | 46 + .../pages/Bounties/Form/NewBountyForm.tsx | 5 + .../components/pages/Bounties/Form/index.tsx | 8 +- packages/react-app/src/hooks/useBounties.ts | 3 + packages/react-app/src/models/Bounty.ts | 6 + packages/react-app/src/models/BountyDb.ts | 17 + packages/react-app/src/pages/_app.tsx | 9 +- .../react-app/src/services/bounty.service.ts | 17 +- packages/react-app/src/types/Paginate.ts | 2 +- packages/react-app/src/types/Queries.ts | 3 +- .../tests/integration/api/auth.spec.ts | 1 - .../unit/services/bounty.service.spec.ts | 6 + packages/react-app/tsconfig.jest.json | 3 +- packages/react-app/tsconfig.json | 3 + yarn.lock | 8366 +++++++++-------- 19 files changed, 4722 insertions(+), 3801 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 6df2707d..69cff663 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,6 @@ "markdown.preview.fontSize": 16, "terminal.integrated.fontSize": 16, "editor.fontSize": 14, - "editor.scrollbar.verticalScrollbarSize": 12 + "editor.scrollbar.verticalScrollbarSize": 12, + "typescript.tsdk": "node_modules/typescript/lib" } \ No newline at end of file diff --git a/package.json b/package.json index 93f86bd7..5ac75277 100644 --- a/package.json +++ b/package.json @@ -38,5 +38,9 @@ }, "devDependencies": { "husky": "^7.0.1" + }, + "resolutions": { + "**/@types/react": "^17.0.38" } + } diff --git a/packages/react-app/package.json b/packages/react-app/package.json index 6b942ef5..9d22dc56 100644 --- a/packages/react-app/package.json +++ b/packages/react-app/package.json @@ -42,7 +42,7 @@ "@hookform/resolvers": "^2.7.1", "@netlify/plugin-nextjs": "^3.8.0", "@testing-library/react-hooks": "^8.0.0", - "@types/mongoose-paginate-v2": "^1.4.1", + "@types/mongoose-paginate-v2": "~1.4.1", "@wojtekmaj/enzyme-adapter-react-17": "^0.6.6", "axios": "^0.24.0", "chakra-react-select": "^4.4.2", @@ -53,7 +53,7 @@ "framer-motion": "^4.1.17", "lint-staged": "^11.0.0", "mongo-cursor-pagination": "^7.6.1", - "mongoose": "^5.13.4", + "mongoose": "^5.13.15", "next": "^12.1.0", "next-auth": "4.0.0-next.26", "next-seo": "^4.26.0", @@ -80,11 +80,11 @@ "@testing-library/react-hooks": "^8.0.0", "@types/dompurify": "^2.3.3", "@types/enzyme": "^3.10.10", - "@types/jest": "^27.0.2", + "@types/jest": "~27.5.0", "@types/next-auth": "^3.15.0", "@types/node": "^16.4.7", "@types/nprogress": "^0.2.0", - "@types/react": "^17.0.14", + "@types/react": "^17.0.2", "@types/react-csv": "^1.1.2", "@types/react-datepicker": "^4.3.4", "@types/react-html-parser": "^2.0.2", @@ -95,7 +95,7 @@ "enzyme-to-json": "^3.6.2", "eslint": "^7.30.0", "eslint-config-next": "^11.0.1", - "jest": "^27.3.1", + "jest": "~27.5.0", "react-dom": "^17.0.2", "react-test-renderer": "^17.0.2", "ts-jest": "^27.0.7", diff --git a/packages/react-app/setupTests.ts b/packages/react-app/setupTests.ts index 9aba2f79..50bcd2cf 100644 --- a/packages/react-app/setupTests.ts +++ b/packages/react-app/setupTests.ts @@ -3,3 +3,14 @@ import Adapter from '@wojtekmaj/enzyme-adapter-react-17'; import '@testing-library/jest-dom'; configure({ adapter: new Adapter() }); + +window.matchMedia = (query) => ({ + matches: false, + media: query, + onchange: null, + addListener: jest.fn(), + removeListener: jest.fn(), + addEventListener: jest.fn(), + removeEventListener: jest.fn(), + dispatchEvent: jest.fn(), +}); \ No newline at end of file diff --git a/packages/react-app/src/components/pages/Bounties/Bounty/index.tsx b/packages/react-app/src/components/pages/Bounties/Bounty/index.tsx index 5dc42a36..8c53f045 100644 --- a/packages/react-app/src/components/pages/Bounties/Bounty/index.tsx +++ b/packages/react-app/src/components/pages/Bounties/Bounty/index.tsx @@ -42,6 +42,7 @@ import { useRouter } from 'next/router'; import { BountyMarkPaidButton } from './markPaid'; import { WarningIcon } from '@chakra-ui/icons'; import { useUser } from '@app/hooks/useUser'; +import { useBounty } from '@app/hooks/useBounties'; type SetState = (arg: T) => void; @@ -347,6 +348,9 @@ const BountyDetails = ({ ? MiscUtils.shortDate(new Date(bounty.dueAt)) : 'unspecified'; + const bountyTemplate: BountyCollection | null | undefined = bounty.repeatTemplateId ? + useBounty(bounty.repeatTemplateId).bounty : null; + return ( @@ -476,6 +480,48 @@ const BountyDetails = ({ + {bountyTemplate && + + + + repeats every + + + + + {bountyTemplate.repeatDays?.toString() + + (bountyTemplate.repeatDays > 1 ? ' days' : ' day')} + + + + + + {bountyTemplate.endRepeatsDate ? 'ending' : 'ending after'} + + + + + {bountyTemplate.endRepeatsDate ? + MiscUtils.shortDate(new Date(bountyTemplate.endRepeatsDate)) : + bountyTemplate.numRepeats.toString() + ' repeats'} + + + + + } {bounty.tags && { return (
)}> - + Title {errors.title?.message} - + Description