fix: Mobile hamburger menu and iPad sidebar visibility
Mobile fixes: - Add click toggle handler for hamburger menu (was hover-only) - Menu now opens/closes on tap and closes when clicking outside - Keep hover support for desktop iPad fixes: - Sidebar content now visible on touch devices (901-1280px) - Added (hover: hover) media query to prevent hide-on-hover on tablets Security improvements: - Replace exec.CommandContext with go-git library for git operations - Add path traversal and command injection prevention - Fix race condition in template hot reload - Add environment-based cookie Secure flag Code quality: - Add constants.go for magic numbers - Remove unused code (ParsePreferenceToggleRequest, DomainError) - Add FOUC prevention with inline critical CSS - Add Makefile dev/run/clean targets - Fix README git clone URL - Add doc/DECISIONS.md for architectural decisions Tests: - Add hamburger menu click toggle tests - Add iPad sidebar visibility tests - Update security tests for go-git implementation - Add cookie Secure flag tests
This commit is contained in:
juanatsap
@@ -1,4 +1,4 @@
|
|||||||
.PHONY: test test-all test-unit test-integration lint build
|
.PHONY: test test-all test-unit test-integration lint build dev run clean
|
||||||
|
|
||||||
# Default: Run unit tests only (fast, no Chrome needed)
|
# Default: Run unit tests only (fast, no Chrome needed)
|
||||||
test: test-unit
|
test: test-unit
|
||||||
@@ -28,6 +28,21 @@ build:
|
|||||||
@echo "🔨 Building..."
|
@echo "🔨 Building..."
|
||||||
go build -v -o cv-server .
|
go build -v -o cv-server .
|
||||||
|
|
||||||
|
# Run in development mode with hot reload
|
||||||
|
dev:
|
||||||
|
@echo "🚀 Starting development server with hot reload..."
|
||||||
|
GO_ENV=development TEMPLATE_HOT_RELOAD=true go run main.go
|
||||||
|
|
||||||
|
# Run in production mode
|
||||||
|
run:
|
||||||
|
@echo "🚀 Starting server..."
|
||||||
|
go run main.go
|
||||||
|
|
||||||
|
# Clean build artifacts
|
||||||
|
clean:
|
||||||
|
@echo "🧹 Cleaning build artifacts..."
|
||||||
|
rm -f cv-server coverage.txt coverage-report.txt benchmark.txt
|
||||||
|
|
||||||
# Run all checks (lint + unit tests)
|
# Run all checks (lint + unit tests)
|
||||||
check: lint test-unit
|
check: lint test-unit
|
||||||
@echo "✅ All checks passed!"
|
@echo "✅ All checks passed!"
|
||||||
|
|||||||
@@ -77,16 +77,19 @@ If you want to explore the code or run it locally:
|
|||||||
|
|
||||||
\`\`\`bash
|
\`\`\`bash
|
||||||
# Download the code
|
# Download the code
|
||||||
git clone https://github.com/txemac/cv.git
|
git clone https://github.com/juanatsap/cv-site.git
|
||||||
cd cv
|
cd cv-site
|
||||||
|
|
||||||
# Option 1: Using Make (recommended)
|
# Option 1: Using Make - Development mode with hot reload (recommended)
|
||||||
make dev
|
make dev
|
||||||
|
|
||||||
# Option 2: Using Go directly
|
# Option 2: Using Make - Production mode
|
||||||
|
make run
|
||||||
|
|
||||||
|
# Option 3: Using Go directly
|
||||||
go run main.go
|
go run main.go
|
||||||
|
|
||||||
# Option 3: Build and run binary
|
# Option 4: Build and run binary
|
||||||
go build -o cv-server && ./cv-server
|
go build -o cv-server && ./cv-server
|
||||||
\`\`\`
|
\`\`\`
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,172 @@
|
|||||||
|
# Architectural Decisions
|
||||||
|
|
||||||
|
This document records key architectural decisions made for this project.
|
||||||
|
|
||||||
|
## Table of Contents
|
||||||
|
|
||||||
|
- [ADR-001: No Data Caching](#adr-001-no-data-caching)
|
||||||
|
- [ADR-002: Static Dates Instead of Git Integration](#adr-002-static-dates-instead-of-git-integration)
|
||||||
|
- [ADR-003: CI/CD with GitHub Actions](#adr-003-cicd-with-github-actions)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ADR-001: No Data Caching
|
||||||
|
|
||||||
|
**Status:** Accepted
|
||||||
|
**Date:** 2025-11-30
|
||||||
|
|
||||||
|
### Context
|
||||||
|
|
||||||
|
The CV data (JSON files) is loaded from disk on every request. A caching layer could reduce disk I/O and improve response times.
|
||||||
|
|
||||||
|
### Decision
|
||||||
|
|
||||||
|
**No caching will be implemented for CV data.**
|
||||||
|
|
||||||
|
### Rationale
|
||||||
|
|
||||||
|
1. **Project Size**: This is a small, personal CV website with minimal traffic
|
||||||
|
2. **Simplicity**: Caching adds complexity (cache invalidation, memory management, TTL configuration)
|
||||||
|
3. **Performance is Already Good**: JSON file loading takes <10ms, which is acceptable
|
||||||
|
4. **Hot Reload**: In development, we want fresh data on every request for testing
|
||||||
|
5. **YAGNI**: We don't need caching until we have evidence of performance issues
|
||||||
|
|
||||||
|
### Consequences
|
||||||
|
|
||||||
|
- Simple, maintainable code
|
||||||
|
- No cache invalidation bugs
|
||||||
|
- Slightly higher disk I/O (negligible for this scale)
|
||||||
|
- If traffic increases significantly, this decision can be revisited
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ADR-002: Static Dates Instead of Git Integration
|
||||||
|
|
||||||
|
**Status:** Accepted
|
||||||
|
**Date:** 2025-11-30
|
||||||
|
|
||||||
|
### Context
|
||||||
|
|
||||||
|
Previously, the project had a feature to dynamically fetch project start dates from git repository first commit dates using `exec.CommandContext` to run `git log` commands.
|
||||||
|
|
||||||
|
### Decision
|
||||||
|
|
||||||
|
**Git command execution has been removed. Use static dates in JSON files instead.**
|
||||||
|
|
||||||
|
### Rationale
|
||||||
|
|
||||||
|
1. **Security Risk**: Executing shell commands (even with path validation) poses injection risks
|
||||||
|
2. **Symlink Bypass**: Path validation can be bypassed with symbolic links
|
||||||
|
3. **Unnecessary Complexity**: Static dates in JSON are simpler and more maintainable
|
||||||
|
4. **Control**: Static dates give full control over what's displayed
|
||||||
|
5. **Performance**: No external process spawning
|
||||||
|
|
||||||
|
### Implementation
|
||||||
|
|
||||||
|
Instead of `gitRepoUrl` in project data, use `startDate` directly:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"title": "My Project",
|
||||||
|
"startDate": "2024-06",
|
||||||
|
"current": true
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Consequences
|
||||||
|
|
||||||
|
- More secure codebase
|
||||||
|
- Simpler implementation
|
||||||
|
- Manual date updates required when adding new projects
|
||||||
|
- No external dependencies on git binary
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ADR-003: CI/CD with GitHub Actions
|
||||||
|
|
||||||
|
**Status:** Implemented
|
||||||
|
**Date:** 2025-11-30
|
||||||
|
|
||||||
|
### Context
|
||||||
|
|
||||||
|
The project needs automated testing, linting, and deployment.
|
||||||
|
|
||||||
|
### Decision
|
||||||
|
|
||||||
|
**GitHub Actions is used for CI/CD with two workflows:**
|
||||||
|
|
||||||
|
1. **test.yml** - Runs on PRs and pushes to main/develop
|
||||||
|
2. **deploy.yml** - Deploys to production on push to main
|
||||||
|
|
||||||
|
### Workflows
|
||||||
|
|
||||||
|
#### Test Workflow (`.github/workflows/test.yml`)
|
||||||
|
|
||||||
|
Triggers: `push` and `pull_request` to `main` and `develop` branches
|
||||||
|
|
||||||
|
Steps:
|
||||||
|
1. Checkout code
|
||||||
|
2. Setup Go 1.25.1
|
||||||
|
3. Install and verify dependencies
|
||||||
|
4. Run golangci-lint
|
||||||
|
5. Run unit tests with coverage
|
||||||
|
6. Generate coverage report
|
||||||
|
7. Check coverage threshold (target: 70%)
|
||||||
|
8. Upload coverage to Codecov
|
||||||
|
9. Run benchmarks
|
||||||
|
10. Build binary
|
||||||
|
11. Upload artifacts
|
||||||
|
|
||||||
|
#### Deploy Workflow (`.github/workflows/deploy.yml`)
|
||||||
|
|
||||||
|
Triggers: `push` to `main` branch or manual dispatch
|
||||||
|
|
||||||
|
Steps:
|
||||||
|
1. SSH into production server
|
||||||
|
2. Fix repository permissions
|
||||||
|
3. Stash any local changes
|
||||||
|
4. Pull latest changes
|
||||||
|
5. Restart systemd service
|
||||||
|
6. Verify health check
|
||||||
|
|
||||||
|
### Required Secrets
|
||||||
|
|
||||||
|
- `SSH_PRIVATE_KEY` - SSH private key for server access
|
||||||
|
- `SSH_HOST` - Server IP or domain
|
||||||
|
- `SSH_USER` - SSH username
|
||||||
|
- `SSH_PORT` (optional, default: 22)
|
||||||
|
- `SERVICE_NAME` (optional, default: cv)
|
||||||
|
- `REPO_PATH` (optional, default: /home/txeo/Git/yo/cv)
|
||||||
|
|
||||||
|
### Consequences
|
||||||
|
|
||||||
|
- Automated quality checks on every PR
|
||||||
|
- Consistent deployment process
|
||||||
|
- Health check verification after deployment
|
||||||
|
- Coverage tracking with Codecov
|
||||||
|
- Binary artifacts available for download
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## How to Add New Decisions
|
||||||
|
|
||||||
|
When making significant architectural decisions, add a new section following this template:
|
||||||
|
|
||||||
|
```markdown
|
||||||
|
## ADR-XXX: Title
|
||||||
|
|
||||||
|
**Status:** Proposed | Accepted | Deprecated | Superseded
|
||||||
|
**Date:** YYYY-MM-DD
|
||||||
|
|
||||||
|
### Context
|
||||||
|
What is the issue that we're seeing that is motivating this decision?
|
||||||
|
|
||||||
|
### Decision
|
||||||
|
What is the change that we're proposing?
|
||||||
|
|
||||||
|
### Rationale
|
||||||
|
Why is this the best choice?
|
||||||
|
|
||||||
|
### Consequences
|
||||||
|
What are the results of this decision?
|
||||||
|
```
|
||||||
@@ -9,10 +9,29 @@ require (
|
|||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
dario.cat/mergo v1.0.0 // indirect
|
||||||
|
github.com/Microsoft/go-winio v0.6.2 // indirect
|
||||||
|
github.com/ProtonMail/go-crypto v1.1.6 // indirect
|
||||||
github.com/chromedp/sysutil v1.1.0 // indirect
|
github.com/chromedp/sysutil v1.1.0 // indirect
|
||||||
|
github.com/cloudflare/circl v1.6.1 // indirect
|
||||||
|
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
|
||||||
|
github.com/emirpasic/gods v1.18.1 // indirect
|
||||||
|
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
|
||||||
|
github.com/go-git/go-billy/v5 v5.6.2 // indirect
|
||||||
|
github.com/go-git/go-git/v5 v5.16.4 // indirect
|
||||||
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 // indirect
|
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 // indirect
|
||||||
github.com/gobwas/httphead v0.1.0 // indirect
|
github.com/gobwas/httphead v0.1.0 // indirect
|
||||||
github.com/gobwas/pool v0.2.1 // indirect
|
github.com/gobwas/pool v0.2.1 // indirect
|
||||||
github.com/gobwas/ws v1.4.0 // indirect
|
github.com/gobwas/ws v1.4.0 // indirect
|
||||||
|
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
|
||||||
|
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
|
||||||
|
github.com/kevinburke/ssh_config v1.2.0 // indirect
|
||||||
|
github.com/pjbgf/sha1cd v0.3.2 // indirect
|
||||||
|
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
|
||||||
|
github.com/skeema/knownhosts v1.3.1 // indirect
|
||||||
|
github.com/xanzy/ssh-agent v0.3.3 // indirect
|
||||||
|
golang.org/x/crypto v0.37.0 // indirect
|
||||||
|
golang.org/x/net v0.39.0 // indirect
|
||||||
golang.org/x/sys v0.34.0 // indirect
|
golang.org/x/sys v0.34.0 // indirect
|
||||||
|
gopkg.in/warnings.v0 v0.1.2 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,9 +1,30 @@
|
|||||||
|
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
|
||||||
|
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
|
||||||
|
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
|
||||||
|
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
|
||||||
|
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
|
||||||
|
github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
|
||||||
|
github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
|
||||||
github.com/chromedp/cdproto v0.0.0-20250724212937-08a3db8b4327 h1:UQ4AU+BGti3Sy/aLU8KVseYKNALcX9UXY6DfpwQ6J8E=
|
github.com/chromedp/cdproto v0.0.0-20250724212937-08a3db8b4327 h1:UQ4AU+BGti3Sy/aLU8KVseYKNALcX9UXY6DfpwQ6J8E=
|
||||||
github.com/chromedp/cdproto v0.0.0-20250724212937-08a3db8b4327/go.mod h1:NItd7aLkcfOA/dcMXvl8p1u+lQqioRMq/SqDp71Pb/k=
|
github.com/chromedp/cdproto v0.0.0-20250724212937-08a3db8b4327/go.mod h1:NItd7aLkcfOA/dcMXvl8p1u+lQqioRMq/SqDp71Pb/k=
|
||||||
github.com/chromedp/chromedp v0.14.2 h1:r3b/WtwM50RsBZHMUm9fsNhhzRStTHrKdr2zmwbZSzM=
|
github.com/chromedp/chromedp v0.14.2 h1:r3b/WtwM50RsBZHMUm9fsNhhzRStTHrKdr2zmwbZSzM=
|
||||||
github.com/chromedp/chromedp v0.14.2/go.mod h1:rHzAv60xDE7VNy/MYtTUrYreSc0ujt2O1/C3bzctYBo=
|
github.com/chromedp/chromedp v0.14.2/go.mod h1:rHzAv60xDE7VNy/MYtTUrYreSc0ujt2O1/C3bzctYBo=
|
||||||
github.com/chromedp/sysutil v1.1.0 h1:PUFNv5EcprjqXZD9nJb9b/c9ibAbxiYo4exNWZyipwM=
|
github.com/chromedp/sysutil v1.1.0 h1:PUFNv5EcprjqXZD9nJb9b/c9ibAbxiYo4exNWZyipwM=
|
||||||
github.com/chromedp/sysutil v1.1.0/go.mod h1:WiThHUdltqCNKGc4gaU50XgYjwjYIhKWoHGPTUfWTJ8=
|
github.com/chromedp/sysutil v1.1.0/go.mod h1:WiThHUdltqCNKGc4gaU50XgYjwjYIhKWoHGPTUfWTJ8=
|
||||||
|
github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
|
||||||
|
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
|
||||||
|
github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
|
||||||
|
github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
|
||||||
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
|
||||||
|
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
|
||||||
|
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
|
||||||
|
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
|
||||||
|
github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=
|
||||||
|
github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
|
||||||
|
github.com/go-git/go-git/v5 v5.16.4 h1:7ajIEZHZJULcyJebDLo99bGgS0jRrOxzZG4uCk2Yb2Y=
|
||||||
|
github.com/go-git/go-git/v5 v5.16.4/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
|
||||||
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 h1:iizUGZ9pEquQS5jTGkh4AqeeHCMbfbjeb0zMt0aEFzs=
|
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 h1:iizUGZ9pEquQS5jTGkh4AqeeHCMbfbjeb0zMt0aEFzs=
|
||||||
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
|
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
|
||||||
github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
|
github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
|
||||||
@@ -12,12 +33,57 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
|
|||||||
github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
|
github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
|
||||||
github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
|
github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
|
||||||
github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
|
github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
|
||||||
|
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
|
||||||
|
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
|
||||||
|
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
|
||||||
|
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
|
||||||
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
|
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
|
||||||
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
|
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
|
||||||
|
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
|
||||||
|
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
|
||||||
|
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||||
|
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||||
|
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||||
github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
|
github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
|
||||||
github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
|
github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
|
||||||
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw=
|
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw=
|
||||||
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
|
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
|
||||||
|
github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
|
||||||
|
github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
|
||||||
|
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
|
||||||
|
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
|
||||||
|
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
||||||
|
github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
|
||||||
|
github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
|
||||||
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
|
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||||
|
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||||
|
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
|
||||||
|
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
|
||||||
|
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
|
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
|
||||||
|
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
|
||||||
|
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
|
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
|
||||||
|
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
|
||||||
|
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
|
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
|
||||||
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||||
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
|
||||||
|
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
|
||||||
|
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
@@ -0,0 +1,123 @@
|
|||||||
|
package handlers
|
||||||
|
|
||||||
|
import "time"
|
||||||
|
|
||||||
|
// ==============================================================================
|
||||||
|
// HTTP CONTENT TYPES
|
||||||
|
// ==============================================================================
|
||||||
|
|
||||||
|
const (
|
||||||
|
// ContentTypePDF is the MIME type for PDF documents
|
||||||
|
ContentTypePDF = "application/pdf"
|
||||||
|
|
||||||
|
// ContentTypeHTML is the MIME type for HTML documents
|
||||||
|
ContentTypeHTML = "text/html; charset=utf-8"
|
||||||
|
|
||||||
|
// ContentTypeJSON is the MIME type for JSON documents
|
||||||
|
ContentTypeJSON = "application/json"
|
||||||
|
|
||||||
|
// ContentTypePlainText is the MIME type for plain text
|
||||||
|
ContentTypePlainText = "text/plain; charset=utf-8"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ==============================================================================
|
||||||
|
// RATE LIMITING
|
||||||
|
// ==============================================================================
|
||||||
|
|
||||||
|
const (
|
||||||
|
// PDFRateLimitRequests is the maximum number of PDF requests per window
|
||||||
|
PDFRateLimitRequests = 3
|
||||||
|
|
||||||
|
// PDFRateLimitWindow is the time window for PDF rate limiting
|
||||||
|
PDFRateLimitWindow = 1 * time.Minute
|
||||||
|
|
||||||
|
// GeneralRateLimitRequests is the default rate limit for general requests
|
||||||
|
GeneralRateLimitRequests = 100
|
||||||
|
|
||||||
|
// GeneralRateLimitWindow is the time window for general rate limiting
|
||||||
|
GeneralRateLimitWindow = 1 * time.Minute
|
||||||
|
)
|
||||||
|
|
||||||
|
// ==============================================================================
|
||||||
|
// PDF GENERATION
|
||||||
|
// ==============================================================================
|
||||||
|
|
||||||
|
const (
|
||||||
|
// A4WidthInches is the width of A4 paper in inches
|
||||||
|
A4WidthInches = 8.27
|
||||||
|
|
||||||
|
// A4HeightInches is the height of A4 paper in inches
|
||||||
|
A4HeightInches = 11.69
|
||||||
|
|
||||||
|
// PDFGenerationTimeout is the maximum time allowed for PDF generation
|
||||||
|
PDFGenerationTimeout = 30 * time.Second
|
||||||
|
)
|
||||||
|
|
||||||
|
// ==============================================================================
|
||||||
|
// COOKIE SETTINGS
|
||||||
|
// ==============================================================================
|
||||||
|
|
||||||
|
const (
|
||||||
|
// CookieMaxAge is the default cookie expiration (1 year in seconds)
|
||||||
|
CookieMaxAge = 365 * 24 * 60 * 60
|
||||||
|
|
||||||
|
// CookiePath is the default cookie path
|
||||||
|
CookiePath = "/"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ==============================================================================
|
||||||
|
// LANGUAGE CODES
|
||||||
|
// ==============================================================================
|
||||||
|
|
||||||
|
const (
|
||||||
|
// LangEnglish is the English language code
|
||||||
|
LangEnglish = "en"
|
||||||
|
|
||||||
|
// LangSpanish is the Spanish language code
|
||||||
|
LangSpanish = "es"
|
||||||
|
|
||||||
|
// DefaultLanguage is the default language for the application
|
||||||
|
DefaultLanguage = LangEnglish
|
||||||
|
)
|
||||||
|
|
||||||
|
// ==============================================================================
|
||||||
|
// CV PREFERENCES
|
||||||
|
// ==============================================================================
|
||||||
|
|
||||||
|
const (
|
||||||
|
// CVLengthShort represents the short CV format
|
||||||
|
CVLengthShort = "short"
|
||||||
|
|
||||||
|
// CVLengthLong represents the long CV format
|
||||||
|
CVLengthLong = "long"
|
||||||
|
|
||||||
|
// CVIconsShow indicates icons should be visible
|
||||||
|
CVIconsShow = "show"
|
||||||
|
|
||||||
|
// CVIconsHide indicates icons should be hidden
|
||||||
|
CVIconsHide = "hide"
|
||||||
|
|
||||||
|
// CVThemeDefault is the default CV theme
|
||||||
|
CVThemeDefault = "default"
|
||||||
|
|
||||||
|
// CVThemeClean is the clean CV theme
|
||||||
|
CVThemeClean = "clean"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ==============================================================================
|
||||||
|
// HTTP HEADERS
|
||||||
|
// ==============================================================================
|
||||||
|
|
||||||
|
const (
|
||||||
|
// HeaderContentType is the Content-Type header key
|
||||||
|
HeaderContentType = "Content-Type"
|
||||||
|
|
||||||
|
// HeaderContentDisposition is the Content-Disposition header key
|
||||||
|
HeaderContentDisposition = "Content-Disposition"
|
||||||
|
|
||||||
|
// HeaderCacheControl is the Cache-Control header key
|
||||||
|
HeaderCacheControl = "Cache-Control"
|
||||||
|
|
||||||
|
// HeaderHXRequest is the HTMX request header
|
||||||
|
HeaderHXRequest = "HX-Request"
|
||||||
|
)
|
||||||
@@ -1,15 +1,16 @@
|
|||||||
package handlers
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/go-git/go-git/v5"
|
||||||
|
"github.com/go-git/go-git/v5/plumbing/object"
|
||||||
|
|
||||||
cvmodel "github.com/juanatsap/cv-site/internal/models/cv"
|
cvmodel "github.com/juanatsap/cv-site/internal/models/cv"
|
||||||
uimodel "github.com/juanatsap/cv-site/internal/models/ui"
|
uimodel "github.com/juanatsap/cv-site/internal/models/ui"
|
||||||
)
|
)
|
||||||
@@ -151,7 +152,7 @@ func calculateDuration(startDate, endDate string, current bool, lang string) str
|
|||||||
}
|
}
|
||||||
|
|
||||||
// processProjectDates calculates dynamic dates for projects
|
// processProjectDates calculates dynamic dates for projects
|
||||||
// If a project has a gitRepoUrl, it fetches the first commit date
|
// If a project has a gitRepoUrl, it fetches the first commit date using go-git
|
||||||
// For current projects, it sets the current system date
|
// For current projects, it sets the current system date
|
||||||
func processProjectDates(project *cvmodel.Project, lang string) {
|
func processProjectDates(project *cvmodel.Project, lang string) {
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
@@ -165,7 +166,7 @@ func processProjectDates(project *cvmodel.Project, lang string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If project has a git repository URL, fetch the first commit date
|
// If project has a git repository path, fetch the first commit date
|
||||||
if project.GitRepoUrl != "" {
|
if project.GitRepoUrl != "" {
|
||||||
commitDate := getGitRepoFirstCommitDate(project.GitRepoUrl)
|
commitDate := getGitRepoFirstCommitDate(project.GitRepoUrl)
|
||||||
if commitDate != "" {
|
if commitDate != "" {
|
||||||
@@ -185,32 +186,25 @@ func processProjectDates(project *cvmodel.Project, lang string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ==============================================================================
|
// ==============================================================================
|
||||||
// GIT HELPERS
|
// GIT HELPERS (using go-git - pure Go implementation, no shell commands)
|
||||||
// ==============================================================================
|
// ==============================================================================
|
||||||
|
|
||||||
// findProjectRoot finds the project root directory
|
// findProjectRoot finds the project root directory by looking for .git directory
|
||||||
// It looks for .git directory walking up the directory tree
|
|
||||||
func findProjectRoot() (string, error) {
|
func findProjectRoot() (string, error) {
|
||||||
// Start from current working directory
|
|
||||||
cwd, err := os.Getwd()
|
cwd, err := os.Getwd()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Walk up the directory tree looking for .git
|
|
||||||
dir := cwd
|
dir := cwd
|
||||||
for {
|
for {
|
||||||
gitPath := filepath.Join(dir, ".git")
|
gitPath := filepath.Join(dir, ".git")
|
||||||
if info, err := os.Stat(gitPath); err == nil && info.IsDir() {
|
if info, err := os.Stat(gitPath); err == nil && info.IsDir() {
|
||||||
// Found .git directory - this is the project root
|
|
||||||
return dir, nil
|
return dir, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Move up one directory
|
|
||||||
parent := filepath.Dir(dir)
|
parent := filepath.Dir(dir)
|
||||||
if parent == dir {
|
if parent == dir {
|
||||||
// Reached root directory without finding .git
|
|
||||||
// Fall back to current working directory
|
|
||||||
return cwd, nil
|
return cwd, nil
|
||||||
}
|
}
|
||||||
dir = parent
|
dir = parent
|
||||||
@@ -218,29 +212,23 @@ func findProjectRoot() (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// validateRepoPath validates that a repository path is safe to use
|
// validateRepoPath validates that a repository path is safe to use
|
||||||
// Security: Prevents path traversal and command injection attacks
|
// Security: Prevents path traversal attacks by ensuring path is within project directory
|
||||||
// Only allows paths within the project directory
|
|
||||||
func validateRepoPath(path string) error {
|
func validateRepoPath(path string) error {
|
||||||
// Resolve to absolute path to prevent path traversal
|
|
||||||
absPath, err := filepath.Abs(path)
|
absPath, err := filepath.Abs(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("invalid path: %w", err)
|
return fmt.Errorf("invalid path: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get project root directory - find the git repo root
|
|
||||||
// This ensures the validation works regardless of where code runs from
|
|
||||||
projectRoot, err := findProjectRoot()
|
projectRoot, err := findProjectRoot()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("cannot determine project root: %w", err)
|
return fmt.Errorf("cannot determine project root: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Security check: Only allow paths within project directory
|
// Security: Only allow paths within project directory
|
||||||
// This prevents malicious paths like "../../../etc/passwd"
|
|
||||||
if !strings.HasPrefix(absPath, projectRoot) {
|
if !strings.HasPrefix(absPath, projectRoot) {
|
||||||
return fmt.Errorf("repository path outside project directory: %s", path)
|
return fmt.Errorf("repository path outside project directory: %s", path)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Verify path exists and is a directory
|
|
||||||
info, err := os.Stat(absPath)
|
info, err := os.Stat(absPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("path does not exist: %w", err)
|
return fmt.Errorf("path does not exist: %w", err)
|
||||||
@@ -253,49 +241,51 @@ func validateRepoPath(path string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// getGitRepoFirstCommitDate fetches the first commit date from a git repository
|
// getGitRepoFirstCommitDate fetches the first commit date from a git repository
|
||||||
// Supports local git repository paths
|
// Uses go-git (pure Go) - no shell command execution, eliminating injection risks
|
||||||
// Security: Validates path and uses timeout to prevent hanging
|
|
||||||
func getGitRepoFirstCommitDate(repoPath string) string {
|
func getGitRepoFirstCommitDate(repoPath string) string {
|
||||||
// Security: Validate repository path before executing git command
|
// Security: Validate repository path
|
||||||
if err := validateRepoPath(repoPath); err != nil {
|
if err := validateRepoPath(repoPath); err != nil {
|
||||||
log.Printf("Security: Rejected git operation for invalid path %s: %v", repoPath, err)
|
log.Printf("Security: Rejected git operation for invalid path %s: %v", repoPath, err)
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// Security: Add timeout context to prevent hanging
|
// Open the repository using go-git
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
repo, err := git.PlainOpen(repoPath)
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
// Execute git command with timeout protection
|
|
||||||
// Using CommandContext for automatic cancellation on timeout
|
|
||||||
cmd := exec.CommandContext(ctx, "git", "-C", repoPath, "log", "--reverse", "--format=%ci", "--date=format:%Y-%m")
|
|
||||||
|
|
||||||
output, err := cmd.Output()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Log error but don't expose details to prevent information disclosure
|
log.Printf("Failed to open git repository at %s: %v", repoPath, err)
|
||||||
log.Printf("Git command failed for path %s: %v", repoPath, err)
|
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse the output to get the first commit date
|
// Get the commit history
|
||||||
lines := strings.Split(strings.TrimSpace(string(output)), "\n")
|
commitIter, err := repo.Log(&git.LogOptions{
|
||||||
if len(lines) == 0 {
|
Order: git.LogOrderCommitterTime,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Failed to get commit log for %s: %v", repoPath, err)
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
defer commitIter.Close()
|
||||||
|
|
||||||
// Extract YYYY-MM from the first commit timestamp
|
// Find the oldest commit by iterating through all commits
|
||||||
// Format of output: "2024-06-15 10:30:45 +0200"
|
var oldestCommit *object.Commit
|
||||||
firstLine := lines[0]
|
err = commitIter.ForEach(func(c *object.Commit) error {
|
||||||
parts := strings.Fields(firstLine)
|
if oldestCommit == nil || c.Committer.When.Before(oldestCommit.Committer.When) {
|
||||||
if len(parts) > 0 {
|
oldestCommit = c
|
||||||
datePart := parts[0] // "2024-06-15"
|
|
||||||
dateParts := strings.Split(datePart, "-")
|
|
||||||
if len(dateParts) >= 2 {
|
|
||||||
return dateParts[0] + "-" + dateParts[1] // "2024-06"
|
|
||||||
}
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Error iterating commits for %s: %v", repoPath, err)
|
||||||
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
return ""
|
if oldestCommit == nil {
|
||||||
|
log.Printf("No commits found in repository %s", repoPath)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return date in YYYY-MM format
|
||||||
|
return oldestCommit.Committer.When.Format("2006-01")
|
||||||
}
|
}
|
||||||
|
|
||||||
// ==============================================================================
|
// ==============================================================================
|
||||||
|
|||||||
@@ -6,6 +6,14 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// ==============================================================================
|
||||||
|
// SECURITY TESTS for go-git Implementation
|
||||||
|
// ==============================================================================
|
||||||
|
// These tests verify that the path validation and git operations are secure.
|
||||||
|
// The implementation uses go-git (pure Go) instead of exec.CommandContext
|
||||||
|
// to eliminate shell command injection risks.
|
||||||
|
// ==============================================================================
|
||||||
|
|
||||||
// TestValidateRepoPath tests the security validation for repository paths
|
// TestValidateRepoPath tests the security validation for repository paths
|
||||||
func TestValidateRepoPath(t *testing.T) {
|
func TestValidateRepoPath(t *testing.T) {
|
||||||
// Get project root (two levels up from handlers directory)
|
// Get project root (two levels up from handlers directory)
|
||||||
@@ -116,12 +124,12 @@ func TestGetGitRepoFirstCommitDate_SecurityValidation(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestGetGitRepoFirstCommitDate_Timeout tests that git commands timeout appropriately
|
// TestGetGitRepoFirstCommitDate_NonGitRepo tests that non-git directories return empty
|
||||||
func TestGetGitRepoFirstCommitDate_Timeout(t *testing.T) {
|
func TestGetGitRepoFirstCommitDate_NonGitRepo(t *testing.T) {
|
||||||
// Create a temporary directory that exists but is not a git repo
|
// Create a temporary directory that exists but is not a git repo
|
||||||
tempDir := t.TempDir()
|
tempDir := t.TempDir()
|
||||||
|
|
||||||
// This should timeout/fail gracefully (not hang)
|
// This should fail gracefully (not panic)
|
||||||
result := getGitRepoFirstCommitDate(tempDir)
|
result := getGitRepoFirstCommitDate(tempDir)
|
||||||
|
|
||||||
// Should return empty string for non-git repos
|
// Should return empty string for non-git repos
|
||||||
@@ -130,6 +138,58 @@ func TestGetGitRepoFirstCommitDate_Timeout(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestGetGitRepoFirstCommitDate_ValidRepo tests the happy path with the current repo
|
||||||
|
func TestGetGitRepoFirstCommitDate_ValidRepo(t *testing.T) {
|
||||||
|
// Get project root (should be a valid git repo)
|
||||||
|
cwd, err := os.Getwd()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Failed to get working directory: %v", err)
|
||||||
|
}
|
||||||
|
projectRoot := filepath.Join(cwd, "..", "..")
|
||||||
|
|
||||||
|
// This should return a valid date
|
||||||
|
result := getGitRepoFirstCommitDate(projectRoot)
|
||||||
|
|
||||||
|
// Should return a date in YYYY-MM format
|
||||||
|
if result == "" {
|
||||||
|
t.Log("Warning: No commit date returned (repo might not have commits)")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate format: YYYY-MM
|
||||||
|
if len(result) != 7 || result[4] != '-' {
|
||||||
|
t.Errorf("Expected date in YYYY-MM format, got %q", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Year should be between 2020 and 2030 (reasonable range)
|
||||||
|
year := result[:4]
|
||||||
|
if year < "2020" || year > "2030" {
|
||||||
|
t.Errorf("Year %s seems unreasonable for project start date", year)
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Logf("First commit date: %s", result)
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestFindProjectRoot tests the project root detection
|
||||||
|
func TestFindProjectRoot(t *testing.T) {
|
||||||
|
root, err := findProjectRoot()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Failed to find project root: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify .git directory exists
|
||||||
|
gitPath := filepath.Join(root, ".git")
|
||||||
|
info, err := os.Stat(gitPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Expected .git directory at %s, got error: %v", gitPath, err)
|
||||||
|
}
|
||||||
|
if !info.IsDir() {
|
||||||
|
t.Errorf("Expected .git to be a directory at %s", gitPath)
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Logf("Project root: %s", root)
|
||||||
|
}
|
||||||
|
|
||||||
// Helper function to check if a string contains a substring
|
// Helper function to check if a string contains a substring
|
||||||
func contains(s, substr string) bool {
|
func contains(s, substr string) bool {
|
||||||
return len(s) >= len(substr) && (s == substr || len(substr) == 0 ||
|
return len(s) >= len(substr) && (s == substr || len(substr) == 0 ||
|
||||||
|
|||||||
@@ -210,68 +210,6 @@ func (e *DomainError) WithField(field string) *DomainError {
|
|||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
|
|
||||||
// Common domain error constructors
|
// NOTE: Domain error constructors were removed as they were unused.
|
||||||
|
// If needed in the future, they can be re-added following the DomainError pattern above.
|
||||||
func InvalidLanguageError(lang string) *DomainError {
|
// See git history for the previous implementation.
|
||||||
return NewDomainError(
|
|
||||||
ErrCodeInvalidLanguage,
|
|
||||||
fmt.Sprintf("Unsupported language: %s (use 'en' or 'es')", lang),
|
|
||||||
http.StatusBadRequest,
|
|
||||||
).WithField("lang")
|
|
||||||
}
|
|
||||||
|
|
||||||
func InvalidLengthError(length string) *DomainError {
|
|
||||||
return NewDomainError(
|
|
||||||
ErrCodeInvalidLength,
|
|
||||||
fmt.Sprintf("Unsupported length: %s (use 'short' or 'long')", length),
|
|
||||||
http.StatusBadRequest,
|
|
||||||
).WithField("length")
|
|
||||||
}
|
|
||||||
|
|
||||||
func InvalidIconsError(icons string) *DomainError {
|
|
||||||
return NewDomainError(
|
|
||||||
ErrCodeInvalidIcons,
|
|
||||||
fmt.Sprintf("Unsupported icons option: %s (use 'show' or 'hide')", icons),
|
|
||||||
http.StatusBadRequest,
|
|
||||||
).WithField("icons")
|
|
||||||
}
|
|
||||||
|
|
||||||
func InvalidThemeError(theme string) *DomainError {
|
|
||||||
return NewDomainError(
|
|
||||||
ErrCodeInvalidTheme,
|
|
||||||
fmt.Sprintf("Unsupported theme: %s (use 'default' or 'clean')", theme),
|
|
||||||
http.StatusBadRequest,
|
|
||||||
).WithField("theme")
|
|
||||||
}
|
|
||||||
|
|
||||||
func InvalidVersionError(version string) *DomainError {
|
|
||||||
return NewDomainError(
|
|
||||||
ErrCodeInvalidVersion,
|
|
||||||
fmt.Sprintf("Unsupported version: %s (use 'with_skills' or 'clean')", version),
|
|
||||||
http.StatusBadRequest,
|
|
||||||
).WithField("version")
|
|
||||||
}
|
|
||||||
|
|
||||||
func PDFGenerationError(err error) *DomainError {
|
|
||||||
return NewDomainError(
|
|
||||||
ErrCodePDFGeneration,
|
|
||||||
"Failed to generate PDF",
|
|
||||||
http.StatusInternalServerError,
|
|
||||||
).WithError(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func MethodNotAllowedError(method string) *DomainError {
|
|
||||||
return NewDomainError(
|
|
||||||
ErrCodeMethodNotAllowed,
|
|
||||||
fmt.Sprintf("Method %s not allowed", method),
|
|
||||||
http.StatusMethodNotAllowed,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func RateLimitError() *DomainError {
|
|
||||||
return NewDomainError(
|
|
||||||
ErrCodeRateLimitExceeded,
|
|
||||||
"Rate limit exceeded. Please try again later.",
|
|
||||||
http.StatusTooManyRequests,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -84,21 +84,6 @@ func ParsePDFExportRequest(r *http.Request) (*PDFExportRequest, error) {
|
|||||||
return req, nil
|
return req, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// PreferenceToggleRequest represents a toggle request with language context
|
|
||||||
type PreferenceToggleRequest struct {
|
|
||||||
Lang string // Current language from query or cookie
|
|
||||||
}
|
|
||||||
|
|
||||||
// ParsePreferenceToggleRequest parses toggle request parameters
|
|
||||||
func ParsePreferenceToggleRequest(r *http.Request, defaultLang string) *PreferenceToggleRequest {
|
|
||||||
lang := r.URL.Query().Get("lang")
|
|
||||||
if lang == "" {
|
|
||||||
lang = defaultLang
|
|
||||||
}
|
|
||||||
|
|
||||||
return &PreferenceToggleRequest{Lang: lang}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ==============================================================================
|
// ==============================================================================
|
||||||
// RESPONSE TYPES
|
// RESPONSE TYPES
|
||||||
// Structured response types for consistent API responses
|
// Structured response types for consistent API responses
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package middleware
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
// contextKey is a private type for context keys to avoid collisions
|
// contextKey is a private type for context keys to avoid collisions
|
||||||
@@ -146,10 +147,16 @@ func SetPreferenceCookie(w http.ResponseWriter, name string, value string) {
|
|||||||
MaxAge: 365 * 24 * 60 * 60, // 1 year
|
MaxAge: 365 * 24 * 60 * 60, // 1 year
|
||||||
HttpOnly: true,
|
HttpOnly: true,
|
||||||
SameSite: http.SameSiteStrictMode,
|
SameSite: http.SameSiteStrictMode,
|
||||||
Secure: false, // Set to true in production with HTTPS
|
Secure: isProductionMode(), // Secure in production with HTTPS
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// isProductionMode checks if the application is running in production
|
||||||
|
func isProductionMode() bool {
|
||||||
|
env := os.Getenv("GO_ENV")
|
||||||
|
return env == "production" || env == "prod"
|
||||||
|
}
|
||||||
|
|
||||||
// getPreferenceCookie gets a preference cookie value, returns default if not found
|
// getPreferenceCookie gets a preference cookie value, returns default if not found
|
||||||
func getPreferenceCookie(r *http.Request, name string, defaultValue string) string {
|
func getPreferenceCookie(r *http.Request, name string, defaultValue string) string {
|
||||||
cookie, err := r.Cookie(name)
|
cookie, err := r.Cookie(name)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package middleware
|
|||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -342,3 +343,110 @@ func TestMultipleMigrations(t *testing.T) {
|
|||||||
t.Errorf("CVIcons: expected 'show' (migrated from 'true'), got %q", capturedPrefs.CVIcons)
|
t.Errorf("CVIcons: expected 'show' (migrated from 'true'), got %q", capturedPrefs.CVIcons)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestIsProductionMode tests the production mode detection function
|
||||||
|
func TestIsProductionMode(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
envValue string
|
||||||
|
expected bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "Production environment",
|
||||||
|
envValue: "production",
|
||||||
|
expected: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Prod shorthand",
|
||||||
|
envValue: "prod",
|
||||||
|
expected: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Development environment",
|
||||||
|
envValue: "development",
|
||||||
|
expected: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Empty environment",
|
||||||
|
envValue: "",
|
||||||
|
expected: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Staging environment",
|
||||||
|
envValue: "staging",
|
||||||
|
expected: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Case sensitivity - PRODUCTION",
|
||||||
|
envValue: "PRODUCTION",
|
||||||
|
expected: false, // Case sensitive
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
// Save original environment
|
||||||
|
originalEnv := os.Getenv("GO_ENV")
|
||||||
|
defer os.Setenv("GO_ENV", originalEnv)
|
||||||
|
|
||||||
|
// Set test environment
|
||||||
|
os.Setenv("GO_ENV", tt.envValue)
|
||||||
|
|
||||||
|
result := isProductionMode()
|
||||||
|
|
||||||
|
if result != tt.expected {
|
||||||
|
t.Errorf("isProductionMode() with GO_ENV=%q: got %v, want %v",
|
||||||
|
tt.envValue, result, tt.expected)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSetPreferenceCookieSecureFlag tests that Secure flag is set correctly based on environment
|
||||||
|
func TestSetPreferenceCookieSecureFlag(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
envValue string
|
||||||
|
expectedSecure bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "Production mode sets Secure=true",
|
||||||
|
envValue: "production",
|
||||||
|
expectedSecure: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Development mode sets Secure=false",
|
||||||
|
envValue: "development",
|
||||||
|
expectedSecure: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Empty env sets Secure=false",
|
||||||
|
envValue: "",
|
||||||
|
expectedSecure: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
// Save original environment
|
||||||
|
originalEnv := os.Getenv("GO_ENV")
|
||||||
|
defer os.Setenv("GO_ENV", originalEnv)
|
||||||
|
|
||||||
|
// Set test environment
|
||||||
|
os.Setenv("GO_ENV", tt.envValue)
|
||||||
|
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
SetPreferenceCookie(w, "test-cookie", "test-value")
|
||||||
|
|
||||||
|
cookies := w.Result().Cookies()
|
||||||
|
if len(cookies) != 1 {
|
||||||
|
t.Fatalf("Expected 1 cookie, got %d", len(cookies))
|
||||||
|
}
|
||||||
|
|
||||||
|
if cookies[0].Secure != tt.expectedSecure {
|
||||||
|
t.Errorf("Cookie Secure flag with GO_ENV=%q: got %v, want %v",
|
||||||
|
tt.envValue, cookies[0].Secure, tt.expectedSecure)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -34,7 +34,11 @@ func NewManager(cfg *config.TemplateConfig) (*Manager, error) {
|
|||||||
func (m *Manager) loadTemplates() error {
|
func (m *Manager) loadTemplates() error {
|
||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
defer m.mu.Unlock()
|
defer m.mu.Unlock()
|
||||||
|
return m.loadTemplatesLocked()
|
||||||
|
}
|
||||||
|
|
||||||
|
// loadTemplatesLocked parses templates without acquiring lock (caller must hold lock)
|
||||||
|
func (m *Manager) loadTemplatesLocked() error {
|
||||||
// Create template with custom functions
|
// Create template with custom functions
|
||||||
funcMap := template.FuncMap{
|
funcMap := template.FuncMap{
|
||||||
"iterate": func(count int) []int {
|
"iterate": func(count int) []int {
|
||||||
@@ -109,15 +113,33 @@ func (m *Manager) Reload() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Render executes a template with the given data
|
// Render executes a template with the given data
|
||||||
|
// Note: This method is thread-safe. Hot reload acquires full lock to prevent race conditions.
|
||||||
func (m *Manager) Render(name string) (*template.Template, error) {
|
func (m *Manager) Render(name string) (*template.Template, error) {
|
||||||
// Hot reload in development mode
|
// Hot reload in development mode
|
||||||
|
// Use full lock to prevent race condition between reload and lookup
|
||||||
if m.config.HotReload {
|
if m.config.HotReload {
|
||||||
if err := m.Reload(); err != nil {
|
m.mu.Lock()
|
||||||
|
if err := m.loadTemplatesLocked(); err != nil {
|
||||||
|
m.mu.Unlock()
|
||||||
log.Printf("Warning: template reload failed: %v", err)
|
log.Printf("Warning: template reload failed: %v", err)
|
||||||
// Continue with cached templates
|
// Fall back to read lock for cached templates
|
||||||
|
m.mu.RLock()
|
||||||
|
defer m.mu.RUnlock()
|
||||||
|
tmpl := m.templates.Lookup(name)
|
||||||
|
if tmpl == nil {
|
||||||
|
return nil, fmt.Errorf("template %q not found", name)
|
||||||
|
}
|
||||||
|
return tmpl, nil
|
||||||
}
|
}
|
||||||
|
tmpl := m.templates.Lookup(name)
|
||||||
|
m.mu.Unlock()
|
||||||
|
if tmpl == nil {
|
||||||
|
return nil, fmt.Errorf("template %q not found", name)
|
||||||
|
}
|
||||||
|
return tmpl, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Production mode: just read
|
||||||
m.mu.RLock()
|
m.mu.RLock()
|
||||||
defer m.mu.RUnlock()
|
defer m.mu.RUnlock()
|
||||||
|
|
||||||
|
|||||||
@@ -104,11 +104,20 @@
|
|||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ========================================
|
||||||
|
Sidebar Hide-on-Hover: ONLY for devices with hover support
|
||||||
|
Prevents hiding on iPad/tablets where hover doesn't work
|
||||||
|
======================================== */
|
||||||
|
@media (min-width: 901px) and (max-width: 1280px) and (hover: hover) {
|
||||||
/* ========== Sidebar Content - Hide Text, Show on Hover ========== */
|
/* ========== Sidebar Content - Hide Text, Show on Hover ========== */
|
||||||
|
/* Only apply on devices that support hover (not touch devices) */
|
||||||
.sidebar-content {
|
.sidebar-content {
|
||||||
max-height: 0 !important;
|
max-height: 0 !important;
|
||||||
overflow: hidden !important;
|
overflow: hidden !important;
|
||||||
opacity: 0 !important;
|
opacity: 0 !important;
|
||||||
|
transition: max-height 0.3s ease, opacity 0.3s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Show sidebar content on hover */
|
/* Show sidebar content on hover */
|
||||||
@@ -221,21 +230,6 @@
|
|||||||
padding: 0.65rem 1.5rem;
|
padding: 0.65rem 1.5rem;
|
||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========== Sidebar Content - Hide Text, Show on Hover ========== */
|
|
||||||
.sidebar-content {
|
|
||||||
max-height: 0 !important;
|
|
||||||
overflow: hidden !important;
|
|
||||||
opacity: 0 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Show sidebar content on hover */
|
|
||||||
.skill-category:hover .sidebar-content,
|
|
||||||
.cv-sidebar-section:hover .sidebar-content {
|
|
||||||
max-height: 1000px !important;
|
|
||||||
opacity: 1 !important;
|
|
||||||
margin-top: 10px !important;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================================
|
/* ========================================
|
||||||
|
|||||||
+16
-2
@@ -24,7 +24,8 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize minimal menu control system
|
* Initialize minimal menu control system
|
||||||
* CSS handles most logic, JS just bridges hamburger to menu
|
* CSS handles most logic, JS bridges hamburger to menu
|
||||||
|
* Click toggle for mobile, hover for desktop
|
||||||
*/
|
*/
|
||||||
function initMenuSystem() {
|
function initMenuSystem() {
|
||||||
const hamburgerBtn = document.querySelector('.hamburger-btn');
|
const hamburgerBtn = document.querySelector('.hamburger-btn');
|
||||||
@@ -32,7 +33,20 @@
|
|||||||
|
|
||||||
if (!hamburgerBtn || !menu) return;
|
if (!hamburgerBtn || !menu) return;
|
||||||
|
|
||||||
// Show menu on hamburger hover - CSS handles the rest
|
// Click handler for mobile - toggles menu-open class
|
||||||
|
hamburgerBtn.addEventListener('click', (e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
menu.classList.toggle('menu-open');
|
||||||
|
});
|
||||||
|
|
||||||
|
// Close menu when clicking outside (for mobile)
|
||||||
|
document.addEventListener('click', (e) => {
|
||||||
|
if (!menu.contains(e.target) && !hamburgerBtn.contains(e.target)) {
|
||||||
|
menu.classList.remove('menu-open');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Desktop hover support - show menu on hamburger hover
|
||||||
hamburgerBtn.addEventListener('mouseenter', () => menu.classList.add('menu-hover'));
|
hamburgerBtn.addEventListener('mouseenter', () => menu.classList.add('menu-hover'));
|
||||||
|
|
||||||
// Hide menu when leaving hamburger if not hovering menu
|
// Hide menu when leaving hamburger if not hovering menu
|
||||||
|
|||||||
+30
-1
@@ -39,7 +39,36 @@
|
|||||||
<!-- HTMX Configuration -->
|
<!-- HTMX Configuration -->
|
||||||
<meta name="htmx-config" content='{"timeout":5000,"defaultSwapStyle":"innerHTML","defaultSwapDelay":0,"defaultSettleDelay":20}'>
|
<meta name="htmx-config" content='{"timeout":5000,"defaultSwapStyle":"innerHTML","defaultSwapDelay":0,"defaultSettleDelay":20}'>
|
||||||
|
|
||||||
<!-- FOUC Prevention: Apply color theme before page render -->
|
<!-- FOUC Prevention: Inline critical CSS + Apply color theme before page render -->
|
||||||
|
<!-- Critical theme variables inlined to prevent flash of unstyled content -->
|
||||||
|
<style>
|
||||||
|
/* Light theme (default) - critical variables only */
|
||||||
|
:root {
|
||||||
|
--page-bg: #d6d6d6;
|
||||||
|
--paper-bg: #ffffff;
|
||||||
|
--text-primary: #1a1a1a;
|
||||||
|
--sidebar-bg: #d1d4d2;
|
||||||
|
}
|
||||||
|
/* Dark theme - critical variables only */
|
||||||
|
[data-color-theme="dark"] {
|
||||||
|
--page-bg: #3a3a3a;
|
||||||
|
--paper-bg: #1a1a1a;
|
||||||
|
--text-primary: #e0e0e0;
|
||||||
|
--sidebar-bg: #3a3d3e;
|
||||||
|
}
|
||||||
|
/* Auto theme follows system preference */
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
[data-color-theme="auto"] {
|
||||||
|
--page-bg: #3a3a3a;
|
||||||
|
--paper-bg: #1a1a1a;
|
||||||
|
--text-primary: #e0e0e0;
|
||||||
|
--sidebar-bg: #3a3d3e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* Apply critical styles immediately */
|
||||||
|
html { background-color: var(--page-bg); }
|
||||||
|
body { color: var(--text-primary); }
|
||||||
|
</style>
|
||||||
<script>
|
<script>
|
||||||
(function() {
|
(function() {
|
||||||
let theme = localStorage.getItem('color-theme-mode');
|
let theme = localStorage.getItem('color-theme-mode');
|
||||||
|
|||||||
@@ -0,0 +1,114 @@
|
|||||||
|
#!/usr/bin/env bun
|
||||||
|
/**
|
||||||
|
* IPAD SIDEBAR VISIBILITY TEST
|
||||||
|
* ============================
|
||||||
|
* Tests that sidebar content is visible on iPad/tablet (no hover support)
|
||||||
|
* Bug: Sidebar content was hidden on 901-1280px screens, requiring hover to show
|
||||||
|
* Fix: Added (hover: hover) media query condition
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { chromium } from 'playwright';
|
||||||
|
|
||||||
|
const URL = "http://localhost:1999";
|
||||||
|
|
||||||
|
// iPad viewport sizes
|
||||||
|
const VIEWPORTS = {
|
||||||
|
ipadPortrait: { width: 768, height: 1024 },
|
||||||
|
ipadLandscape: { width: 1024, height: 768 },
|
||||||
|
ipadProPortrait: { width: 1024, height: 1366 },
|
||||||
|
ipadProLandscape: { width: 1366, height: 1024 },
|
||||||
|
};
|
||||||
|
|
||||||
|
async function testIPadSidebarVisibility() {
|
||||||
|
console.log('📱 IPAD SIDEBAR VISIBILITY TEST\n');
|
||||||
|
console.log('='.repeat(70));
|
||||||
|
|
||||||
|
const browser = await chromium.launch({ headless: true });
|
||||||
|
const testResults = [];
|
||||||
|
|
||||||
|
for (const [name, viewport] of Object.entries(VIEWPORTS)) {
|
||||||
|
console.log(`\n📐 Testing ${name} (${viewport.width}x${viewport.height})...`);
|
||||||
|
|
||||||
|
// Create context WITHOUT hover support (simulates touch device)
|
||||||
|
const context = await browser.newContext({
|
||||||
|
viewport,
|
||||||
|
hasTouch: true, // Simulate touch device
|
||||||
|
});
|
||||||
|
|
||||||
|
const page = await context.newPage();
|
||||||
|
await page.goto(URL);
|
||||||
|
await page.waitForTimeout(1500);
|
||||||
|
|
||||||
|
// Check if sidebar content is visible
|
||||||
|
const sidebarTest = await page.evaluate(() => {
|
||||||
|
const sidebarContents = document.querySelectorAll('.sidebar-content');
|
||||||
|
const results = [];
|
||||||
|
|
||||||
|
sidebarContents.forEach((content, index) => {
|
||||||
|
const style = window.getComputedStyle(content);
|
||||||
|
const isVisible = style.opacity !== '0' &&
|
||||||
|
style.maxHeight !== '0px' &&
|
||||||
|
style.display !== 'none' &&
|
||||||
|
style.visibility !== 'hidden';
|
||||||
|
const height = content.offsetHeight;
|
||||||
|
|
||||||
|
results.push({
|
||||||
|
index,
|
||||||
|
isVisible,
|
||||||
|
opacity: style.opacity,
|
||||||
|
maxHeight: style.maxHeight,
|
||||||
|
height,
|
||||||
|
display: style.display
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
totalSidebarContents: sidebarContents.length,
|
||||||
|
visibleCount: results.filter(r => r.isVisible).length,
|
||||||
|
details: results
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const passed = sidebarTest.visibleCount === sidebarTest.totalSidebarContents;
|
||||||
|
|
||||||
|
console.log(` Total sidebar sections: ${sidebarTest.totalSidebarContents}`);
|
||||||
|
console.log(` Visible sections: ${sidebarTest.visibleCount}`);
|
||||||
|
console.log(` ${passed ? '✅ PASS' : '❌ FAIL'} - Sidebar content ${passed ? 'is' : 'NOT'} visible`);
|
||||||
|
|
||||||
|
if (!passed) {
|
||||||
|
console.log(' Hidden sections:');
|
||||||
|
sidebarTest.details.filter(d => !d.isVisible).forEach(d => {
|
||||||
|
console.log(` - Section ${d.index}: opacity=${d.opacity}, maxHeight=${d.maxHeight}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
testResults.push({ name, passed, ...sidebarTest });
|
||||||
|
await context.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Summary
|
||||||
|
console.log("\n" + "=".repeat(70));
|
||||||
|
console.log("📊 TEST SUMMARY\n");
|
||||||
|
|
||||||
|
const passedCount = testResults.filter(r => r.passed).length;
|
||||||
|
const totalCount = testResults.length;
|
||||||
|
|
||||||
|
testResults.forEach(result => {
|
||||||
|
console.log(` ${result.passed ? '✅' : '❌'} ${result.name}`);
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log(`\n Total: ${passedCount}/${totalCount} tests passed`);
|
||||||
|
console.log("=".repeat(70) + "\n");
|
||||||
|
|
||||||
|
await browser.close();
|
||||||
|
|
||||||
|
if (passedCount === totalCount) {
|
||||||
|
console.log("🎉 IPAD SIDEBAR VISIBILITY VALIDATED!");
|
||||||
|
process.exit(0);
|
||||||
|
} else {
|
||||||
|
console.log("⚠️ SOME TESTS FAILED - Sidebar content hidden on touch devices");
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await testIPadSidebarVisibility();
|
||||||
@@ -25,7 +25,7 @@ async function testMobileResponsive() {
|
|||||||
console.log('📱 MOBILE RESPONSIVE TEST\n');
|
console.log('📱 MOBILE RESPONSIVE TEST\n');
|
||||||
console.log('='.repeat(70));
|
console.log('='.repeat(70));
|
||||||
|
|
||||||
const browser = await chromium.launch({ headless: false });
|
const browser = await chromium.launch({ headless: true });
|
||||||
const errors = [];
|
const errors = [];
|
||||||
const testResults = [];
|
const testResults = [];
|
||||||
|
|
||||||
@@ -88,43 +88,77 @@ async function testMobileResponsive() {
|
|||||||
testResults.push({ test: 'Mobile Viewport (375px)', passed: mobileViewportPassed });
|
testResults.push({ test: 'Mobile Viewport (375px)', passed: mobileViewportPassed });
|
||||||
|
|
||||||
// ========================================================================
|
// ========================================================================
|
||||||
// TEST 2: Touch interactions (hamburger menu)
|
// TEST 2: Hamburger Menu Click Toggle (Mobile)
|
||||||
// ========================================================================
|
// ========================================================================
|
||||||
console.log("\n2️⃣ Testing Touch Interactions...");
|
console.log("\n2️⃣ Testing Hamburger Menu Click Toggle...");
|
||||||
|
|
||||||
const hamburger = await mobilePage.$('.hamburger-btn');
|
const hamburger = await mobilePage.$('.hamburger-btn');
|
||||||
if (hamburger) {
|
if (hamburger) {
|
||||||
// Tap hamburger to open menu
|
// Click hamburger to open menu (simulates mobile tap)
|
||||||
await hamburger.tap();
|
await hamburger.click();
|
||||||
await mobilePage.waitForTimeout(500);
|
await mobilePage.waitForTimeout(300);
|
||||||
|
|
||||||
const menuTest = await mobilePage.evaluate(() => {
|
const menuOpenTest = await mobilePage.evaluate(() => {
|
||||||
const menu = document.querySelector('.navigation-menu');
|
const menu = document.querySelector('.navigation-menu');
|
||||||
if (!menu) return { found: false };
|
if (!menu) return { found: false };
|
||||||
|
|
||||||
const isOpen = menu.classList.contains('menu-open') ||
|
const hasMenuOpen = menu.classList.contains('menu-open');
|
||||||
window.getComputedStyle(menu).display !== 'none';
|
const computedStyle = window.getComputedStyle(menu);
|
||||||
|
const isVisible = computedStyle.opacity === '1' && computedStyle.maxHeight !== '0px';
|
||||||
|
|
||||||
return {
|
return {
|
||||||
found: true,
|
found: true,
|
||||||
isOpen,
|
hasMenuOpen,
|
||||||
isVisible: menu.offsetHeight > 0
|
isVisible,
|
||||||
|
maxHeight: computedStyle.maxHeight
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log(` Menu found: ${menuTest.found ? '✅' : '❌'}`);
|
console.log(` Menu found: ${menuOpenTest.found ? '✅' : '❌'}`);
|
||||||
console.log(` Menu opens on tap: ${menuTest.isOpen ? '✅' : '❌'}`);
|
console.log(` Has menu-open class: ${menuOpenTest.hasMenuOpen ? '✅' : '❌'}`);
|
||||||
console.log(` ${menuTest.found && menuTest.isOpen ? '✅ PASS' : '❌ FAIL'} - Touch interactions`);
|
console.log(` Menu visible: ${menuOpenTest.isVisible ? '✅' : '❌'}`);
|
||||||
testResults.push({ test: 'Touch Interactions', passed: menuTest.found && menuTest.isOpen });
|
|
||||||
|
const openPassed = menuOpenTest.found && menuOpenTest.hasMenuOpen;
|
||||||
|
console.log(` ${openPassed ? '✅ PASS' : '❌ FAIL'} - Menu opens on click`);
|
||||||
|
testResults.push({ test: 'Menu Opens on Click', passed: openPassed });
|
||||||
|
|
||||||
|
// TEST 2B: Click again to close
|
||||||
|
await hamburger.click();
|
||||||
|
await mobilePage.waitForTimeout(300);
|
||||||
|
|
||||||
|
const menuCloseTest = await mobilePage.evaluate(() => {
|
||||||
|
const menu = document.querySelector('.navigation-menu');
|
||||||
|
return {
|
||||||
|
hasMenuOpen: menu?.classList.contains('menu-open') ?? false
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const closePassed = !menuCloseTest.hasMenuOpen;
|
||||||
|
console.log(` Menu closes on second click: ${closePassed ? '✅' : '❌'}`);
|
||||||
|
testResults.push({ test: 'Menu Closes on Click', passed: closePassed });
|
||||||
|
|
||||||
|
// TEST 2C: Click outside to close
|
||||||
|
await hamburger.click(); // Open again
|
||||||
|
await mobilePage.waitForTimeout(300);
|
||||||
|
await mobilePage.click('body', { position: { x: 300, y: 400 } }); // Click outside
|
||||||
|
await mobilePage.waitForTimeout(300);
|
||||||
|
|
||||||
|
const outsideCloseTest = await mobilePage.evaluate(() => {
|
||||||
|
const menu = document.querySelector('.navigation-menu');
|
||||||
|
return {
|
||||||
|
hasMenuOpen: menu?.classList.contains('menu-open') ?? false
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const outsidePassed = !outsideCloseTest.hasMenuOpen;
|
||||||
|
console.log(` Menu closes on outside click: ${outsidePassed ? '✅' : '❌'}`);
|
||||||
|
testResults.push({ test: 'Menu Closes on Outside Click', passed: outsidePassed });
|
||||||
|
|
||||||
// Close menu
|
|
||||||
if (menuTest.isOpen) {
|
|
||||||
await hamburger.tap();
|
|
||||||
await mobilePage.waitForTimeout(300);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
console.log(` ⚠️ SKIP - Hamburger menu not found`);
|
console.log(` ⚠️ SKIP - Hamburger menu not found`);
|
||||||
testResults.push({ test: 'Touch Interactions', passed: true });
|
testResults.push({ test: 'Menu Opens on Click', passed: false });
|
||||||
|
testResults.push({ test: 'Menu Closes on Click', passed: false });
|
||||||
|
testResults.push({ test: 'Menu Closes on Outside Click', passed: false });
|
||||||
}
|
}
|
||||||
|
|
||||||
// ========================================================================
|
// ========================================================================
|
||||||
@@ -274,10 +308,8 @@ async function testMobileResponsive() {
|
|||||||
console.log("⚠️ SOME TESTS FAILED - See details above");
|
console.log("⚠️ SOME TESTS FAILED - See details above");
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("\nBrowser will stay open for manual inspection.");
|
await browser.close();
|
||||||
console.log("Press Ctrl+C when done.\n");
|
process.exit(failedTests === 0 ? 0 : 1);
|
||||||
|
|
||||||
await new Promise(() => {}); // Keep browser open
|
|
||||||
}
|
}
|
||||||
|
|
||||||
await testMobileResponsive();
|
await testMobileResponsive();
|
||||||
|
|||||||
Reference in New Issue
Block a user