bender/bd539cad-e5a1-45ab-8774-c070fc7bb50f
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #11

Open
bender wants to merge 89 commits from version_4 into main
pull from: version_4
merge into: bender:main
Conversation 0 Commits 89 Files Changed 71 +3849 -11161
bender commented 2026-03-11 19:51:08 +00:00
Owner
Copy Link

Automated merge of version_4 into main

Automated merge of version_4 into main
bender added 6 commits 2026-03-11 19:51:08 +00:00
Update src/app/login/page.tsx bcaa0caf27
Add src/app/onboarding/page.tsx f9d8b78ee5
Update src/app/page.tsx f54f9f9bf8
Add src/context/AuthContext.tsx 510d761391
Add src/hooks/useAuthGuard.ts 96a8f5247a
Add src/utils/auth.ts b8135f1fc0
bender added 1 commit 2026-03-11 19:51:08 +00:00
Add src/utils/auth.ts b8135f1fc0
bender added 1 commit 2026-03-11 19:53:52 +00:00
Update src/components/cardStack/hooks/useDepth3DAnimation.ts 1b8554a0bb
bender added 1 commit 2026-03-11 19:53:52 +00:00
Update src/components/cardStack/layouts/timelines/TimelineBase.tsx a406b76790
bender added 1 commit 2026-03-11 19:53:53 +00:00
Update src/components/sections/contact/ContactCenter.tsx a5e216ec6a
bender added 1 commit 2026-03-11 19:53:54 +00:00
Update src/components/sections/contact/ContactSplit.tsx 1a0248e376
bender added 1 commit 2026-03-11 19:53:55 +00:00
Update src/components/sections/contact/ContactSplitForm.tsx b296f5013f
bender added 1 commit 2026-03-11 19:53:56 +00:00
Update src/hooks/useCheckout.ts cb251050ad
bender added 1 commit 2026-03-11 19:53:57 +00:00
Update src/hooks/useProductCatalog.ts b82517bd26
bender added 1 commit 2026-03-11 19:53:57 +00:00
Update src/hooks/useProductDetail.ts 658186b6db
bender added 1 commit 2026-03-11 19:53:58 +00:00
Update src/lib/api/product.ts 98a23739da
bender added 1 commit 2026-03-11 19:57:47 +00:00
Update src/app/components/WorkoutDataIntegration.tsx c110f9f390
bender added 1 commit 2026-03-11 19:57:47 +00:00
Update src/app/hooks/useWorkoutTracking.ts 278e792635
bender added 1 commit 2026-03-11 19:57:48 +00:00
Update src/app/page.tsx e195685ce3
bender added 1 commit 2026-03-11 19:57:49 +00:00
Update src/components/cardStack/CardStack.tsx 5286b5b2d6
bender added 1 commit 2026-03-11 19:57:50 +00:00
Update src/components/cardStack/hooks/useCardAnimation.ts 131e19e764
bender added 1 commit 2026-03-11 19:57:50 +00:00
Update src/components/ecommerce/productCatalog/ProductCatalog.tsx 6b4dc7c030
bender added 1 commit 2026-03-11 19:57:51 +00:00
Update src/components/sections/product/ProductCardFour.tsx 6349355571
bender added 1 commit 2026-03-11 19:57:52 +00:00
Update src/components/sections/product/ProductCardOne.tsx 3002750d76
bender added 1 commit 2026-03-11 19:57:53 +00:00
Update src/components/sections/product/ProductCardThree.tsx 62d1f843c3
bender added 1 commit 2026-03-11 19:57:55 +00:00
Update src/hooks/useProducts.ts d8dabe8ef2
bender added 1 commit 2026-03-11 20:00:12 +00:00
Update src/app/page.tsx a9b3dc9aca
bender added 1 commit 2026-03-11 20:02:26 +00:00
Update src/app/page.tsx 7f73cf6e08
bender added 1 commit 2026-03-11 20:06:24 +00:00
Update src/components/cardStack/layouts/timelines/TimelinePhoneView.tsx 634caa98b8
bender added 1 commit 2026-03-11 20:06:24 +00:00
Update src/components/cardStack/layouts/timelines/TimelineProcessFlow.tsx 76392110de
bender added 1 commit 2026-03-11 20:06:25 +00:00
Update src/components/sections/blog/BlogCardOne.tsx 9b4126d8c2
bender added 1 commit 2026-03-11 20:06:26 +00:00
Update src/components/sections/blog/BlogCardThree.tsx 20f9d612bd
bender added 1 commit 2026-03-11 20:06:27 +00:00
Update src/components/sections/blog/BlogCardTwo.tsx d64a0e08e5
bender added 1 commit 2026-03-11 20:06:27 +00:00
Update src/components/sections/contact/ContactFaq.tsx 0876763e0a
bender added 1 commit 2026-03-11 20:06:28 +00:00
Update src/components/sections/feature/FeatureBento.tsx 8a53e68e68
bender added 1 commit 2026-03-11 20:06:29 +00:00
Update src/components/sections/feature/FeatureCardMedia.tsx d34cb5cd3b
bender added 1 commit 2026-03-11 20:06:31 +00:00
Update src/components/sections/feature/FeatureCardTwentyFive.tsx fe761c357c
bender added 1 commit 2026-03-11 20:06:31 +00:00
Update src/components/sections/feature/FeatureCardTwentySeven.tsx b695eb2916
bender added 1 commit 2026-03-11 20:06:32 +00:00
Update src/components/sections/feature/FeatureCardTwentyThree.tsx 509003722c
bender added 1 commit 2026-03-11 20:06:33 +00:00
Update src/components/sections/feature/featureBorderGlow/FeatureBorderGlow.tsx 7156e0d043
bender added 1 commit 2026-03-11 20:06:34 +00:00
Update src/components/sections/feature/featureCardThree/FeatureCardThree.tsx d418ee3ee6
bender added 1 commit 2026-03-11 20:06:34 +00:00
Update src/components/sections/feature/featureHoverPattern/FeatureHoverPattern.tsx 51bc451f07
bender added 1 commit 2026-03-11 20:06:35 +00:00
Update src/components/sections/metrics/MetricCardEleven.tsx 2365e1292a
bender added 1 commit 2026-03-11 20:06:36 +00:00
Update src/components/sections/metrics/MetricCardOne.tsx 978b9c24c9
bender added 1 commit 2026-03-11 20:06:37 +00:00
Update src/components/sections/metrics/MetricCardSeven.tsx 14b3d11517
bender added 1 commit 2026-03-11 20:06:39 +00:00
Update src/components/sections/metrics/MetricCardTwo.tsx d5e2739205
bender added 1 commit 2026-03-11 20:06:39 +00:00
Update src/components/sections/pricing/PricingCardOne.tsx cbec55a2fb
bender added 1 commit 2026-03-11 20:06:40 +00:00
Update src/components/sections/pricing/PricingCardThree.tsx 84e1179f34
bender added 1 commit 2026-03-11 20:06:41 +00:00
Update src/components/sections/pricing/PricingCardTwo.tsx 4d7534755a
bender added 1 commit 2026-03-11 20:06:42 +00:00
Update src/components/sections/team/TeamCardFive.tsx 021f8f419d
bender added 1 commit 2026-03-11 20:06:42 +00:00
Update src/components/sections/team/TeamCardOne.tsx b3aab80cad
bender added 1 commit 2026-03-11 20:06:43 +00:00
Update src/components/sections/team/TeamCardSix.tsx 838905d1d7
bender added 1 commit 2026-03-11 20:06:44 +00:00
Update src/components/sections/team/TeamCardTwo.tsx 2d741b1aaa
bender added 1 commit 2026-03-11 20:06:44 +00:00
Update src/components/sections/testimonial/TestimonialCardOne.tsx bb5328d0ca
bender added 1 commit 2026-03-11 20:06:45 +00:00
Update src/components/sections/testimonial/TestimonialCardThirteen.tsx 83497cd071
bender added 1 commit 2026-03-11 20:06:46 +00:00
Update src/components/sections/testimonial/TestimonialCardTwo.tsx 5dae6a5a55
bender added 1 commit 2026-03-11 20:10:39 +00:00
Add src/app/api/auth/logout/route.ts d4b97ada6d
bender added 1 commit 2026-03-11 20:10:39 +00:00
Add src/app/api/auth/verify-session/route.ts 21fca3fecd
bender added 1 commit 2026-03-11 20:10:40 +00:00
Update src/app/login/page.tsx a647371658
bender added 1 commit 2026-03-11 20:10:40 +00:00
Update src/app/onboarding/page.tsx 69d14ea498
bender added 1 commit 2026-03-11 20:10:41 +00:00
Update src/app/page.tsx 9c037f5b7e
bender added 1 commit 2026-03-11 20:10:42 +00:00
Add src/components/ProtectedRoute.tsx 6b99eb7d61
bender added 1 commit 2026-03-11 20:10:43 +00:00
Add src/hooks/useAuth.ts 695bcc9059
bender added 1 commit 2026-03-11 20:13:30 +00:00
Update src/app/page.tsx 4b37ad38d2
bender added 1 commit 2026-03-11 20:16:29 +00:00
Update src/app/page.tsx b3a5df98d4
bender added 1 commit 2026-03-11 20:16:30 +00:00
Update src/components/cardStack/CardList.tsx 7908873b89
bender added 1 commit 2026-03-11 20:16:30 +00:00
Update src/components/cardStack/CardStack.tsx 080e9b0ae5
bender added 1 commit 2026-03-11 20:16:30 +00:00
Add src/components/cardStack/CardStackContext.tsx 6bc9bd2fd7
bender added 1 commit 2026-03-11 20:16:31 +00:00
Update src/components/cardStack/layouts/carousels/AutoCarousel.tsx 567bd4870c
bender added 1 commit 2026-03-11 20:16:31 +00:00
Update src/components/cardStack/layouts/carousels/ButtonCarousel.tsx 9acf67e242
bender added 1 commit 2026-03-11 20:29:36 +00:00
Add src/app/dashboard/page.tsx 723ffce34b
bender added 1 commit 2026-03-11 20:29:37 +00:00
Update src/app/login/page.tsx 2c13e6485b
bender added 1 commit 2026-03-11 20:29:38 +00:00
Update src/app/page.tsx 6600f3fbb2
bender added 1 commit 2026-03-11 20:29:39 +00:00
Update src/hooks/useAuth.ts 28a491c46b
bender added 1 commit 2026-03-11 20:29:39 +00:00
Update src/utils/auth.ts 1939b2ce14
This pull request has changes conflicting with the target branch.
  • src/app/api/auth/login/route.ts
  • src/app/api/auth/logout/route.ts
  • src/app/components/WorkoutDataIntegration.tsx
  • src/app/dashboard/page.tsx
  • src/app/hooks/useWorkoutTracking.ts
  • src/app/lib/storage/workoutStorage.ts
  • src/app/login/page.tsx
  • src/app/page.tsx
  • src/components/sections/blog/BlogCardOne.tsx
  • src/components/sections/blog/BlogCardThree.tsx
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin version_4:version_4
git checkout version_4
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
bender
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: bender/bd539cad-e5a1-45ab-8774-c070fc7bb50f#11
Delete Branch "version_4"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?