-
Notifications
You must be signed in to change notification settings - Fork 0
chore: merge dev into main #57
Draft
ronjalh
wants to merge
92
commits into
main
Choose a base branch
from
dev
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
+19,217
−676
Conversation
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
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Reads the Table of Elements in the PDF and writes the JSON files and one image per element and vault to data/, following docs/DATA_MODEL.md. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
751 elements, 87 vaults, 22 element groups and 208 variant groups, with one image per element and vault. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Adds READMEs for scripts/extract-cop/ and data/, and a project structure section to the root README. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The database keeps the file name and the API gives a full URL.
…t plan Adds LIMIT_REACHED to the schema and removes the review notes from AI_USAGE.
…he-code-of-points 16 extract catalog data from the code of points
docs: add GraphQL schema draft for the catalog
21 set up the backend and prisma
feat: set up Tailwind CSS, shadcn/ui and Lucide icons
chore: merge main into dev (the colours from PR #35)
The search argument now says: at most 80 characters and 8 words, text without searchable words finds nothing, and clients should limit their input field.
Keeps both AI_USAGE sections. Puts the one-line descriptions in schema.graphql back as they are in dev: an earlier Prettier run had turned all of them into blocks.
Keeps both AI_USAGE sections. The other changes from dev (Tailwind, shadcn/ui, the colours) merged without conflicts. Lint, typecheck, build and all 45 tests pass, with the database tests run against the seeded catalog.
24 add indexes and search
…ss configuration of the databse in VM
docs: describe the search text limits in schema.graphql
Vault.dValue, CatalogFilter.difficultyValues, createGymnast, renameGymnast and createRoutine had ended up inside doc comments and were missing from the schema. Also restores the searchCatalog search description from dev (80 characters, 8 words, text without searchable words finds nothing).
- Give --text-color a dark value so headings are readable in dark mode. - Rename the D-value --background-color to --badge-d-value-bg (it overrode the page background) and add --badge-d-value-text for light mode. - Move the dark token block out of :root so data-theme="dark" works on <html>, as in src/index.css. - README: fonts are Faustina and Inter now, not system fonts.
Adding an item that is already in a gymnast's list, or removing one that is not, now changes nothing and returns the gymnast, so ALREADY_EXISTS is gone and NOT_FOUND is only for unknown ids. Routine.dScore is null while the routine has a removed item, the same rule as calculateDScore. calculateDScore keeps taking only item ids.
Only the layout of the doc comments changes. printSchema gives the same result before and after.
feat: expose design tokens as Tailwind utilities
…ql-schema feat: add the missing fields to the GraphQL schema
26 set up the database on the VM
Sign in
to join this conversation on GitHub.
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.
Summary
Updates
mainwith what has been done ondev.mainis only updated fromdev; all other PRs go todev.Merge #56 (main into dev) first. It brings the colours from PR #35, which were merged directly into
mainby accident, intodev. After that this PR is a plain update ofmain.What is new on
mainMerged into
devsincemainlast was updated:data/,scripts/extract-cop/)docs/API.mdand the README sections on GraphQLdocs/DATA_MODEL.mddata/, and the word rules for the search49 commits in all. Nothing that is open on
devis included (#49, #52 and #53 are still in review).Things to know
main.mainstill has the Vite starter page as the front page, so the "Status" text in the README is still right.Testing
npm run lint,npm run buildandnpm testpass ondevtogether with #56.🤖 Generated with Claude Code