Skip to content

getting updates from main - #31

Closed
Kavinduk2 wants to merge 79 commits into
developfrom
main
Closed

getting updates from main#31
Kavinduk2 wants to merge 79 commits into
developfrom
main

Conversation

@Kavinduk2

Copy link
Copy Markdown
Collaborator

Getting the latest updates from main to the develop branch

Umeshinduranga and others added 14 commits February 7, 2026 19:54
* making model files

* feat: implement progress tracking APIs with streak and mood logging

* Feature/user authentication (#22)

* make the database configuration

* implement betterAuth authentication system with email/password support

* Feature/user authentication (#23)

* make the database configuration

* implement betterAuth authentication system with email/password support

* Add auth layout with gradient background and centered design

* Implement login page with validation and social auth UI

* Add signup page with password strength indicator and comprehensive documentation

* feat: Add progress tracking system with auth integration

- Created Progress model with streak, mood log, and milestones
- Implemented daily check-in API with mood tracking
- Added streak calculation with automatic reset
- Integrated 7 milestone achievements (1, 7, 14, 30, 90, 180, 365 days)
- Protected all routes with better-auth middleware
- Fixed MONGODB_URI environment variable
- Resolved merge conflicts from develop branch

* Update Reminder model with addiction types: drugs, social_media, pornography

* Add docs folder and update models with longestStreak

* journal

* fix: register journal routes in app and add proper /journals path prefix

* Fixing/journal (#25)

* fix BetterAuth configuration and middleware

* configure CORS and application setup

* implement and refactor all endpoints

* configure protected endpoints with authentication

* update schemas and add type definitions

* update package-lock.json

---------

Co-authored-by: isuruudarakumarasiri <mdiu.kumarasiri@gmail.com>
Co-authored-by: Kavinduk2 <kashyaparanathunga2003@gmail.com>
* Initial plan

* Add automated README update system for merged PRs

Co-authored-by: Umeshinduranga <171968920+Umeshinduranga@users.noreply.github.com>

* Add automation documentation and update gitignore

Co-authored-by: Umeshinduranga <171968920+Umeshinduranga@users.noreply.github.com>

* Fix regex patterns for better compatibility and flexibility

Co-authored-by: Umeshinduranga <171968920+Umeshinduranga@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Umeshinduranga <171968920+Umeshinduranga@users.noreply.github.com>
Co-authored-by: Umeshinduranga <171968920+Umeshinduranga@users.noreply.github.com>
Co-authored-by: Umeshinduranga <171968920+Umeshinduranga@users.noreply.github.com>
…ules

Add CODEOWNERS to require owner approval on all PRs
…r-review-rules

Revert "Add CODEOWNERS to require owner approval on all PRs"
@vercel

vercel Bot commented Feb 10, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
re-life-frontend Ready Ready Preview, Comment Mar 28, 2026 10:52am
re-life-frontend-e1aw Ready Ready Preview, Comment Mar 28, 2026 10:52am
1 Skipped Deployment
Project Deployment Actions Updated (UTC)
re-life-website Ignored Ignored Preview Mar 28, 2026 10:52am

Umeshinduranga and others added 12 commits February 17, 2026 12:21
…cator

- Updated the signup page layout to include a left panel with motivational text and branding.
- Added password strength evaluation and visual feedback.
- Removed terms and conditions checkbox and related validation.
- Improved form field styling and layout for better user experience.
- Changed primary action button on the splash screen to direct users to the signup page instead of the questionnaire.

fix: suppress hydration warnings in layout component
- Create auth-client.ts with signUp, signIn, signOut, getSession, and progress API functions
- Create AuthContext.tsx provider with useAuth hook for global auth state
- Update root layout.tsx with AuthProvider wrapper
- Configure next.config.js with API proxy rewrites to backend (port 5000)
- Update backend app.ts with custom auth routes before BetterAuth catch-all
…ntrollers, routes, validation, and authentication middleware.
iukumarasiri-dev and others added 29 commits March 10, 2026 18:58
… team members can install dependencies both ways
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants