Skip to content

Fix countdown timer + add 8-bit hero animation#11

Open
carmatthews wants to merge 2 commits into
mainfrom
fix/countdown-hours-and-hero-animation
Open

Fix countdown timer + add 8-bit hero animation#11
carmatthews wants to merge 2 commits into
mainfrom
fix/countdown-hours-and-hero-animation

Conversation

@carmatthews

Copy link
Copy Markdown
Owner

Summary

  • Fix Countdown timer shows wrong hours when event is multiple days away #10 — Countdown timer displayed total hours (e.g. 77h) instead of the remainder after extracting days (5h). Changed the formula from total_seconds // 3600 to (total_seconds % 86400) // 3600 so hours are always 0–23.
  • Regenerated hero animation — Custom chibi pixel art character based on presenter photo (blonde hair, blue glasses, black turtleneck) running with a laptop in a Super Mario-style side-scroller scene with scrolling bricks, parallax hills, and drifting clouds.

Test plan

  • python3 -m pytest tests/ -v — all 17 tests pass (including the 2 that previously failed)
  • Open http://localhost:8000 and verify the countdown shows correct hours (0–23 range)
  • Verify the 8-bit animation renders between the countdown and "Featuring" sections

🤖 Generated with Claude Code

Fix #10: countdown hours showed total hours (e.g. 77h) instead of
remainder after days (0-23). Changed formula from
`total_seconds // 3600` to `(total_seconds % 86400) // 3600`.

Also regenerated animation.css with a custom chibi pixel art
character (blonde hair, blue glasses, black turtleneck) in a
Super Mario-style side-scroller scene.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@carmatthews

Copy link
Copy Markdown
Owner Author

@claude can you resolve the conflicts

@claude

claude Bot commented Mar 16, 2026

Copy link
Copy Markdown

Claude finished @carmatthews's task in 3m 37s —— View job


Resolving Merge Conflicts

Root cause identified: The PR branch (fix/countdown-hours-and-hero-animation) has an orphan commit history — it shares no common ancestor with main. Both branches have different versions of animation.css, so GitHub can't auto-merge.

What needs to happen: Rebase the PR branch onto main, keeping the updated animation.css from this PR.

Unfortunately, the git operations needed to resolve this (resetting the branch or merging unrelated histories) require elevated permissions that aren't available in this CI context.


How to resolve this manually

Run these commands locally:

# 1. Save the new animation.css content
git show fix/countdown-hours-and-hero-animation:webinar_site/static/animation.css > /tmp/new_animation.css

# 2. Checkout main and create a fresh branch
git checkout main
git pull origin main
git checkout -b fix/countdown-hours-and-hero-animation-rebased

# 3. Apply the new animation.css
cp /tmp/new_animation.css webinar_site/static/animation.css
git add webinar_site/static/animation.css
git commit -m "Fix countdown timer hours bug + add 8-bit hero animation"

# 4. Force-push to update the PR branch
git push origin fix/countdown-hours-and-hero-animation-rebased:fix/countdown-hours-and-hero-animation --force-with-lease

Or, if you'd prefer to merge main into the existing branch with unrelated histories:

git checkout fix/countdown-hours-and-hero-animation
git merge origin/main --allow-unrelated-histories
# Resolve animation.css conflict in favor of the PR version, then:
git add webinar_site/static/animation.css
git commit
git push origin fix/countdown-hours-and-hero-animation

The only file that differs between this PR and main is animation.csscountdown.py already has the correct fix in main.

Kept our branch's animation.css (freshly generated pixel art character).
Incorporated new GitHub Actions workflows from main.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Countdown timer shows wrong hours when event is multiple days away

1 participant