Skip to content
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.

Sign up for GitHub

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

Jump to bottom

MembershipTemplates are displayed in products #58

Merged
merged 7 commits into from
Sep 30, 2024
Merged

MembershipTemplates are displayed in products #58

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ea7952
Progress
LobeTia Apr 15, 2024
34a04cd
First working iteration
LobeTia Apr 18, 2024
c57b029
Merge remote-tracking branch 'origin/main' into feat/56/membership-te…
LobeTia Apr 28, 2024
f4ff3e8
Some reformat
LobeTia Apr 28, 2024
f34abd5
@types/node semver locked at tilde
LobeTia Apr 29, 2024
18b7188
Aligned node types with current lts version
LobeTia Apr 29, 2024
5f55830
Moved seeds data to dedicated folder
LobeTia Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
214 changes: 210 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
"start": "next start",
"ragequit": "rm -rf .next && npm run db:push && npm run dev"
},
"prisma": {
"seed": "tsx prisma/seeds/index.ts"
},
"dependencies": {
"@auth/prisma-adapter": "^1.4.0",
"@hookform/resolvers": "^3.3.4",
Expand All @@ -30,6 +33,7 @@
"@radix-ui/react-dropdown-menu": "^2.0.6",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-scroll-area": "^1.0.5",
"@radix-ui/react-select": "^2.0.0",
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-toast": "^1.1.5",
Expand Down Expand Up @@ -57,7 +61,7 @@
"devDependencies": {
"@types/eslint": "^8.56.2",
"@types/lodash": "^4.17.0",
"@types/node": "^20.11.20",
"@types/node": "^20.12.7",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we using the node 20.12.7 version?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are using node 20 lts (iron)
I aligned the corresponding .nvm file to always point to the latest lts version and updated package semver to fetch the latest version, please note that types and node are now always aligned

"@types/nodemailer": "^6.4.14",
"@types/react": "^18.2.57",
"@types/react-dom": "^18.2.19",
Expand All @@ -73,6 +77,7 @@
"prisma": "^5.10.2",
"tailwindcss": "^3.4.1",
"tailwindcss-animate": "^1.0.7",
"tsx": "^4.7.2",
"typescript": "^5.4.2"
},
"ct3aMetadata": {
Expand Down
2 changes: 1 addition & 1 deletion prisma/migrations/20240411161725_add_membership_template/migration.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CREATE TABLE "MembershipTemplate" (
"priceUnit" "PriceUnit" NOT NULL DEFAULT 'EUR',
"stripePriceId" TEXT NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMP(3) NOT NULL;
"updatedAt" TIMESTAMP(3) NOT NULL,

CONSTRAINT "MembershipTemplate_pkey" PRIMARY KEY ("id")
);
Expand Down
6 changes: 6 additions & 0 deletions prisma/migrations/20240411161726_add_membership_keys/migration.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
-- CreateIndex
CREATE UNIQUE INDEX "User_stripeCustomerId_key" ON "User"("stripeCustomerId");

-- AddForeignKey
ALTER TABLE "Membership" ADD COLUMN "membershipTemplateId" TEXT NOT NULL;
ALTER TABLE "Membership" ADD CONSTRAINT "Membership_membershipTemplateId_fkey" FOREIGN KEY ("membershipTemplateId") REFERENCES "MembershipTemplate"("id") ON DELETE CASCADE ON UPDATE CASCADE;
Loading
Loading