-
Notifications
You must be signed in to change notification settings - Fork 0
User Membership Integration + Volunteer #13
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
dokicaaa
wants to merge
7
commits into
main
Choose a base branch
from
feat/user-membership
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
8fcbb35
Added Membership Support
dokicaaa 252f867
Removed dev logs
dokicaaa 2a99112
fix: resolve yearly metadata bug and webhook crash in membership flow
dokicaaa 02b1688
updated env.example
dokicaaa 4865a31
fix: volunteer request sends dual email to base and applicant
dokicaaa 75ddfe0
fixed issues left from copilot reviews
dokicaaa 80682e6
Merge branch 'main' into feat/user-membership
dokicaaa File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| import { factories } from '@strapi/strapi'; | ||
|
|
||
| export default factories.createCoreRouter('api::event-request.event-request'); | ||
| export default { | ||
| routes: [], | ||
| }; | ||
42 changes: 42 additions & 0 deletions
42
cms/src/api/membership/content-types/membership/schema.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| { | ||
| "kind": "collectionType", | ||
| "collectionName": "memberships", | ||
| "info": { | ||
| "singularName": "membership", | ||
| "pluralName": "memberships", | ||
| "displayName": "Membership", | ||
| "description": "Tracks user membership subscriptions" | ||
| }, | ||
| "options": { | ||
| "draftAndPublish": false | ||
| }, | ||
| "pluginOptions": {}, | ||
| "attributes": { | ||
| "user": { | ||
| "type": "relation", | ||
| "relation": "manyToOne", | ||
| "target": "plugin::users-permissions.user", | ||
| "inversedBy": "memberships" | ||
| }, | ||
| "tier": { | ||
| "type": "enumeration", | ||
| "enum": ["monthly", "yearly"], | ||
| "required": true | ||
| }, | ||
| "status": { | ||
| "type": "enumeration", | ||
| "enum": ["active", "inactive", "cancelled", "cancel_pending", "pending"], | ||
| "default": "pending" | ||
| }, | ||
| "startDate": { | ||
| "type": "datetime" | ||
| }, | ||
| "endDate": { | ||
| "type": "datetime" | ||
| }, | ||
| "stripeSubscriptionId": { | ||
| "type": "string", | ||
| "private": true | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR removes the custom
approvecontroller method, butroutes/custom-event-request.tsstill registersPOST /event-requests/:id/approvewith handlerevent-request.approve. Strapi validates route handlers at startup, so the server throws "Handler not found" and won't boot. That route file needs to be deleted along with the controller method (the publish middleware insrc/middlewares/event-request-approval.tsalready covers the approval flow).