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

Final Release #175

Closed
wants to merge 137 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
137 commits
Select commit Hold shift + click to select a range
eca78db
fix(ops): backend integration with cors and cookies (#33)
amir-kedis Nov 2, 2024
65371f6
🐛 (Login): fix bugs (#32)
Asmaa-204 Nov 2, 2024
e2d6b9d
:bug: (privacy-settings): fixing bugs (#34)
AbdelruhmanSamy Nov 2, 2024
2ad0f67
fix(profile-settings): fix integration with backend (#35)
amir-kedis Nov 2, 2024
483e97b
(fix) integration with backend signup (#36)
sarah-kamall Nov 4, 2024
b8e369d
fix confirm email and reset password (#37)
sarah-kamall Nov 4, 2024
c839bd8
:recycle: applying factory design pattern + integration with BE (#38)
AbdelruhmanSamy Nov 6, 2024
d1aecd4
:recycle: add getKey function (#40)
AbdelruhmanSamy Nov 6, 2024
716bd9f
Feature/update profile picture (mock) (#39)
AhmedHamdiy Nov 7, 2024
645730c
🎉(oauth): Integrated with backend (#42)
Asmaa-204 Nov 8, 2024
53adca8
(CI) Added a github action to trigger jenkins pipelines (#43)
shehab299 Nov 8, 2024
19c9739
:sparkles: (block): view block list + add/remove users from block l…
AbdelruhmanSamy Nov 8, 2024
a53d464
feat(devices): devices and session management + add animations (#46)
amir-kedis Nov 8, 2024
9a68aaf
socket and messages infrastructure setup (#45)
sarah-kamall Nov 8, 2024
8df04a0
Add nginx configuration (#47)
shehab299 Nov 8, 2024
d5958ee
:bug: (block): adding data-testid prop (#48)
AbdelruhmanSamy Nov 8, 2024
9080784
fixed socket persistent connection (#52)
sarah-kamall Nov 26, 2024
d3debc0
fix: bug fixes and adjustments (#53)
amir-kedis Nov 26, 2024
3828e67
feat: in-chat search (gui component) (#54)
amir-kedis Nov 27, 2024
ec92697
fix: fix env vars not being loaded in tests (#55)
amir-kedis Nov 27, 2024
f9c8cc0
Chats (#57)
Asmaa-204 Nov 28, 2024
e5cd2b4
:bug: (block): fixing blocklist (#58)
AbdelruhmanSamy Nov 29, 2024
55568cb
✨ (messaging): Two users sending messages (#59)
Asmaa-204 Nov 29, 2024
70b6a1d
🚑️ Fix merge error in login mock (#60)
Asmaa-204 Nov 29, 2024
2295de7
Feature/story upload (#56)
AhmedHamdiy Nov 29, 2024
003eb26
feature(messaging): add in chat search functionality (#61)
amir-kedis Nov 29, 2024
d96f643
hotfix: render with highlight (#63)
amir-kedis Nov 29, 2024
3775acb
hotfix: fix the not found endpoints in stories (#66)
AhmedHamdiy Nov 29, 2024
9f008a2
Emojies picker set up (#65)
sarah-kamall Nov 29, 2024
e268ef4
feature: pin messages (GUI) (#67)
amir-kedis Nov 29, 2024
00f5767
hotfix: missing package to to package.json (#68)
amir-kedis Nov 29, 2024
ab640b4
:bug: (config): fixing small bug (#64)
AbdelruhmanSamy Nov 29, 2024
d820594
💄 (messaging): Added edit ui (#69)
Asmaa-204 Nov 29, 2024
a555d95
:bug: (forward): fixing scrollable chats list (#70)
AbdelruhmanSamy Nov 29, 2024
8360b1a
feature: pin integration (optimistic rendering) (#71)
amir-kedis Nov 29, 2024
d5e9879
✨ (messaging): Setup redux store for active message (#72)
Asmaa-204 Nov 29, 2024
850cd8b
✨ (messaging): Finished edit message (#73)
Asmaa-204 Nov 29, 2024
f881d79
🚑️ (messaging): Reset input on discarding edit (#74)
Asmaa-204 Nov 29, 2024
a586dda
💄 (messaging): Added message details ui (pin, timestamp) (#75)
Asmaa-204 Nov 30, 2024
52d754e
👽️ (sockets): Update send-message event to match backend (#76)
Asmaa-204 Nov 30, 2024
2088d1e
📝 Added docs for mocking sockets (#77)
Asmaa-204 Nov 30, 2024
8b36b9c
hotfix: socket mock not sending to chat room correctly (#78)
amir-kedis Nov 30, 2024
46be64c
fix integration with deployed backend setup (#79)
amir-kedis Nov 30, 2024
04439e2
:bug: (privacySettings): fixing test-id doesn't appear bug (#80)
AbdelruhmanSamy Nov 30, 2024
8a214d5
:bug: (messaging) : adding missing testids (#81)
AbdelruhmanSamy Nov 30, 2024
526d2f4
:sparkles: (messaging): Reply totally done + code refactoring (#82)
AbdelruhmanSamy Nov 30, 2024
b956381
feat: addmedia to messages (#83)
sarah-kamall Nov 30, 2024
7552ebb
fix: integrate chats backend (#84)
amir-kedis Nov 30, 2024
58714b2
Integration media fixes (#85)
sarah-kamall Dec 1, 2024
841ac0c
chore: add test ids for messaging components (#86)
amir-kedis Dec 1, 2024
f83ff42
feat: add simple static code analysis (#87)
amir-kedis Dec 1, 2024
b3c5168
fix: backend changing chats model (#88)
amir-kedis Dec 1, 2024
55639cd
fix: make the story compatible with the BE (#89)
AhmedHamdiy Dec 1, 2024
e60f7d3
✨ (messaging): Integrate messages with backend (#90)
Asmaa-204 Dec 1, 2024
1b4d728
hotfix: Make addStory button sticky (#91)
AhmedHamdiy Dec 2, 2024
c544746
feat/voice-notes: adding voice notes (#92)
sarah-kamall Dec 2, 2024
0f510de
✅(messaging): Integrated (send, edit, reply, pin, unpin) with backen…
Asmaa-204 Dec 2, 2024
3910973
:recycle: (messaging): Whole messaging state management refactored!! …
AbdelruhmanSamy Dec 2, 2024
c150cb6
fix(search): fix broken searchbar (#96)
amir-kedis Dec 2, 2024
ef2fbf4
hot-fix: accessing media input alert (#97)
sarah-kamall Dec 2, 2024
a6f3712
:bug: (media-messaging): re-enabling emojie picker (#98)
AbdelruhmanSamy Dec 3, 2024
39d57ca
Feature/gifs stickers (#99)
AhmedHamdiy Dec 3, 2024
845bb08
:bug: +90 edits :fire: (#100)
AbdelruhmanSamy Dec 3, 2024
043d2fa
fix: page loading optimization + fixing some eslint errors (#101)
amir-kedis Dec 5, 2024
ad9c2aa
:bug: : Fixed forward, edit , reply bugs + tested using UI (#102)
AbdelruhmanSamy Dec 6, 2024
bdd53dd
💄 Responsive login (#104)
Asmaa-204 Dec 7, 2024
313eff1
upload video stories (#103)
AhmedHamdiy Dec 7, 2024
8498617
:bug: (messaging): Solved interface problems with BE (#106)
AbdelruhmanSamy Dec 8, 2024
8fa3e06
💄 (groups): Finish create group ui (#107)
Asmaa-204 Dec 9, 2024
e7750fe
✨ (groups): Merge creating new group with backend (#108)
Asmaa-204 Dec 9, 2024
7ca185e
💄 (groups): Added some styles for group-view (#109)
Asmaa-204 Dec 9, 2024
ee69c19
:sparkles: (messaging): integrating block with messaging (#110)
AbdelruhmanSamy Dec 11, 2024
2c5050f
:sparkles: (messaging): lastmessage updates on sending (#111)
AbdelruhmanSamy Dec 11, 2024
0a9e2be
feat: search UI (#112)
amir-kedis Dec 11, 2024
eafbfbd
♻️ (messaging): Refactor message component (#114)
Asmaa-204 Dec 11, 2024
d3441fd
bugfixs: scroll + flickering (solved using memoization) (#113)
amir-kedis Dec 11, 2024
6d4c9a7
:bug: (messaging): fixing scrolling behavior (#115)
AbdelruhmanSamy Dec 11, 2024
e340804
:recycle: (messaging): refactoring chatInput (#116)
AbdelruhmanSamy Dec 12, 2024
ee4d8df
:bug: : (hot fix): fixing chat sudden close + fixing UI bugs in chat …
AbdelruhmanSamy Dec 12, 2024
0d69370
Calls prototype (#118)
sarah-kamall Dec 12, 2024
105d199
✨ (channels): Create new channel (#119)
Asmaa-204 Dec 12, 2024
8dd619f
:bug: (messaging): fixing messaging bugs (#120)
AbdelruhmanSamy Dec 13, 2024
549923f
:bug: (messages): fix message being received duplicated (#121)
AbdelruhmanSamy Dec 13, 2024
775d616
🐛 (hotfix): Fix changing hooks order (#122)
Asmaa-204 Dec 13, 2024
46f550f
:zap: (hotfix): improving loading chatlist performance (#123)
AbdelruhmanSamy Dec 13, 2024
84eef6d
Merge branch 'main' into dev
AbdelruhmanSamy Dec 13, 2024
61e9867
feature(search): close with menu button + tabs + No result fount elem…
amir-kedis Dec 13, 2024
b8abb66
:sparkles: (sidebar): introducing right sidebar from same component (…
AbdelruhmanSamy Dec 15, 2024
45b25fc
✨ (groups): Show group info (#128)
Asmaa-204 Dec 17, 2024
d5a8fc3
docs: add static analysis results to README padges (#129)
amir-kedis Dec 17, 2024
05b19cb
:sparkles: (Messaging): Delete Message finished (#130)
AbdelruhmanSamy Dec 17, 2024
e6816ed
✨ (groups): Add group members, new admins (#131)
Asmaa-204 Dec 18, 2024
84e839b
feat(search): global search + integration with backend (#132)
amir-kedis Dec 18, 2024
20ec20a
🐛 Fix white screen on signup (#133)
Asmaa-204 Dec 18, 2024
b8b2a3a
feat(search): search in e2ee chats (#134)
amir-kedis Dec 18, 2024
ca057f8
:sparkles: (messaging): E2E encryption finished (#135)
AbdelruhmanSamy Dec 19, 2024
09c6498
🐛 (groups): Fix adding exisiting members to group (#136)
Asmaa-204 Dec 19, 2024
0ff8e21
chore: add test ids for search module (#137)
amir-kedis Dec 19, 2024
1968548
:bug: (messaging): delete back to life (#138)
AbdelruhmanSamy Dec 19, 2024
cc8c216
🐛 (groups): Fix receive empty messages (#139)
Asmaa-204 Dec 19, 2024
ccc0c02
✨ (groups): Show list of members and search for a certain one (#140)
Asmaa-204 Dec 20, 2024
f377fb9
✨ (groups): Remove users from group by admin, Leave group (#141)
Asmaa-204 Dec 20, 2024
7f30d40
:bug: (messaging): fixing almost all errors appearing in terminal (#142)
AbdelruhmanSamy Dec 20, 2024
816412d
💄 (groups): Added permissions ui (#143)
Asmaa-204 Dec 20, 2024
f9d8c35
:bug: (messaging): fix messages not rendered upon reload (#144)
AbdelruhmanSamy Dec 20, 2024
9f28219
feat(channels): message + comment box UI (#145)
amir-kedis Dec 20, 2024
cd76d5b
bug-fix: media upload (#146)
sarah-kamall Dec 20, 2024
59c0586
feat(channels): comments UI + send comment (#147)
amir-kedis Dec 20, 2024
706089b
💄 (channels): Finish channel-settings ui (#148)
Asmaa-204 Dec 20, 2024
5243c8a
🐛(groups): Fix backView of admin page (#150)
Asmaa-204 Dec 21, 2024
6f3bc39
Feature/admin dashboard (#149)
AhmedHamdiy Dec 21, 2024
439a5d9
:bug: (groups): fix add new group (#151)
AbdelruhmanSamy Dec 21, 2024
afa5626
Feature/admin dashboard (#152)
AhmedHamdiy Dec 21, 2024
0a11a15
🐛 (groups): Fix removed member still has the chat (#153)
Asmaa-204 Dec 21, 2024
6e70b12
add phase 1 (#154)
sarah-kamall Dec 21, 2024
56d313f
hotfix: fix vite build crashing (#155)
amir-kedis Dec 21, 2024
385bb34
✨ (groups): Admins can set post permission (#156)
Asmaa-204 Dec 21, 2024
af51cfb
fix: adjust sixing (#158)
sarah-kamall Dec 21, 2024
603c259
fix media messaging bugs (#157)
AhmedHamdiy Dec 21, 2024
d679009
Fix voice recorder (#159)
AhmedHamdiy Dec 21, 2024
34e2860
✨ (groups): Admin can delete group for all members (#160)
Asmaa-204 Dec 21, 2024
85e6105
fix: search not getting results in filters
amir-kedis Dec 21, 2024
455dd2e
fix: search and correct send types finally (based on file ext) (#161)
amir-kedis Dec 21, 2024
73e6a8b
feat(search): click on user gets you to his chat (doesn't create if n…
amir-kedis Dec 21, 2024
135188b
✨ (groups): Admins can set privacy for groups and channels (#163)
Asmaa-204 Dec 21, 2024
c9dc909
🐛 (channels): Fix non admins have chat input (#164)
Asmaa-204 Dec 21, 2024
72e0ea4
feat(admin): double check before ban/deactivate users (#165)
AhmedHamdiy Dec 21, 2024
10c7673
🐛 (channels): Fix users can reply on threads with no permission (#166)
Asmaa-204 Dec 21, 2024
b917960
filter chat (#167)
AhmedHamdiy Dec 21, 2024
cfea05a
Fix render the inappropriate messages (#168)
AhmedHamdiy Dec 21, 2024
490952a
Feat/mentions (#169)
AbdelruhmanSamy Dec 21, 2024
c0d83ff
🐛 Fixing merge issues
AbdelruhmanSamy Dec 21, 2024
dcae4e8
Feat/calls (#170)
sarah-kamall Dec 21, 2024
904d9b9
fix: call ended (#171)
sarah-kamall Dec 21, 2024
80f46ad
Fix calls (#172)
sarah-kamall Dec 22, 2024
0987e8b
🐛 (messaging): Reply and Forward Fixed (#173)
AbdelruhmanSamy Dec 22, 2024
9259b57
Fix calls (#174)
sarah-kamall Dec 22, 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
Prev Previous commit
Next Next commit
🐛 (block): adding data-testid prop (#48)
  • Loading branch information
AbdelruhmanSamy authored Nov 8, 2024
commit d5958ee07615733311d9ca700005fd2876cf3232
1 change: 1 addition & 0 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"react-international-phone": "^4.3.0",
"react-router-dom": "^6.27.0",
"redux-mock-store": "^1.5.5",
"socket.io-client": "^4.8.1",
"styled-components": "^6.1.13",
"yup": "^1.4.0"
},
Expand Down
2 changes: 1 addition & 1 deletion app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import ResetPasswordModal from "@features/authentication/reset-password/ResetPas
import ProtectedRoute from "@components/protected-route/ProtectedRoute";
import AppLayout from "@components/AppLayout";

import ChatBox from "@features/Chats/ChatBox";
import ChatBox from "@features/chats/ChatBox";
import SocketProvider from "sockets/SocketProvider";

const queryClient = new QueryClient({
Expand Down
7 changes: 5 additions & 2 deletions app/src/features/privacy-settings/AddToBlockMenuList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ const StyledList = styled.ul<StyledListProps>`
border-radius: var(--border-radius-default);
`;


interface StyledListProps {
$bottom?: number;
$right?: number;
Expand Down Expand Up @@ -81,7 +80,11 @@ function AddToBlockMenuList({ setIsMenuOpened }: any) {
username: item.name.toLowerCase() + 123,
};
return (
<StylingWrapper onClick={() => handleClick(item)} key={data.id}>
<StylingWrapper
onClick={() => handleClick(item)}
key={data.id}
data-testid={`block-user-${data.id}`}
>
<BlockItem {...data} />
</StylingWrapper>
);
Expand Down
7 changes: 6 additions & 1 deletion app/src/features/privacy-settings/BlockItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ function BlockItem({ id, name, username }: BlockedUserInterface) {
return (
<StyledSideBarRow
onClick={() => setIsBlockButtonEnabled(!isBlockButtonEnabled)}
data-testid={`open-block-option-${id}`}
>
<RowInfo>
<Avatar name={name[0]} />
Expand All @@ -95,7 +96,11 @@ function BlockItem({ id, name, username }: BlockedUserInterface) {
</RowInfo>

{isBlockButtonEnabled && (
<StyledList {...menuStyles} onClick={() => handleRemove(id)}>
<StyledList
{...menuStyles}
onClick={() => handleRemove(id)}
data-testid={`remove-from-blocklist-${id}`}
>
<HoverMask>
<RowInfo>
{getIcon("Unlock")}
Expand Down
2 changes: 1 addition & 1 deletion app/src/features/privacy-settings/BlockList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ function BlockList() {
$size={3.3}
$color="white"
$bgColor="var(--accent-color)"
data-testid="add-contacts-icon"
onClick={() => setIsMenuOpened(!isMenuOpened)}
data-testid="block-user-menu-icon"
/>

{isMenuOpened && <AddToBlockMenuList setIsMenuOpened={setIsMenuOpened} />}
Expand Down