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

feat/fix to issue #242 #248

Merged
merged 36 commits into from
Nov 27, 2024
Merged

Conversation

ekumamatthew
Copy link
Contributor

Fix #242

@whateverfw whateverfw self-requested a review November 23, 2024 07:04
@djeck1432 djeck1432 marked this pull request as ready for review November 23, 2024 10:42
Copy link
Owner

@djeck1432 djeck1432 left a comment

Choose a reason for hiding this comment

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

frontend/src/pages/forms/Form.jsx Outdated Show resolved Hide resolved
frontend/src/pages/forms/Form.jsx Outdated Show resolved Hide resolved
frontend/src/pages/forms/Form.jsx Outdated Show resolved Hide resolved
frontend/src/components/modals/modal.css Outdated Show resolved Hide resolved
frontend/src/pages/forms/Form.jsx Outdated Show resolved Hide resolved
@whateverfw
Copy link
Collaborator

@ekumamatthew any updates?

@ekumamatthew
Copy link
Contributor Author

Updating my PR shortly

Copy link
Collaborator

@whateverfw whateverfw Nov 23, 2024

Choose a reason for hiding this comment

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

styles don't match figma, please take a look how other modals are implemented already (e.g. notification one on dashboard)

Copy link
Collaborator

Choose a reason for hiding this comment

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

@ekumamatthew this is still unresolved after latest changes), also - modal should be centered on the screen

frontend/src/pages/forms/Form.jsx Outdated Show resolved Hide resolved
frontend/src/pages/forms/Form.jsx Outdated Show resolved Hide resolved
@djeck1432
Copy link
Owner

@ekumamatthew Any updates?

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.

@ekumamatthew seems like some of your changes were overwritten after your latest merges, (Form.jsx), please take a look and fix, thanks

@ekumamatthew
Copy link
Contributor Author

I made the position function a hook. so that it can be re-useable anytime

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.

So, functionally-wise everything is fine.

But as I already pointed there are issues with modal's styling.

ER (Figma):
image

AR (Your implementation):
image

You should do it exactly the same as in Figma. As I already suggested you already have the same modal on dashboard for notifications, just use the same styles as there...

@whateverfw
Copy link
Collaborator

@ekumamatthew put your background file to public folder and use it in css like that url('/public/background.png'), as you can see in other places (form.css, dashboard.css, withdraw.css). Also I still see font color mismatches with figma.

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.

@ekumamatthew
Copy link
Contributor Author

Font colour... okay. I'll look at the figma again

@ekumamatthew
Copy link
Contributor Author

I had a look at the figma text color its same here
Uploading design color.png…

@whateverfw
Copy link
Collaborator

@ekumamatthew Form.jsx:141 Uncaught ReferenceError: StyledPopup is not defined when I try to access form page.....

@whateverfw
Copy link
Collaborator

@ekumamatthew this page is completely broken now, there are everything duplicated, probably it was wrong resolvment of merge conflict

@whateverfw
Copy link
Collaborator

@ekumamatthew don't use StyledPopup in this componen anymore, use your ClosePositionModal, but fix mobile,
image
that's how it currently looks..

@whateverfw
Copy link
Collaborator

@ekumamatthew Also, now I realise that you don't need background image for popup at all, in figma it is just a demonstration that on the background should be actual page, not some image, so remove background-image: url('/public/positionBg.svg');

@whateverfw
Copy link
Collaborator

@ekumamatthew also, please resolve merge conflicts with main and make sure everything works, (last time I've checked font color were ok), just need to merge it properly and correctly use your modal component and not styledpopup

@djeck1432
Copy link
Owner

@ekumamatthew Please, fix test cases

@ekumamatthew
Copy link
Contributor Author

ive sync with origin. i'm getting along with the UI and the project better ... also the ui is not so mobile fit. I can fix this if I'm pointed to the UI.. so u can
make it an issue i'd fix

@whateverfw
Copy link
Collaborator

@ekumamatthew now the whole Form page is completely broken...
image

can you please revert css changes that do not relate to close position popup?

@djeck1432
Copy link
Owner

@ekumamatthew please, text me in dm, I'm going to unassign you, sorry, this critical task and we need to finish it right away

return (
<div className="form-content-wrapper">
Copy link
Collaborator

Choose a reason for hiding this comment

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

removing this container cause broken ui on the page..

@whateverfw
Copy link
Collaborator

@ekumamatthew also seems like background on the main page is broken now on this branch for some reason.

@whateverfw
Copy link
Collaborator

@ekumamatthew please fix failed CI build

@whateverfw
Copy link
Collaborator

@ekumamatthew you should build your app before you commit and make sure it works.

Copy link
Owner

@djeck1432 djeck1432 left a comment

Choose a reason for hiding this comment

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

Sorry, we need to close this task and fix what was left, you will get partially reward

@djeck1432 djeck1432 merged commit 3ddb581 into djeck1432:main Nov 27, 2024
2 of 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.

[FRONTEND] New position window mini-app
3 participants