Merge branch 'rinafcode:main' into men

Author: jaynomyaro

.husky/pre-push

@@ -1,3 +1,35 @@
 #!/bin/sh
-command -v git-lfs >/dev/null 2>&1 || { printf >&2 "\n%s\n\n" "This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'pre-push' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks')."; exit 2; }
-git lfs pre-push "$@"
+. "$(dirname "$0")/_/husky.sh"
+
+# Git hooks run with a minimal PATH; ensure pnpm is available.
+if ! command -v pnpm >/dev/null 2>&1; then
+  if [ -n "$PNPM_HOME" ]; then
+    PATH="$PNPM_HOME:$PATH"
+  fi
+  PATH="$HOME/.local/share/pnpm:/opt/homebrew/bin:/usr/local/bin:$PATH"
+  export PATH
+fi
+
+if ! command -v pnpm >/dev/null 2>&1; then
+  printf >&2 "\n❌ Pre-push blocked: pnpm not found on PATH.\nInstall pnpm or add it to PATH, then try pushing again.\n\n"
+  exit 1
+fi
+
+command -v git-lfs >/dev/null 2>&1 || {
+  printf >&2 "\n%s\n\n" "This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'pre-push' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks')."
+  exit 2
+}
+
+git lfs pre-push "$@" || exit $?
+
+echo "Running type-check before push..."
+pnpm run type-check || {
+  printf >&2 "\n❌ Pre-push blocked: TypeScript type-check failed.\nFix the errors above, then try pushing again.\n\n"
+  exit 1
+}
+
+echo "Running tests before push..."
+pnpm run test || {
+  printf >&2 "\n❌ Pre-push blocked: Tests failed.\nFix the failing tests above, then try pushing again.\n\n"
+  exit 1
+}

CONTRIBUTING.md

@@ -40,10 +40,26 @@ Your PR will be blocked from merging unless it meets the following:
 
 ## Local checks (run before pushing)
 
-- `npm run type-check`
-- `npm run lint`
-- `npm run test`
-- `npm run build`
+- `pnpm run type-check`
+- `pnpm run lint`
+- `pnpm run test`
+- `pnpm run build`
+
+## Git hooks
+
+### Pre-push (`.husky/pre-push`)
+
+Before a push is sent to the remote, the pre-push hook runs automatically:
+
+1. **Git LFS** — validates LFS-tracked files (`git lfs pre-push`)
+2. **Type-check** — `pnpm run type-check` (`tsc --noEmit`)
+3. **Tests** — `pnpm run test` (`vitest run`)
+
+If type-check or tests fail, the push is **blocked** and the hook prints which check failed. Fix the reported errors and push again.
+
+The hook ensures `pnpm` is on `PATH` (common install locations and `$PNPM_HOME`). If `pnpm` still cannot be found, the push is blocked with a clear message.
+
+`lint` and `build` are not run by this hook; run them locally or rely on CI before opening a PR.
 
 ## PR description format
 

DOCKER_DEPLOYMENT.md

