From 4a1e1e3e7e3d3f2f31323febfafde06a9f4e4d16 Mon Sep 17 00:00:00 2001 From: AmirAgassi <33383085+AmirAgassi@users.noreply.github.com> Date: Wed, 18 Dec 2024 02:36:49 -0500 Subject: [PATCH 01/23] add 'withdrawn' state to project status enum --- backend/.sqlc/migrations/20241215194302_initial_schema.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/.sqlc/migrations/20241215194302_initial_schema.sql b/backend/.sqlc/migrations/20241215194302_initial_schema.sql index cce72510..b7592654 100644 --- a/backend/.sqlc/migrations/20241215194302_initial_schema.sql +++ b/backend/.sqlc/migrations/20241215194302_initial_schema.sql @@ -14,7 +14,8 @@ CREATE TYPE project_status AS ENUM ( 'draft', 'pending', 'verified', - 'declined' + 'declined', + 'withdrawn' ); CREATE TABLE IF NOT EXISTS users ( From cfa48a7ed4a16d5acb491bbf4bc8466c7089acd5 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:14:05 -0500 Subject: [PATCH 02/23] Add reviewer to-do item to PR template file Signed-off-by: Nausher Rao --- .github/pull_request_template.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 90a721ef..491c5e64 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,6 +1,7 @@ ## Checklist Before opening this PR, make sure the PR: - [ ] Has an **assignee or group of assignees**. +- [ ] Has a **reviewer or a group of reviewers**. - [ ] Is **labelled properly**. - [ ] Has the **SPUR project assigned to it**. - [ ] Has an **assigned milestone**. From 9df90da6e1e4b15ac7d2e45debdc6f9d538d692a Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:15:00 -0500 Subject: [PATCH 03/23] Remove useless to-do items from PR template Signed-off-by: Nausher Rao --- .github/pull_request_template.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 491c5e64..51c83666 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -7,8 +7,6 @@ Before opening this PR, make sure the PR: - [ ] Has an **assigned milestone**. Additionally, make sure that: -- [ ] My code follows the style guidelines of this project. -- [ ] I have performed a self-review of my code. - [ ] I have commented my code, particularly in hard-to-understand areas. - [ ] I have made corresponding changes to the documentation. - [ ] My changes generate no new warnings. @@ -26,9 +24,9 @@ Replace this with a summary of the changes and the related issues. Please also i Please delete options that are not relevant: - [ ] Bug fix (non-breaking change which fixes an issue). - [ ] New feature (non-breaking change which adds functionality). -- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected). +- [ ] Breaking change (fix or feature that would cause existing functionality not to work as expected). - [ ] This change requires a documentation update. ## Testing -- Replace this with a list of test files that cover all the changes in this PR. +- Replace this with a list of test files covering all the PR changes. - ... From 468150c468520b4848888948982fd11909bc1bb1 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:17:22 -0500 Subject: [PATCH 04/23] Remove "type of change" section from PR template Signed-off-by: Nausher Rao --- .github/pull_request_template.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 51c83666..00deef73 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -20,13 +20,6 @@ Replace this with a summary of the changes and the related issues. Please also i ## Linked Issues - Fixes # (add all issues that this PR closes, prefixed with either "Fixes" or "Closes"). -## Type of Change -Please delete options that are not relevant: -- [ ] Bug fix (non-breaking change which fixes an issue). -- [ ] New feature (non-breaking change which adds functionality). -- [ ] Breaking change (fix or feature that would cause existing functionality not to work as expected). -- [ ] This change requires a documentation update. - ## Testing - Replace this with a list of test files covering all the PR changes. - ... From 6ec99c7a1af089f3308125ea403777729f9e8b60 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:31:54 -0500 Subject: [PATCH 05/23] Create feature.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/feature.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/feature.md diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md new file mode 100644 index 00000000..51104ec5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature.md @@ -0,0 +1,26 @@ +--- +name: Feature +about: An addition, change, or refactor to the backend AND frontend. +title: "[Feat] Describe what to add here" +labels: backend, frontend, enhancement +assignees: '' + +--- + +## Checklist +Before submitting this ticket, make sure this ticket: +- [ ] Is **labelled properly** - if this is a refactor, add the label! +- [ ] Has the **SPUR project assigned to it**. +- [ ] Has an **assigned milestone**. + +And lastly: +- [ ] Once someone picks up this ticket, **make sure to assign it**. + +## Description +Replace this text with a brief description of the feature. + +## Screenshots +If applicable add screenshots, otherwise delete this section. + +## Additional Information +If applicable add any other information, otherwise, delete this section. From 402d02bfe7b9ff9095ece479fe1a54c4420a62c5 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:34:13 -0500 Subject: [PATCH 06/23] Create issue.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/issue.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/issue.md diff --git a/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/issue.md new file mode 100644 index 00000000..82843328 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.md @@ -0,0 +1,30 @@ +--- +name: Issue, Bug, or Error +about: A bug pertaining to the backend AND frontend. +title: "[Bug] Describe what to fix here" +labels: backend, frontend, bug +assignees: '' + +--- + +## Checklist +Before submitting this ticket, make sure this ticket: +- [ ] Is **labelled properly**. +- [ ] Has the **SPUR project assigned to it**. +- [ ] Has an **assigned milestone**. + +And lastly: +- [ ] Once someone picks up this ticket, **make sure to assign it to a developer**. + +## Description +Replace this text with a brief description of the issue. + +## Reproduction +1. Replace this with a list of steps to reproduce the issue. +2. ... + +## Screenshots +If applicable add screenshots, otherwise delete this section. + +## Additional Information +If applicable add any other information, otherwise, delete this section. From a53a1aee21f5feed2fbf2a84511e741adf0b94c6 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:34:30 -0500 Subject: [PATCH 07/23] Update 03-backend-issue.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/03-backend-issue.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/03-backend-issue.md b/.github/ISSUE_TEMPLATE/03-backend-issue.md index ab1f1485..196f16a1 100644 --- a/.github/ISSUE_TEMPLATE/03-backend-issue.md +++ b/.github/ISSUE_TEMPLATE/03-backend-issue.md @@ -1,7 +1,7 @@ --- -name: Backend Issue -about: An issue pertaining to the backend (routes, middleware, database, or funding). -title: "[BE Issue] Describe what to fix here" +name: Backend Issue, Bug, or Error +about: A bug pertaining to the backend (routes, middleware, database, or funding). +title: "[BE Bug] Describe what to fix here" labels: backend, bug assignees: '' From 9cf52344b199c163387929247a28e610634228c9 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:34:45 -0500 Subject: [PATCH 08/23] Update 05-frontend-issue.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/05-frontend-issue.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/05-frontend-issue.md b/.github/ISSUE_TEMPLATE/05-frontend-issue.md index 04e17547..ab9f02b7 100644 --- a/.github/ISSUE_TEMPLATE/05-frontend-issue.md +++ b/.github/ISSUE_TEMPLATE/05-frontend-issue.md @@ -1,7 +1,7 @@ --- -name: Frontend Issue -about: An issue pertaining to the frontend. -title: "[FE Issue] Describe what to fix here" +name: Frontend Issue, Bug, or Error +about: An bug pertaining to the frontend. +title: "[FE Bug] Describe what to fix here" labels: bug, frontend assignees: '' From fe1501dd9f6412d88a0c6412a09168b6b02dd0b6 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:35:05 -0500 Subject: [PATCH 09/23] Update 07-ui-issue.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/07-ui-issue.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/07-ui-issue.md b/.github/ISSUE_TEMPLATE/07-ui-issue.md index 62a4dd78..e64bcc2a 100644 --- a/.github/ISSUE_TEMPLATE/07-ui-issue.md +++ b/.github/ISSUE_TEMPLATE/07-ui-issue.md @@ -1,7 +1,7 @@ --- -name: UI Issue -about: An issue pertaining to the Figma UI design file. -title: "[UI Feat] Describe what to fix here" +name: UI Issue, Bug, or Error +about: A bug pertaining to the Figma UI design file. +title: "[UI Bug] Describe what to fix here" labels: bug, design assignees: '' From 537547e08107d505eab354ff7131ad171143195f Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:35:14 -0500 Subject: [PATCH 10/23] Rename 07-ui-issue.md to 07-ui-bug.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/{07-ui-issue.md => 07-ui-bug.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{07-ui-issue.md => 07-ui-bug.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/07-ui-issue.md b/.github/ISSUE_TEMPLATE/07-ui-bug.md similarity index 100% rename from .github/ISSUE_TEMPLATE/07-ui-issue.md rename to .github/ISSUE_TEMPLATE/07-ui-bug.md From b0d1dc855bdbe421f20a3adbd6cc9c2178e05956 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:35:23 -0500 Subject: [PATCH 11/23] Rename 03-backend-issue.md to 03-backend-bug.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/{03-backend-issue.md => 03-backend-bug.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{03-backend-issue.md => 03-backend-bug.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/03-backend-issue.md b/.github/ISSUE_TEMPLATE/03-backend-bug.md similarity index 100% rename from .github/ISSUE_TEMPLATE/03-backend-issue.md rename to .github/ISSUE_TEMPLATE/03-backend-bug.md From 1f382c1575ce2f5c7198cc597b75300867d59202 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:35:39 -0500 Subject: [PATCH 12/23] Update and rename 05-frontend-issue.md to 05-frontend-bug.md Signed-off-by: Nausher Rao --- .../ISSUE_TEMPLATE/{05-frontend-issue.md => 05-frontend-bug.md} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/ISSUE_TEMPLATE/{05-frontend-issue.md => 05-frontend-bug.md} (94%) diff --git a/.github/ISSUE_TEMPLATE/05-frontend-issue.md b/.github/ISSUE_TEMPLATE/05-frontend-bug.md similarity index 94% rename from .github/ISSUE_TEMPLATE/05-frontend-issue.md rename to .github/ISSUE_TEMPLATE/05-frontend-bug.md index ab9f02b7..4d95fa56 100644 --- a/.github/ISSUE_TEMPLATE/05-frontend-issue.md +++ b/.github/ISSUE_TEMPLATE/05-frontend-bug.md @@ -1,6 +1,6 @@ --- name: Frontend Issue, Bug, or Error -about: An bug pertaining to the frontend. +about: A bug pertaining to the frontend. title: "[FE Bug] Describe what to fix here" labels: bug, frontend assignees: '' From 2d5d64e38b91667a9f55579c7779aec5fd18e29d Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:35:57 -0500 Subject: [PATCH 13/23] Rename 09-misc.md to 11-misc.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/{09-misc.md => 11-misc.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{09-misc.md => 11-misc.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/09-misc.md b/.github/ISSUE_TEMPLATE/11-misc.md similarity index 100% rename from .github/ISSUE_TEMPLATE/09-misc.md rename to .github/ISSUE_TEMPLATE/11-misc.md From 11c6e59ceee7097e0eaf2161109e930eb34b28c5 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:36:14 -0500 Subject: [PATCH 14/23] Rename 08-ci.md to 10-ci.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/{08-ci.md => 10-ci.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{08-ci.md => 10-ci.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/08-ci.md b/.github/ISSUE_TEMPLATE/10-ci.md similarity index 100% rename from .github/ISSUE_TEMPLATE/08-ci.md rename to .github/ISSUE_TEMPLATE/10-ci.md From 900703cf003e0a4f4a5856abb89bd13c03674c57 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:36:25 -0500 Subject: [PATCH 15/23] Rename 07-ui-bug.md to 09-ui-bug.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/{07-ui-bug.md => 09-ui-bug.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{07-ui-bug.md => 09-ui-bug.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/07-ui-bug.md b/.github/ISSUE_TEMPLATE/09-ui-bug.md similarity index 100% rename from .github/ISSUE_TEMPLATE/07-ui-bug.md rename to .github/ISSUE_TEMPLATE/09-ui-bug.md From 4a2f9f7d2d6b2cb3a5fe23ce99365db93294cfc6 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:36:57 -0500 Subject: [PATCH 16/23] Rename 06-ui-feature.md to 08-ui-feature.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/{06-ui-feature.md => 08-ui-feature.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{06-ui-feature.md => 08-ui-feature.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/06-ui-feature.md b/.github/ISSUE_TEMPLATE/08-ui-feature.md similarity index 100% rename from .github/ISSUE_TEMPLATE/06-ui-feature.md rename to .github/ISSUE_TEMPLATE/08-ui-feature.md From f1054350117cdebd89f20487899b4e92367870ce Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:37:09 -0500 Subject: [PATCH 17/23] Rename 05-frontend-bug.md to 07-frontend-bug.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/{05-frontend-bug.md => 07-frontend-bug.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{05-frontend-bug.md => 07-frontend-bug.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/05-frontend-bug.md b/.github/ISSUE_TEMPLATE/07-frontend-bug.md similarity index 100% rename from .github/ISSUE_TEMPLATE/05-frontend-bug.md rename to .github/ISSUE_TEMPLATE/07-frontend-bug.md From d0382088271dfaacafffc5af2a32e849fb404b9c Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:37:19 -0500 Subject: [PATCH 18/23] Rename 04-frontend-feature.md to 06-frontend-feature.md Signed-off-by: Nausher Rao --- .../{04-frontend-feature.md => 06-frontend-feature.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{04-frontend-feature.md => 06-frontend-feature.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/04-frontend-feature.md b/.github/ISSUE_TEMPLATE/06-frontend-feature.md similarity index 100% rename from .github/ISSUE_TEMPLATE/04-frontend-feature.md rename to .github/ISSUE_TEMPLATE/06-frontend-feature.md From 3b50230231172ca877b50602d6f8371c17e2495f Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:37:32 -0500 Subject: [PATCH 19/23] Rename 03-backend-bug.md to 05-backend-bug.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/{03-backend-bug.md => 05-backend-bug.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{03-backend-bug.md => 05-backend-bug.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/03-backend-bug.md b/.github/ISSUE_TEMPLATE/05-backend-bug.md similarity index 100% rename from .github/ISSUE_TEMPLATE/03-backend-bug.md rename to .github/ISSUE_TEMPLATE/05-backend-bug.md From cb9dcfa6223c607fec44bf8c5757eb80174f2781 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:37:42 -0500 Subject: [PATCH 20/23] Rename 02-backend-feature.md to 04-backend-feature.md Signed-off-by: Nausher Rao --- .../{02-backend-feature.md => 04-backend-feature.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{02-backend-feature.md => 04-backend-feature.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/02-backend-feature.md b/.github/ISSUE_TEMPLATE/04-backend-feature.md similarity index 100% rename from .github/ISSUE_TEMPLATE/02-backend-feature.md rename to .github/ISSUE_TEMPLATE/04-backend-feature.md From 0f8ca473c0c6d746d307340ef64cabf9a6517fce Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:37:52 -0500 Subject: [PATCH 21/23] Rename feature.md to 02-feature.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/{feature.md => 02-feature.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{feature.md => 02-feature.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/02-feature.md similarity index 100% rename from .github/ISSUE_TEMPLATE/feature.md rename to .github/ISSUE_TEMPLATE/02-feature.md From 17e8ef259a674771ac04bc079a541f97dd6f1dad Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:38:01 -0500 Subject: [PATCH 22/23] Rename issue.md to 03-issue.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/{issue.md => 03-issue.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{issue.md => 03-issue.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/issue.md b/.github/ISSUE_TEMPLATE/03-issue.md similarity index 100% rename from .github/ISSUE_TEMPLATE/issue.md rename to .github/ISSUE_TEMPLATE/03-issue.md From a2858d27bff735a30dc00b2eb39e6a7248894207 Mon Sep 17 00:00:00 2001 From: Nausher Rao Date: Wed, 18 Dec 2024 03:41:17 -0500 Subject: [PATCH 23/23] Rename 03-issue.md to 03-bug.md Signed-off-by: Nausher Rao --- .github/ISSUE_TEMPLATE/{03-issue.md => 03-bug.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{03-issue.md => 03-bug.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/03-issue.md b/.github/ISSUE_TEMPLATE/03-bug.md similarity index 100% rename from .github/ISSUE_TEMPLATE/03-issue.md rename to .github/ISSUE_TEMPLATE/03-bug.md