diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..686e073
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,69 @@
+# Git
+.git
+.gitignore
+.gitattributes
+
+# CI/CD
+.github
+
+# Documentation
+*.md
+!README.md
+
+# Node
+node_modules
+npm-debug.log
+yarn-error.log
+.npm
+.yarn
+
+# Testing
+coverage
+.nyc_output
+*.test.js
+*.spec.js
+
+# Editor
+.vscode
+.idea
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Build artifacts
+dist-ssr
+
+# Python (for build context)
+__pycache__
+*.py[cod]
+*$py.class
+*.so
+.Python
+venv
+env
+.venv
+
+# Pulumi
+.pulumi
+infrastructure/
+
+# Automation
+automation/
+
+# Docker
+Dockerfile
+docker-compose*.yml
+.dockerignore
+
+# Misc
+.env
+.env.local
+.env.*.local
+*.log
+tmp
+temp
+.cache
diff --git a/.github/AGENT_COLLABORATION.md b/.github/AGENT_COLLABORATION.md
new file mode 100644
index 0000000..26baf77
--- /dev/null
+++ b/.github/AGENT_COLLABORATION.md
@@ -0,0 +1,342 @@
+# Agent Collaboration Guide
+
+## Overview
+
+This document provides guidelines for AI agents (Copilot, Codex, CodeRabbit, etc.) working on this repository to ensure smooth handoffs, clear communication, and effective task completion.
+
+## Active Agents
+
+The following AI agents may work on this repository:
+
+- **@copilot** - GitHub Copilot for code changes and PR management
+- **@codex** - OpenAI Codex for code review and fixes
+- **@gemini** - Google Gemini for analysis
+- **@coderabbitai** - CodeRabbit for automated code reviews
+- **@code-factor** - Code quality analysis
+- **@snyk-bot** - Security vulnerability scanning
+- **@dependabot** - Dependency updates
+- **@jules** - Additional AI assistant
+
+## Technical Limitations
+
+### URL Access Constraints
+
+**IMPORTANT**: Most AI agents operate in sandboxed environments with the following limitations:
+
+1. **No HTTP/HTTPS Access**: Agents cannot make HTTP requests to any URLs, including:
+ - github.com URLs (even for the same repository)
+ - External review links
+ - API endpoints
+ - Documentation sites
+
+2. **Repository Access**: Agents have direct file system access to:
+ - The cloned repository at `/home/runner/work/bleedy/bleedy`
+ - All files tracked by git
+ - Generated build artifacts
+
+3. **Workarounds for Reviews**:
+ - Instead of sharing review URLs, paste the actual review comments into PR comments
+ - Reference specific files and line numbers directly
+ - Quote the exact code or suggestion that needs addressing
+
+### Git Operations
+
+Agents typically cannot:
+- Directly execute `git commit`, `git push`, or `git merge`
+- Force push or rebase branches
+- Modify other branches beyond their assigned branch
+
+Agents can:
+- Read git history and diffs
+- Create changes that are committed via specialized tools
+- View branch status and commit logs
+
+## Communication Patterns
+
+### 1. Agent-to-Agent Handoffs
+
+When handing off work to another agent, include:
+
+```markdown
+@agent-name
+
+**Context**: [Brief description of what was done]
+
+**Remaining Work**:
+- [ ] Task 1
+- [ ] Task 2
+
+**Important Notes**:
+- Constraint or consideration 1
+- Constraint or consideration 2
+
+**Files Modified**:
+- path/to/file1.ts (reason)
+- path/to/file2.py (reason)
+
+**Testing Status**: [What has been tested, what needs testing]
+```
+
+### 2. Requesting Reviews
+
+When requesting a review from another agent:
+
+```markdown
+@agent-name
+
+Please review the following changes:
+
+**File**: path/to/file.ts
+**Lines**: 10-25
+**Change**: [Description]
+**Concern**: [What to check]
+
+**Expected**: [What should happen]
+**Actual**: [What currently happens, if applicable]
+```
+
+### 3. Reporting Completion
+
+When completing a task:
+
+```markdown
+**Completed**: [Brief description]
+
+**Commit**: abc1234
+
+**Changes**:
+- ✅ Item 1
+- ✅ Item 2
+
+**Testing**: [Results of testing]
+
+**Next Steps**: [Optional - what should be done next]
+```
+
+## Collaboration Workflows
+
+### Workflow 1: Code Review and Fix
+
+1. **CodeRabbit** identifies issues and leaves review comments
+2. **Copilot** or **Codex** reads the review comments (pasted in PR)
+3. Agent makes fixes and commits
+4. Agent mentions original reviewer: "@coderabbitai - Fixed in commit abc1234"
+
+### Workflow 2: Feature Development
+
+1. **Copilot** creates initial implementation
+2. **Copilot** mentions @codex for review
+3. User pastes any external review comments into PR
+4. **Codex** (if available) or **Copilot** addresses feedback
+5. Final testing and merge
+
+### Workflow 3: Security and Dependencies
+
+1. **Snyk** or **Dependabot** identifies security issues
+2. User creates issue or PR comment with details
+3. **Copilot** or **Codex** implements fixes
+4. Automated scans validate the fix
+
+## Best Practices
+
+### For All Agents
+
+1. **Always Check Current State First**
+ ```bash
+ git status
+ git log --oneline -10
+ npm run build # or appropriate build command
+ ```
+
+2. **Test Before Committing**
+ - Run linters: `npm run lint`
+ - Run tests: `npm test` (if tests exist)
+ - Build: `npm run build`
+ - Verify no regressions
+
+3. **Make Minimal Changes**
+ - Change only what's necessary
+ - Don't refactor unrelated code
+ - Don't fix unrelated issues
+
+4. **Document Changes**
+ - Update README if needed
+ - Update inline comments for complex logic
+ - Note breaking changes clearly
+
+5. **Use Structured Commits**
+ - Clear, descriptive commit messages
+ - Reference issue numbers
+ - Group related changes
+
+### For Code Reviews
+
+1. **Be Specific**
+ - Quote exact code snippets
+ - Provide line numbers
+ - Suggest specific alternatives
+
+2. **Provide Context**
+ - Explain WHY a change is needed
+ - Reference documentation or standards
+ - Note potential impacts
+
+3. **Be Actionable**
+ - Clear request vs. suggestion
+ - Priority (must-fix vs. nice-to-have)
+ - Acceptance criteria
+
+## Common Issues and Solutions
+
+### Issue: Agent Can't Access Review URL
+
+**Problem**: Agent asked to review https://github.com/user/repo/pull/123#review-456
+
+**Solution**:
+```markdown
+Instead of the URL, paste the review content:
+
+**File**: src/components/Example.vue
+**Line**: 45
+**Comment**: "This function should handle null values"
+**Suggestion**:
+\`\`\`typescript
+if (value === null) return defaultValue;
+\`\`\`
+```
+
+### Issue: Conflicting Agent Changes
+
+**Problem**: Two agents made changes to the same file
+
+**Solution**:
+1. User decides which changes to keep
+2. User manually merges if needed
+3. User pastes the final desired state in a comment
+4. One agent implements the resolution
+
+### Issue: Test Failures After Changes
+
+**Problem**: CI/CD fails after agent commits
+
+**Solution**:
+1. Agent checks local test results first
+2. If tests pass locally but fail in CI, investigate environment differences
+3. Document any known failures in PR description
+4. Don't commit if tests fail locally
+
+## Task Templates
+
+### Template: Bug Fix
+
+```markdown
+**Bug**: [Description]
+**File**: path/to/file
+**Line**: [Line number if known]
+**Expected**: [What should happen]
+**Actual**: [What currently happens]
+**Fix**: [Proposed solution]
+
+**Testing**:
+- [ ] Unit tests pass
+- [ ] Manual testing completed
+- [ ] No regressions
+```
+
+### Template: Feature Addition
+
+```markdown
+**Feature**: [Description]
+**Files Affected**:
+- path/to/file1 (new)
+- path/to/file2 (modified)
+
+**Implementation**:
+- [ ] Core functionality
+- [ ] Error handling
+- [ ] Documentation
+- [ ] Tests (if applicable)
+
+**Testing**:
+- [ ] Feature works as expected
+- [ ] Edge cases handled
+- [ ] No breaking changes
+```
+
+### Template: Refactoring
+
+```markdown
+**Refactoring**: [Description]
+**Reason**: [Why this change]
+**Scope**: [What's included]
+
+**Changes**:
+- [ ] Extract function/component
+- [ ] Rename for clarity
+- [ ] Simplify logic
+
+**Testing**:
+- [ ] All tests pass
+- [ ] Functionality unchanged
+- [ ] Performance impact: [none/positive/negative]
+```
+
+## Environment-Specific Notes
+
+### Copilot
+
+- Uses `report_progress` tool to commit and push
+- Cannot merge PRs directly
+- Has access to file system and git operations
+- Cannot make HTTP requests
+
+### CodeRabbit
+
+- Primarily does automated reviews
+- Can suggest fixes but cannot commit directly
+- Reviews are posted as PR comments
+
+### Dependabot/Snyk
+
+- Automated security and dependency updates
+- Creates PRs automatically
+- Requires human or agent review before merge
+
+## Escalation
+
+If an agent encounters issues beyond its capabilities:
+
+1. **Document the blocker** clearly in a PR comment
+2. **Tag the user** to request intervention
+3. **Suggest alternatives** if possible
+4. **Preserve work done** so it's not lost
+
+Example:
+```markdown
+@danelkay93
+
+I've encountered a limitation that prevents me from completing this task:
+
+**Issue**: [Description]
+**Attempted**: [What I tried]
+**Blocker**: [Specific limitation]
+
+**Options**:
+1. [Alternative approach]
+2. [Manual intervention needed]
+3. [Different agent might help]
+
+**Work Completed**:
+- ✅ Part A (commit abc1234)
+- ⏸️ Part B (blocked)
+```
+
+## Updates to This Document
+
+This document should be updated when:
+- New agents are added to the project
+- Workflow patterns change
+- Common issues are identified
+- Technical limitations change
+
+Last Updated: 2025-10-18
diff --git a/.github/ISSUE_TEMPLATE/agent_task.md b/.github/ISSUE_TEMPLATE/agent_task.md
new file mode 100644
index 0000000..785c9f3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/agent_task.md
@@ -0,0 +1,53 @@
+---
+name: Agent Task
+about: Template for creating tasks that can be picked up by AI agents
+title: '[AGENT] '
+labels: 'ai-task'
+assignees: ''
+---
+
+## Task Description
+
+
+
+## Context
+
+
+
+## Acceptance Criteria
+
+
+
+- [ ] Criterion 1
+- [ ] Criterion 2
+- [ ] Criterion 3
+
+## Files to Modify
+
+
+
+- `path/to/file1.ts` - [reason]
+- `path/to/file2.vue` - [reason]
+
+## Testing Requirements
+
+- [ ] Build passes (`npm run build`)
+- [ ] Linting passes (`npm run lint`)
+- [ ] Tests pass (if applicable)
+- [ ] Manual testing completed
+
+## Additional Notes
+
+
+
+## Agent Assignment
+
+
+
+Suggested agent: @copilot
+
+---
+
+**Priority**:
+**Effort**:
+**Category**:
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..97601b9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,44 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+title: '[BUG] '
+labels: 'bug'
+assignees: ''
+---
+
+## Bug Description
+
+
+
+## Steps to Reproduce
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+## Expected Behavior
+
+
+
+## Actual Behavior
+
+
+
+## Screenshots
+
+
+
+## Environment
+
+- **Browser**:
+- **OS**:
+- **Version**:
+
+## Additional Context
+
+
+
+## Possible Solution
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..5be96b9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,36 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+title: '[FEATURE] '
+labels: 'enhancement'
+assignees: ''
+---
+
+## Feature Description
+
+
+
+## Problem Statement
+
+
+
+Is your feature request related to a problem? Please describe.
+
+## Proposed Solution
+
+
+
+## Alternatives Considered
+
+
+
+## Additional Context
+
+
+
+## Implementation Notes
+
+
+
+**Estimated Effort**:
+**Priority**:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..5da9ddc
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,82 @@
+# Pull Request
+
+## Description
+
+
+
+## Type of Change
+
+
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Documentation update
+- [ ] Infrastructure/DevOps change
+- [ ] Refactoring (no functional changes)
+
+## Related Issues
+
+
+
+Fixes #
+Related to #
+
+## Changes Made
+
+
+
+- Change 1
+- Change 2
+- Change 3
+
+## Testing Completed
+
+
+
+- [ ] Build passes locally (`npm run build`)
+- [ ] Linting passes (`npm run lint`)
+- [ ] Type checking passes (`npm run type-check`)
+- [ ] Formatting is correct (`npm run format:check`)
+- [ ] Manual testing completed
+- [ ] All tests pass (if applicable)
+
+### Manual Testing Details
+
+
+
+## Screenshots
+
+
+
+## Checklist
+
+
+
+- [ ] My code follows the project's code style
+- [ ] I have performed a self-review of my code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works (if applicable)
+- [ ] New and existing unit tests pass locally with my changes (if applicable)
+- [ ] Any dependent changes have been merged and published
+
+## Agent Information
+
+
+
+**Created by**:
+
+**Agent Notes**:
+
+
+## Breaking Changes
+
+
+
+N/A
+
+## Additional Context
+
+
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index a3c9ba9..0644298 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -5,6 +5,7 @@
**Bleedy** is a web application for adding bleed margins to images, built with Vue 3, Vite, TypeScript, and PyScript. It allows users to upload images and automatically add professional bleed margins using Python image processing in the browser.
### Key Technologies
+
- **Frontend**: Vue 3 + TypeScript + Vite
- **UI Framework**: Element Plus with custom wired-elements for sketchy aesthetics
- **Python Integration**: PyScript 2025.5.1 with PIL (Pillow) for image processing
@@ -16,6 +17,7 @@
## Build and Development Commands
### Environment Setup
+
**ALWAYS run `npm install` first** - this project uses patched dependencies and requires proper installation.
```bash
@@ -25,58 +27,72 @@ npm install
### Development Commands
#### Start Development Server
+
```bash
npm run dev
```
+
- Starts Vite dev server on http://localhost:5173/
- Includes hot reload for Vue components
- Takes ~1-2 seconds to start
- PyScript loads asynchronously in browser
#### Build for Production
+
```bash
npm run build
```
+
- **Time required**: ~8-10 seconds
- Creates `dist/` directory with production build
- Includes PyScript files and assets
- Warning about chunk sizes is expected (large PyScript dependencies)
#### Type Checking
+
```bash
npm run type-check
```
+
- **Known Issues**: Currently fails with 4 TypeScript errors in components
- Errors relate to missing method references and type mismatches
- Build still succeeds despite type errors
#### Preview Production Build
+
```bash
npm run preview
```
+
- Serves production build locally for testing
### Linting and Formatting
#### ESLint (BROKEN - Needs Fix)
+
```bash
npm run lint
```
+
- **Status**: Currently broken due to ESLint 9.x flat config migration
- **Issue**: `eslint.config.js` uses old CommonJS format but project is ES modules
- **Workaround**: Use `npx eslint . --fix` after converting config to ES modules format
#### Prettier
+
```bash
npm run format
```
+
- Formats source files in `src/` directory
- Configuration in `.prettierrc.json`
### Testing
+
```bash
npm run test:unit
```
+
- **Status**: No tests currently exist
- Uses Vitest with jsdom environment
- Configuration ready in `vitest.config.ts`
@@ -84,6 +100,7 @@ npm run test:unit
## Project Architecture
### Directory Structure
+
```
/
├── src/
@@ -108,6 +125,7 @@ npm run test:unit
```
### Key Configuration Files
+
- `vite.config.ts` - Vite build configuration with Vue, Element Plus, and custom elements
- `tsconfig.*.json` - TypeScript configuration split across multiple files
- `vitest.config.ts` - Test configuration (inherits from Vite config)
@@ -115,6 +133,7 @@ npm run test:unit
- `.prettierrc.json` - Code formatting rules
### PyScript Integration
+
- **Python Version**: Pyodide 0.26.1
- **Python Packages**: Pillow (PIL) for image processing
- **Communication**: Custom event system between Python and Vue
@@ -126,18 +145,21 @@ npm run test:unit
## Dependencies and Patches
### Critical Dependencies
+
- `vue@^3.5.13` - Core framework
- `element-plus@^2.9.5` - UI components
- `typescript@~5.7.2` - Type checking
- `vite@^6.0.6` - Build tool
### Patched Dependencies
+
**IMPORTANT**: This project patches two dependencies. Running `npm install` applies these patches automatically.
1. `roughjs@4.6.6.patch` - Fixes rendering issues
2. `wired-elements@3.0.0-rc.6.patch` - Fixes compatibility with modern browsers
### Known Dependency Issues
+
- **wired-elements**: Using old RC version (3.0.0-rc.6) that's no longer maintained
- **ESLint**: Configuration needs migration to flat config format
- **Browserslist**: Data is 7 months old (warning during build)
@@ -145,6 +167,7 @@ npm run test:unit
## Continuous Integration
### GitHub Workflows
+
1. **Azure Static Web Apps CI/CD** (`.github/workflows/azure-static-web-apps-*.yml`)
- Deploys to Azure on pushes to master
- Uses standard Node.js build process
@@ -156,57 +179,104 @@ npm run test:unit
- Currently only runs SonarCloud scan
### Pre-commit Hooks (Planned)
+
- `scripts/check-pyscript-version.sh` - Validates PyScript version consistency
- Currently not integrated with Husky
## Common Issues and Solutions
### TypeScript Errors
+
- **Issue**: 4 type errors in components (missing methods, type mismatches)
- **Impact**: Build succeeds, but `npm run type-check` fails
- **Solution**: Fix component type definitions and method references
### ESLint Configuration
+
- **Issue**: Config uses old format, incompatible with ESLint 9.x
- **Solution**: Convert `eslint.config.js` to ES modules format, remove `root` property
### PyScript Loading
+
- **Issue**: PyScript loads asynchronously, may cause timing issues
- **Solution**: Use event listeners for Python-JavaScript communication
### Build Warnings
+
- Large bundle size warnings are expected due to PyScript/Pyodide dependencies
- Chunk size limit warnings can be ignored for this use case
## Development Guidelines
### Making Changes
+
1. **Always run `npm install`** after pulling changes (patches may update)
2. **Test in development mode first**: `npm run dev`
3. **Check build**: `npm run build` (ignore type check failures for now)
4. **Verify functionality**: Test image upload and processing in browser
### Component Development
+
- Vue 3 Composition API with `
+ ```
+
+#### Option B: Sentry (Error Tracking Focus)
+
+- **Pros:**
+ - Excellent error tracking and debugging
+ - Free tier available
+ - Easy integration with Vue
+ - Source map support
+ - Release tracking
+- **Cons:**
+ - Limited performance monitoring on free tier
+ - Focused primarily on error tracking
+- **Implementation:**
+
+ ```javascript
+ // In src/main.ts
+ import * as Sentry from '@sentry/vue'
+
+ Sentry.init({
+ app,
+ dsn: 'https://your-dsn@sentry.io/project-id',
+ integrations: [
+ new Sentry.BrowserTracing({
+ routingInstrumentation: Sentry.vueRouterInstrumentation(router)
+ })
+ ],
+ tracesSampleRate: 1.0
+ })
+ ```
+
+#### Option C: Google Analytics + Web Vitals (Free, Basic)
+
+- **Pros:**
+ - Free forever
+ - Easy setup
+ - Good for user behavior tracking
+ - Core Web Vitals monitoring
+- **Cons:**
+ - Limited technical metrics
+ - No real-time alerting
+ - Limited error tracking
+- **Implementation:**
+ ```html
+
+
+
+ ```
+
+### 3. Log Management
+
+**What to Log:**
+
+- Application errors and warnings
+- PyScript initialization events
+- Image processing events
+- User actions (anonymized)
+- Performance bottlenecks
+
+**Recommended Tools:**
+
+- **Azure Log Analytics** (Integrated with Azure)
+- **Datadog Logs** (If using Datadog for APM)
+- **Console logs** + Browser DevTools (Development only)
+
+### 4. Synthetic Monitoring
+
+**What to Monitor:**
+
+- Availability from different geographic locations
+- Critical user flows (upload → process → download)
+- Page load times
+- API endpoint availability (when added)
+
+**Recommended Tools:**
+
+- **Datadog Synthetics** (Comprehensive)
+- **Azure Monitor Availability Tests** (Basic)
+- **Pingdom** (Simple uptime monitoring)
+- **UptimeRobot** (Free tier available)
+
+### 5. Security Monitoring
+
+**What to Monitor:**
+
+- Failed authentication attempts (when auth is added)
+- Suspicious user behavior
+- Dependency vulnerabilities
+- Security scanning results
+
+**Recommended Tools:**
+
+- **GitHub Dependabot** (Already enabled)
+- **Snyk** (Security scanning in CI/CD)
+- **Trivy** (Container security scanning)
+- **Azure Security Center** (Infrastructure security)
+
+## Key Metrics to Track
+
+### User Experience Metrics
+
+- **Page Load Time:** < 3 seconds (target)
+- **PyScript Initialization:** < 5 seconds (target)
+- **Image Processing Time:** Varies by image size
+- **Error Rate:** < 1% (target)
+- **Bounce Rate:** Monitor in analytics
+
+### Technical Metrics
+
+- **Memory Usage:** Browser memory consumption
+- **CPU Usage:** Client-side processing
+- **Bundle Size:** JavaScript bundle size
+- **Cache Hit Rate:** Static asset caching
+- **Build Time:** CI/CD build duration
+
+### Business Metrics
+
+- **Daily Active Users (DAU)**
+- **Images Processed per Day**
+- **Average Processing Time**
+- **User Retention Rate**
+- **Feature Adoption Rate**
+
+## Alerting Strategy
+
+### Critical Alerts (Immediate Response)
+
+- Application completely down
+- Error rate > 10%
+- PyScript initialization failure > 50%
+- Build/deployment failures
+
+### Warning Alerts (Review within hours)
+
+- Error rate > 5%
+- Page load time > 5 seconds
+- Increased memory consumption
+- Stale branch accumulation
+
+### Info Alerts (Review weekly)
+
+- Dependency updates available
+- Performance degradation trends
+- Usage pattern changes
+
+## Implementation Phases
+
+### Phase 1: Foundation (Immediate)
+
+- [x] Enable GitHub Actions workflow monitoring
+- [ ] Set up Azure Monitor basic alerts
+- [ ] Implement console-based error logging
+- [ ] Add performance.mark() for key operations
+- [ ] Create monitoring documentation
+
+### Phase 2: Basic Monitoring (1-2 weeks)
+
+- [ ] Choose and implement error tracking (Sentry recommended)
+- [ ] Add Google Analytics or similar for user tracking
+- [ ] Implement Web Vitals monitoring
+- [ ] Set up uptime monitoring (UptimeRobot)
+- [ ] Create basic dashboards
+
+### Phase 3: Advanced Monitoring (1-2 months)
+
+- [ ] Implement comprehensive APM (Datadog or similar)
+- [ ] Add custom metrics collection
+- [ ] Set up log aggregation
+- [ ] Implement synthetic monitoring
+- [ ] Create detailed dashboards and alerts
+
+### Phase 4: Optimization (Ongoing)
+
+- [ ] Fine-tune alert thresholds
+- [ ] Add custom metrics based on usage patterns
+- [ ] Implement anomaly detection
+- [ ] Regular review and optimization
+- [ ] Cost optimization for monitoring tools
+
+## Monitoring Tools Comparison
+
+| Tool | Cost | Setup | Features | Best For |
+| -------------------- | ---- | ------- | ----------------- | ---------------------- |
+| **Datadog** | $$$ | Medium | Complete platform | Enterprise, all-in-one |
+| **Sentry** | $ | Easy | Error tracking | Error monitoring focus |
+| **Google Analytics** | Free | Easy | User behavior | Basic analytics |
+| **Azure Monitor** | $ | Easy | Infrastructure | Azure deployments |
+| **Prometheus** | Free | Complex | Time-series | Self-hosted, advanced |
+| **UptimeRobot** | Free | Easy | Uptime | Simple availability |
+
+## Cost Considerations
+
+### Free Tier Options
+
+- **Google Analytics:** Free forever
+- **Sentry:** 5,000 errors/month free
+- **UptimeRobot:** 50 monitors free
+- **Azure Monitor:** Basic metrics included with resources
+
+### Paid Considerations
+
+- **Datadog:** ~$15-31/host/month + usage
+- **New Relic:** ~$99-349/month
+- **Azure Application Insights:** Pay-as-you-go
+
+### Recommendation
+
+Start with free tools and upgrade as needed:
+
+1. Begin with Azure Monitor (included)
+2. Add Sentry for error tracking (free tier)
+3. Add Google Analytics for user behavior (free)
+4. Evaluate Datadog or alternatives when budget allows
+
+## Security and Privacy
+
+### Data Privacy
+
+- Anonymize user data in logs and analytics
+- Comply with GDPR/CCPA requirements
+- Avoid logging sensitive information
+- Use privacy-respecting analytics tools
+
+### Security Best Practices
+
+- Store monitoring credentials in GitHub Secrets
+- Use read-only API keys where possible
+- Implement proper access controls
+- Regular security audits of monitoring infrastructure
+- Monitor the monitoring tools themselves
+
+## Dashboard Examples
+
+### Operations Dashboard
+
+- Current error rate
+- Active users
+- Page load times
+- PyScript initialization times
+- Recent deployments
+- Build success rate
+
+### Performance Dashboard
+
+- Core Web Vitals (LCP, FID, CLS)
+- Bundle size trends
+- API response times (when added)
+- Browser compatibility metrics
+- Memory usage patterns
+
+### Business Dashboard
+
+- Daily/Monthly Active Users
+- Images processed
+- Geographic distribution
+- Browser/device breakdown
+- Feature usage statistics
+
+## Integration with CI/CD
+
+### GitHub Actions Integration
+
+```yaml
+# Add to CI workflow
+- name: Send deployment notification to Datadog
+ if: always()
+ run: |
+ curl -X POST "https://api.datadoghq.com/api/v1/events" \
+ -H "DD-API-KEY: ${{ secrets.DATADOG_API_KEY }}" \
+ -H "Content-Type: application/json" \
+ -d '{
+ "title": "Deployment to production",
+ "text": "Build ${{ github.run_number }} deployed",
+ "priority": "normal",
+ "tags": ["deployment", "production"],
+ "alert_type": "info"
+ }'
+```
+
+## Next Steps
+
+1. **Immediate Actions:**
+ - Review this document with the team
+ - Decide on monitoring tools based on budget and requirements
+ - Create Sentry account for error tracking
+ - Set up Google Analytics
+
+2. **Short-term (1-2 weeks):**
+ - Implement chosen error tracking solution
+ - Add basic performance monitoring
+ - Create initial dashboards
+ - Set up basic alerts
+
+3. **Medium-term (1-3 months):**
+ - Evaluate APM solutions
+ - Implement comprehensive monitoring
+ - Optimize alert thresholds
+ - Create detailed dashboards
+
+4. **Ongoing:**
+ - Regular monitoring review
+ - Cost optimization
+ - Tool evaluation
+ - Metric refinement
+
+## Resources
+
+- [Azure Monitor Documentation](https://docs.microsoft.com/en-us/azure/azure-monitor/)
+- [Datadog Documentation](https://docs.datadoghq.com/)
+- [Sentry Vue Integration](https://docs.sentry.io/platforms/javascript/guides/vue/)
+- [Web Vitals](https://web.dev/vitals/)
+- [Google Analytics](https://analytics.google.com/)
+- [Prometheus Documentation](https://prometheus.io/docs/)
+
+## Feedback and Updates
+
+This document should be reviewed and updated quarterly or when:
+
+- New monitoring tools are evaluated
+- Significant changes to application architecture
+- New monitoring requirements identified
+- Budget changes affect tool selection
+
+Last updated: 2025-10-16
diff --git a/PR_READINESS.md b/PR_READINESS.md
index 717a65d..2100e50 100644
--- a/PR_READINESS.md
+++ b/PR_READINESS.md
@@ -11,6 +11,7 @@ This PR successfully consolidates all 7 open PRs into a unified, modern codebase
## 📋 Consolidation Summary
### PRs Consolidated:
+
1. **PR #1**: `refactor-cleanup` - Foundational refactoring and cleanup
2. **PR #7**: `phase1-refactor-pyscript-deps` - PyScript dependency modernization
3. **PR #8**: `fix/eslint-errors` - ESLint fixes and comprehensive modernization (BASE)
@@ -20,6 +21,7 @@ This PR successfully consolidates all 7 open PRs into a unified, modern codebase
7. **PR #15**: `snyk-upgrade-element-plus-2.10.5` - Snyk security update
### Consolidation Approach:
+
Used **PR #8** (`fix/eslint-errors`) as the foundation due to its comprehensive modernization, then integrated valuable changes from all other PRs.
---
@@ -27,30 +29,36 @@ Used **PR #8** (`fix/eslint-errors`) as the foundation due to its comprehensive
## 🎯 Key Improvements Delivered
### 1. Dependency Upgrades ✅
+
- **element-plus**: 2.9.1 → 2.11.4 (all Snyk security fixes applied)
- **vue**: 3.5.13 → 3.5.22 (latest stable)
- **vue-router**: 4.5.0 → 4.5.1 (latest stable)
- **PyScript**: 2025.5.1 with Pyodide 0.26.1
### 2. TypeScript Type Safety ✅
+
Fixed critical issues that would cause runtime crashes:
+
- **Logo.vue**: Added SVGSVGElement typing + null guards
- **App.vue**: Imported missing `nextTick`, fixed parameter types
- **ImageGallery.vue**: Proper TypeScript types for refs
- **ImageSelection.vue**: Fixed File[] emit consistency
### 3. Accessibility Compliance ✅
+
- Removed global `outline: none` (WCAG violation)
- Added accessible `:focus-visible` styles for all interactive elements
- Meets WCAG 2.1 Level AA requirements
- Improved keyboard navigation visibility
### 4. Modern Configuration ✅
+
- **ESLint 9.x**: Migrated to flat config format
- **CI/CD**: Comprehensive pipeline with lint, format, type-check, and build
- **PyScript**: Event-driven JS-Python communication
### 5. Comprehensive Documentation ✅
+
- **CONSOLIDATION_CHANGES.md**: All changes, removals, version updates
- **CODERABBIT_FIXES.md**: TypeScript and accessibility fixes
- **FUTURE_WORK.md**: Roadmap for future development
@@ -62,6 +70,7 @@ Fixed critical issues that would cause runtime crashes:
## ✅ Validation Results
### Build Status
+
```
✓ built in 11.37s
✓ 1566 modules transformed
@@ -70,6 +79,7 @@ Fixed critical issues that would cause runtime crashes:
```
### Type Checking
+
```
✓ Critical type errors fixed (Logo, App, ImageGallery, ImageSelection)
⚠️ 26 non-critical TypeScript errors remain (documented)
@@ -77,13 +87,15 @@ Fixed critical issues that would cause runtime crashes:
```
**Non-Critical Errors:**
+
- Missing type declarations for third-party libraries
-- Implicit `any` types in older Vue 2-style components
+- Implicit `any` types in older Vue 2-style components
- Experimental browser API types (File System API)
These don't block builds and are documented for future resolution.
### Dependency Audit
+
```
⚠️ 5 moderate severity vulnerabilities (transitive dev dependencies)
✓ No critical/high vulnerabilities
@@ -93,6 +105,7 @@ These don't block builds and are documented for future resolution.
Can be addressed with `npm audit fix` in a future security-focused PR.
### Linting
+
```
✓ ESLint 9.x flat config working
✓ Prettier formatting consistent
@@ -100,6 +113,7 @@ Can be addressed with `npm audit fix` in a future security-focused PR.
```
### Functionality
+
```
✅ Core image processing preserved
✅ PyScript integration working
@@ -113,14 +127,18 @@ Can be addressed with `npm audit fix` in a future security-focused PR.
## 📊 Review Comments Status
### CodeRabbit Review ✅
+
All critical issues addressed in commit `5999327`:
+
- ✅ TypeScript type safety issues fixed
- ✅ Null guard protections added
- ✅ Accessibility violations resolved
- ✅ Component communication type consistency restored
### User Feedback ✅
+
All user requests addressed:
+
- ✅ Package version regressions fixed (commit `4f8ba7a`)
- ✅ Comprehensive change documentation created
- ✅ No functionality removed without documentation
@@ -128,6 +146,7 @@ All user requests addressed:
- ✅ Agent task considerations included
### Unresolved Comments
+
None. All actionable comments have been addressed.
---
@@ -137,7 +156,9 @@ None. All actionable comments have been addressed.
After merging this PR into master, perform the following:
### 1. Close Consolidated PRs
+
Close and mark as consolidated:
+
- PR #1 (refactor-cleanup)
- PR #7 (phase1-refactor-pyscript-deps)
- PR #8 (fix/eslint-errors) - BASE
@@ -147,6 +168,7 @@ Close and mark as consolidated:
- PR #15 (snyk-upgrade-element-plus-2.10.5)
### 2. Delete Obsolete Branches
+
```bash
git branch -d refactor-cleanup
git branch -d phase1-refactor-pyscript-deps
@@ -157,11 +179,13 @@ git branch -d snyk-upgrade-element-plus-2.10.5
```
### 3. Deploy to Production
+
- Run full build: `npm run build`
- Verify functionality in production environment
- Monitor for any runtime issues
### 4. Future Security Updates
+
- Set up Dependabot or Snyk for automated security monitoring
- Address the 5 moderate vulnerabilities in next maintenance window
@@ -172,6 +196,7 @@ git branch -d snyk-upgrade-element-plus-2.10.5
All changes are comprehensively documented for future developers and AI agents:
### Key Documentation Files:
+
1. **CONSOLIDATION_CHANGES.md** - Change tracking, version updates, removals
2. **CODERABBIT_FIXES.md** - TypeScript and accessibility fixes
3. **FUTURE_WORK.md** - Development roadmap and planned improvements
@@ -180,6 +205,7 @@ All changes are comprehensively documented for future developers and AI agents:
6. **PR_READINESS.md** - This comprehensive readiness assessment
### Documentation Completeness:
+
- ✅ All package version changes documented
- ✅ All removed files/functionality documented with rationale
- ✅ All added functionality documented
@@ -193,25 +219,33 @@ All changes are comprehensively documented for future developers and AI agents:
## ⚠️ Known Limitations (Non-Blocking)
### 1. TypeScript Errors
+
26 non-critical TypeScript errors remain but don't prevent builds:
+
- Primarily missing type declarations for legacy libraries
- Can be gradually addressed in future PRs
- Documented in CODERABBIT_FIXES.md
### 2. Test Coverage
+
No automated tests currently exist:
+
- Vitest infrastructure is set up
- Test creation is planned (see FUTURE_WORK.md)
- Manual functional testing performed successfully
### 3. Dependency Vulnerabilities
+
5 moderate vulnerabilities in transitive dev dependencies:
+
- Don't affect production builds
- Can be addressed with `npm audit fix --force`
- Should be handled in dedicated security PR
### 4. Chunk Size Warning
+
Large bundle size due to PyScript/Pyodide:
+
- Expected for this application architecture
- Future optimization opportunity documented
- Doesn't affect functionality
@@ -223,8 +257,9 @@ Large bundle size due to PyScript/Pyodide:
### ✅ **APPROVED FOR SQUASH AND MERGE**
**Rationale:**
+
1. All critical issues resolved
-2. Build succeeds consistently
+2. Build succeeds consistently
3. No breaking changes introduced
4. Comprehensive documentation provided
5. All code review comments addressed
@@ -233,6 +268,7 @@ Large bundle size due to PyScript/Pyodide:
8. Modern best practices implemented
**Merge Strategy:**
+
- **Recommended**: Squash and merge
- **Reason**: Consolidates 5 commits into clean history
- **Commit Message**: Use PR title with summary from description
@@ -240,6 +276,7 @@ Large bundle size due to PyScript/Pyodide:
**Confidence Level:** High (9/10)
The only minor deductions are for:
+
- Non-critical TypeScript errors (documented, can be fixed later)
- Lack of automated tests (infrastructure ready, planned for future)
@@ -248,6 +285,7 @@ The only minor deductions are for:
## 📞 Support Information
For questions or issues after merge:
+
- Review `CONSOLIDATION_CHANGES.md` for change rationale
- Check `CODERABBIT_FIXES.md` for specific fixes made
- Consult `FUTURE_WORK.md` for planned improvements
@@ -261,20 +299,21 @@ For questions or issues after merge:
**Target Branch**: master
**Source Branch**: copilot/fix-24af5139-e7f4-41f7-8db2-e4ecab11f72c
-
---
## 🤖 AUTOMATION UPDATE (Commit ddcc433)
-**All post-merge actions are now automatedecho ___BEGIN___COMMAND_OUTPUT_MARKER___ ; PS1= ; PS2= ; EC=0 ; echo ___BEGIN___COMMAND_DONE_MARKER___0 ; }*
+\*_All post-merge actions are now automatedecho ***BEGIN***COMMAND_OUTPUT_MARKER*** ; PS1= ; PS2= ; EC=0 ; echo ***BEGIN***COMMAND_DONE_MARKER***0 ; }_
### What's Automated:
+
- ✅ **PR Cleanup**: Closes PRs #1, #7, #8, #10, #12, #14, #15 automatically
- ✅ **Branch Deletion**: Removes all obsolete branches automatically
- ✅ **Dependency Updates**: Dependabot configured for weekly security updates
- ✅ **Pre-commit Checks**: Husky hooks for code quality
### Manual Actions (Only 3):
+
1. Dismiss reviews (see REVIEW_RESOLUTION.md)
2. Deploy to production (`npm run build`)
3. Run `npm audit fix`
@@ -282,4 +321,3 @@ For questions or issues after merge:
**Complete documentation**: `AUTOMATION_SETUP.md`
When this PR merges, everything happens automatically. 🎉
-
diff --git a/QUICKSTART.md b/QUICKSTART.md
new file mode 100644
index 0000000..c1db916
--- /dev/null
+++ b/QUICKSTART.md
@@ -0,0 +1,305 @@
+# Quick Start Guide - Infrastructure and Automation
+
+This guide helps you quickly get started with the new infrastructure and automation features added to the Bleedy project.
+
+## What's New?
+
+This PR adds:
+
+- 🏗️ **Infrastructure as Code** with Pulumi
+- 🤖 **Automation Scripts** for repository management
+- 🐳 **Docker** containerization
+- ⚙️ **Enhanced GitHub Actions** workflows
+- 📊 **Monitoring** strategy documentation
+
+## Quick Setup
+
+### 1. Application Development (No Changes)
+
+Normal development workflow remains unchanged:
+
+```bash
+npm install
+npm run dev
+```
+
+### 2. Using Docker (Optional)
+
+#### Development Mode
+
+```bash
+docker-compose up web
+```
+
+Access at: http://localhost:5173
+
+#### Production Mode
+
+```bash
+docker-compose build
+docker-compose --profile production up nginx
+```
+
+Access at: http://localhost:8080
+
+### 3. Automation Scripts (For Maintainers)
+
+#### List All Branches
+
+```bash
+cd automation
+pip install -r requirements.txt
+python scripts/branch_manager.py list
+```
+
+#### Cleanup Stale Branches (Dry Run)
+
+```bash
+export GITHUB_TOKEN="your-token"
+export GITHUB_REPOSITORY="danelkay93/bleedy"
+python scripts/branch_manager.py cleanup --older-than 180 --dry-run
+```
+
+#### Post-Merge Cleanup (Dry Run)
+
+```bash
+python scripts/post_merge_cleanup.py --pr-number 18 --dry-run
+```
+
+### 4. Infrastructure Management (Optional)
+
+Only needed if managing infrastructure:
+
+```bash
+# Install Pulumi
+curl -fsSL https://get.pulumi.com | sh
+
+# Setup
+cd infrastructure
+pip install -r requirements.txt
+pulumi login
+
+# Preview changes
+pulumi preview
+
+# Apply changes (requires PULUMI_ACCESS_TOKEN)
+pulumi up
+```
+
+## GitHub Actions Workflows
+
+### Automatic Workflows
+
+These run automatically:
+
+1. **CI Checks** (`ci.yml`)
+ - Runs on every push and PR
+ - Checks formatting, linting, types, and builds
+
+2. **Docker Compose** (`docker-compose.yml`)
+ - Runs on Dockerfile changes
+ - Builds and tests containers
+ - Security scans with Trivy
+
+3. **Post-Merge Cleanup** (`post-merge-cleanup.yml`)
+ - Runs when consolidation PRs are merged
+ - Closes old PRs and deletes branches
+
+4. **Branch Management** (`branch-management.yml`)
+ - Runs weekly
+ - Reports stale branches
+
+### Manual Workflows
+
+Trigger manually from GitHub Actions tab:
+
+1. **Pulumi** (`pulumi.yml`)
+ - Deploy infrastructure changes
+ - Requires `PULUMI_ACCESS_TOKEN` secret
+
+2. **Branch Management** (`branch-management.yml`)
+ - List, cleanup, or protect branches
+ - Always use dry-run first!
+
+## Directory Structure
+
+```
+bleedy/
+├── automation/ # 🤖 Automation scripts
+│ ├── scripts/
+│ │ ├── post_merge_cleanup.py
+│ │ └── branch_manager.py
+│ └── requirements.txt
+│
+├── infrastructure/ # 🏗️ Pulumi IaC
+│ ├── __main__.py
+│ ├── Pulumi.yaml
+│ └── requirements.txt
+│
+├── .github/workflows/ # ⚙️ GitHub Actions
+│ ├── ci.yml
+│ ├── pulumi.yml
+│ ├── docker-compose.yml
+│ ├── branch-management.yml
+│ └── post-merge-cleanup.yml
+│
+├── Dockerfile # 🐳 Container build
+├── docker-compose.yml # 🐳 Service orchestration
+├── nginx.conf # 🌐 Production web server
+│
+└── Documentation
+ ├── INFRASTRUCTURE.md # Complete infrastructure guide
+ ├── MONITORING.md # Monitoring strategy
+ └── automation/README.md # Automation scripts guide
+```
+
+## Common Tasks
+
+### For Developers
+
+**Normal development** - Nothing changes:
+
+```bash
+npm install
+npm run dev
+npm run build
+```
+
+**Test with Docker** - Optional:
+
+```bash
+docker-compose up web
+```
+
+### For Maintainers
+
+**List branches**:
+
+```bash
+cd automation
+pip install -r requirements.txt
+python scripts/branch_manager.py list
+```
+
+**Cleanup old branches** (always dry-run first):
+
+```bash
+export GITHUB_TOKEN="your-token"
+python scripts/branch_manager.py cleanup --older-than 180 --dry-run
+```
+
+**Protect important branches**:
+
+```bash
+python scripts/branch_manager.py protect --branch master --dry-run
+```
+
+### For DevOps
+
+**Deploy infrastructure**:
+
+```bash
+cd infrastructure
+pulumi preview # Always preview first
+pulumi up # Apply changes
+```
+
+**Check infrastructure status**:
+
+```bash
+pulumi stack output
+pulumi stack
+```
+
+## What Needs Configuration?
+
+### Minimal Setup (Everything Works)
+
+- Nothing! The PR works out of the box for normal development.
+
+### Optional Features
+
+#### For Pulumi (Infrastructure Management)
+
+1. Create account at [app.pulumi.com](https://app.pulumi.com)
+2. Get access token
+3. Add `PULUMI_ACCESS_TOKEN` to GitHub secrets
+4. Run `pulumi login` locally
+
+#### For Automation Scripts
+
+1. Generate GitHub personal access token with `repo` scope
+2. Set environment variables:
+ ```bash
+ export GITHUB_TOKEN="your-token"
+ export GITHUB_REPOSITORY="danelkay93/bleedy"
+ ```
+
+#### For Monitoring (Future)
+
+See `MONITORING.md` for tool recommendations.
+
+## Testing Your Changes
+
+### Test Build
+
+```bash
+npm run build
+```
+
+### Test Python Scripts
+
+```bash
+python3 -m py_compile automation/scripts/*.py
+```
+
+### Test Docker
+
+```bash
+docker-compose build
+docker-compose up web
+```
+
+### Test Workflows (Locally)
+
+```bash
+# Install act (https://github.com/nektos/act)
+act -l # List workflows
+act pull_request # Simulate PR event
+```
+
+## Need Help?
+
+### Documentation
+
+- **Complete infrastructure guide**: [INFRASTRUCTURE.md](INFRASTRUCTURE.md)
+- **Monitoring strategy**: [MONITORING.md](MONITORING.md)
+- **Automation scripts**: [automation/README.md](automation/README.md)
+- **Pulumi setup**: [infrastructure/README.md](infrastructure/README.md)
+
+### Troubleshooting
+
+- Check GitHub Actions logs for workflow issues
+- Use `--dry-run` flag for all automation scripts
+- Review Docker logs: `docker-compose logs`
+- Check Pulumi state: `pulumi stack`
+
+### Questions?
+
+- Open an issue in the repository
+- Review documentation in respective directories
+- Check tool-specific documentation
+
+## What's Next?
+
+After merging this PR:
+
+1. **Optional**: Set up Pulumi for infrastructure management
+2. **Optional**: Configure monitoring (see `MONITORING.md`)
+3. **Recommended**: Review automation scripts locally
+4. **Recommended**: Test Docker setup locally
+5. Continue normal development!
+
+---
+
+**Remember**: All new features are optional and don't affect normal development workflow!
diff --git a/REVIEW_RESOLUTION.md b/REVIEW_RESOLUTION.md
index 91444d9..1c044fe 100644
--- a/REVIEW_RESOLUTION.md
+++ b/REVIEW_RESOLUTION.md
@@ -7,14 +7,17 @@ This document provides instructions for resolving the three open reviews on PR #
PR #18 has the following review comments that need to be addressed or dismissed:
### Review 1: CodeRabbit AI Review
+
**Status**: Addressed in commits
**Action Required**: Dismiss review or mark as resolved
### Review 2: User Request - Package Versions
+
**Status**: Addressed in commit 4f8ba7a
**Action Required**: Confirm resolution
### Review 3: User Request - Code Review Comments
+
**Status**: Addressed in commit 5999327 and b682a60
**Action Required**: Confirm resolution
@@ -25,6 +28,7 @@ PR #18 has the following review comments that need to be addressed or dismissed:
### 1. CodeRabbit Review - Critical Issues
**Issues Raised**:
+
- TypeScript type safety problems (Logo.vue, App.vue, ImageGallery.vue)
- Missing imports (nextTick in App.vue)
- Invalid CSS syntax
@@ -32,6 +36,7 @@ PR #18 has the following review comments that need to be addressed or dismissed:
- Accessibility violations (global outline:none)
**Resolution** (Commit: 5999327):
+
- ✅ **Logo.vue**: Added `SVGSVGElement` typing and null guards
- ✅ **App.vue**: Imported missing `nextTick`, fixed CSS quotes, added parameter types
- ✅ **ImageGallery.vue**: Added proper TypeScript types for all refs
@@ -41,6 +46,7 @@ PR #18 has the following review comments that need to be addressed or dismissed:
**Documentation**: `CODERABBIT_FIXES.md` contains complete details
**Validation**:
+
- Build passes: ✅ (8.69s)
- All critical issues resolved: ✅
- Accessibility compliant: ✅
@@ -48,9 +54,11 @@ PR #18 has the following review comments that need to be addressed or dismissed:
### 2. Package Version Verification
**Issue Raised**:
+
> "Please ensure that the end result after rebasing and merging this PR doesn't regress Package and dependency versions..."
**Resolution** (Commit: 4f8ba7a):
+
- ✅ **element-plus**: 2.9.1 → 2.11.4 (all Snyk security updates)
- ✅ **vue**: 3.5.13 → 3.5.22 (latest stable)
- ✅ **vue-router**: 4.5.0 → 4.5.1 (latest stable)
@@ -61,6 +69,7 @@ PR #18 has the following review comments that need to be addressed or dismissed:
**Documentation**: `CONSOLIDATION_CHANGES.md` tracks all version changes and removals
**Validation**:
+
- All dependencies upgraded: ✅
- No regressions: ✅
- Comprehensive documentation: ✅
@@ -68,21 +77,25 @@ PR #18 has the following review comments that need to be addressed or dismissed:
### 3. Code Review Comments Resolution
**Issue Raised**:
+
> "Please ensure all code review comments and suggestions by coderabbitai and others are addressed if needed, and resolved."
**Resolution** (Commits: 5999327, b682a60):
+
- ✅ All CodeRabbit issues addressed (see section 1)
- ✅ Package versions verified and corrected (see section 2)
- ✅ Created `PR_READINESS.md` with comprehensive assessment
- ✅ Updated `CONSOLIDATION_CHANGES.md` with accurate versions and known issues
- ✅ All actionable comments resolved
-**Documentation**:
+**Documentation**:
+
- `PR_READINESS.md` - Complete merge readiness assessment
- `CODERABBIT_FIXES.md` - TypeScript and accessibility fixes
- `CONSOLIDATION_CHANGES.md` - All changes documented
**Validation**:
+
- All critical comments addressed: ✅
- Build successful: ✅
- Documentation complete: ✅
@@ -105,38 +118,41 @@ Since I (GitHub Copilot) cannot directly interact with GitHub's API to dismiss r
- Or click the "..." menu → "Dismiss review"
3. **Add dismissal reason**:
+
```
All issues raised in this review have been addressed in subsequent commits:
- Commit 5999327: TypeScript and accessibility fixes
- Commit 4f8ba7a: Package version corrections
- Commit b682a60: Documentation updates
-
+
See CODERABBIT_FIXES.md and PR_READINESS.md for details.
```
### Option 2: Request Review Resolution (No Special Permissions Needed)
1. **Tag reviewers in a comment**:
+
```markdown
@coderabbitai All issues from your review have been addressed:
-
+
✅ TypeScript type safety - Fixed in commit 5999327
✅ Accessibility violations - Fixed in commit 5999327
✅ Package versions - Verified in commit 4f8ba7a
✅ Documentation - Complete in commit b682a60
-
+
Please re-review and approve if the fixes are satisfactory.
```
2. **For user reviews**, add a comment:
+
```markdown
All requested changes have been implemented:
-
+
✅ Package versions verified (element-plus: 2.11.4, vue: 3.5.22)
✅ No functionality removed without documentation
✅ Comprehensive change tracking in CONSOLIDATION_CHANGES.md
✅ Future recommendations in FUTURE_WORK.md
-
+
Build validated: 8.69s, all tests passing.
```
@@ -171,6 +187,7 @@ Use this checklist to track review resolution:
After all reviews are resolved:
### 1. Final Verification
+
```bash
# Clone the branch
git checkout copilot/fix-24af5139-e7f4-41f7-8db2-e4ecab11f72c
@@ -196,6 +213,7 @@ npm run lint -- --no-fix
**Recommended merge method**: Squash and merge
**Commit message**:
+
```
Consolidate all open PRs into unified master-ready codebase (#18)
@@ -232,7 +250,7 @@ After merge, verify that automation runs:
- refactor-cleanup
- phase1-refactor-pyscript-deps
- fix/eslint-errors
- - snyk-upgrade-* branches
+ - snyk-upgrade-\* branches
4. **Check cleanup comment**:
- Return to merged PR #18
@@ -247,6 +265,7 @@ After merge, verify that automation runs:
**Issue**: "You don't have permission to dismiss this review"
**Solution**:
+
- Ask repository owner/admin to dismiss
- Or request reviewer to update their review status
- Or merge with approved reviews from other maintainers
@@ -256,16 +275,18 @@ After merge, verify that automation runs:
**Issue**: Post-merge cleanup workflow didn't execute
**Solution**:
+
1. Check workflow run status in Actions tab
2. Verify PR was merged (not just closed)
3. Check workflow file for syntax errors
4. Manually close PRs and delete branches if needed:
+
```bash
# Delete branches locally
git branch -d refactor-cleanup
git branch -d phase1-refactor-pyscript-deps
# etc.
-
+
# Delete remote branches
git push origin --delete refactor-cleanup
git push origin --delete phase1-refactor-pyscript-deps
@@ -277,6 +298,7 @@ After merge, verify that automation runs:
**Issue**: Build fails in production
**Solution**:
+
1. Verify npm version: `npm --version` (should be 11.0.0+)
2. Clean install: `rm -rf node_modules package-lock.json && npm install`
3. Check Node version: `node --version` (should be 20.x)
diff --git a/automation/README.md b/automation/README.md
new file mode 100644
index 0000000..9df1d73
--- /dev/null
+++ b/automation/README.md
@@ -0,0 +1,198 @@
+# Automation Scripts
+
+This directory contains Python automation scripts for repository management tasks using the [Plumbum](https://plumbum.readthedocs.io/) library for command execution.
+
+## Prerequisites
+
+Install the required dependencies:
+
+```bash
+pip install -r requirements.txt
+```
+
+## Scripts
+
+### post_merge_cleanup.py
+
+Automates cleanup of consolidated PRs and their branches after a consolidation PR has been merged.
+
+**Usage:**
+
+```bash
+# Basic usage
+python scripts/post_merge_cleanup.py --pr-number 18
+
+# Dry run (no actual changes)
+python scripts/post_merge_cleanup.py --pr-number 18 --dry-run
+
+# Custom PR numbers and branches
+python scripts/post_merge_cleanup.py --pr-number 18 \
+ --pr-numbers-to-close 1 7 8 \
+ --branches-to-delete feature/old-1 feature/old-2
+```
+
+**Required Environment Variables:**
+
+- `GITHUB_TOKEN`: GitHub personal access token with `repo` permissions
+- `GITHUB_REPOSITORY`: Repository in format "owner/repo" (auto-detected from git remote if not set)
+
+**Features:**
+
+- Closes consolidated PRs with explanatory comments
+- Deletes obsolete branches
+- Adds cleanup summary comment to consolidation PR
+- Supports dry-run mode for safe testing
+
+### branch_manager.py
+
+Comprehensive branch management tool for listing, cleaning up, protecting, and syncing branches.
+
+**Commands:**
+
+#### List Branches
+
+```bash
+# List all branches
+python scripts/branch_manager.py list
+
+# List branches older than 90 days
+python scripts/branch_manager.py list --older-than 90
+
+# List branches matching a pattern
+python scripts/branch_manager.py list --pattern "feature/"
+```
+
+#### Cleanup Stale Branches
+
+```bash
+# Delete branches older than 180 days
+python scripts/branch_manager.py cleanup --older-than 180
+
+# Dry run with custom exclusions
+python scripts/branch_manager.py cleanup --older-than 180 \
+ --exclude master main develop staging \
+ --dry-run
+
+# Cleanup only specific pattern
+python scripts/branch_manager.py cleanup --older-than 90 \
+ --pattern "snyk-"
+```
+
+#### Protect Branch
+
+```bash
+# Protect master branch with default settings
+python scripts/branch_manager.py protect --branch master
+
+# Custom protection rules
+python scripts/branch_manager.py protect --branch develop \
+ --require-reviews 2 \
+ --require-ci
+```
+
+#### Sync Branch
+
+```bash
+# Sync feature branch with the detected default branch (auto-detects main/master)
+python scripts/branch_manager.py sync --branch feature/my-feature
+
+# Explicitly target a different upstream branch
+python scripts/branch_manager.py sync --branch feature/my-feature --upstream release/2024-10
+
+# Dry run
+python scripts/branch_manager.py sync --branch feature/my-feature --dry-run
+```
+
+The `sync` command now discovers the remote's default branch automatically. This
+keeps local snapshots aligned with whichever branch GitHub designates as the
+source of truth (usually `main` or `master`).
+
+**Required Environment Variables:**
+
+- `GITHUB_TOKEN`: GitHub personal access token with `repo` permissions
+- `GITHUB_REPOSITORY`: Repository in format "owner/repo" (auto-detected if not set)
+
+## Integration with GitHub Actions
+
+These scripts are designed to be used in GitHub Actions workflows. See the workflows in `.github/workflows/` for examples.
+
+Example workflow usage:
+
+```yaml
+- name: Run post-merge cleanup
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ GITHUB_REPOSITORY: ${{ github.repository }}
+ run: |
+ pip install -r automation/requirements.txt
+ python automation/scripts/post_merge_cleanup.py --pr-number ${{ github.event.pull_request.number }}
+```
+
+## Development
+
+### Testing Scripts Locally
+
+Always use `--dry-run` flag when testing:
+
+```bash
+# Test post-merge cleanup
+export GITHUB_TOKEN="your-token"
+export GITHUB_REPOSITORY="owner/repo"
+python scripts/post_merge_cleanup.py --pr-number 18 --dry-run
+
+# Test branch cleanup
+python scripts/branch_manager.py cleanup --older-than 180 --dry-run
+```
+
+### Adding New Scripts
+
+1. Create a new Python script in `scripts/`
+2. Add shebang and proper documentation
+3. Add required dependencies to `requirements.txt`
+4. Make script executable: `chmod +x scripts/your_script.py`
+5. Update this README with usage instructions
+6. Create corresponding GitHub Actions workflow if needed
+
+## Best Practices
+
+- **Always test with `--dry-run` first** before running scripts that modify repository state
+- Use descriptive commit messages when adding new scripts
+- Document all environment variables and parameters
+- Handle errors gracefully with informative messages
+- Use Plumbum for command execution instead of `subprocess`
+- Follow PEP 8 style guidelines
+- Add type hints for better code maintainability
+- Before exporting repository snapshots, run `git fetch origin --prune` and
+ `git remote set-head origin --auto` so that `origin/main` or `origin/master`
+ exists locally. When @copilot prepares snapshots, ensure those commands are
+ part of the preparation workflow to keep the default branch available.
+
+## Troubleshooting
+
+### "GITHUB_TOKEN environment variable not set"
+
+Set your GitHub token:
+
+```bash
+export GITHUB_TOKEN="ghp_your_token_here"
+```
+
+### "Could not determine repository name"
+
+Set the repository explicitly:
+
+```bash
+export GITHUB_REPOSITORY="owner/repo"
+```
+
+### Permission Denied Errors
+
+Ensure your GitHub token has `repo` scope permissions.
+
+### Branch Not Found Errors
+
+The branch may have already been deleted. Check branch existence with:
+
+```bash
+python scripts/branch_manager.py list
+```
diff --git a/automation/requirements.txt b/automation/requirements.txt
new file mode 100644
index 0000000..faf035a
--- /dev/null
+++ b/automation/requirements.txt
@@ -0,0 +1,4 @@
+plumbum>=1.8.0,<2.0.0
+PyGithub>=2.0.0,<3.0.0
+pyyaml>=6.0.0,<7.0.0
+python-dotenv>=1.0.0,<2.0.0
diff --git a/automation/scripts/branch_manager.py b/automation/scripts/branch_manager.py
new file mode 100755
index 0000000..f62b177
--- /dev/null
+++ b/automation/scripts/branch_manager.py
@@ -0,0 +1,413 @@
+#!/usr/bin/env python3
+"""
+Branch Management Script
+
+This script automates branch management tasks including:
+- Listing branches by age, activity, and status
+- Cleaning up stale branches
+- Creating branch protection rules
+- Syncing branches with upstream
+
+Usage:
+ python branch_manager.py [options]
+
+Commands:
+ list - List branches with filtering options
+ cleanup - Delete stale branches
+ protect - Set up branch protection rules
+ sync - Sync branch with upstream
+
+Environment Variables:
+ GITHUB_TOKEN: GitHub personal access token with repo permissions
+ GITHUB_REPOSITORY: Repository in format "owner/repo"
+"""
+
+import argparse
+import sys
+from datetime import datetime, timedelta, timezone
+from typing import List, Optional
+
+from plumbum import local, FG
+from plumbum.cmd import git
+from github import Github, GithubException
+
+
+def get_github_client() -> Github:
+ """Initialize and return GitHub client."""
+ import os
+ token = os.environ.get('GITHUB_TOKEN')
+ if not token:
+ raise ValueError("GITHUB_TOKEN environment variable not set")
+ return Github(token)
+
+
+def get_repository_name() -> str:
+ """Get repository name from environment or git config."""
+ import os
+ repo = os.environ.get('GITHUB_REPOSITORY')
+ if not repo:
+ try:
+ # Try to get from git remote
+ remote_url = git('config', '--get', 'remote.origin.url').strip()
+ if 'github.com' in remote_url:
+ repo = remote_url.split('github.com')[1].strip('/:').replace('.git', '')
+ except Exception as e:
+ raise ValueError(
+ f"Could not determine repository name. Set GITHUB_REPOSITORY env var. Error: {e}"
+ )
+ return repo
+
+
+def detect_default_branch(remote: str = 'origin') -> str:
+ """Detect the default branch name for the given remote.
+
+ Falls back to common branch names or the current HEAD if the remote
+ symbolic reference is unavailable. This helps keep environments that
+ rely on shallow snapshots aligned with the canonical default branch.
+ """
+
+ try:
+ symbolic_ref = git('symbolic-ref', f'refs/remotes/{remote}/HEAD').strip()
+ return symbolic_ref.split('/')[-1]
+ except Exception:
+ for candidate in ('main', 'master', 'trunk'):
+ try:
+ git('show-ref', '--verify', f'refs/remotes/{remote}/{candidate}')
+ return candidate
+ except Exception:
+ continue
+
+ try:
+ return git('rev-parse', '--abbrev-ref', 'HEAD').strip()
+ except Exception:
+ # Final fallback used when no branch data is present at all.
+ return 'master'
+
+
+def list_branches(
+ gh: Github,
+ repo_name: str,
+ older_than_days: Optional[int] = None,
+ pattern: Optional[str] = None
+) -> None:
+ """List branches with optional filtering."""
+ repo = gh.get_repo(repo_name)
+ branches = repo.get_branches()
+
+ print("📋 Branch List\n")
+ print(f"{'Branch Name':<40} {'Last Commit':<20} {'Protected':<10}")
+ print("-" * 70)
+
+ cutoff_date = None
+ now = datetime.now(timezone.utc)
+ if older_than_days:
+ cutoff_date = now - timedelta(days=older_than_days)
+
+ for branch in branches:
+ # Filter by pattern if provided
+ if pattern and pattern not in branch.name:
+ continue
+
+ commit = repo.get_commit(branch.commit.sha)
+ commit_date = commit.commit.author.date.astimezone(timezone.utc)
+
+ # Filter by age if provided
+ if cutoff_date and commit_date > cutoff_date:
+ continue
+
+ # Format date
+ days_old = (now - commit_date).days
+ date_str = f"{days_old} days ago"
+
+ protected_str = "Yes" if branch.protected else "No"
+
+ print(f"{branch.name:<40} {date_str:<20} {protected_str:<10}")
+
+
+def cleanup_branches(
+ gh: Github,
+ repo_name: str,
+ older_than_days: int,
+ pattern: Optional[str] = None,
+ exclude: Optional[List[str]] = None,
+ dry_run: bool = False
+) -> None:
+ """Delete stale branches."""
+ repo = gh.get_repo(repo_name)
+ branches = repo.get_branches()
+
+ now = datetime.now(timezone.utc)
+ cutoff_date = now - timedelta(days=older_than_days)
+ exclude = exclude or ['master', 'main', 'develop', 'staging', 'production']
+
+ default_branch = repo.default_branch
+ if default_branch and default_branch not in exclude:
+ exclude.append(default_branch)
+
+ print(f"🗑️ Cleaning up branches older than {older_than_days} days\n")
+ if dry_run:
+ print("⚠️ DRY RUN MODE - No actual changes will be made\n")
+
+ deleted_count = 0
+ skipped_count = 0
+
+ for branch in branches:
+ # Skip excluded branches
+ if branch.name in exclude:
+ skipped_count += 1
+ continue
+
+ # Skip protected branches
+ if branch.protected:
+ print(f"ℹ️ Skipping protected branch: {branch.name}")
+ skipped_count += 1
+ continue
+
+ # Filter by pattern if provided
+ if pattern and pattern not in branch.name:
+ continue
+
+ # Check age
+ commit = repo.get_commit(branch.commit.sha)
+ commit_date = commit.commit.author.date.astimezone(timezone.utc)
+
+ if commit_date < cutoff_date:
+ if dry_run:
+ print(f"[DRY RUN] Would delete branch: {branch.name}")
+ else:
+ try:
+ ref = repo.get_git_ref(f"heads/{branch.name}")
+ ref.delete()
+ print(f"✅ Deleted branch: {branch.name}")
+ deleted_count += 1
+ except GithubException as e:
+ print(f"⚠️ Could not delete {branch.name}: {e.data.get('message', str(e))}")
+
+ print(f"\n📊 Summary: {deleted_count} deleted, {skipped_count} skipped")
+
+
+def protect_branch(
+ gh: Github,
+ repo_name: str,
+ branch_name: str,
+ require_reviews: int = 1,
+ require_ci: bool = False,
+ dry_run: bool = False
+) -> None:
+ """Set up branch protection rules."""
+ repo = gh.get_repo(repo_name)
+
+ print(f"🔒 Setting up protection for branch: {branch_name}\n")
+ if dry_run:
+ print("⚠️ DRY RUN MODE - No actual changes will be made")
+
+ try:
+ branch = repo.get_branch(branch_name)
+
+ required_status_checks = None
+ if require_ci:
+ required_status_checks = {
+ "strict": True,
+ "contexts": ["CI Checks and Build"],
+ }
+
+ required_pull_request_reviews = None
+ if require_reviews > 0:
+ required_pull_request_reviews = {
+ "required_approving_review_count": require_reviews
+ }
+
+ if dry_run:
+ print(f"[DRY RUN] Would apply protection with settings:")
+ print(f" - Required reviews: {require_reviews}")
+ print(f" - Required CI: {require_ci}")
+ else:
+ kwargs = {}
+ if required_status_checks is not None:
+ kwargs["required_status_checks"] = required_status_checks
+ if required_pull_request_reviews is not None:
+ kwargs["required_pull_request_reviews"] = required_pull_request_reviews
+
+ branch.edit_protection(**kwargs)
+ print(f"✅ Branch protection applied successfully")
+
+ except GithubException as e:
+ print(f"❌ Error: {e.data.get('message', str(e))}")
+
+
+def sync_branch(
+ branch_name: str,
+ upstream_branch: Optional[str] = None,
+ dry_run: bool = False
+) -> None:
+ """Sync branch with upstream.
+
+ When no upstream branch is provided we attempt to detect the remote's
+ default branch so that environments created from repository snapshots
+ keep up with the canonical history.
+ """
+
+ detected_upstream = upstream_branch or detect_default_branch()
+ print(f"🔄 Syncing branch '{branch_name}' with '{detected_upstream}'\n")
+ if dry_run:
+ print("⚠️ DRY RUN MODE - No actual changes will be made")
+
+ try:
+ # Fetch latest changes
+ if dry_run:
+ print(f"[DRY RUN] Would fetch from origin")
+ else:
+ git['fetch', 'origin'] & FG
+
+ # Checkout target branch
+ if dry_run:
+ print(f"[DRY RUN] Would checkout branch: {branch_name}")
+ else:
+ git['checkout', branch_name] & FG
+
+ # Merge upstream
+ if dry_run:
+ print(
+ f"[DRY RUN] Would merge origin/{detected_upstream} into {branch_name}"
+ )
+ else:
+ git['merge', f'origin/{detected_upstream}'] & FG
+ print(f"✅ Successfully synced {branch_name} with {detected_upstream}")
+
+ except Exception as e:
+ print(f"❌ Error during sync: {e}")
+
+
+def main():
+ """Main entry point for the branch manager script."""
+ parser = argparse.ArgumentParser(
+ description="Manage GitHub branches with various operations"
+ )
+ subparsers = parser.add_subparsers(dest='command', help='Command to execute')
+
+ # List command
+ list_parser = subparsers.add_parser('list', help='List branches')
+ list_parser.add_argument(
+ '--older-than',
+ type=int,
+ help='Only show branches older than N days'
+ )
+ list_parser.add_argument(
+ '--pattern',
+ help='Filter branches by name pattern'
+ )
+
+ # Cleanup command
+ cleanup_parser = subparsers.add_parser('cleanup', help='Delete stale branches')
+ cleanup_parser.add_argument(
+ '--older-than',
+ type=int,
+ required=True,
+ help='Delete branches older than N days'
+ )
+ cleanup_parser.add_argument(
+ '--pattern',
+ help='Only delete branches matching pattern'
+ )
+ cleanup_parser.add_argument(
+ '--exclude',
+ nargs='+',
+ help='Branch names to exclude from deletion'
+ )
+ cleanup_parser.add_argument(
+ '--dry-run',
+ action='store_true',
+ help='Perform a dry run'
+ )
+
+ # Protect command
+ protect_parser = subparsers.add_parser('protect', help='Set branch protection')
+ protect_parser.add_argument(
+ '--branch',
+ required=True,
+ help='Branch name to protect'
+ )
+ protect_parser.add_argument(
+ '--require-reviews',
+ type=int,
+ default=1,
+ help='Number of required reviews'
+ )
+ protect_parser.add_argument(
+ '--require-ci',
+ action='store_true',
+ default=False,
+ help='Require CI checks to pass'
+ )
+ protect_parser.add_argument(
+ '--dry-run',
+ action='store_true',
+ help='Perform a dry run'
+ )
+
+ # Sync command
+ sync_parser = subparsers.add_parser('sync', help='Sync branch with upstream')
+ sync_parser.add_argument(
+ '--branch',
+ required=True,
+ help='Branch name to sync'
+ )
+ sync_parser.add_argument(
+ '--upstream',
+ help='Upstream branch to sync with (defaults to detected remote head)'
+ )
+ sync_parser.add_argument(
+ '--dry-run',
+ action='store_true',
+ help='Perform a dry run'
+ )
+
+ args = parser.parse_args()
+
+ if not args.command:
+ parser.print_help()
+ return 1
+
+ try:
+ # Initialize GitHub client for commands that need it
+ if args.command in ['list', 'cleanup', 'protect']:
+ gh = get_github_client()
+ repo_name = get_repository_name()
+ print(f"📦 Repository: {repo_name}\n")
+
+ # Execute command
+ if args.command == 'list':
+ list_branches(gh, repo_name, args.older_than, args.pattern)
+
+ elif args.command == 'cleanup':
+ cleanup_branches(
+ gh,
+ repo_name,
+ args.older_than,
+ args.pattern,
+ args.exclude,
+ args.dry_run
+ )
+
+ elif args.command == 'protect':
+ protect_branch(
+ gh,
+ repo_name,
+ args.branch,
+ args.require_reviews,
+ args.require_ci,
+ args.dry_run
+ )
+
+ elif args.command == 'sync':
+ sync_branch(args.branch, args.upstream, args.dry_run)
+
+ return 0
+
+ except Exception as e:
+ print(f"\n❌ Error: {e}", file=sys.stderr)
+ return 1
+
+
+if __name__ == '__main__':
+ sys.exit(main())
diff --git a/automation/scripts/post_merge_cleanup.py b/automation/scripts/post_merge_cleanup.py
new file mode 100755
index 0000000..53a6ba3
--- /dev/null
+++ b/automation/scripts/post_merge_cleanup.py
@@ -0,0 +1,230 @@
+#!/usr/bin/env python3
+"""
+Post-Merge Cleanup Script
+
+This script automates the cleanup of consolidated PRs and their branches
+after a consolidation PR has been merged. It uses Plumbum for command
+execution and PyGithub for GitHub API interactions.
+
+Usage:
+ python post_merge_cleanup.py --pr-number [--dry-run]
+
+Environment Variables:
+ GITHUB_TOKEN: GitHub personal access token with repo permissions
+ GITHUB_REPOSITORY: Repository in format "owner/repo"
+"""
+
+import argparse
+import os
+import sys
+from typing import List, Optional
+
+from plumbum import local, FG
+from plumbum.cmd import git
+from github import Github, GithubException
+
+# Constants
+DEFAULT_CONSOLIDATED_PR_NUMBERS = [1, 7, 8, 10, 12, 14, 15]
+DEFAULT_CONSOLIDATED_BRANCHES = [
+ 'refactor-cleanup',
+ 'phase1-refactor-pyscript-deps',
+ 'fix/eslint-errors',
+ 'snyk-upgrade-element-plus-2.9.1',
+ 'snyk-upgrade-element-plus-2.9.5',
+ 'snyk-upgrade-element-plus-2.10.5'
+]
+
+
+def get_github_client() -> Github:
+ """Initialize and return GitHub client."""
+ token = os.environ.get('GITHUB_TOKEN')
+ if not token:
+ raise ValueError("GITHUB_TOKEN environment variable not set")
+ return Github(token)
+
+
+def get_repository_name() -> str:
+ """Get repository name from environment or git config."""
+ repo = os.environ.get('GITHUB_REPOSITORY')
+ if not repo:
+ try:
+ # Try to get from git remote
+ remote_url = git('config', '--get', 'remote.origin.url').strip()
+ # Parse repository from URL (handles both HTTPS and SSH)
+ if 'github.com' in remote_url:
+ repo = remote_url.split('github.com')[1].strip('/:').replace('.git', '')
+ except Exception as e:
+ raise ValueError(
+ f"Could not determine repository name. Set GITHUB_REPOSITORY env var. Error: {e}"
+ )
+ return repo
+
+
+def close_consolidated_prs(
+ gh: Github,
+ repo_name: str,
+ pr_numbers: List[int],
+ consolidation_pr_number: int,
+ dry_run: bool = False
+) -> None:
+ """Close the consolidated PRs with appropriate comments."""
+ repo = gh.get_repo(repo_name)
+
+ for pr_number in pr_numbers:
+ try:
+ pr = repo.get_pull(pr_number)
+
+ if pr.state == 'open':
+ comment = (
+ f"This PR has been consolidated into #{consolidation_pr_number} "
+ f"and merged to master.\n\n"
+ f"All changes from this PR are included in the consolidated merge. "
+ f"Closing as completed."
+ )
+
+ if dry_run:
+ print(f"[DRY RUN] Would close PR #{pr_number} with comment: {comment}")
+ else:
+ pr.create_issue_comment(comment)
+ pr.edit(state='closed')
+ print(f"✅ Closed PR #{pr_number}")
+ else:
+ print(f"ℹ️ PR #{pr_number} is already {pr.state}")
+
+ except GithubException as e:
+ print(f"⚠️ Could not process PR #{pr_number}: {e.data.get('message', str(e))}")
+
+
+def delete_branches(
+ gh: Github,
+ repo_name: str,
+ branches: List[str],
+ dry_run: bool = False
+) -> None:
+ """Delete the consolidated branches."""
+ repo = gh.get_repo(repo_name)
+
+ for branch in branches:
+ try:
+ if dry_run:
+ print(f"[DRY RUN] Would delete branch: {branch}")
+ else:
+ ref = repo.get_git_ref(f"heads/{branch}")
+ ref.delete()
+ print(f"✅ Deleted branch: {branch}")
+
+ except GithubException as e:
+ if e.status == 404:
+ print(f"ℹ️ Branch {branch} not found (may already be deleted)")
+ else:
+ print(f"⚠️ Could not delete branch {branch}: {e.data.get('message', str(e))}")
+
+
+def add_cleanup_summary(
+ gh: Github,
+ repo_name: str,
+ consolidation_pr_number: int,
+ dry_run: bool = False
+) -> None:
+ """Add a summary comment to the consolidation PR."""
+ repo = gh.get_repo(repo_name)
+
+ comment = (
+ "## 🧹 Post-Merge Cleanup Complete\n\n"
+ "✅ Consolidated PRs have been closed\n"
+ "✅ Obsolete branches have been deleted\n\n"
+ "The repository is now clean and ready for future development."
+ )
+
+ try:
+ if dry_run:
+ print(f"[DRY RUN] Would add summary comment to PR #{consolidation_pr_number}")
+ else:
+ issue = repo.get_issue(consolidation_pr_number)
+ issue.create_comment(comment)
+ print(f"✅ Added cleanup summary to PR #{consolidation_pr_number}")
+ except GithubException as e:
+ print(f"⚠️ Could not add summary comment: {e.data.get('message', str(e))}")
+
+
+def main():
+ """Main entry point for the post-merge cleanup script."""
+ parser = argparse.ArgumentParser(
+ description="Cleanup consolidated PRs and branches after merge"
+ )
+ parser.add_argument(
+ '--pr-number',
+ type=int,
+ required=True,
+ help='The consolidation PR number that was merged'
+ )
+ parser.add_argument(
+ '--pr-numbers-to-close',
+ type=int,
+ nargs='+',
+ default=DEFAULT_CONSOLIDATED_PR_NUMBERS,
+ help='PR numbers to close (space-separated)'
+ )
+ parser.add_argument(
+ '--branches-to-delete',
+ nargs='+',
+ default=DEFAULT_CONSOLIDATED_BRANCHES,
+ help='Branch names to delete (space-separated)'
+ )
+ parser.add_argument(
+ '--dry-run',
+ action='store_true',
+ help='Perform a dry run without making actual changes'
+ )
+
+ args = parser.parse_args()
+
+ try:
+ print("🚀 Starting post-merge cleanup...")
+ if args.dry_run:
+ print("⚠️ DRY RUN MODE - No actual changes will be made")
+
+ # Initialize GitHub client
+ gh = get_github_client()
+ repo_name = get_repository_name()
+ print(f"📦 Repository: {repo_name}")
+ print(f"🔗 Consolidation PR: #{args.pr_number}")
+
+ # Close consolidated PRs
+ print("\n📝 Closing consolidated PRs...")
+ close_consolidated_prs(
+ gh,
+ repo_name,
+ args.pr_numbers_to_close,
+ args.pr_number,
+ args.dry_run
+ )
+
+ # Delete branches
+ print("\n🗑️ Deleting consolidated branches...")
+ delete_branches(
+ gh,
+ repo_name,
+ args.branches_to_delete,
+ args.dry_run
+ )
+
+ # Add summary comment
+ print("\n📋 Adding cleanup summary...")
+ add_cleanup_summary(
+ gh,
+ repo_name,
+ args.pr_number,
+ args.dry_run
+ )
+
+ print("\n✨ Post-merge cleanup completed successfully!")
+ return 0
+
+ except Exception as e:
+ print(f"\n❌ Error during cleanup: {e}", file=sys.stderr)
+ return 1
+
+
+if __name__ == '__main__':
+ sys.exit(main())
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..14f0d87
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,40 @@
+version: '3.8'
+
+services:
+ # Bleedy web application
+ web:
+ build:
+ context: .
+ dockerfile: Dockerfile
+ target: development
+ ports:
+ - '5173:5173'
+ environment:
+ - NODE_ENV=development
+ volumes:
+ - ./src:/app/src
+ - ./public:/app/public
+ - node_modules:/app/node_modules
+ command: npm run dev
+ networks:
+ - bleedy-network
+
+ # Nginx for production-like serving (optional)
+ nginx:
+ image: nginx:alpine
+ ports:
+ - '8080:80'
+ volumes:
+ - ./dist:/usr/share/nginx/html:ro
+ - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
+ networks:
+ - bleedy-network
+ profiles:
+ - production
+
+volumes:
+ node_modules:
+
+networks:
+ bleedy-network:
+ driver: bridge
diff --git a/eslint.config.js b/eslint.config.js
index 62e107c..ca5fc56 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,10 +1,18 @@
import pluginVue from 'eslint-plugin-vue'
-import {
- defineConfig,
- createConfig as vueTsEslintConfig,
-} from '@vue/eslint-config-typescript'
+import {defineConfig, createConfig as vueTsEslintConfig} from '@vue/eslint-config-typescript'
export default defineConfig(
+ {
+ ignores: [
+ '**/dist/**',
+ '**/dist-ssr/**',
+ '**/coverage/**',
+ 'auto-imports.d.ts',
+ 'components.d.ts',
+ '**/*.d.ts',
+ 'node_modules/**'
+ ]
+ },
pluginVue.configs['flat/recommended'],
- vueTsEslintConfig(),
+ vueTsEslintConfig()
)
diff --git a/infrastructure/Pulumi.dev.yaml b/infrastructure/Pulumi.dev.yaml
new file mode 100644
index 0000000..f59b9d1
--- /dev/null
+++ b/infrastructure/Pulumi.dev.yaml
@@ -0,0 +1,6 @@
+config:
+ bleedy-infrastructure:environment: development
+ pulumi:tags:
+ value:
+ environment: development
+ managed-by: pulumi
diff --git a/infrastructure/Pulumi.yaml b/infrastructure/Pulumi.yaml
new file mode 100644
index 0000000..10d8d03
--- /dev/null
+++ b/infrastructure/Pulumi.yaml
@@ -0,0 +1,9 @@
+name: bleedy-infrastructure
+runtime: python
+description: Infrastructure as Code for Bleedy application using Pulumi
+
+config:
+ pulumi:tags:
+ value:
+ project: bleedy
+ environment: production
diff --git a/infrastructure/README.md b/infrastructure/README.md
new file mode 100644
index 0000000..b5932aa
--- /dev/null
+++ b/infrastructure/README.md
@@ -0,0 +1,324 @@
+# Bleedy Infrastructure as Code
+
+This directory contains Infrastructure as Code (IaC) definitions for the Bleedy application using [Pulumi](https://www.pulumi.com/) with Python.
+
+## Overview
+
+Bleedy is currently deployed to Azure Static Web Apps. This Pulumi project provides a foundation for managing the infrastructure programmatically and can be extended to include:
+
+- Azure Static Web Apps resource definition
+- Custom domain configuration
+- CDN setup
+- Monitoring and logging infrastructure
+- Database resources (if needed)
+- API backend resources (if needed)
+
+## Prerequisites
+
+1. **Install Pulumi CLI:**
+
+ ```bash
+ curl -fsSL https://get.pulumi.com | sh
+ ```
+
+2. **Install Python Dependencies:**
+
+ ```bash
+ pip install -r requirements.txt
+ ```
+
+3. **Configure Pulumi Backend:**
+
+ You can use either:
+ - Pulumi Cloud (default): Sign up at [app.pulumi.com](https://app.pulumi.com)
+ - Self-managed backend: File system, Azure Blob, AWS S3, etc.
+
+ ```bash
+ # Login to Pulumi Cloud
+ pulumi login
+
+ # Or use local backend
+ pulumi login --local
+ ```
+
+4. **Configure Azure Credentials** (when managing Azure resources):
+ ```bash
+ az login
+ ```
+
+## Getting Started
+
+### Initialize the Stack
+
+The project includes a `dev` stack by default. To create a new stack:
+
+```bash
+cd infrastructure
+pulumi stack init production
+```
+
+### Configure the Stack
+
+Set required configuration values:
+
+```bash
+pulumi config set azure-native:location WestUS2
+pulumi config set bleedy-infrastructure:environment production
+```
+
+### Preview Changes
+
+Preview infrastructure changes before applying:
+
+```bash
+pulumi preview
+```
+
+### Deploy Infrastructure
+
+Apply the infrastructure changes:
+
+```bash
+pulumi up
+```
+
+### View Outputs
+
+View exported values from the stack:
+
+```bash
+pulumi stack output
+```
+
+## Project Structure
+
+```
+infrastructure/
+├── __main__.py # Main Pulumi program
+├── Pulumi.yaml # Project configuration
+├── Pulumi.dev.yaml # Development stack configuration
+├── requirements.txt # Python dependencies
+└── README.md # This file
+```
+
+## Configuration
+
+### Stack Configuration
+
+Each stack can have its own configuration in `Pulumi..yaml`:
+
+```yaml
+config:
+ bleedy-infrastructure:environment: production
+ azure-native:location: WestUS2
+ pulumi:tags:
+ value:
+ environment: production
+ managed-by: pulumi
+```
+
+### Secrets Management
+
+Pulumi automatically encrypts sensitive configuration values:
+
+```bash
+# Set a secret value
+pulumi config set --secret apiKey mySecretValue
+
+# View configuration (secrets are encrypted)
+pulumi config
+```
+
+## GitHub Actions Integration
+
+### Pulumi Workflow
+
+A GitHub Actions workflow is provided for automated infrastructure deployment:
+
+```yaml
+name: Pulumi Infrastructure
+
+on:
+ push:
+ branches:
+ - master
+ paths:
+ - 'infrastructure/**'
+
+jobs:
+ pulumi:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Setup Python
+ uses: actions/setup-python@v5
+ with:
+ python-version: '3.12'
+
+ - name: Install dependencies
+ run: |
+ cd infrastructure
+ pip install -r requirements.txt
+
+ - name: Pulumi up
+ uses: pulumi/actions@v5
+ with:
+ command: up
+ # Use 'dev' stack for PRs, 'production' for pushes to master
+ stack-name: ${{ github.event_name == 'pull_request' && 'dev' || 'production' }}
+ work-dir: infrastructure
+ env:
+ PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
+```
+
+### Required Secrets
+
+Add these secrets to your GitHub repository:
+
+- `PULUMI_ACCESS_TOKEN`: Your Pulumi access token (from app.pulumi.com)
+- `AZURE_CREDENTIALS`: Azure service principal credentials (if using Azure)
+
+## Extending Infrastructure
+
+### Adding Azure Static Web Apps
+
+Example code to add Azure Static Web App resource:
+
+```python
+import pulumi_azure_native as azure
+
+# Create resource group
+resource_group = azure.resources.ResourceGroup(
+ "bleedy-rg",
+ location="WestUS2"
+)
+
+# Create Static Web App
+static_web_app = azure.web.StaticSite(
+ "bleedy-app",
+ resource_group_name=resource_group.name,
+ location=resource_group.location,
+ sku=azure.web.SkuDescriptionArgs(
+ name="Free",
+ tier="Free",
+ ),
+ branch="master",
+ repository_url="https://github.com/danelkay93/bleedy",
+ build_properties=azure.web.StaticSiteBuildPropertiesArgs(
+ app_location="/",
+ api_location="",
+ output_location="dist",
+ )
+)
+
+# Export the default hostname
+pulumi.export("endpoint", static_web_app.default_hostname)
+```
+
+### Adding Custom Domain
+
+```python
+# Add custom domain
+custom_domain = azure.web.StaticSiteCustomDomain(
+ "bleedy-custom-domain",
+ domain_name="bleedy.example.com",
+ name=static_web_app.name,
+ resource_group_name=resource_group.name
+)
+```
+
+## Stack Management
+
+### List Available Stacks
+
+```bash
+pulumi stack ls
+```
+
+### Switch Stacks
+
+```bash
+pulumi stack select dev
+pulumi stack select production
+```
+
+### Delete a Stack
+
+```bash
+pulumi stack rm dev
+```
+
+### Export/Import Stack State
+
+```bash
+# Export stack state
+pulumi stack export --file stack-backup.json
+
+# Import stack state
+pulumi stack import --file stack-backup.json
+```
+
+## Best Practices
+
+1. **Use Stack-Specific Configuration**: Keep environment-specific settings in `Pulumi..yaml`
+2. **Tag All Resources**: Use tags for cost tracking and resource management
+3. **Use Secrets for Sensitive Data**: Always use `pulumi config set --secret` for passwords, tokens, etc.
+4. **Review Before Applying**: Always run `pulumi preview` before `pulumi up`
+5. **Automate with CI/CD**: Use GitHub Actions for consistent deployments
+6. **Version Control**: Keep all Pulumi code in version control
+7. **Document Changes**: Update this README when adding new infrastructure components
+
+## Troubleshooting
+
+### "no credentials" Error
+
+Ensure you're logged into Pulumi:
+
+```bash
+pulumi login
+```
+
+### Azure Authentication Issues
+
+Re-authenticate with Azure:
+
+```bash
+az login
+az account set --subscription "your-subscription-id"
+```
+
+### State Conflicts
+
+If you encounter state conflicts:
+
+```bash
+pulumi cancel # Cancel any pending operations
+pulumi refresh # Sync state with actual infrastructure
+```
+
+### Stack Locked
+
+If a stack is locked from a previous operation:
+
+```bash
+pulumi stack export | pulumi stack import --force
+```
+
+## Resources
+
+- [Pulumi Documentation](https://www.pulumi.com/docs/)
+- [Pulumi Python SDK](https://www.pulumi.com/docs/languages-sdks/python/)
+- [Azure Native Provider](https://www.pulumi.com/registry/packages/azure-native/)
+- [Pulumi Examples](https://github.com/pulumi/examples)
+- [Pulumi Best Practices](https://www.pulumi.com/docs/using-pulumi/best-practices/)
+
+## Future Enhancements
+
+- [ ] Define Azure Static Web Apps resource in code
+- [ ] Add custom domain configuration
+- [ ] Set up CDN with Azure Front Door
+- [ ] Configure monitoring with Azure Application Insights
+- [ ] Add cost optimization tags and policies
+- [ ] Set up multiple environments (dev, staging, production)
+- [ ] Implement infrastructure testing with Pulumi policy packs
diff --git a/infrastructure/__main__.py b/infrastructure/__main__.py
new file mode 100644
index 0000000..e9a1b47
--- /dev/null
+++ b/infrastructure/__main__.py
@@ -0,0 +1,31 @@
+"""
+Bleedy Infrastructure as Code using Pulumi
+
+This module defines the infrastructure for the Bleedy application,
+currently deployed to Azure Static Web Apps.
+"""
+
+import pulumi
+from pulumi import Config, export
+
+# Get configuration
+config = Config()
+stack_name = pulumi.get_stack()
+project_name = pulumi.get_project()
+
+# Export basic configuration
+export("project_name", project_name)
+export("stack_name", stack_name)
+export("environment", config.get("environment") or stack_name)
+
+# Note: Azure Static Web Apps infrastructure is currently managed through
+# the Azure Portal and GitHub Actions workflow. This Pulumi project serves
+# as a foundation for future infrastructure management.
+
+# Future infrastructure resources will be added here:
+# - Azure Static Web Apps resource definition
+# - Custom domain configuration
+# - CDN setup
+# - Monitoring and logging infrastructure
+
+pulumi.log.info(f"Pulumi project '{project_name}' initialized for stack '{stack_name}'")
diff --git a/infrastructure/requirements.txt b/infrastructure/requirements.txt
new file mode 100644
index 0000000..c13b37c
--- /dev/null
+++ b/infrastructure/requirements.txt
@@ -0,0 +1,4 @@
+pulumi>=3.0.0,<4.0.0
+pulumi-azure-native>=2.0.0,<3.0.0
+pulumi-docker>=4.0.0,<5.0.0
+pyyaml>=6.0.0,<7.0.0
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 0000000..8e644ae
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,36 @@
+server {
+ listen 80;
+ server_name localhost;
+ root /usr/share/nginx/html;
+ index index.html;
+
+ # Gzip compression
+ gzip on;
+ gzip_vary on;
+ gzip_min_length 1024;
+ gzip_types text/plain text/css text/xml text/javascript application/javascript application/rss+xml application/json;
+
+ # Security headers
+ add_header X-Frame-Options "SAMEORIGIN" always;
+ add_header X-Content-Type-Options "nosniff" always;
+ add_header X-XSS-Protection "1; mode=block" always;
+ add_header Referrer-Policy "no-referrer-when-downgrade" always;
+
+ # Cache static assets
+ location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
+ expires 1y;
+ add_header Cache-Control "public, immutable";
+ }
+
+ # SPA routing - serve index.html for all routes
+ location / {
+ try_files $uri $uri/ /index.html;
+ }
+
+ # Health check endpoint
+ location /health {
+ access_log off;
+ return 200 "healthy\n";
+ add_header Content-Type text/plain;
+ }
+}
diff --git a/package-lock.json b/package-lock.json
index a30bbe1..54f8132 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,6 +38,7 @@
"eslint": "^9.17.0",
"eslint-plugin-format": "^1.0.1",
"eslint-plugin-vue": "^9.32.0",
+ "husky": "^9.1.7",
"jsdom": "^25.0.1",
"postcss": "^8.4.49",
"prettier": "^3.4.2",
@@ -5519,6 +5520,22 @@
"node": ">=18.18.0"
}
},
+ "node_modules/husky": {
+ "version": "9.1.7",
+ "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
+ "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "husky": "bin.js"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/typicode"
+ }
+ },
"node_modules/iconv-lite": {
"version": "0.6.3",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
diff --git a/src/assets/scss/handdrawn.scss b/src/assets/scss/handdrawn.scss
index a53533b..271738b 100644
--- a/src/assets/scss/handdrawn.scss
+++ b/src/assets/scss/handdrawn.scss
@@ -4,11 +4,11 @@ $lightgray: #919090;
// @import url(https://fonts.googleapis.com/css?family=Indie+Flower);
// @import url(https://fonts.googleapis.com/css?family=Covered+By+Your+Grace);
// @import url(https://fonts.googleapis.com/css?family=Shadows+Into+Light);
-@import "https://fonts.googleapis.com/css?family=Architects+Daughter";
+@import 'https://fonts.googleapis.com/css?family=Architects+Daughter';
body {
// background: whitesmoke url(assets/backgrounds/paper_texture309.jpg);
- background: whitesmoke url("assets/backgrounds/paper_texture310.jpg");
+ background: whitesmoke url('assets/backgrounds/paper_texture310.jpg');
// background: whitesmoke url(assets/backgrounds/paper_texture318.jpg);
// background: whitesmoke url(assets/backgrounds/paper_texture327.jpg);
diff --git a/src/assets/sketch_icons/AddImageIcon.vue b/src/assets/sketch_icons/AddImageIcon.vue
index 3313602..ef16232 100644
--- a/src/assets/sketch_icons/AddImageIcon.vue
+++ b/src/assets/sketch_icons/AddImageIcon.vue
@@ -1,80 +1,58 @@
-