Phase 3.1: Add remaining local files

.gitignore

@@ -4,6 +4,7 @@ __pycache__/
 *$py.class
 *.so
 .Python
+<<<<<<< HEAD
 venv/
 env/
 ENV/
@@ -17,12 +18,52 @@ build/
 *.sqlite
 *.sqlite3
 data/
+=======
+env/
+venv/
+ENV/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# FastAPI / Uvicorn
+*.db
+*.sqlite
+*.sqlite3
+
+# Environment variables
+.env
+.env.local
+.env.*.local
+
+# IDEs
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+.DS_Store
+>>>>>>> 65c71b3d67d462fe9ecc01a1c2aa17e54b626fe2
 
 # Node
 node_modules/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+<<<<<<< HEAD
 .pnpm-debug.log*
 
 # Frontend Build
@@ -46,11 +87,29 @@ logs/
 .env
 .env.local
 .env.*.local
+=======
+pnpm-debug.log*
+lerna-debug.log*
+dist/
+dist-ssr/
+*.local
+
+# Testing
+.coverage
+htmlcov/
+.pytest_cache/
+coverage/
+
+# Logs
+logs/
+*.log
+>>>>>>> 65c71b3d67d462fe9ecc01a1c2aa17e54b626fe2
 
 # OS
 Thumbs.db
 .DS_Store
 
+<<<<<<< HEAD
 # Uploads
 uploads/
 avatars/
@@ -65,3 +124,19 @@ htmlcov/
 *.tmp
 *.temp
 ~*
+=======
+# Database
+*.db
+*.sqlite
+family_hub.db
+
+# Docker
+.dockerignore
+
+# Temporary files
+*.tmp
+*.temp
+*.bak
+*.swp
+*~
+>>>>>>> 65c71b3d67d462fe9ecc01a1c2aa17e54b626fe2