Skip to content

Added my Name to the list #1708

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.

Sign up for GitHub

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

Merged
4 commits merged into from
Jun 16, 2026
+8 −6
Merged

Added my Name to the list #1708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8b8690
Added my Name to the list
BhushanSah Jun 15, 2026
60bdd94
fixed merge conflict
BhushanSah Jun 16, 2026
21f0073
Fixed The Accordion open issue on StudentSearch & MyProfile
BhushanSah Jun 16, 2026
7f04b1a
Merge remote-tracking branch 'origin' into sahb
BhushanSah Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/config/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,6 @@ contributors:
- name: "Alina Petrosyants"
role: "Software Engineer"
- name: "Denys Zhytkov"
role: "Software Engineer"
role: "Software Engineer"
- name: "Bhushan Sah"
role: "Software Engineer"
8 changes: 4 additions & 4 deletions app/templates/main/userProfile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ <h3 class="accordion-header" id="headingZero">
<!-- ################# Upcoming Events ################ -->
<div class="accordion-item">
<h3 class="accordion-header" id="headingOne">
{% set focus = "open" if visibleAccordion == "upcoming" or (not visibleAccordion and volunteer.username == g.current_user.username) else "collapsed" %}
{% set focus = "open" if visibleAccordion == "upcoming" else "collapsed" %}
<button class="accordion-button {{focus}}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">Upcoming Events</button>
</h3>
{% set show = "show" if visibleAccordion == "upcoming" or (not visibleAccordion and volunteer.username == g.current_user.username) else ""%}
{% set show = "show" if visibleAccordion == "upcoming" else ""%}
<div id="collapseOne" class="accordion-collapse collapse {{show}} " aria-labelledby="headingOne" data-bs-parent="#userProfile">
<div class="accordion-body">
<div class="row table-responsive" style="flex-direction: column">
Expand Down Expand Up @@ -191,12 +191,12 @@ <h5>You have not participated in any events.</h5>
<!-- ################# Program Table ################ -->
<div class="accordion-item">
<h3 class="accordion-header" id="headingThree">
{% set focus = "open" if visibleAccordion == "programTable" or (not visibleAccordion and volunteer.username != g.current_user.username) else "collapsed" %}
{% set focus = "open" if visibleAccordion == "programTable" else "collapsed" %}
<button class="accordion-button {{focus}}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
Programs
</button>
</h3>
{% set show = "show" if visibleAccordion == "programTable" or (not visibleAccordion and volunteer.username != g.current_user.username) else "" %}
{% set show = "show" if visibleAccordion == "programTable" else "" %}
<div id="collapseThree" class="accordion-collapse collapse {{show}}" aria-labelledby="headingThree" data-bs-parent="#userProfile">
<div class="accordion-body">
<div class="table-responsive">
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ attrs==25.3.0
blessings==1.7
blinker==1.9.0
certifi==2025.8.3
cffi
cffi
chardet==5.2.0
charset-normalizer==3.4.2
click==8.2.1
Expand Down
Loading