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

refactor(UI): clean up portal pages #29018

Merged
merged 23 commits into from
Oct 4, 2022

Conversation

sumaiya2908
Copy link
Contributor

@sumaiya2908 sumaiya2908 commented Dec 24, 2021

Needs to be merged after this

  • List View

Before
Screenshot 2021-12-24 at 12 09 18 PM

After
Screenshot 2021-12-24 at 12 08 11 PM

  • Preview

Before

Screenshot 2022-01-03 at 12 02 08 PM

After

Screenshot 2022-01-03 at 11 41 33 AM

Mobile View

Screenshot 2022-01-03 at 11 41 43 AM

Pages Affected

  • sales/purchase order preview
  • Quotations
  • Sales/Purchase invoice

@sumaiya2908 sumaiya2908 marked this pull request as draft December 24, 2021 06:46
@sumaiya2908 sumaiya2908 changed the title refactor(UI): clean up list view for portal pages refactor(UI): clean up portal pages Dec 29, 2021
@codecov
Copy link

codecov bot commented Dec 29, 2021

Codecov Report

Merging #29018 (4fdeaf9) into develop (1c5ae80) will increase coverage by 0.27%.
The diff coverage is n/a.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #29018      +/-   ##
===========================================
+ Coverage    63.84%   64.12%   +0.27%     
===========================================
  Files          817      817              
  Lines        58161    58161              
===========================================
+ Hits         37133    37294     +161     
+ Misses       21028    20867     -161     
Impacted Files Coverage Δ
erpnext/accounts/doctype/bank/bank.py 71.42% <0.00%> (-14.29%) ⬇️
...pnext/setup/doctype/sales_partner/sales_partner.py 65.21% <0.00%> (-4.35%) ⬇️
erpnext/accounts/party.py 77.71% <0.00%> (-4.18%) ⬇️
...next/accounts/doctype/bank_account/bank_account.py 77.27% <0.00%> (-2.28%) ⬇️
...pnext/accounts/report/gross_profit/gross_profit.py 73.91% <0.00%> (-1.09%) ⬇️
erpnext/stock/report/stock_ageing/stock_ageing.py 93.80% <0.00%> (-0.96%) ⬇️
erpnext/stock/doctype/warehouse/warehouse.py 79.02% <0.00%> (-0.70%) ⬇️
...ype/account/chart_of_accounts/chart_of_accounts.py 76.87% <0.00%> (-0.69%) ⬇️
erpnext/stock/doctype/batch/batch.py 83.33% <0.00%> (-0.62%) ⬇️
...xt/accounts/doctype/sales_invoice/sales_invoice.py 81.81% <0.00%> (-0.09%) ⬇️
... and 23 more

@sumaiya2908 sumaiya2908 marked this pull request as ready for review January 4, 2022 10:43
@marination
Copy link
Collaborator

@sumaiya2908

The empty states feel too empty. Perhaps a white card with the illustration in the center would be better ?

Screenshot 2022-01-12 at 12 27 34 PM

The sidebar items disappear when i go to any page like /orders.

Screenshot 2022-01-12 at 12 28 48 PM

The same in v13:
Screenshot 2022-01-12 at 12 29 59 PM

@sumaiya2908
Copy link
Contributor Author

@marination both the issues are to be fixed in the framework. We can go ahead with this PR if everything else is fine.

@marination
Copy link
Collaborator

@sumaiya2908 can you address the failing linter ?

@sumaiya2908
Copy link
Contributor Author

@marination is there any other test to address for this PR?

@stale
Copy link

stale bot commented Mar 5, 2022

This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@stale stale bot added the inactive label Mar 5, 2022
@stale stale bot closed this Mar 8, 2022
@ankush ankush reopened this Sep 16, 2022
@stale stale bot removed the inactive label Sep 16, 2022
@stale
Copy link

stale bot commented Oct 1, 2022

This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@stale stale bot added the inactive label Oct 1, 2022
@stale stale bot removed the inactive label Oct 3, 2022
@deepeshgarg007
Copy link
Member

@Mergifyio backport version-14-hotfix

@mergify
Copy link
Contributor

mergify bot commented Oct 3, 2022

backport version-14-hotfix

✅ Backports have been created

@deepeshgarg007 deepeshgarg007 self-assigned this Oct 3, 2022
@ankush ankush added squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. and removed fix-conflicts labels Oct 3, 2022
@deepeshgarg007
Copy link
Member

Fixed Payment Button Placement

Before:
image

After:
Screenshot 2022-10-03 at 10 37 05 PM

@deepeshgarg007 deepeshgarg007 merged commit da43a5e into frappe:develop Oct 4, 2022
mergify bot pushed a commit that referenced this pull request Oct 4, 2022
* refactor: list view for portal pages

* refactor: add align center class

* refactor: change footer btn class(primary)

* refactor: add order style page

* refactor: import order page in website

* refactor: remove table elements

* fix: preview image height

* fix: make string translatable

* refactor: change font variables

* refactor: order preview bg white

* refactor: center align items

* fix: breadcrumb padding

* refactor: make preview image rounded

* refactor: add condition for image container

* refactor: change alignment for mobile view

* fix: make footer button secondary

* refactor: clean code

* refactor: code indentantion

* refactor: remove space

* fix: Payment section cleanup

Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit da43a5e)
deepeshgarg007 pushed a commit that referenced this pull request Oct 4, 2022
refactor(UI): clean up portal pages (#29018)

* refactor: list view for portal pages

* refactor: add align center class

* refactor: change footer btn class(primary)

* refactor: add order style page

* refactor: import order page in website

* refactor: remove table elements

* fix: preview image height

* fix: make string translatable

* refactor: change font variables

* refactor: order preview bg white

* refactor: center align items

* fix: breadcrumb padding

* refactor: make preview image rounded

* refactor: add condition for image container

* refactor: change alignment for mobile view

* fix: make footer button secondary

* refactor: clean code

* refactor: code indentantion

* refactor: remove space

* fix: Payment section cleanup

Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit da43a5e)

Co-authored-by: Summayya Hashmani <58825865+sumaiya2908@users.noreply.github.com>
@barredterra barredterra mentioned this pull request Mar 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants