Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Default Merge #159

Merged
merged 34 commits into from
May 15, 2024
Merged

Default Merge #159

merged 34 commits into from
May 15, 2024

Conversation

GAOChengzhan
Copy link
Contributor

@GAOChengzhan GAOChengzhan commented May 14, 2024

Default Merge

Copy link

netlify bot commented May 14, 2024

Deploy Preview for voluble-rugelach-5a3809 ready!

Name Link
🔨 Latest commit 64a7390
🔍 Latest deploy log https://app.netlify.com/sites/voluble-rugelach-5a3809/deploys/6643db0557bc740008e6c6b2
😎 Deploy Preview https://deploy-preview-159--voluble-rugelach-5a3809.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@GAOChengzhan GAOChengzhan changed the title Default merge Default Merge May 14, 2024
Copy link
Member

@d2fong d2fong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly just need clarification on a few things.

@@ -0,0 +1,73 @@
.p-dropdown-panel {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the current convention for this codebase is to not make separate css files for components, the css is just inline in the sx or style props.

@keiono any thoughts on this?

In my opinion, not a big deal for now though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Emmm, if I use cx or style, I think it will cause some code duplications since there are some components with the same class sharing the same style.

src/models/TableModel/impl/InMemoryTable.ts Outdated Show resolved Hide resolved
src/models/TableModel/impl/InMemoryTable.ts Outdated Show resolved Hide resolved
src/features/MergeNetworks/utils/helper-functions.ts Outdated Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of this file?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a file for icons, originally I wanted to put the icons aside the button 'union', 'intersection' and 'difference' just like the cytoscape desktop, but I encountered some difficulty in showing them correctly, so for now I just keep it here.
image

@GAOChengzhan
Copy link
Contributor Author

I commented out the 'Advanced options' in the dialog window just for the workshop since for now it is not so stable without the implementation of 'Type coercion'.

@GAOChengzhan GAOChengzhan requested a review from d2fong May 15, 2024 00:05
@d2fong d2fong merged commit 6d59058 into development May 15, 2024
4 checks passed
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.

None yet

2 participants