chore: merge main ← prod #237
Draft
Conversation
This file contains 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
* feat: add socket.io dependency * feat: export io so it can be accessed in canvas service * feat: move socket methods to a handler * feat: get frontend connected to server * feat: create broadcast pixel place method * feat: broadcast placed pixels * feat: update canvas when a new pixel is received * chore: remove unused state * feat: handle temporary client disconnects * chore: cleanup resynchronisation * feat: pass timestamp from server
fix: stricter socket disconnects
feat: reuse saved images in cache
* feat: added fancy reticle * feat: readded crosshair when zoomed out * refactor: tidy up
* feat: better pixel preview * fix: rgba
fix: pixel selection is on mouse down rather than mouse up
* feat: sticky headers and footers in action panel * fix: resorted overflow in css * fix: don't forward prop
* feat: sticky headers and footers in action panel * fix: resorted overflow in css * feat: history loading skeleton * fix: removed weird duplicate * refactor: better skeleton * refactor: removed now-unused classes * refactor: changed the length again * Update packages/frontend/src/components/action-panel/tabs/PixelHistoryListItem.tsx Co-authored-by: Josh Jeffers <38820160+pumbas600@users.noreply.github.com> --------- Co-authored-by: Josh Jeffers <38820160+pumbas600@users.noreply.github.com>
* feat: leaderboard skeleton * refactor: || to ?? * Update packages/frontend/src/app/leaderboard/Leaderboard.tsx Co-authored-by: Josh Jeffers <38820160+pumbas600@users.noreply.github.com> --------- Co-authored-by: Josh Jeffers <38820160+pumbas600@users.noreply.github.com>
* feat: stats-me skeleton * refactor: || to ??
* feat: added invite button * refactor: sorted css * feat: added link in env, context, and button * refactor: moved env variable to front-end * refactor: target and rel
* fix: centred the preview pixel properly * fix: fix centering attempt 2
fix: reset everything when switching canvas
* no unused variables * enforce
sou323
changed the title
recommend vscode-styled-components extension
* fix: shrinking of reticle causing it to not position correctly * docs: update comment to be more clear what is being fixed
* tweak bot command card styling * ensure full width * remove unneeded styled component * curly quote * remove unneeded explicit typing * organise imports * refactor JSX * ditto
fix: usernames now wrap in history
|
As a note, can we not squash this commit, and instead do a merge commit as each of these branches have already been squashed and I'd like to keep these in the main branch :) |
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.
This branch contains commits made post-submission, which are not reflected in the demo deployment but are on the public deployment. This branch will be merged once demos and marking are complete and the main branch is unlocked.
(Don't squash this branch!)