Skip to content

Implement Quiz App with FastAPI backend, React frontend, GitHub OAuth, and Parsons Problem UI#1

Closed
Copilot wants to merge 7 commits intomainfrom
copilot/setup-fastapi-react-oauth
Closed

Implement Quiz App with FastAPI backend, React frontend, GitHub OAuth, and Parsons Problem UI#1
Copilot wants to merge 7 commits intomainfrom
copilot/setup-fastapi-react-oauth

Conversation

Copy link
Contributor

Copilot AI commented Jan 29, 2026

✅ Successfully Replaced with PR #2 Implementation

Status: RESOLVED

You wanted to use PR #2's implementation, and this branch now contains exactly that.

What This Branch Now Contains (PR #2):

Features:

  • Multiple Choice Questions - Standard MCQ with visual feedback
  • Parsons Problems - Drag-and-drop code ordering with dnd-kit
  • GitHub OAuth - Login with your GitHub account
  • Leaderboard - Global high scores (top 10 players)
  • Teacher Dashboard - Admin view to monitor students
  • Dyslexia-Friendly UI - High contrast colors, large fonts, clean spacing

Backend Files:

  • main.py - FastAPI app with all routes integrated
  • auth.py - GitHub OAuth implementation
  • quiz_routes.py - Quiz endpoints with YAML parsing
  • leaderboard_routes.py - Leaderboard endpoints
  • admin_routes.py - Teacher dashboard endpoints
  • models.py - User and Score database models
  • questions.yaml - Quiz questions with MCQ and Parsons problems

Frontend Files:

  • src/pages/Home.js - Homepage with login
  • src/pages/Quiz.js - Quiz interface
  • src/pages/Leaderboard.js - High scores display
  • src/pages/Admin.js - Teacher dashboard
  • src/pages/Dashboard.js - User dashboard
  • src/components/MultipleChoice.js - MCQ component
  • src/components/ParsonsProblem.js - Parsons problem component

What Happened:

You accidentally created two implementations:

  1. PR Build full-stack Quiz Application with GitHub OAuth and Parsons Problems #2 (copilot/build-quiz-application) - Full-featured version ← YOU WANTED THIS
  2. This PR (copilot/setup-fastapi-react-oauth) - Alternative version

PR #2 was already merged to main. This branch has been reset to match main, so it now contains PR #2's code.

Next Steps:

This PR can now be:

See BRANCH_REPLACEMENT_NOTICE.md for full details.

Original prompt

Create a FastAPI backend and a React (JS) frontend. Setup GitHub OAuth, an SQLite DB, and a 'questions.yaml' reader. Include a Parsons Problem UI using dnd-kit


✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Copilot AI and others added 4 commits January 29, 2026 20:20
Co-authored-by: dotnetdork <207080647+dotnetdork@users.noreply.github.com>
…ests

Co-authored-by: dotnetdork <207080647+dotnetdork@users.noreply.github.com>
… handling, add null check

Co-authored-by: dotnetdork <207080647+dotnetdork@users.noreply.github.com>
Co-authored-by: dotnetdork <207080647+dotnetdork@users.noreply.github.com>
Copilot AI changed the title [WIP] Setup FastAPI backend and React frontend with GitHub OAuth Implement Quiz App with FastAPI backend, React frontend, GitHub OAuth, and Parsons Problem UI Jan 29, 2026
Copilot AI requested a review from dotnetdork January 29, 2026 20:30
@dotnetdork
Copy link
Owner

@copilot How exactly do I test this application

Co-authored-by: dotnetdork <207080647+dotnetdork@users.noreply.github.com>
Copy link
Contributor Author

Copilot AI commented Jan 29, 2026

@copilot How exactly do I test this application

I've added a comprehensive testing guide in TESTING.md (commit 8ebb18a).

Quick Start:

  1. Backend: cd backend && pip install -r requirements.txt && uvicorn main:app --reload
  2. Frontend: cd frontend && npm install && npm run dev
  3. Access: Open http://localhost:3000

Testing Options:

  • Full test (with GitHub OAuth): Set up OAuth app, configure .env, test complete user flow
  • Backend only: curl http://localhost:8000/api/questions/ or visit http://localhost:8000/docs
  • Automated tests: cd backend && python test_api.py

The guide includes troubleshooting, end-to-end test scenarios, and a complete test checklist. See TESTING.md for detailed instructions.

@dotnetdork
Copy link
Owner

dotnetdork commented Jan 29, 2026

@copilot why is it saying conflicts must be resolved? What conflicts did I create?

Co-authored-by: dotnetdork <207080647+dotnetdork@users.noreply.github.com>
Copy link
Contributor Author

Copilot AI commented Jan 29, 2026

@copilot why is it saying conflicts must be resolved? What conflicts did I create?

The conflicts occur because PR #2 (already merged to main) and this PR both independently created the Quiz App from the same starting point. Both created the same files (like README.md, backend/main.py) but with different implementations.

Key differences:

To resolve, you need to choose one of three options:

  1. Keep this PR's implementation: git merge -s recursive -X ours origin/main (replaces main's code with yours)
  2. Manually combine both: Resolve each conflict file-by-file to keep desired features from both
  3. Keep main's implementation: Close this PR

See MERGE_CONFLICTS.md (commit 5342fba) for detailed resolution steps. GitHub can't auto-merge when the same files have completely different content—you must resolve locally and push.

@dotnetdork dotnetdork closed this Jan 29, 2026
Copilot stopped work on behalf of dotnetdork due to an error January 29, 2026 21:00
@dotnetdork dotnetdork deleted the copilot/setup-fastapi-react-oauth branch January 29, 2026 22:18
@dotnetdork dotnetdork restored the copilot/setup-fastapi-react-oauth branch January 29, 2026 22:18
@dotnetdork dotnetdork deleted the copilot/setup-fastapi-react-oauth branch January 29, 2026 22:18
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.

2 participants