Skip to content

Conversation

grv-saini-20
Copy link
Collaborator

@grv-saini-20 grv-saini-20 commented Jul 30, 2025

Description of change

Fixed all the merge conflicts in the platforms

Issue Number

Type of change

  • Breaking (any change that would cause existing functionality to not work as expected)
  • New (a change which implements a new feature)
  • Update (a change which updates existing functionality)
  • Fix (a change which fixes an issue)
  • Docs (changes to the documentation)
  • Chore (refactoring, build scripts or anything else that isn't user-facing)

How the change has been tested

Change checklist

  • I have ensured that the CI Checks pass locally
  • I have removed any unnecessary logic
  • My code is well documented
  • I have signed my commits
  • My code follows the pattern of the application
  • I have self reviewed my code

@grv-saini-20 grv-saini-20 requested a review from coodos as a code owner July 30, 2025 11:05
Copy link
Contributor

coderabbitai bot commented Jul 30, 2025

Important

Review skipped

More than 25% of the files skipped due to max files limit. The review is being skipped to prevent a low-quality review.

88 files out of 195 files are above the max files limit of 100. Please upgrade to Pro plan to get higher limits.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch merge-platforms

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@coodos coodos merged commit ddd40be into main Jul 30, 2025
3 of 4 checks passed
@coodos coodos deleted the merge-platforms branch July 30, 2025 11:31
@sosweetham sosweetham mentioned this pull request Jul 31, 2025
6 tasks
sosweetham pushed a commit that referenced this pull request Aug 1, 2025
* feat: setup control-panel project, added-colors same as eid-wallet

* feat: group

* fix: separate page added for members

* chore: added dummy data and commented the protection on routes for development purposes.

* feat: added view participants button.

* feat: added participants modal

* feat: group

* feat: group-charter-manager

* feat: added nanoid

* feat: added context menu and the owner or admin status

* feat: added context menu functionality on frontend.

* fix: lock file

* fix: added a edit modal

* chore: renamed to member.

* fix: responsiveness

* fix: responsiveness

* feat: added group settings page.

* fix: role based editing

* feat: show info and not allow edits when not a group admin or owner.

* fix: user role based edit in group info

* fix: edit image with pencil icon

* fix: added a text area

* feat: new group functionality and textarea fixed

* feat: new group functionality and textarea fixed

* feat: added close icon on dialog boxes for accessibility improvement.

* feat: removed save and close button on group settings for non admin or non owner users.

* feat: added add members button.

* feat: added add members component.

* feat: added relevant checks.

* feat: added icons next to owner and admin.

* feat: added new chat button.

* chore: fixed squigglies.

* feat: added new chat flow.

* chore: trimed down the non-required code and made a new next js project group charter manager.

* feat: added working 404 page with some changes.

* feat: fixed and added /dashboard route

* chore: upgraded tailwind v3 to v4 in old group charter

* chore: copied old index.css to new global.css

* chore: added missing dependencies for tailwindcss

* chore: upgraded new charter app's whole codebase to tailwind v4

* chore: moved dashboard page to correct route

* feat: added new charter page

* feat: added single charter page.

* feat: added /charter/:id/edit route

* chore: removed old charter codebase.

* feat: eVoting

* chore: project moved to platforms

* chore: created a new next app and moved the older to the old folder

* chore: moved the old to old dir.

* chore: migrated old project to tailwindcss v4

* feat: added components and other stuff to the new proj.

* feat: added the not found page.

* feat: added homepage.

* feat: added create page.

* feat: added vote/id page.

* chore: remove the old evoting proj.

* feat: add a button, modal for sign charter

* fix: lock file

* fix: lock file

---------

Co-authored-by: Sahil Garg <me.sahil.gg@gmail.com>
Co-authored-by: Merul Dhiman <69296233+coodos@users.noreply.github.com>
sosweetham added a commit that referenced this pull request Aug 7, 2025
* feat: add deep link support

* fix: remove db/data

* fix: add db/data to gitignore

* fix: remove useless comment

* feat: wallet deep link logic

* fix: remove useless comments

* fix: lock file

* fix: add files

* chore: formatting fixed.

* chore: lint fixed.

* chore: fixed nested onMount conflict.

* chore: fixed duplicate handleFinalSubmit function definitions.

* chore: formatting.

* fix: Improve URL parsing and error handling for deep links.

* chore: formatting.

* fix: Conditional scanning start based on deep link presence.

* fix: Security concern: Hardcoded session ID in test file.

* fix: Add input validation and sanitization for deep link parameters.

* fix: Critical: Missing error handling for URL constructor.

* fix: Critical: Inverted domain validation logic.

* fix: Refactor complex deep link parsing logic.

* Merge platforms (#270)

* feat: setup control-panel project, added-colors same as eid-wallet

* feat: group

* fix: separate page added for members

* chore: added dummy data and commented the protection on routes for development purposes.

* feat: added view participants button.

* feat: added participants modal

* feat: group

* feat: group-charter-manager

* feat: added nanoid

* feat: added context menu and the owner or admin status

* feat: added context menu functionality on frontend.

* fix: lock file

* fix: added a edit modal

* chore: renamed to member.

* fix: responsiveness

* fix: responsiveness

* feat: added group settings page.

* fix: role based editing

* feat: show info and not allow edits when not a group admin or owner.

* fix: user role based edit in group info

* fix: edit image with pencil icon

* fix: added a text area

* feat: new group functionality and textarea fixed

* feat: new group functionality and textarea fixed

* feat: added close icon on dialog boxes for accessibility improvement.

* feat: removed save and close button on group settings for non admin or non owner users.

* feat: added add members button.

* feat: added add members component.

* feat: added relevant checks.

* feat: added icons next to owner and admin.

* feat: added new chat button.

* chore: fixed squigglies.

* feat: added new chat flow.

* chore: trimed down the non-required code and made a new next js project group charter manager.

* feat: added working 404 page with some changes.

* feat: fixed and added /dashboard route

* chore: upgraded tailwind v3 to v4 in old group charter

* chore: copied old index.css to new global.css

* chore: added missing dependencies for tailwindcss

* chore: upgraded new charter app's whole codebase to tailwind v4

* chore: moved dashboard page to correct route

* feat: added new charter page

* feat: added single charter page.

* feat: added /charter/:id/edit route

* chore: removed old charter codebase.

* feat: eVoting

* chore: project moved to platforms

* chore: created a new next app and moved the older to the old folder

* chore: moved the old to old dir.

* chore: migrated old project to tailwindcss v4

* feat: added components and other stuff to the new proj.

* feat: added the not found page.

* feat: added homepage.

* feat: added create page.

* feat: added vote/id page.

* chore: remove the old evoting proj.

* feat: add a button, modal for sign charter

* fix: lock file

* fix: lock file

---------

Co-authored-by: Sahil Garg <me.sahil.gg@gmail.com>
Co-authored-by: Merul Dhiman <69296233+coodos@users.noreply.github.com>

* fix: added state to the required variable to correctly reflect updated state.

* fix: formatting.

* chore: formatting and added prettier in group-charter-manager.

* chore: formatting

* fix: critical performance issue with missing dependency array.

* fix: paraglide errors due to dependency error in control panel.

* fix: user profile types.

* chore: checks fixed in pictique.

* fix: controlpanel deps issue.

* chore: renamed to a consistent namimg convention of handle instead of username.

* chore: formatting.

* fix: pglide

* fix: remove ignore for check

* fix: normalize check script

---------

Co-authored-by: Sahil Garg <sahil@auvo.io>
Co-authored-by: Gourav Saini <128782564+grv-saini-20@users.noreply.github.com>
Co-authored-by: Sahil Garg <me.sahil.gg@gmail.com>
Co-authored-by: Merul Dhiman <69296233+coodos@users.noreply.github.com>
coodos added a commit that referenced this pull request Aug 7, 2025
* Merge platforms (#270)

* feat: setup control-panel project, added-colors same as eid-wallet

* feat: group

* fix: separate page added for members

* chore: added dummy data and commented the protection on routes for development purposes.

* feat: added view participants button.

* feat: added participants modal

* feat: group

* feat: group-charter-manager

* feat: added nanoid

* feat: added context menu and the owner or admin status

* feat: added context menu functionality on frontend.

* fix: lock file

* fix: added a edit modal

* chore: renamed to member.

* fix: responsiveness

* fix: responsiveness

* feat: added group settings page.

* fix: role based editing

* feat: show info and not allow edits when not a group admin or owner.

* fix: user role based edit in group info

* fix: edit image with pencil icon

* fix: added a text area

* feat: new group functionality and textarea fixed

* feat: new group functionality and textarea fixed

* feat: added close icon on dialog boxes for accessibility improvement.

* feat: removed save and close button on group settings for non admin or non owner users.

* feat: added add members button.

* feat: added add members component.

* feat: added relevant checks.

* feat: added icons next to owner and admin.

* feat: added new chat button.

* chore: fixed squigglies.

* feat: added new chat flow.

* chore: trimed down the non-required code and made a new next js project group charter manager.

* feat: added working 404 page with some changes.

* feat: fixed and added /dashboard route

* chore: upgraded tailwind v3 to v4 in old group charter

* chore: copied old index.css to new global.css

* chore: added missing dependencies for tailwindcss

* chore: upgraded new charter app's whole codebase to tailwind v4

* chore: moved dashboard page to correct route

* feat: added new charter page

* feat: added single charter page.

* feat: added /charter/:id/edit route

* chore: removed old charter codebase.

* feat: eVoting

* chore: project moved to platforms

* chore: created a new next app and moved the older to the old folder

* chore: moved the old to old dir.

* chore: migrated old project to tailwindcss v4

* feat: added components and other stuff to the new proj.

* feat: added the not found page.

* feat: added homepage.

* feat: added create page.

* feat: added vote/id page.

* chore: remove the old evoting proj.

* feat: add a button, modal for sign charter

* fix: lock file

* fix: lock file

---------

Co-authored-by: Sahil Garg <me.sahil.gg@gmail.com>
Co-authored-by: Merul Dhiman <69296233+coodos@users.noreply.github.com>

* chore: added group manifest spinup logic

* chore: group charter creation fixed

* fix: loading state on auth

* feat: group creation works

* feat: chat bubbles

* feat: group capabilities

* chore: flip isOwn

* chore: charter to socials sync

* feat: charter CRUD

* chore: add cerberus

* fix: cerberus message trigger

* chore: change migration

* chore: bump max retries and exponention backoff

* chore: delete useless files

* chore: change resolve

* chore: change to fetch

* chore: fix evaul-core

---------

Co-authored-by: Gourav Saini <128782564+grv-saini-20@users.noreply.github.com>
Co-authored-by: Sahil Garg <me.sahil.gg@gmail.com>
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.

3 participants