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

fix: Improved events calendar page #1178

Merged
merged 10 commits into from
Dec 15, 2023

Conversation

pateldivyesh1323
Copy link
Contributor

What kind of change does this PR introduce?

Improved calendar view of events page

Issue Number:

Fixes #1175

Did you add tests for your changes?

Yes

Snapshots/Videos:

  • Before

image

  • After
Talawa.Events.-.Google.Chrome.2023-12-11.22-26-15.mp4

If relevant, did you update the documentation?

No

Summary

  • Matched colors
  • Removed small calendar
  • Improved borders
  • Moved add events button to right top
  • Added previous and next icons

Does this PR introduce a breaking change?

No

Have you read the contributing guide?

Yes

Copy link

Our Pull Request Approval Process

We have these basic policies to make the approval process smoother for our volunteer team.

Testing Your Code

Please make sure your code passes all tests. Our test code coverage system will fail if these conditions occur:

  1. The overall code coverage drops below the target threshold of the repository
  2. Any file in the pull request has code coverage levels below the repository threshold
  3. Merge conflicts

The process helps maintain the overall reliability of the code base and is a prerequisite for getting your PR approved. Assigned reviewers regularly review the PR queue and tend to focus on PRs that are passing.

Reviewers

When your PR has been assigned reviewers contact them to get your code reviewed and approved via:

  1. comments in this PR or
  2. our slack channel

Reviewing Your Code

Your reviewer(s) will have the following roles:

  1. arbitrators of future discussions with other contributors about the validity of your changes
  2. point of contact for evaluating the validity of your work
  3. person who verifies matching issues by others that should be closed.
  4. person who gives general guidance in fixing your tests

CONTRIBUTING.md

Read our CONTRIBUTING.md file. Most importantly:

  1. PRs with issues not assigned to you will be closed by the reviewer
  2. Fix the first comment in the PR so that each issue listed automatically closes

Other

  1. 🎯 Please be considerate of our volunteers' time. Contacting the person who assigned the reviewers is not advised unless they ask for your input. Do not @ the person who did the assignment otherwise.
  2. Read the CONTRIBUTING.md file make

@Cioppolo14
Copy link
Contributor

@pateldivyesh1323
Please fix the failing tests. Our test code coverage system will fail if any of these conditions occur:

  1. The overall code coverage drops below the target threshold of the repository
  2. Any file in the pull request has code coverage levels below the repository threshold
  3. The code does not comply with our linting check or other related formatting requirements

We do this to ensure the overall reliability of the code base is maintained. This is a prerequisite for getting your PR approved. Assigned reviewers regularly review the PR queue and tend to focus on PRs that are passing.

@palisadoes
Copy link
Contributor

We had to revert a PR that was causing tests to fail incorrectly. Please submit a minor commit to trigger an update of the GitHub workflow

Copy link

codecov bot commented Dec 12, 2023

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (655b6b3) 92.77% compared to head (8ff89f7) 95.55%.
Report is 39 commits behind head on develop.

Files Patch % Lines
...rgProfileFieldSettings/OrgProfileFieldSettings.tsx 90.00% 3 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1178      +/-   ##
===========================================
+ Coverage    92.77%   95.55%   +2.78%     
===========================================
  Files          134      137       +3     
  Lines         3238     3330      +92     
  Branches       904      931      +27     
===========================================
+ Hits          3004     3182     +178     
+ Misses         225      142      -83     
+ Partials         9        6       -3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@aashimawadhwa
Copy link
Member

aashimawadhwa commented Dec 12, 2023

@pateldivyesh1323 the calendar looks good but can we work more on fixed tile sizes and making it visible in a view-port and is this calendar responsive?

https://demo.tailadmin.com/calendar
can you replicate this behavior?

@pateldivyesh1323
Copy link
Contributor Author

@aashimawadhwa The events will not fit in fixed tile sizes, so I will have to add "more" button to display the events of that date, Is that ok?
image

@aashimawadhwa
Copy link
Member

aashimawadhwa commented Dec 12, 2023

Yes please do that on small screen sizes and for the rest show the events as in the tailadmin calendar.
@pateldivyesh1323

@pateldivyesh1323
Copy link
Contributor Author

@aashimawadhwa The events are not fitting on single tile on larger screens also, a single tile can handle one or two events not more than that, it will break after it, so should I add "more" button on larger screens similarly?

@aashimawadhwa
Copy link
Member

@aashimawadhwa The events are not fitting on single tile on larger screens also, a single tile can handle one or two events not more than that, it will break after it, so should I add "more" button on larger screens similarly?

this will not accelerate the user experience, please follow the designs as similar to https://demo.tailadmin.com/calendar this demo.

@pateldivyesh1323
Copy link
Contributor Author

@aashimawadhwa In demo it does shows only single event, but in our case we have multiple events which are not fitting in fixed tile size.

@aashimawadhwa
Copy link
Member

Screen.Recording.2023-12-12.at.2.46.07.PM.mov

you can show 2 events by default in ascending order and then show a more button, to fit 2 events decrease the width of event tile and handle rest case as it is handled in google calendar. @pateldivyesh1323

@pateldivyesh1323
Copy link
Contributor Author

@aashimawadhwa Does this look good?

Talawa.Events.-.Google.Chrome.2023-12-13.15-35-43.mp4

Copy link
Member

@aashimawadhwa aashimawadhwa left a comment

Choose a reason for hiding this comment

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

Merge the latest code into this branch, this maybe the cause of of your failed code coverage tests .

@pateldivyesh1323
Copy link
Contributor Author

@aashimawadhwa I have pushed the latest code

There is no use of these file src\screens\OrganizationEvents\calendar.css and react-calendar package now as we removed the small calendar

Should I remove them?

@aashimawadhwa
Copy link
Member

@aashimawadhwa I have pushed the latest code

There is no use of these file src\screens\OrganizationEvents\calendar.css and react-calendar package now as we removed the small calendar

Should I remove them?

Yes sure you can clean the code.

@pateldivyesh1323
Copy link
Contributor Author

@aashimawadhwa Done👍

@aashimawadhwa
Copy link
Member

can you fix this? @pateldivyesh1323
Screenshot 2023-12-15 at 11 34 42 PM

@pateldivyesh1323
Copy link
Contributor Author

@aashimawadhwa Done

Copy link
Member

@aashimawadhwa aashimawadhwa left a comment

Choose a reason for hiding this comment

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

LGTM 👍🏼 @rishav-jha-mech please have a look.

@palisadoes palisadoes merged commit 253f95d into PalisadoesFoundation:develop Dec 15, 2023
7 of 8 checks passed
@pateldivyesh1323 pateldivyesh1323 deleted the 1175 branch December 15, 2023 19:18
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.

4 participants