Merge main, resolve conflicts, and fix content path references#190
Draft
Copilot wants to merge 5 commits intosimplify-client-appfrom
Draft
Merge main, resolve conflicts, and fix content path references#190Copilot wants to merge 5 commits intosimplify-client-appfrom
Copilot wants to merge 5 commits intosimplify-client-appfrom
Conversation
Co-authored-by: GeekTrainer <6109729+GeekTrainer@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Simplify client by removing Svelte and using pure Astro
Merge main, resolve conflicts, and fix content path references
Mar 9, 2026
- Revert content/github-actions/2-code-scanning.md to main (remove UI text changes) - Remove orphaned content/shared-images/setup-secret-protection.png - Remove .dev/ sandbox tooling (not needed for this PR) - Remove root PLAN.md planning artifact Path updates in actions content (server/ → app/server/, client/ → app/client/) are unchanged as they were already correct. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Code: - seed_database.py now respects DATABASE_PATH env var (matches app.py pattern) Factual fixes: - Fix reusable workflow nesting limit: 10 → 4 levels (8-reusable-workflows.md) - Add cache: 'pip' to composite action setup-python step (7-custom-actions.md) - Clarify secrets vs variables distinction in reusable workflows example Content cleanup: - Fix Ctl → Ctrl typo across 8 files - Fix 'Then caller' → 'The caller' typo (8-reusable-workflows.md) - Fix URL path: using-workflows → writing-workflows (5-matrix-strategies.md) - Fix misleading [marketplace] link label → [caching] in README - Rewrite 4-caching.md intro to lead with caching, not marketplace - Clarify 'code scanning workflow' next step (9-required-workflows.md) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1-hour fixes: - Fix ## HERE line number: 69 → 80 (1-add-endpoint.md) - Fix WS → WSL abbreviation (README.md) - Fix 'prior set' → 'prior step' (0-setup.md) - Fix 'one of models' → 'one of the models' (5-bonus.md) - Fix test command: remove 'as you did previously', add working dir (4-add-feature.md) - Fix absolute link paths to relative (1-add-endpoint.md) - Fix Ctl → Ctrl (1-add-endpoint.md) Full-day fixes: - Fix if __name__ line number: 71 → 82, fix code indent (6-code.md) - Fix 'Mongo DB' → 'SQLite' (3-codespaces.md) - Fix 3 corrupted URLs (5-context.md) - Fix XCode link syntax: parentheses → brackets (5-context.md) - Fix wrong issue title/PR name to match exercise 2 (7-github-flow.md) - Fix 'front-end tests' → 'server unit tests' (7-github-flow.md) - Fix 'virtual server' → 'virtual environment' (6-code.md) - Fix cd server → cd app/server (6-code.md) - Fix Explorer path: 'server' → 'app > server' (4-testing.md) - Fix test_file.py → test_app.py (5-context.md) - Fix 'previously talked about extensions' (8-deployment.md) - Fix Ctl → Ctrl across 6 files - Update actions/checkout@v3 → v4, setup-python@v4 → v5 (4-testing.md) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR #179 was in a dirty merge state against
main. This mergesmainin, resolves conflicts, and updates all content paths to match theapp/directory restructure.Conflict resolution
.gitignore: keptapp/client/andapp/server/paths; added.azurefrom mainREADME.md: updated to three workshops (added GitHub Actions link); kept updated tech stack description (Tailwind, no Svelte)Content from main pulled in
content/github-actions/workshop (11 files)content/shared-images/shared screenshot assets (moved fromcontent/1-hour/images/)next-steps.mdPath reference fixes (
/client→app/client,/server→app/server)content/1-hour/0-setup.md—scripts/start-app.sh→app/scripts/start-app.shcontent/1-hour/1-add-endpoint.md— inline text and restart notecontent/full-day/3-codespaces.md—postStartCommandscript pathcontent/github-actions/3-running-tests.md,4-caching.md,5-matrix-strategies.md,7-custom-actions.md,9-required-workflows.md—working-directory,pip install -r, andcache-dependency-pathreferencesGrammar fix
content/full-day/README.md: "The application for the workshop uses is built" → "The application used for the workshop is built"🔒 GitHub Advanced Security automatically protects Copilot coding agent pull requests. You can protect all pull requests by enabling Advanced Security for your repositories. Learn more about Advanced Security.