@@ -266,9 +266,23 @@ docker image prune
 docker system prune -a --volumes
 ```
 
+## SEO: Sitemap Submission
+
+The build pipeline automatically generates `public/sitemap.xml` via the `postbuild` script. After deploying to production:
+
+1. **Verify the sitemap** is accessible at `https://your-domain.com/sitemap.xml`
+2. **Submit to Google Search Console:**
+   - Navigate to [Google Search Console](https://search.google.com/search-console)
+   - Select your property
+   - Go to **Sitemaps** under **Indexing**
+   - Enter `sitemap.xml` and click Submit
+3. **Monitor** for crawl errors and indexing status in Search Console
+
 ## Reference
 
 - [Next.js Docker Documentation](https://nextjs.org/docs/deployment/docker)
 - [Docker Best Practices](https://docs.docker.com/develop/dev-best-practices/)
 - [Docker Compose Reference](https://docs.docker.com/compose/compose-file/)
 - [Alpine Linux Benefits](https://www.alpinelinux.org/)
+- [Google Search Console](https://search.google.com/search-console)
+- [Sitemaps.org Protocol](https://www.sitemaps.org/)

STRUCTURED_DATA_IMPLEMENTATION.md

@@ -0,0 +1,145 @@
+# Structured Data Implementation for Filter Controls
+
+## Overview
+
+This document describes the implementation of Structured Data (JSON-LD) for Filter Controls in the TeachLink application. This implementation improves SEO and accessibility by providing machine-readable metadata about filter options.
+
+## Implementation Details
+
+### Files Created
+
+1. **`src/utils/structuredDataUtils.ts`**
+
+   - Utility functions for generating JSON-LD structured data
+   - Functions:
+     - `generateFilterStructuredData()`: Generates complete filter control structured data
+     - `generateBreadcrumbStructuredData()`: Generates breadcrumb navigation structured data
+     - `generateFilterGroupStructuredData()`: Generates individual filter group structured data
+     - `validateStructuredData()`: Validates JSON-LD structure and schema.org compliance
+
+2. **`src/components/seo/StructuredDataScript.tsx`**
+
+   - React component to render JSON-LD script tags
+   - Validates JSON before rendering
+   - Uses `type="application/ld+json"` for proper schema.org recognition
+
+3. **`src/utils/__tests__/structuredDataUtils.test.ts`**
+   - Comprehensive unit tests for structured data utilities
+   - Tests for generation, validation, and edge cases
+
+### Files Modified
+
+1. **`src/components/search/FilterSidebar.tsx`**
+
+   - Added structured data generation for search filters
+   - Includes: difficulty, duration, price, topics, instructor, node affinity
+   - Integrated `StructuredDataScript` component
+
+2. **`src/components/dashboard/DashboardFilters.tsx`**
+
+   - Added structured data for dashboard analytics filters
+   - Includes: time range, aggregation, metric, categories
+   - Integrated `StructuredDataScript` component
+
+3. **`src/components/search/FacetedFilterSystem.tsx`**
+   - Added structured data for faceted search filters
+   - Includes: content type, topics, difficulty, price, rating
+   - Integrated `StructuredDataScript` component
+
+## Schema.org Compliance
+
+The implementation follows schema.org specifications:
+
+- Uses `@context: https://schema.org`
+- Implements `FilterControls` type for main filter groups
+- Uses `ItemList` for filter options
+- Uses `PropertyValueSpecification` for individual filter groups
+- Uses `BreadcrumbList` for navigation breadcrumbs
+
+## Accessibility Considerations
+
+### ARIA Labels
+
+- All existing ARIA labels are preserved
+- Structured data provides additional semantic information
+- Screen readers can access filter metadata through JSON-LD
+
+### Keyboard Navigation
+
+- No changes to keyboard navigation
+- Existing keyboard shortcuts and focus management remain intact
+
+### Screen Reader Support
+
+- JSON-LD provides machine-readable descriptions
+- Filter options include descriptive text in structured data
+- Helps assistive technologies understand filter semantics
+
+## Security Considerations
+
+### XSS Prevention
+
+- `StructuredDataScript` component uses `dangerouslySetInnerHTML` only after validation
+- JSON parsing validates structure before rendering
+- No user input is directly injected without sanitization
+
+### Data Validation
+
+- `validateStructuredData()` function ensures:
+  - Valid JSON format
+  - Required fields present (@context, @type)
+  - Schema.org context compliance
+- Invalid structured data is not rendered to prevent console errors
+
+### Performance Impact
+
+- Structured data generation uses `useMemo` to avoid unnecessary recalculations
+- Minimal performance overhead (JSON serialization)
+- Only renders when filter values change
+
+## Testing
+
+### Unit Tests
+
+- Comprehensive test coverage for all utility functions
+- Tests for:
+  - JSON-LD generation
+  - Schema.org compliance
+  - Validation logic
+  - Edge cases (invalid JSON, missing fields)
+
+### Integration Testing
+
+- Structured data is integrated into all three filter components
+- Each component generates appropriate metadata for its filters
+- No regression in existing functionality
+
+## Browser Compatibility
+
+- JSON-LD is supported by all modern browsers
+- Graceful degradation for older browsers (script tag simply not rendered)
+- No impact on core functionality if structured data fails to load
+
+## SEO Benefits
+
+- Search engines can understand filter structure
+- Rich snippets potential for filter pages
+- Improved indexing of filterable content
+- Better semantic understanding of UI controls
+
+## Future Enhancements
+
+Potential improvements:
+
+1. Dynamic structured data based on actual filter results
+2. Integration with Google Rich Results testing
+3. Add more schema.org types as needed
+4. Server-side rendering for initial structured data
+5. Internationalization support for structured data descriptions
+
+## Maintenance Notes
+
+- When adding new filters, update the corresponding structured data generation
+- Keep structured data in sync with UI changes
+- Run tests after modifying filter components
+- Validate JSON-LD using Google's Structured Data Testing Tool

package.json

@@ -34,14 +34,15 @@
     "check-i18n": "node scripts/check-i18n.cjs",
     "check-locales": "node scripts/check-locales.mjs",
     "prebuild": "pnpm run check-locales && pnpm run check-i18n",
-    "generate:sitemap": "npx tsx scripts/generate-sitemap.ts"
+    "postbuild": "pnpm run generate:sitemap",
+    "generate:sitemap": "npx tsx scripts/generate-sitemap.ts",
+    "migrate": "npx tsx src/lib/db/migrate.ts"
   },
   "dependencies": {
     "@apollo/client": "^3.8.0",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^8.0.0",
     "@dnd-kit/utilities": "^3.2.2",
-    "@hello-pangea/dnd": "^18.0.1",
     "@hookform/resolvers": "^3.10.0",
     "@monaco-editor/react": "^4.7.0",
     "@testing-library/dom": "^10.4.1",
@@ -73,8 +74,6 @@
     "react": "^18.3.1",
     "react-big-calendar": "1.19.4",
     "react-countdown": "^2.3.6",
-    "react-dnd": "^16.0.1",
-    "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.3.1",
     "react-hook-form": "^7.60.0",
     "react-hot-toast": "^2.6.0",