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

Reworking Frontend Styles to Tailwind #500

Conversation

michojekunle
Copy link
Contributor

No description provided.

@michojekunle
Copy link
Contributor Author

@djeck1432 Here I've made a draft pr for this issue #486

@djeck1432 djeck1432 linked an issue Jan 24, 2025 that may be closed by this pull request
@djeck1432 djeck1432 marked this pull request as ready for review January 24, 2025 21:28
@djeck1432
Copy link
Owner

@michojekunle Please, finalize your task tomorrow, this task is critical and will block us

@whateverfw
Copy link
Collaborator

@michojekunle any updates?

@michojekunle
Copy link
Contributor Author

@michojekunle any updates?

Hi, I'm still on this currently

Copy link
Collaborator

@whateverfw whateverfw left a comment

Choose a reason for hiding this comment

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

add cn utility composed with tailwind-merge and clsx (example reference: https://korayguler.medium.com/how-to-merge-react-and-tailwind-css-class-names-f5faeb10ed24) and use it for cases where styles should be applied conditionally or composed

frontend/package-lock.json Outdated Show resolved Hide resolved
frontend/package.json Show resolved Hide resolved
frontend/package.json Outdated Show resolved Hide resolved
frontend/tailwind.config.js Outdated Show resolved Hide resolved
frontend/tailwind.config.js Outdated Show resolved Hide resolved
@whateverfw
Copy link
Collaborator

@michojekunle Please sync with main and resolve merge conflicts, also resolve my comments and push your latest changes, we are planning to wrap up and finish this ticket tomorrow with changes that you'll able to finish by that time.

@whateverfw
Copy link
Collaborator

whateverfw commented Jan 27, 2025

@michojekunle just to be clear, did you finish and I can start to review?
Please do not make further changes to other components, let's concentrate on what you've done for now.

@michojekunle
Copy link
Contributor Author

@michojekunle just to be clear, did you finish and I can start to review? Please do not make further changes to other components, let's concentrate on what you've done for now.

no, not yet, there are still some components I need to update

@whateverfw
Copy link
Collaborator

@michojekunle just to be clear, did you finish and I can start to review? Please do not make further changes to other components, let's concentrate on what you've done for now.

no, not yet, there are still some components I need to update

ok, just let me know when you've finished everything that was planned

Copy link
Collaborator

@whateverfw whateverfw left a comment

Choose a reason for hiding this comment

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

@michojekunle please make sure to remove old css files that are not used anymore

Copy link
Collaborator

@whateverfw whateverfw left a comment

Choose a reason for hiding this comment

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

don't use colors directly in components, you should define them in tailwind config and use in components by that names

frontend/src/pages/position-history/PositionHistory.jsx Outdated Show resolved Hide resolved
@michojekunle
Copy link
Contributor Author

Hi @djeck1432 @whateverfw

Please review

Copy link
Collaborator

@whateverfw whateverfw left a comment

Choose a reason for hiding this comment

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

@michojekunle Currently there are styles mismatches on each page in terms of font sizes, font weight, font colors, card borders, paddings, etc., etc.

You should compare previous version with current one and make sure it looks exactly the same as before.

@michojekunle
Copy link
Contributor Author

@michojekunle Currently there are styles mismatches on each page in terms of font sizes, font weight, font colors, card borders, paddings, etc., etc.

You should compare previous version with current one and make sure it looks exactly the same as before.

Alright, I'm already on this

@whateverfw
Copy link
Collaborator

@michojekunle please resolve merge conflicts, also let me know when should I make next code review

@michojekunle
Copy link
Contributor Author

@michojekunle please resolve merge conflicts, also let me know when should I make next code review

Alright sure, these conflicts are really much 🥲😂

I'm on it now

@whateverfw
Copy link
Collaborator

whateverfw commented Jan 28, 2025

@michojekunle please resolve merge conflicts, also let me know when should I make next code review

Alright sure, these conflicts are really much 🥲😂

I'm on it now

mostly there are import differences, nothing much

@whateverfw
Copy link
Collaborator

@michojekunle did you make merge correctly?

@michojekunle
Copy link
Contributor Author

@michojekunle did you make merge correctly?

yeah, I'm trying to fix an error now from the merge

@michojekunle
Copy link
Contributor Author

michojekunle commented Jan 29, 2025

@michojekunle did you make merge correctly?

yeah, I'm trying to fix an error now from the merge

There was a change from CRA to Vite which I think was not implemented correctly and causing errors locally for me after merging, I'm trying to fix those errors now

@whateverfw
Copy link
Collaborator

@michojekunle it was implemented correctly, at least I was able to run it locally myself and we run it in production currently

(the only possible issue could be in-between tailwind/vite but I'm not sure what)

@michojekunle
Copy link
Contributor Author

Hi @whateverfw I've resolved the merge conflicts

Copy link
Collaborator

@whateverfw whateverfw left a comment

Choose a reason for hiding this comment

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

@michojekunle did you run the project?
image

also i see that in some places it was incorrectly merged (e.g. Documentation.jsx has duplicate keys in some objects)

@djeck1432
Copy link
Owner

@michojekunle sorry, there is still work left

@djeck1432 djeck1432 closed this Jan 29, 2025
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.

[Fronted] Rework fronted styles with tailwind css
3 participants