Files
picpeak/CONTRIBUTING.md
T
Paul Nothaft d606fcd5a4 docs: branch model + migration-to-org guide + PR-template target hint
Operator + contributor docs for the post-org-move world. None of these
files reference the legacy branch names (`beta` / old `main` meaning) —
they describe the new shape (`main` = active dev, `stable` = curated
release channel), so they're correct from the moment the rename happens.

Three additions/edits:

1. `docs/migration-to-org.md` (new) — operator-facing one-pager that the
   in-app migration banner + the OLD GHCR package URLs (now 404) can
   point at. Walks through the single `docker-compose.yml` edit needed.

2. `CONTRIBUTING.md` — new "Branch model" section explaining which
   branch to target (`main` for features + most fixes; `stable` only
   for small, surgical bugfix backports). Updates the "fork from beta"
   step to "fork from main". Updates the release-process paragraph to
   describe the two-channel model instead of the old beta→main promote.

3. `.github/PULL_REQUEST_TEMPLATE.md` — adds a target-branch hint at
   the top of the template (HTML comment so it shows during PR
   composition but doesn't render in the merged PR body).
2026-06-29 22:05:56 +02:00

7.0 KiB

Contributing to PicPeak

First off, thank you for considering contributing to PicPeak! It's people like you that make PicPeak such a great tool for photographers worldwide.

🤝 Code of Conduct

This project and everyone participating in it is governed by the PicPeak Code of Conduct. By participating, you are expected to uphold this code.

🎯 How Can I Contribute?

Reporting Bugs

Before creating bug reports, please check the existing issues as you might find out that you don't need to create one. When you are creating a bug report, please include as many details as possible:

  • Use a clear and descriptive title
  • Describe the exact steps to reproduce the problem
  • Provide specific examples to demonstrate the steps
  • Describe the behavior you observed and what you expected
  • Include screenshots if possible
  • Include your environment details (OS, browser, Docker version, etc.)

Suggesting Enhancements

Enhancement suggestions are tracked as GitHub issues. When creating an enhancement suggestion, please include:

  • Use a clear and descriptive title
  • Provide a detailed description of the suggested enhancement
  • Provide specific examples to demonstrate the enhancement
  • Describe the current behavior and expected behavior
  • Explain why this enhancement would be useful

Your First Code Contribution

Unsure where to begin? You can start by looking through these issues:

Pull Requests

  1. Fork the repo and create your branch from main (active development)
  2. Install dependencies:
    cd backend && npm install
    cd ../frontend && npm install
    
  3. Make your changes and ensure:
    • Code follows the existing style
    • Tests pass: npm test
    • Linting passes: npm run lint
  4. Write tests if you've added code
  5. Update documentation if needed
  6. Create a Pull Request

💻 Development Setup

Prerequisites

  • Node.js 18+
  • Docker & Docker Compose
  • Git

Local Development

# Clone your fork
git clone https://github.com/your-username/picpeak.git
cd picpeak

# Install dependencies
cd backend && npm install
cd ../frontend && npm install

# Set up environment
cp .env.example .env
# Edit .env with your settings

# Start development servers
docker-compose -f docker-compose.dev.yml up

After pulling changes that touch backend/package.json / backend/package-lock.json (or the frontend equivalents), rebuild the affected image so the live-mounted source can require() the new deps:

docker compose -f docker-compose.dev.yml up -d --build backend
# (or `frontend`, or both)

The dev compose bakes node_modules into the image while live-mounting ./backend/src and ./frontend/src from disk. A dep added on disk won't be picked up until the image is rebuilt — typical symptom is a MODULE_NOT_FOUND restart loop on the affected container.

Running Tests

# Backend tests
cd backend && npm test

# Frontend tests
cd frontend && npm test

# E2E tests
npm run test:e2e

📝 Styleguides

Git Commit Messages

  • Use the present tense ("Add feature" not "Added feature")
  • Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
  • Limit the first line to 72 characters or less
  • Reference issues and pull requests liberally after the first line
  • Consider starting the commit message with an applicable emoji:
    • 🎨 :art: when improving the format/structure of the code
    • 🐛 :bug: when fixing a bug
    • 🔥 :fire: when removing code or files
    • 📝 :memo: when writing docs
    • 🚀 :rocket: when improving performance
    • :sparkles: when adding a new feature

JavaScript/TypeScript Styleguide

  • Use ES6+ features
  • Prefer async/await over promises
  • Use meaningful variable names
  • Add JSDoc comments for functions
  • Follow ESLint rules

React Styleguide

  • Use functional components with hooks
  • Keep components small and focused
  • Use TypeScript for type safety
  • Follow the existing folder structure
  • Write tests for new components

📦 Project Structure

picpeak/
├── backend/
│   ├── src/
│   │   ├── routes/      # API endpoints
│   │   ├── services/    # Business logic
│   │   ├── middleware/  # Express middleware
│   │   └── utils/       # Utilities
│   └── migrations/      # Database migrations
├── frontend/
│   ├── src/
│   │   ├── components/  # Reusable components
│   │   ├── pages/       # Page components
│   │   ├── services/    # API services
│   │   └── hooks/       # Custom hooks
│   └── public/          # Static assets

🌿 Branch model

PicPeak runs on two long-lived branches:

Branch Role What targets it
main Active development. The next release is being assembled here. Feature PRs. Most bugfix PRs.
stable Curated release channel. Production-recommended. Urgent bugfix backports only — small, surgical PRs that land cleanly without dragging in unrelated changes.

Which branch should my PR target?

  • New feature → target main.
  • Bugfix that ONLY affects active dev → target main.
  • Bugfix that current stable users need → open a small PR against main, AND a separate small PR against stable with the same change. Keep both surgical so each lands cleanly.

Hard rule on PR scope: bugfix PRs against stable must be small enough to backport without conflict. Omnibus PRs (e.g. five unrelated sub-features) are fine for main, but never for stable — they make the next main → stable merge painful and break the "stable is always shippable" invariant.

If you're not sure which branch to target, default to main and a maintainer will retarget during review.

🔄 Release Process

Releases are cut independently from main (pre-release versions for the active channel) and stable (semver releases for the curated channel). release-please handles version bumps, changelog generation, and Docker image publication automatically — contributors don't update package.json or CHANGELOG.md by hand.

Periodic main → stable merges promote a batch of main work to the stable channel. The maintainer chooses when (typically every ~4 weeks, sooner if a hot bug demands it).

See RELEASING.md for the full operational doc (promotion criteria, conflict-resolution checklist for the main → stable merge, hotfix backport path, versioning rules).

📮 Contact

Thank you for contributing! 🎉