-
Notifications
You must be signed in to change notification settings - Fork 0
Comprehensive integration: Combine PR #59 (GitHub Actions workflows) and PR #56 (UI/UX improvements) with intelligent conflict resolution #61
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
syed-reza98
merged 14 commits into
main
from
copilot/fix-3d127e34-b87f-4bcc-a8b7-cd54af27b4f4
Aug 21, 2025
Merged
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
28f5388
Initial plan
Copilot a6f3559
Implement codebase hardening and documentation improvements
Copilot cb76f5f
Add implementation summary documentation
Copilot 6b66dc1
Remove environment file entries from .gitignore as requested
Copilot bc080f3
Comprehensive UI/UX improvements: Fix critical date inconsistency, en…
Copilot aa21d89
Add comprehensive expert analysis documentation: mobile testing matri…
Copilot 327809a
Update client/package.json
rezwana-karim 385a4f0
Initial plan
Copilot e0de049
Merge PR #56: UI/UX expert review implementation with critical date c…
Copilot df717f8
Apply core files from PR #56: date fixes, loading states, testing imp…
Copilot c0d0d32
Add comprehensive CI/CD pipeline from PR #59: Enhanced GitHub Actions…
Copilot f962529
Update client/src/components/ui/LoadingSkeleton.tsx
rezwana-karim e05c470
Update ci-cd-pipeline.yml
rezwana-karim 0c7f3eb
Update client/prisma/seed.ts
rezwana-karim File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| name: "Sharothee Wedding Website CodeQL Config" | ||
|
|
||
| # Paths to analyze | ||
| paths: | ||
| - "client/src" | ||
| - ".github/workflows" | ||
|
|
||
| # Paths to ignore | ||
| paths-ignore: | ||
| - "client/node_modules" | ||
| - "client/.next" | ||
| - "client/out" | ||
| - "client/dist" | ||
| - "client/build" | ||
| - "client/coverage" | ||
| - "client/prisma/migrations" | ||
| - "docs" | ||
| - "copilot's docs" | ||
|
|
||
| # Additional queries for wedding website security | ||
| queries: | ||
| - name: security-extended | ||
| uses: security-extended | ||
| - name: security-and-quality | ||
| uses: security-and-quality | ||
|
|
||
| # Wedding-specific configuration | ||
| wedding-security-checks: | ||
| - authentication-bypass | ||
| - data-exposure | ||
| - rsvp-form-validation | ||
| - admin-panel-access | ||
| - guest-data-protection |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,299 @@ | ||
| name: 🧪 Wedding Website CI/CD Pipeline | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ "main", "develop" ] | ||
| paths: | ||
| - 'client/**' | ||
| - '.github/workflows/**' | ||
| pull_request: | ||
| branches: [ "main" ] | ||
| paths: | ||
| - 'client/**' | ||
| - '.github/workflows/**' | ||
| workflow_dispatch: | ||
| inputs: | ||
| deploy_environment: | ||
| description: 'Environment to deploy to' | ||
| required: false | ||
| default: 'development' | ||
| type: choice | ||
| options: | ||
| - development | ||
| - staging | ||
| - production | ||
|
|
||
| permissions: | ||
| contents: read | ||
| issues: write | ||
| pull-requests: write | ||
| checks: write | ||
|
|
||
| env: | ||
| NODE_VERSION: '20' | ||
| WORKING_DIRECTORY: './client' | ||
|
|
||
| jobs: | ||
| build-and-test: | ||
| runs-on: ubuntu-latest | ||
| timeout-minutes: 15 | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup Node.js | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: ${{ env.NODE_VERSION }} | ||
| cache: 'npm' | ||
| cache-dependency-path: 'client/package-lock.json' | ||
|
|
||
| - name: Install dependencies | ||
| working-directory: ${{ env.WORKING_DIRECTORY }} | ||
| run: | | ||
| npm ci --prefer-offline --no-audit | ||
| echo "✅ Dependencies installed successfully" | ||
|
|
||
| - name: Create environment file | ||
| working-directory: ${{ env.WORKING_DIRECTORY }} | ||
| run: | | ||
| cat << EOF > .env.local | ||
| # Database | ||
| DATABASE_URL="file:./dev.db" | ||
|
|
||
| # NextAuth | ||
| NEXTAUTH_SECRET="wedding-test-secret-key-for-ci" | ||
| NEXTAUTH_URL="http://localhost:3000" | ||
|
|
||
| # Email (Test keys) | ||
| RESEND_API_KEY="re_test_api_key" | ||
|
|
||
| # Cloudinary (Test keys) | ||
| CLOUDINARY_CLOUD_NAME="test-cloud" | ||
| CLOUDINARY_API_KEY="test-api-key" | ||
| CLOUDINARY_API_SECRET="test-api-secret" | ||
| EOF | ||
| echo "✅ Environment file created for CI" | ||
|
|
||
| - name: Generate Prisma client | ||
| working-directory: ${{ env.WORKING_DIRECTORY }} | ||
| run: | | ||
| npx prisma generate | ||
| echo "✅ Prisma client generated" | ||
|
|
||
| - name: Lint code | ||
| working-directory: ${{ env.WORKING_DIRECTORY }} | ||
| run: | | ||
| npm run lint | ||
| echo "✅ Code linting passed" | ||
|
|
||
| - name: Type check | ||
| working-directory: ${{ env.WORKING_DIRECTORY }} | ||
| run: | | ||
| npm run type-check | ||
| echo "✅ TypeScript check passed" | ||
|
|
||
| - name: Run tests | ||
| working-directory: ${{ env.WORKING_DIRECTORY }} | ||
| run: | | ||
| npm test -- --ci --coverage --watchAll=false | ||
| echo "✅ Tests completed" | ||
|
|
||
| - name: Build application | ||
| working-directory: ${{ env.WORKING_DIRECTORY }} | ||
| run: | | ||
| npm run build | ||
| echo "✅ Build completed successfully" | ||
|
|
||
| - name: Upload build artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| if: success() | ||
| with: | ||
| name: wedding-website-build | ||
| path: client/.next/ | ||
| retention-days: 7 | ||
|
|
||
| security-audit: | ||
| runs-on: ubuntu-latest | ||
| needs: build-and-test | ||
| if: success() | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup Node.js | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: ${{ env.NODE_VERSION }} | ||
| cache: 'npm' | ||
| cache-dependency-path: 'client/package-lock.json' | ||
|
|
||
| - name: Security audit | ||
| working-directory: ${{ env.WORKING_DIRECTORY }} | ||
| run: | | ||
| npm audit --audit-level=high | ||
| echo "✅ Security audit completed" | ||
| continue-on-error: true | ||
|
|
||
| - name: Check for vulnerable packages | ||
| working-directory: ${{ env.WORKING_DIRECTORY }} | ||
| run: | | ||
| npx audit-ci --config ./audit-ci.json || echo "⚠️ Security vulnerabilities found" | ||
| continue-on-error: true | ||
|
|
||
| performance-test: | ||
| runs-on: ubuntu-latest | ||
| needs: build-and-test | ||
| if: success() && github.event_name == 'pull_request' | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup Node.js | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: ${{ env.NODE_VERSION }} | ||
| cache: 'npm' | ||
| cache-dependency-path: 'client/package-lock.json' | ||
|
|
||
| - name: Install dependencies | ||
| working-directory: ${{ env.WORKING_DIRECTORY }} | ||
| run: npm ci --prefer-offline --no-audit | ||
|
|
||
| - name: Create environment file | ||
| working-directory: ${{ env.WORKING_DIRECTORY }} | ||
| run: | | ||
| cat << EOF > .env.local | ||
| # Database | ||
| DATABASE_URL="file:./dev.db" | ||
|
|
||
| # NextAuth | ||
| NEXTAUTH_SECRET="wedding-test-secret-key-for-ci" | ||
| NEXTAUTH_URL="http://localhost:3000" | ||
|
|
||
| # Email (Test keys) | ||
| RESEND_API_KEY="re_test_api_key" | ||
|
|
||
| # Cloudinary (Test keys) | ||
| CLOUDINARY_CLOUD_NAME="test-cloud" | ||
| CLOUDINARY_API_KEY="test-api-key" | ||
| CLOUDINARY_API_SECRET="test-api-secret" | ||
| EOF | ||
| echo "✅ Environment file created for performance testing" | ||
|
|
||
| - name: Generate Prisma client | ||
| working-directory: ${{ env.WORKING_DIRECTORY }} | ||
| run: | | ||
| npx prisma generate | ||
| echo "✅ Prisma client generated" | ||
|
|
||
| - name: Lighthouse Performance Test | ||
| uses: treosh/lighthouse-ci-action@v11 | ||
| with: | ||
| configPath: '${{ env.WORKING_DIRECTORY }}/lighthouserc.json' | ||
| uploadArtifacts: true | ||
| temporaryPublicStorage: true | ||
| artifactName: 'lighthouse-results' | ||
|
|
||
| deployment-check: | ||
| runs-on: ubuntu-latest | ||
| needs: [build-and-test, security-audit] | ||
| if: success() && (github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch') | ||
|
|
||
| steps: | ||
| - name: Deployment Readiness Check | ||
| uses: actions/github-script@v7 | ||
| with: | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| script: | | ||
| const deployInput = '${{ github.event.inputs.deploy_environment }}'; | ||
| const environment = deployInput || 'development'; | ||
| const isProduction = environment === 'production'; | ||
|
|
||
| console.log(`🚀 Deployment readiness check for: ${environment}`); | ||
|
|
||
| if (isProduction) { | ||
| // Check for any open critical issues | ||
| const { data: criticalIssues } = await github.rest.issues.listForRepo({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| labels: 'wedding-day-critical,critical', | ||
| state: 'open' | ||
| }); | ||
|
|
||
| if (criticalIssues.length > 0) { | ||
| console.log(`⚠️ ${criticalIssues.length} critical issues found - proceed with caution`); | ||
|
|
||
| // Create deployment warning comment | ||
| const warningMessage = `🚨 **Production Deployment Warning**\n\n` + | ||
| `There are ${criticalIssues.length} critical issues open:\n\n` + | ||
| criticalIssues.map(issue => `- #${issue.number}: ${issue.title}`).join('\n') + | ||
| `\n\nPlease review these issues before deploying to production.\n\n` + | ||
| `*Automated check from Wedding Website CI/CD Pipeline*`; | ||
|
|
||
| if (context.issue && context.issue.number) { | ||
| await github.rest.issues.createComment({ | ||
| issue_number: context.issue.number, | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| body: warningMessage | ||
| }); | ||
| } | ||
| } else { | ||
| console.log('✅ No critical issues found - ready for production'); | ||
| } | ||
| } | ||
|
|
||
| // Log deployment readiness | ||
| console.log('📋 Deployment Checklist:'); | ||
| console.log(' ✅ Build successful'); | ||
| console.log(' ✅ Tests passed'); | ||
| console.log(' ✅ Security audit completed'); | ||
| console.log(' ✅ Code quality checks passed'); | ||
| console.log(` 🎯 Target environment: ${environment}`); | ||
|
|
||
| return { | ||
| ready: true, | ||
| environment: environment, | ||
| timestamp: new Date().toISOString() | ||
| }; | ||
|
|
||
| workflow-summary: | ||
| runs-on: ubuntu-latest | ||
| needs: [build-and-test, security-audit, deployment-check] | ||
| if: always() | ||
|
|
||
| steps: | ||
| - name: Workflow Summary | ||
| uses: actions/github-script@v7 | ||
| with: | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| script: | | ||
| const buildStatus = '${{ needs.build-and-test.result }}'; | ||
| const securityStatus = '${{ needs.security-audit.result }}'; | ||
| const deploymentStatus = '${{ needs.deployment-check.result }}'; | ||
|
|
||
| console.log('🎯 Wedding Website CI/CD Pipeline Summary'); | ||
| console.log('=========================================='); | ||
| console.log(`Build & Test: ${buildStatus === 'success' ? '✅' : '❌'} ${buildStatus}`); | ||
| console.log(`Security Audit: ${securityStatus === 'success' ? '✅' : securityStatus === 'skipped' ? '⏭️' : '❌'} ${securityStatus}`); | ||
| console.log(`Deployment Check: ${deploymentStatus === 'success' ? '✅' : deploymentStatus === 'skipped' ? '⏭️' : '❌'} ${deploymentStatus}`); | ||
|
|
||
| const overallSuccess = buildStatus === 'success'; | ||
| console.log(`Overall Status: ${overallSuccess ? '✅ SUCCESS' : '❌ FAILED'}`); | ||
|
|
||
| if (!overallSuccess) { | ||
| console.log('🚨 Pipeline failed - check logs and resolve issues before proceeding'); | ||
| } else { | ||
| console.log('🎉 Pipeline completed successfully - wedding website is ready!'); | ||
| } | ||
|
|
||
| return { | ||
| success: overallSuccess, | ||
| build: buildStatus, | ||
| security: securityStatus, | ||
| deployment: deploymentStatus | ||
| }; | ||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Uncomment the line below to enforce engine-strict dependency checks | ||
| # engine-strict=true |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The security audit step uses continue-on-error: true which may mask critical security vulnerabilities. Consider making high-severity vulnerabilities fail the pipeline while allowing moderate/low severity issues to pass with warnings.