diff --git a/.github/ISSUE_TEMPLATE/02-feature.md b/.github/ISSUE_TEMPLATE/02-feature.md new file mode 100644 index 00000000..51104ec5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/02-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. diff --git a/.github/ISSUE_TEMPLATE/03-bug.md b/.github/ISSUE_TEMPLATE/03-bug.md new file mode 100644 index 00000000..82843328 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/03-bug.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. 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 diff --git a/.github/ISSUE_TEMPLATE/03-backend-issue.md b/.github/ISSUE_TEMPLATE/05-backend-bug.md similarity index 80% rename from .github/ISSUE_TEMPLATE/03-backend-issue.md rename to .github/ISSUE_TEMPLATE/05-backend-bug.md index ab1f1485..196f16a1 100644 --- a/.github/ISSUE_TEMPLATE/03-backend-issue.md +++ b/.github/ISSUE_TEMPLATE/05-backend-bug.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: '' 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 diff --git a/.github/ISSUE_TEMPLATE/05-frontend-issue.md b/.github/ISSUE_TEMPLATE/07-frontend-bug.md similarity index 84% rename from .github/ISSUE_TEMPLATE/05-frontend-issue.md rename to .github/ISSUE_TEMPLATE/07-frontend-bug.md index 04e17547..4d95fa56 100644 --- a/.github/ISSUE_TEMPLATE/05-frontend-issue.md +++ b/.github/ISSUE_TEMPLATE/07-frontend-bug.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: A bug pertaining to the frontend. +title: "[FE Bug] Describe what to fix here" labels: bug, frontend assignees: '' 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 diff --git a/.github/ISSUE_TEMPLATE/07-ui-issue.md b/.github/ISSUE_TEMPLATE/09-ui-bug.md similarity index 82% rename from .github/ISSUE_TEMPLATE/07-ui-issue.md rename to .github/ISSUE_TEMPLATE/09-ui-bug.md index 62a4dd78..e64bcc2a 100644 --- a/.github/ISSUE_TEMPLATE/07-ui-issue.md +++ b/.github/ISSUE_TEMPLATE/09-ui-bug.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: '' 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 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 diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 90a721ef..00deef73 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,13 +1,12 @@ ## 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**. 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. @@ -21,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 to not 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. - ... 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 (