Refactor: Migrate to Prisma-generated Project types (Updated with main sync) - #68
Merged
Merged
Conversation
- Move primary-sidebar.tsx and project-sidebar.tsx to components/sidebars/ - Update import paths in app/settings/layout.tsx and app/projects/[id]/layout.tsx - Improve code organization and modularity 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
- Remove custom Project type definition from types/project.ts - Update imports in ProjectCard and projects page to use @prisma/client - Enhance type safety by using ProjectStatus enum instead of string - Ensure consistency with database schema across all components 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
✅ PR Check Results: PassedBuild Checks
✨ Great work!All checks passed successfully. Your PR is ready for review. Details:
🔗 View Details: |
- Sync latest changes from main branch - Resolve conflicts in project layout and pages - Maintain Project type import from @prisma/client - Adopt main branch's React Query hooks approach for projects page Conflicts resolved: - app/projects/page.tsx: Keep Project import, use main's hooks implementation - app/projects/[id]/layout.tsx: Remove deleted components - app/settings/layout.tsx: File deleted in main, remove from branch 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
norberia
changed the title
- Change from custom '@/types/project' to '@prisma/client' - Fix ESLint import sorting issues - Remove redundant variable to resolve linting warnings 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
- Remove unused Project import from app/projects/page.tsx (type inferred from hook) - Update import order in hooks/use-projects.ts for ESLint compliance - Clean up redundant imports after Prisma type migration 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Changes included
types/project.ts(custom type definition)components/features/projectList/ProjectCard.tsxapp/projects/page.tsx- now uses main branch's React Query implementation with Prisma typesResolved conflicts
app/projects/page.tsx: Kept Project import, adopted main's hooks implementationapp/projects/[id]/layout.tsx: Removed deleted componentsapp/settings/layout.tsx: File deleted in main, removed from branchTest plan
🤖 Generated with Claude Code