Updated the Upcoming Events list UI on the Organization dashboard. #1366

AmitSharma512 · 2024-01-03T19:49:07Z

What kind of change does this PR introduce?

Updated the Upcoming Events list UI on the Organization dashboard.

Issue Number:

Fixes #1358

Snapshots/Videos:

Does this PR introduce a breaking change?

No

Have you read the contributing guide?

Yes

… into Dashboard-UI-Design

github-actions · 2024-01-03T19:49:34Z

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:

The overall code coverage drops below the target threshold of the repository
Any file in the pull request has code coverage levels below the repository threshold
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:

comments in this PR or
our slack channel

Reviewing Your Code

Your reviewer(s) will have the following roles:

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

CONTRIBUTING.md

Read our CONTRIBUTING.md file. Most importantly:

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

Other

🎯 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.
Read the CONTRIBUTING.md file make

src/components/OrganizationDashCards/CardItem.module.css

rishav-jha-mech · 2024-01-04T03:31:45Z

@AmitSharma512 you need to import the icon, not the circle or background associated with them, otherwise we cannot use the same icon else where, also don't add "new" to the file name of icons. Use flex inside the time element, so that instead of overflowing it moves to the next line, for Date its okay but if there is time involved too, it may overflow

… into Dashboard-UI-Design

rishav-jha-mech · 2024-01-06T11:39:38Z

src/components/OrganizationDashCards/CardItem.module.css

@@ -2,7 +2,10 @@
  position: relative;
  display: flex;
  align-items: center;
-  padding: 0.75rem 0;
+  padding: 1rem 3rem 1rem 1.5rem;
+  border: 1px solid #dddddd;


use css variable here

@rishav-jha-mech can you give me some idea about how to use the CSS variables ?

like this,

border: 1px solid var(--bs-gray-200);

--bs-gray-200 this variable is from bootstrap

@rishav-jha-mech, can I write inline bootstrap CSS variables in the classname? Is that ok to write ??

rishav-jha-mech · 2024-01-06T11:39:54Z

src/components/OrganizationDashCards/CardItem.module.css

+  font-style: normal;
+  font-weight: 600;
+  line-height: 18px;
+  color: #000000;


Use css variable from bootstrap here too

rishav-jha-mech · 2024-01-06T11:44:24Z

@AmitSharma512 datesnew.svg and eventsnew.svg are the same use any one only and i see no use of appending new to their file name so please remove that, I can see you have not applied inherit to the colour props in them, the svgs should not have any colour by default, so that we can reuse wherever we want in our project. Please follow how we are using svgs in Leftdrawers, you will get the idea

AmitSharma512 · 2024-01-06T13:49:23Z

@AmitSharma512 datesnew.svg and eventsnew.svg are the same use any one only and i see no use of appending new to their file name so please remove that, I can see you have not applied inherit to the colour props in them, the svgs should not have any colour by default, so that we can reuse wherever we want in our project. Please follow how we are using svgs in Leftdrawers, you will get the idea

@rishav-jha-mech datesnew ad eventsnew are different, they are the new logo from the figma file that's why i have appended new to their name.

AmitSharma512 · 2024-01-06T14:00:53Z

@AmitSharma512 datesnew.svg and eventsnew.svg are the same use any one only and i see no use of appending new to their file name so please remove that, I can see you have not applied inherit to the colour props in them, the svgs should not have any colour by default, so that we can reuse wherever we want in our project. Please follow how we are using svgs in Leftdrawers, you will get the idea

@rishav-jha-mech I can only download the default color logo from the figma file, i cannot download the SVG without any color as i have only preview access to the figma file.

rishav-jha-mech · 2024-01-06T14:19:19Z

@AmitSharma512 you need to modify the svg file by yourself, check for these attributes in svg file like

fill = "#some-colour-hash"

OR

stroke = "#some-colour-hash"

and change it to

fill = "current"
or
stroke = "current"

Check LeftDrawer component for reference

… into Dashboard-UI-Design

AmitSharma512 · 2024-01-07T17:27:52Z

@rishav-jha-mech, I have made all the required changes; please merge the PR.

… into Dashboard-UI-Design

AmitSharma512 · 2024-01-10T09:39:22Z

@rishav-jha-mech please review it

rishav-jha-mech · 2024-01-10T13:27:45Z

src/assets/svgs/locationnew.svg

+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.99999 14.1257L8.48075 13.584C9.02627 12.9593 9.51694 12.3665 9.95351 11.8027L10.3139 11.3273C11.8187 9.29983 12.5714 7.69069 12.5714 6.50136C12.5714 3.96269 10.5249 1.90479 7.99999 1.90479C5.47503 1.90479 3.42856 3.96269 3.42856 6.50136C3.42856 7.69069 4.18132 9.29983 5.68608 11.3273L6.04646 11.8027C6.66927 12.6007 7.32088 13.3751 7.99999 14.1257Z" stroke="#31BB6B" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.99998 8.38093C9.05195 8.38093 9.90474 7.52814 9.90474 6.47617C9.90474 5.4242 9.05195 4.57141 7.99998 4.57141C6.94801 4.57141 6.09521 5.4242 6.09521 6.47617C6.09521 7.52814 6.94801 8.38093 7.99998 8.38093Z" stroke="#31BB6B" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>


