It looks mostly good!

A couple of things I wanted to address, however:

• On the first page, it only has a sign-up button (no login button).
• The ID literally doesn't matter in the URL now, so I think it should just be deleted.
• The navbar doesn't seem to have the links working properly
• I haven't tried signing up yet, but logging in seems to work well.
• I think we need to merge it with the current issue-7 branch to test stuff? I'm okay with merging this into main to test though - clearly some stuff is outdated.

Finally, comments about the merge conflicts:

• The one with focus.tsx may just be that you used an outdated version of @TobbleCobble 's page - if u could discuss this with him quickly it should be easy to resolve?
• The index.tsx one seems to just be you changing the page from the original ping-pong to an "actual" landing page - so that should be a simple fix :)