Conversation
# Conflicts: # client/src/api/main/generated/.openapi-generator/FILES # client/src/api/main/generated/api.ts # client/src/api/main/generated/base.ts # client/src/api/main/generated/common.ts # client/src/api/main/generated/configuration.ts # client/src/api/main/generated/docs/WhiteboardApi.md # client/src/api/main/generated/index.ts # client/src/app/board/[id]/page.tsx # client/src/app/dashboard/page.tsx # client/src/components/WhiteBoard.tsx # server/src/main/java/de/tum/cit/aet/devops/teamserverdown/controller/WhiteboardController.java
…laborative-feature' into 71-implement-collaborative-features
…laborative-feature' into 71-implement-collaborative-features # Conflicts: # client/src/components/Whiteboard.tsx # compose.yml
* access dialog, fix viewport * lint and format client * tiny fix * format and lint --------- Co-authored-by: Xhulia Jasimi <xhulia.jasimi@siemens.com>
…ent-collaborative-features
# Conflicts: # .github/workflows/deploy-to-k8s.yml # compose.yml
…res' into add-client-server-tests # Conflicts: # compose.yml
…tests # Conflicts: # .github/workflows/deploy-to-k8s.yml # client/package-lock.json # client/package.json # client/src/api/realtime/dtos/WhiteboardEvent.ts # client/src/components/Whiteboard.tsx # client/src/components/access-dialog/access-dialog-components/InviteTab.tsx # client/src/components/collaboration-topbar/CollaborationTopbar.tsx # client/src/hooks/api/whiteboard.api.ts # client/src/util/generateUserUniqueColor.ts # client/src/util/generateWhiteboardName.ts # infrastructure/whiteboard-app/pullrequest.values.yaml # infrastructure/whiteboard-app/templates/realtime-deployment.yaml # realtime/go.mod # realtime/go.sum # realtime/pkg/di/wire.go # server/src/main/java/de/tum/cit/aet/devops/teamserverdown/controller/WhiteboardController.java
xhulia028
added a commit
that referenced
this pull request
Jul 20, 2025
* add new avatar colors * generate random whiteboard names * remove rag from compose.yml * implement invite users, setup realtime service * fix useGetMe * readd collaboration top bar * rename dtos * on delete cascade user whiteboard access * spotlessApply * ui improvements * ui improvements * create custom cursor component with rendered logic * publish and subscribe sockets * add cursor array for all users * fix upper menu bug * setup kafka * simple publish and subscribe * working version * Access dialog, fix viewport (#81) * access dialog, fix viewport * lint and format client * tiny fix * format and lint --------- * some tuning * remove commit interval * replace kafka with redis pub sub * remove userid from subscribe to whiteboard events * disable access for invitees * create deployment files * fix deployment files * add server tests * add tests for client and test workflow * format and lint * generate * format * WhiteboardResponse * remove dependency * dummy commit * format and lint * delete dialog * hide style bar text node * package lock * package lock * delete package-lock.json in root * regenerate package-lock * json --------- Co-authored-by: Xhulia Jasimi <xhulia.jasimi@siemens.com> Co-authored-by: Leon Liang <hello@leonliang.lu>
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
2 participants
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.
No description provided.