Why there is hardcoded value for stroke, add current there also

rishav-jha-mech · 2024-01-10T13:28:48Z

@AmitSharma512 fix the failing tests

… into Dashboard-UI-Design

AmitSharma512 · 2024-01-10T18:36:27Z

@rishav-jha-mech made the required changes; please review it.

codecov · 2024-01-10T19:30:17Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (e7cd34b) 97.34% compared to head (d36bb9e) 97.34%.

Additional details and impacted files

@@           Coverage Diff            @@
##           develop    #1366   +/-   ##
========================================
  Coverage    97.34%   97.34%           
========================================
  Files          136      136           
  Lines         3572     3578    +6     
  Branches      1039     1045    +6     
========================================
+ Hits          3477     3483    +6     
  Misses          90       90           
  Partials         5        5

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

… into Dashboard-UI-Design

beingnoble03

@AmitSharma512 please rename the svg files with something relevant to their use. Eg. cardItemDate, cardItemEvent and cardItemLocation.

beingnoble03

Rest LGTM.

palisadoes · 2024-01-13T16:51:08Z

@rishav-jha-mech Please review. You had some requested changes that need to be verified

… into Dashboard-UI-Design

palisadoes · 2024-01-14T16:55:16Z

Please fix the introspection test error

AmitSharma512 · 2024-01-14T16:58:22Z

Please fix the introspection test error

@palisadoes, it is not because of the files changed by me; the error is in the mutations file, and I haven't changed the mutation files. I am getting this error because of the previous commit I pulled from the branch.

AmitSharma512 · 2024-01-14T17:05:16Z

Please fix the introspection test error

@palisadoes The error is because of the files changed in the PR #1384,

The above screenshot shows that the error is in the PR #1384, i guess the PR has to be reverted.

AmitSharma512 · 2024-01-14T17:06:07Z

@rishav-jha-mech Please review. You had some requested changes that need to be verified

All the suggestions from @rishav-jha-mech have been made, you can verify them.

AmitSharma512 · 2024-01-15T09:46:11Z

@beingnoble03 can you please review the changes requested by @rishav-jha-mech , so that I can work on new issues :)))

… into Dashboard-UI-Design

AmitSharma512 added 2 commits January 4, 2024 01:09

Updated the Upcoming Events list UI of the Organization Dashboard.

6f55b51

Merge branch 'develop' of https://github.com/AmitSharma512/talawa-admin…

7f30d18

… into Dashboard-UI-Design

palisadoes requested review from rishav-jha-mech, aashimawadhwa and beingnoble03 January 3, 2024 20:37

rishav-jha-mech reviewed Jan 4, 2024

View reviewed changes

src/components/OrganizationDashCards/CardItem.module.css Outdated Show resolved Hide resolved

AmitSharma512 added 2 commits January 5, 2024 22:50

Merge branch 'develop' of https://github.com/AmitSharma512/talawa-admin…

68f0359

… into Dashboard-UI-Design

Updated the logo on the dashboard

6f2ed65

AmitSharma512 requested a review from rishav-jha-mech January 5, 2024 18:11

rishav-jha-mech reviewed Jan 6, 2024

View reviewed changes

AmitSharma512 added 2 commits January 6, 2024 20:44

Updated the CSS and the logo styling.

8e8f67b

Merge branch 'develop' of https://github.com/AmitSharma512/talawa-admin…

1b4eeb1

… into Dashboard-UI-Design

AmitSharma512 requested a review from rishav-jha-mech January 6, 2024 15:18

AmitSharma512 added 3 commits January 6, 2024 22:17

Merge branch 'develop' of https://github.com/AmitSharma512/talawa-admin…

0cefba9

… into Dashboard-UI-Design

Merge branch 'develop' of https://github.com/AmitSharma512/talawa-admin…

ff3d0d7

… into Dashboard-UI-Design

Merge branch 'develop' of https://github.com/AmitSharma512/talawa-admin…

a4033cb

… into Dashboard-UI-Design

Merge branch 'develop' of https://github.com/AmitSharma512/talawa-admin…

492ba6a

… into Dashboard-UI-Design

rishav-jha-mech reviewed Jan 10, 2024

View reviewed changes

AmitSharma512 added 2 commits January 10, 2024 23:34

Merge branch 'develop' of https://github.com/AmitSharma512/talawa-admin…

e73a825

