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

🧒 Freddy branch #1080

Merged
merged 194 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from 192 commits
Commits
Show all changes
194 commits
Select commit Hold shift + click to select a range
64b903c
✌🏽 Calender booking feature (#470)
RavishingRitesh Jan 27, 2022
b55ce21
🎪 Book appointment from chat issues (#478)
RavishingRitesh Feb 4, 2022
8ed73ef
fix merging conflicts
Leundai Feb 24, 2022
0476ea0
🔧 Calendar mentor fixes (#485)
RavishingRitesh Feb 27, 2022
75a0749
Change frontend back to Heroku based instead of Vercel
Leundai Mar 6, 2022
0f35cbf
Merge branch 'dev' of https://github.com/hack4impact-uiuc/mentee into…
Leundai Mar 6, 2022
9d335d2
merging from master
Leundai Mar 6, 2022
a4619d0
change login and apply logic
eslamzaaki Apr 10, 2022
21872d0
Add mentor application work in front and back end
eslamzaaki Apr 12, 2022
a85d85a
add apply process back and front end for 3 roles
eslamzaaki Apr 14, 2022
c1f8aa1
stage 1 ready for test
eslamzaaki Apr 16, 2022
2394da1
:
eslamzaaki Apr 16, 2022
1c98718
enhance UI finish stage 1
eslamzaaki Apr 19, 2022
be7bbab
stage 1
eslamzaaki Apr 20, 2022
8c3ae36
stage 1.
eslamzaaki Apr 20, 2022
f24a812
stage 1..
eslamzaaki Apr 20, 2022
bb51b93
ehance UI stage1
eslamzaaki Apr 20, 2022
9047ddb
fix login and apply UI
eslamzaaki Apr 21, 2022
1bc48ef
fix login and apply UI
eslamzaaki Apr 21, 2022
e66fb63
fix login and apply UI.
eslamzaaki Apr 21, 2022
079dcdb
fix mentee button
eslamzaaki Apr 22, 2022
7db6357
stage 2 ready for test
eslamzaaki Apr 25, 2022
d27aee6
fix stage2 issues
eslamzaaki Apr 29, 2022
ffd670d
stage2 fixes
eslamzaaki Apr 30, 2022
128cc1f
stage2 changes add Training CMS && new Emails
eslamzaaki May 1, 2022
159eee5
🍐 Apply login partner changes (#506)
eslamzaaki May 1, 2022
8366d13
Add node ccfi
eslamzaaki May 1, 2022
8801e22
🤾🏾‍♂️ Apply login partner changes (#507)
eslamzaaki May 1, 2022
c294f2b
stage 3
eslamzaaki May 8, 2022
5ebbeee
stage3 solve issues
eslamzaaki May 9, 2022
fe23c4a
solve conflict
eslamzaaki May 9, 2022
d6fc7d3
🛍️ Apply login partner changes (#516)
eslamzaaki May 9, 2022
04c49f7
🚶🏼 Apply login partner changes (#524)
eslamzaaki May 12, 2022
efb8169
💁🏿‍♀️ Apply login partner changes (#526)
eslamzaaki May 12, 2022
5b2108a
👈🏻 Apply login partner changes (#528)
eslamzaaki May 13, 2022
154c54b
🚣🏻‍♀️ Apply partner login changes (#529)
eslamzaaki May 17, 2022
a64934a
🚣🏽 Apply partner login changes (#530)
eslamzaaki May 17, 2022
8ed3b54
🐜 Apply partner login changes (#532)
eslamzaaki May 20, 2022
201d988
👷🏿‍♀️ Apply partner login changes (#533)
eslamzaaki May 20, 2022
3364445
🤷🏾 Master update wordings (#535)
eslamzaaki May 24, 2022
817e528
🐂 Fix reset password link and wordings (#538)
eslamzaaki Jun 7, 2022
fef2fad
🤸🏼‍♂️ Fix reset password link and wordings (#539)
eslamzaaki Jun 7, 2022
e105fbe
🌥️ Fix reset password link and wordings (#540)
eslamzaaki Jun 14, 2022
3e3a6ca
💇‍♀️ Apply login partner changes (#543)
eslamzaaki Jul 8, 2022
1fbcd0a
🧑🏼‍🍼 Apply login partner changes (#545)
eslamzaaki Jul 17, 2022
5b8d834
🧓 Apply login partner changes (#547)
eslamzaaki Jul 17, 2022
06236ad
🧜🏽‍♀️ Apply login partner changes (#549)
eslamzaaki Aug 17, 2022
60aea2f
🧑‍🎨 Apply login partner changes (#554)
eslamzaaki Sep 11, 2022
4b5e15d
👨🏿‍🦳 Apply login partner changes (#556)
eslamzaaki Sep 14, 2022
a91bf9d
👨‍🔧 Apply login partner changes (#557)
eslamzaaki Sep 14, 2022
5cd85fd
🧘🏽 561 new existing bio changes (#563)
eslamzaaki Oct 12, 2022
8699cb6
🥼 Merge master dev (#570)
eslamzaaki Oct 19, 2022
c6b9c76
🥑 Five issues (#572)
eslamzaaki Oct 19, 2022
a9e3e3b
🤵🏼‍♂️ Five issues (#573)
eslamzaaki Oct 21, 2022
ed12b7d
🙎🏽‍♂️ Five issues (#576)
eslamzaaki Oct 21, 2022
daac563
🏋️‍♂️ Five issues (#578)
eslamzaaki Oct 22, 2022
700a2a2
💆‍♀️ Five issues (#579)
eslamzaaki Oct 22, 2022
522e805
👊🏻 Admin messages report (#584)
eslamzaaki Nov 25, 2022
b60f117
🗻 Admin messages report (#585)
eslamzaaki Nov 26, 2022
bf32d17
🛌🏾 Admin messages report (#586)
eslamzaaki Nov 29, 2022
58220a2
🚴🏽‍♂️ Admin messages report (#588)
eslamzaaki Nov 30, 2022
84f1036
🧖 Admin messages report (#591)
eslamzaaki Dec 1, 2022
1185435
⬆️ Mongo db upgrade (#594)
SolMon9099 Mar 2, 2023
863f974
⬆️ Python and Node version upgrade (#595)
SolMon9099 Mar 7, 2023
6737fb2
🤞🏽 Python and node version upgrad-2 (#596)
SolMon9099 Mar 7, 2023
fcfc4d9
🙎🏼 Update runserver command (#597)
SolMon9099 Mar 7, 2023
52ac558
👩🏾‍🤝‍👨🏼 Remove runserver command (#598)
SolMon9099 Mar 7, 2023
965c205
⬆️ Mongo db upgrade (#599)
SolMon9099 Mar 7, 2023
7d97f9e
🏃🏾‍♀️ Downgrade eventlet (#600)
SolMon9099 Mar 7, 2023
94f52d3
👍🏼 Downgrade dnspython (#601)
SolMon9099 Mar 7, 2023
18a7ce7
🤰🏻 Message side bar background (#604)
SolMon9099 Mar 8, 2023
028f710
🐗 Downgrade antd-#603, #605 (#606)
SolMon9099 Mar 8, 2023
22e9372
🚣‍♂️ Flask send_file parameter update (#608)
SolMon9099 Mar 8, 2023
190bf53
🏂🏾 issue#609 (#610)
SolMon9099 Mar 9, 2023
7afe557
🍤 Email&sms notification for message (#613)
SolMon9099 Mar 9, 2023
30fbd1c
🛣️ Fix partner error (#614)
SolMon9099 Mar 9, 2023
9242020
✍️ Gunicorn worker increase
Leundai Mar 12, 2023
280f1d6
📇 Skills/languages module (#621)
SolMon9099 Mar 13, 2023
976d3ac
Fix Procfile gunicorn/socket.io worker count
Leundai Mar 13, 2023
0e9beb5
Update Profile Threads 256
Leundai Mar 13, 2023
2126ba6
🔧 fix edit&delete module of skill& language (#632)
SolMon9099 Mar 14, 2023
60564bb
🔧 validate video url and fix bug on edit profile modal (#633)
SolMon9099 Mar 14, 2023
a3c61bd
👨🏻‍🍳 add youtube shorts video to validation (#634)
SolMon9099 Mar 14, 2023
7b0ff57
🌴 big code cleanup (#629)
Leundai Mar 15, 2023
2a0371a
merging master
Leundai Mar 15, 2023
0e1191b
merging master
Leundai Mar 15, 2023
d474cf4
big code cleanup part 2
Leundai Mar 15, 2023
d58f2b6
😼 Formatting
Leundai Mar 15, 2023
2014343
🐣 Merging from master
Leundai Mar 15, 2023
1eeada6
🧑🏻‍🦰 Fixing issues (#820)
SolMon9099 Nov 18, 2023
481527a
🧔🏼 Fixing pashto (#830)
SolMon9099 Nov 21, 2023
89f93e7
💞 Translations for main (#835)
git-translate[bot] Nov 25, 2023
5ef968d
👨‍👨‍👦 Fixing issues (#838)
SolMon9099 Dec 6, 2023
79231b4
🧑🏼‍✈️ Fixing issues (#842)
SolMon9099 Dec 7, 2023
1cd1a5e
👩🏿‍🎨 Fixing issues (#844)
SolMon9099 Dec 7, 2023
fa52d41
🦿 Fixing issues (#846)
SolMon9099 Dec 9, 2023
43a1f17
🔍 Fixing issues (#860)
SolMon9099 Dec 19, 2023
3ad6bc6
👱🏻‍♀️ Fixing issues (#871)
SolMon9099 Dec 20, 2023
9bdecbe
🧒🏻 Docker, pytest and cypress setups (#876)
HamzaAnis Jan 4, 2024
4e39f17
👷🏻‍♂️ Training record (#885)
SolMon9099 Jan 19, 2024
67e1d5b
🤵🏾‍♂️ Fixing issue 2 (#895)
SolMon9099 Jan 24, 2024
a4c71a6
🦙 Fixing issue 2 (#897)
SolMon9099 Jan 24, 2024
2acf037
🐛 Fix partner form bug (#903)
SolMon9099 Jan 30, 2024
76b501e
💍 Fixing issue 2 (#917)
SolMon9099 Feb 4, 2024
d96693d
🌖 Fixing issue 2 (#922)
SolMon9099 Feb 5, 2024
6d8c901
👩🏽‍🔧 Fixing issue 2 (#924)
SolMon9099 Feb 5, 2024
4be2749
👱🏼‍♀️ Fixing issue 2 (#928)
SolMon9099 Feb 8, 2024
202dc5a
😞 Fixing issue 2 (#955)
SolMon9099 Feb 20, 2024
141c0e0
🤽🏽‍♂️ Hub (#968)
SolMon9099 Feb 28, 2024
143234c
🙋🏾 Resolved the Conflicts (#973)
Humayun0008 Mar 2, 2024
296e565
🤎 Hub (#994)
SolMon9099 Mar 8, 2024
cae95b2
🎡 Hub (#1000)
SolMon9099 Mar 8, 2024
dc40994
👫🏿 Hub2 (#1012)
SolMon9099 Mar 14, 2024
937f817
🛌🏻 Hub3 (#1019)
SolMon9099 Mar 22, 2024
a8ec7b5
☝🏾 Hub group chat (#1027)
SolMon9099 May 1, 2024
9cacf5c
🧚 Add meeting link generation feature (#1030)
binary-exe May 6, 2024
804bdc5
🧜‍♂️ Adding iframe meeting feature using 8x8 Jaas (#1036)
binary-exe May 29, 2024
9708df4
fix select mode of mentee application form
WebMon9099 May 29, 2024
56908f4
fix format
WebMon9099 May 30, 2024
d2d68cd
Merge remote-tracking branch 'origin/main' into Freddy_branch
WebMon9099 May 30, 2024
d99a6a2
fix format
WebMon9099 May 30, 2024
074aa6e
Merge branch 'dev' into Freddy_branch
WebMon9099 May 30, 2024
d710d47
Fix format
WebMon9099 May 30, 2024
e7f31a9
fix format
WebMon9099 May 30, 2024
1de5f9e
🧑🏽‍🎤 Freddy branch (#1041)
WebMon9099 May 30, 2024
86c27b5
#1043, #1044
WebMon9099 May 31, 2024
e31a940
Merge branch 'dev' into Freddy_branch
WebMon9099 May 31, 2024
f9cdfd9
👩🏻‍🦼 Freddy branch (#1047)
WebMon9099 May 31, 2024
aa56b36
🐠 Get AppID if it is not set when copying from clipboard (#1049)
binary-exe May 31, 2024
11973f9
Merge remote-tracking branch 'origin/main' into Freddy_branch
WebMon9099 Jun 4, 2024
19c3c37
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 4, 2024
fa5fe17
#1045
WebMon9099 Jun 4, 2024
8b5cac4
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 4, 2024
a267f0d
fix format
WebMon9099 Jun 4, 2024
89bb068
👮🏽‍♀️ Removed commas (#1052)
binary-exe Jun 4, 2024
ba8aa60
Fix position of Power by and message notification error
WebMon9099 Jun 4, 2024
e030cb0
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 4, 2024
0867be4
fix format
WebMon9099 Jun 4, 2024
ca8887e
Fix bug
WebMon9099 Jun 4, 2024
238a3b9
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 4, 2024
b11f1b1
Fix bug
WebMon9099 Jun 5, 2024
71a3bcc
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 5, 2024
8ee4b39
addtional requirement
WebMon9099 Jun 5, 2024
49c1245
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 5, 2024
98cc6e6
add name in message
SolMon9099 Jun 5, 2024
2c84ca9
Fix bug
WebMon9099 Jun 5, 2024
62849b9
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 5, 2024
842ff8b
Add some modification
WebMon9099 Jun 6, 2024
3f9489e
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 6, 2024
1aeec6c
fix format
WebMon9099 Jun 6, 2024
154256e
add link function to direct message
WebMon9099 Jun 6, 2024
f3adbfb
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 6, 2024
27b471b
Merge branch 'main' into Freddy_branch
WebMon9099 Jun 6, 2024
0a69d74
Merge branch 'main' into Freddy_branch
WebMon9099 Jun 6, 2024
a084d4a
Fix format
WebMon9099 Jun 6, 2024
211ef68
🧘🏿‍♀️ Freddy branch (#1061)
WebMon9099 Jun 6, 2024
a731df0
Merge remote-tracking branch 'origin/main' into Freddy_branch
WebMon9099 Jun 10, 2024
1564f0b
Change api for getting countries
WebMon9099 Jun 10, 2024
6084cef
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 10, 2024
c1456cb
Fix remove
WebMon9099 Jun 10, 2024
422acce
😨 Freddy branch (#1063)
WebMon9099 Jun 10, 2024
71791b9
impersonation for Hub
WebMon9099 Jun 11, 2024
8d06b8d
remove hub filter
WebMon9099 Jun 12, 2024
241893c
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 12, 2024
cbfe151
Merge branch 'main' into Freddy_branch
WebMon9099 Jun 12, 2024
941259f
🧖🏼‍♀️ Freddy branch (#1066)
WebMon9099 Jun 12, 2024
55dfe89
For debug of application on iPhone
WebMon9099 Jun 14, 2024
31524bc
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 14, 2024
3d746fb
fix bug
WebMon9099 Jun 14, 2024
771face
Merge branch 'Freddy_branch' of https://github.com/hack4impact-uiuc/m…
WebMon9099 Jun 14, 2024
66746b5
fix bug for iPhone
WebMon9099 Jun 14, 2024
21c02e4
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 14, 2024
81e9ac2
Fix bug for iPhone
WebMon9099 Jun 14, 2024
788a0bd
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 14, 2024
70659d8
Merge branch 'main' into Freddy_branch
WebMon9099 Jun 14, 2024
f24a7ee
remove en-GB
WebMon9099 Jun 14, 2024
19870f1
Merge branch 'Freddy_branch' of https://github.com/hack4impact-uiuc/m…
WebMon9099 Jun 14, 2024
06af49e
🛒 Freddy branch (#1071)
WebMon9099 Jun 14, 2024
3430a2f
Add some features
WebMon9099 Jun 19, 2024
da45441
Merge branch 'main' into Freddy_branch
WebMon9099 Jun 19, 2024
977a060
Fix 4 issues
WebMon9099 Jun 20, 2024
63fcbad
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 20, 2024
fe72418
Fix bug self
WebMon9099 Jun 20, 2024
6c86481
Merge branch 'Freddy_branch' of https://github.com/hack4impact-uiuc/m…
WebMon9099 Jun 20, 2024
0d697f5
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 20, 2024
e510b3c
Fix bug
WebMon9099 Jun 21, 2024
6d1b4c7
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 21, 2024
676dc94
Fix bug
WebMon9099 Jun 21, 2024
6209e55
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 21, 2024
c38a119
Fix notification module
WebMon9099 Jun 21, 2024
8d7ecf8
🧖🏾 Freddy branch (#1074)
WebMon9099 Jun 21, 2024
85cc2bb
profile picture link in the events page
WebMon9099 Jun 25, 2024
4979f4e
Merge branch 'dev' into Freddy_branch
WebMon9099 Jun 25, 2024
2100643
Merge branch 'main' into Freddy_branch
WebMon9099 Jun 25, 2024
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
25 changes: 19 additions & 6 deletions frontend/src/components/EventCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,25 @@ function EventCard(props) {
style={{ height: "90%", overflowY: "auto" }}
>
<div className="gallery-card-header" style={{ height: "7.5rem" }}>
<Avatar
size={90}
icon={getImage(
create_user && create_user.image && create_user.image.url
)}
/>
{create_user && create_user.role > 0 ? (
<NavLink
to={`/gallery/${create_user.role}/${event_item.user_id.$oid}`}
>
<Avatar
size={90}
icon={getImage(
create_user && create_user.image && create_user.image.url
)}
/>
</NavLink>
) : (
<Avatar
size={90}
icon={getImage(
create_user && create_user.image && create_user.image.url
)}
/>
)}
<div className="gallery-header-text gallery-info-section">
<Title style={styles.title} className="gallery-title-text">
{truncate(event_item.title, 15)}
Expand Down
26 changes: 21 additions & 5 deletions frontend/src/components/pages/EventDetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
import { useTranslation } from "react-i18next";
import { ACCOUNT_TYPE, formatDateTime } from "utils/consts";
import { useSelector } from "react-redux";
import { NavLink } from "react-router-dom";

const { Title, Paragraph } = Typography;

Expand Down Expand Up @@ -84,11 +85,26 @@ function EventDetail({ match }) {
<div className={"mentor-profile-content-public"}>
<div style={{ minWidth: "65%" }}>
<div style={{ display: "flex" }}>
<Avatar
size={120}
src={createUser && createUser.image && createUser.image.url}
icon={<UserOutlined />}
/>
{createUser && createUser.role > 0 ? (
<NavLink
to={`/gallery/${createUser.role}/${event.user_id.$oid}`}
>
<Avatar
size={120}
src={
createUser && createUser.image && createUser.image.url
}
icon={<UserOutlined />}
/>
</NavLink>
) : (
<Avatar
size={120}
src={createUser && createUser.image && createUser.image.url}
icon={<UserOutlined />}
/>
)}

<div style={{ marginLeft: "20px" }}>
<Title className="gallery-title-text">
{event && event.title}
Expand Down
15 changes: 13 additions & 2 deletions frontend/src/utils/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ export const fetchAccountById = (id, type) => {
account_type: type,
},
}).then(
(response) => response.data.result.account,
(response) => {
let res = response.data.result.account;
res.role = type;
return res;
},
(err) => {
console.error(err);
}
Expand Down Expand Up @@ -98,7 +102,14 @@ export const fetchAccounts = (
hub_user_id: hub_user_id,
},
}).then(
(response) => response.data.result.accounts,
(response) => {
let account_data = response.data.result.accounts;
account_data.map((account_item) => {
account_item.role = type;
return true;
});
return account_data;
},
(err) => {
console.error(err);
}
Expand Down
Loading