… into Dashboard-UI-Design

Updated the location logo on the Organization Dashboard.

6941ad1

AmitSharma512 requested a review from rishav-jha-mech January 10, 2024 18:35

Fixed the Failing tests.

0b40f69

Merge branch 'develop' of https://github.com/AmitSharma512/talawa-admin…

b1778c1

… into Dashboard-UI-Design

beingnoble03 reviewed Jan 13, 2024

View reviewed changes

Updated the names of the svgs.

25cd687

beingnoble03 approved these changes Jan 13, 2024

View reviewed changes

palisadoes approved these changes Jan 13, 2024

View reviewed changes

Merge branch 'develop' of https://github.com/AmitSharma512/talawa-admin…

63fc6ed

… into Dashboard-UI-Design

Merge branch 'develop' of https://github.com/AmitSharma512/talawa-admin…

d36bb9e

… into Dashboard-UI-Design

AmitSharma512 requested review from palisadoes and beingnoble03 January 15, 2024 19:08

palisadoes merged commit f5fa13d into PalisadoesFoundation:develop Jan 15, 2024
8 of 9 checks passed

AmitSharma512 deleted the Dashboard-UI-Design branch January 15, 2024 19:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated the Upcoming Events list UI on the Organization dashboard. #1366

Updated the Upcoming Events list UI on the Organization dashboard. #1366

AmitSharma512 commented Jan 3, 2024

github-actions bot commented Jan 3, 2024

rishav-jha-mech commented Jan 4, 2024

rishav-jha-mech Jan 6, 2024

AmitSharma512 Jan 6, 2024

rishav-jha-mech Jan 6, 2024

AmitSharma512 Jan 6, 2024

rishav-jha-mech Jan 6, 2024

rishav-jha-mech commented Jan 6, 2024

AmitSharma512 commented Jan 6, 2024

AmitSharma512 commented Jan 6, 2024

rishav-jha-mech commented Jan 6, 2024 •

edited

Loading

AmitSharma512 commented Jan 7, 2024

AmitSharma512 commented Jan 10, 2024

rishav-jha-mech Jan 10, 2024

rishav-jha-mech commented Jan 10, 2024

AmitSharma512 commented Jan 10, 2024

codecov bot commented Jan 10, 2024 •

edited

Loading

beingnoble03 left a comment

beingnoble03 left a comment

palisadoes commented Jan 13, 2024

palisadoes commented Jan 14, 2024 •

edited

Loading

AmitSharma512 commented Jan 14, 2024

AmitSharma512 commented Jan 14, 2024 •

edited

Loading

AmitSharma512 commented Jan 14, 2024

AmitSharma512 commented Jan 15, 2024

Updated the Upcoming Events list UI on the Organization dashboard. #1366

Updated the Upcoming Events list UI on the Organization dashboard. #1366

Conversation

AmitSharma512 commented Jan 3, 2024

github-actions bot commented Jan 3, 2024

Our Pull Request Approval Process

Testing Your Code

Reviewers

Reviewing Your Code

CONTRIBUTING.md

Other

rishav-jha-mech commented Jan 4, 2024

rishav-jha-mech Jan 6, 2024

Choose a reason for hiding this comment

AmitSharma512 Jan 6, 2024

Choose a reason for hiding this comment

rishav-jha-mech Jan 6, 2024

Choose a reason for hiding this comment

AmitSharma512 Jan 6, 2024

Choose a reason for hiding this comment

rishav-jha-mech Jan 6, 2024

Choose a reason for hiding this comment

rishav-jha-mech commented Jan 6, 2024

AmitSharma512 commented Jan 6, 2024

AmitSharma512 commented Jan 6, 2024

rishav-jha-mech commented Jan 6, 2024 • edited Loading

AmitSharma512 commented Jan 7, 2024

AmitSharma512 commented Jan 10, 2024

rishav-jha-mech Jan 10, 2024

Choose a reason for hiding this comment

rishav-jha-mech commented Jan 10, 2024

AmitSharma512 commented Jan 10, 2024

codecov bot commented Jan 10, 2024 • edited Loading

Codecov Report

beingnoble03 left a comment

Choose a reason for hiding this comment

beingnoble03 left a comment

Choose a reason for hiding this comment

palisadoes commented Jan 13, 2024

palisadoes commented Jan 14, 2024 • edited Loading

AmitSharma512 commented Jan 14, 2024

AmitSharma512 commented Jan 14, 2024 • edited Loading

AmitSharma512 commented Jan 14, 2024

AmitSharma512 commented Jan 15, 2024

rishav-jha-mech commented Jan 6, 2024 •

edited

Loading

codecov bot commented Jan 10, 2024 •

edited

Loading

palisadoes commented Jan 14, 2024 •

edited

Loading

AmitSharma512 commented Jan 14, 2024 •

edited

Loading