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

Integration2 #42

Open
wants to merge 191 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
191 commits
Select commit Hold shift + click to select a range
3148281
search initial
asmaalotfyy Apr 14, 2022
df03040
Notification updates
asmaalotfyy Apr 18, 2022
b6407ad
Notification Done
asmaalotfyy Apr 19, 2022
340a490
initial 2
asmaalotfyy Apr 19, 2022
d7b4e95
search updates
asmaalotfyy Apr 19, 2022
617b409
search updates
asmaalotfyy Apr 19, 2022
161e3af
Search Done!
asmaalotfyy Apr 20, 2022
b5de544
Search Errors Fixed
asmaalotfyy Apr 21, 2022
8c1fd0c
Notification Errors Fixed
asmaalotfyy Apr 21, 2022
80b03ac
NotiContent fix
asmaalotfyy Apr 21, 2022
4cb91c1
Data Fixed
asmaalotfyy Apr 21, 2022
9af3e01
Image PopUp Scroll hidden
nohaelboghdady Apr 21, 2022
3740fe4
image scrolling off
nohaelboghdady Apr 22, 2022
4514b70
Update backend branch changes
MohdFarag Apr 26, 2022
4a51df4
return auth
MohdFarag Apr 26, 2022
fedb66c
test+doc
asmaalotfyy Apr 26, 2022
1541132
Fix errors
MohdFarag Apr 26, 2022
174589a
Done
MohdFarag Apr 26, 2022
812d775
Return auth
MohdFarag Apr 26, 2022
e83ab5a
Edit some responses
MohdFarag Apr 26, 2022
8f06356
Edit unban - unset bannedBy
MohdFarag Apr 26, 2022
1609d91
edits
asmaalotfyy Apr 26, 2022
b1f74a0
db update
AbdulrehmanSuliman Apr 26, 2022
6068f55
Merge branch 'frontend' of https://github.com/marriamokasha/Whisper i…
AbdulrehmanSuliman Apr 26, 2022
c181c30
search branch updates
AbdulrehmanSuliman Apr 26, 2022
6de4c1e
merge search
AbdulrehmanSuliman Apr 26, 2022
76c4606
resolving globel style error
amr-zayed Apr 27, 2022
b74e3fe
merging FE_Search on frontend
amr-zayed Apr 27, 2022
fe56fea
merging notification to frontend
amr-zayed Apr 27, 2022
613162e
Copying Intergration
nohaelboghdady Apr 27, 2022
8a8fb49
divided the post component
nohaelboghdady Apr 28, 2022
6c0aefc
activate back icon in tweet page
nohaelboghdady Apr 28, 2022
ad21fdb
tweetbox pretifying
amr-zayed Apr 29, 2022
0137cbc
Post body display imagebox component
amr-zayed Apr 29, 2022
8d903ca
added url array in timeline tweets
Mariam85 Apr 29, 2022
7581ac3
likes,retweets,replies count
Mariam85 Apr 29, 2022
76c1786
increment/decrement number of retweets
Mariam85 Apr 29, 2022
c011c7d
increment/decrement number of likes
Mariam85 Apr 29, 2022
fb86b2e
handling the number of retweets/replies in deleteing
Mariam85 Apr 29, 2022
49e9b21
getting likers of a tweet using it's id
Mariam85 Apr 29, 2022
cfc45ce
deleting tweet's replies and retweets
Mariam85 Apr 29, 2022
3ecfdcf
deleted replies,tweets,retweets,likes
Mariam85 Apr 29, 2022
76b661b
alterations in get requests
Mariam85 Apr 30, 2022
f63dfff
pagenation + sort descendingly
Mariam85 Apr 30, 2022
b8e4546
preventing a banned user from posting
Mariam85 Apr 30, 2022
9875cdd
search feed customizable
amr-zayed Apr 30, 2022
3e75665
manging post footer
nohaelboghdady May 1, 2022
9a29fc4
Admin List of users done
amr-zayed May 1, 2022
dff2482
mergin FE_Admin to frontend
amr-zayed May 1, 2022
2e44b97
Merge branch 'frontend' of https://github.com/marriamokasha/Whisper i…
amr-zayed May 1, 2022
5ec7928
imagebox error resolved
amr-zayed May 2, 2022
95b5d50
added checkbox to user
amr-zayed May 2, 2022
c534fe9
handling userfeed
nohaelboghdady May 2, 2022
6a849b8
uncompleted changes in user
nohaelboghdady May 2, 2022
af43eae
changes in tweet page
nohaelboghdady May 2, 2022
4bee0c8
usersfeed in tweet page
nohaelboghdady May 3, 2022
e9e71fd
rebase with frontend
nohaelboghdady May 3, 2022
b2cef00
uncompleted changes in user
nohaelboghdady May 2, 2022
c6c1254
changes in tweet page
nohaelboghdady May 2, 2022
7e2de5f
rebasing with frontend
nohaelboghdady May 3, 2022
c535d2b
Merge branch 'Post' of https://github.com/marriamokasha/Whisper into …
nohaelboghdady May 3, 2022
6078455
handling user selector in tweet page v1
nohaelboghdady May 3, 2022
a07e5b0
select users in tweet page v2
nohaelboghdady May 3, 2022
e6fed87
managed replies in tweet page v1
nohaelboghdady May 4, 2022
a61b849
Last changes
MohdFarag May 4, 2022
1b99ef6
Merge branch 'BE_admin' into Backend
MohdFarag May 4, 2022
de3c72a
Edit database url and organize app.js
MohdFarag May 4, 2022
4a52f82
Merge branch 'Backend' of https://github.com/marriamokasha/Whisper in…
MohdFarag May 4, 2022
c94c981
Merge branch 'Backend' into integration
MohdFarag May 4, 2022
275bd1e
small commit delete try
MohdFarag May 4, 2022
ec56113
integrating admin stats
amr-zayed May 4, 2022
74bab21
deleting unnecessary files
amr-zayed May 4, 2022
c71e40e
edit comment of noMostFollowed
MohdFarag May 4, 2022
e95fb95
handled post and replies display in tweet page
nohaelboghdady May 4, 2022
89d221e
added tweetbox in tweet page
nohaelboghdady May 4, 2022
99af423
integrating getlistofusers
amr-zayed May 4, 2022
1c64119
user admin
amr-zayed May 5, 2022
edd8d56
integrating list of users
amr-zayed May 5, 2022
f894314
edit user search
MohdFarag May 5, 2022
a77db26
searching by tweet content + optimizing
Mariam85 May 5, 2022
0dc7649
editing the search query
Mariam85 May 5, 2022
0025e7b
edit datepicker
AbdulrehmanSuliman May 5, 2022
a9f8d49
edit datepicker
AbdulrehmanSuliman May 5, 2022
650dc05
edit datepicker
AbdulrehmanSuliman May 5, 2022
ca44d0d
integrating blocking a use
amr-zayed May 6, 2022
17e0cfc
Merge branch 'integration' of https://github.com/marriamokasha/Whispe…
amr-zayed May 6, 2022
cbd5ee0
passing start and end years block user datepicker
amr-zayed May 6, 2022
c576d40
Update tweetsSchema.js
Mariam85 May 6, 2022
6263213
Update tweets.js
Mariam85 May 6, 2022
bc61575
Solving problems with integration
amr-zayed May 6, 2022
9934eab
Merge branch 'integration' of https://github.com/marriamokasha/Whispe…
amr-zayed May 6, 2022
41ee172
fixing feed
amr-zayed May 7, 2022
22e563e
adding notifications functions
NouranFoda May 7, 2022
7aaa2ae
Replies finished
amr-zayed May 7, 2022
77821d2
Replying to certain users
Mariam85 May 7, 2022
64581bf
Replying to certain users
Mariam85 May 7, 2022
90df32a
added replyingUsers
Mariam85 May 7, 2022
8f77e49
added notifications route
NouranFoda May 8, 2022
6b18c4b
notifications+optimizing
Mariam85 May 8, 2022
7840849
Merge branch 'Backend' into BE_tweets
Mariam85 May 8, 2022
516bcb0
Merge pull request #38 from AhmedHabib00/BE_tweets
Mariam85 May 8, 2022
a3bf8be
Profile pic and Cover Photo updated
Abuelfadl May 8, 2022
e3b2e96
Profile Pic & Cover Photo updated
Abuelfadl May 8, 2022
bc1a56f
UserProfile Done
Abuelfadl May 8, 2022
56cb35f
Add notfications
MohdFarag May 8, 2022
85811bf
Merge branch 'BE_admin' into Backend
MohdFarag May 8, 2022
0fe4ec1
Merge branch 'Backend' of https://github.com/marriamokasha/Whisper in…
MohdFarag May 8, 2022
530bc9e
Download multer puckege
MohdFarag May 8, 2022
c5c59ca
editied notification functions return type
NouranFoda May 9, 2022
d58de7c
merging notifications changes
NouranFoda May 9, 2022
3170564
sign up with facebook had security issue
AbdulrehmanSuliman May 9, 2022
3d0a4a1
restoring production env
NouranFoda May 9, 2022
649103f
handled notificationsRoute cornerCase
NouranFoda May 9, 2022
bffd564
Add change on shape of request of users get api
MohdFarag May 9, 2022
09ec0cd
Merge branch 'Backend' of https://github.com/marriamokasha/Whisper in…
MohdFarag May 9, 2022
7f9981d
login with facebook
AbdulrehmanSuliman May 9, 2022
f693ed7
return username in get userProfile route
NouranFoda May 10, 2022
fe6ca62
Merge branch 'Backend' of https://github.com/marriamokasha/Whisper in…
NouranFoda May 10, 2022
0f000c9
edited facebook login route
NouranFoda May 10, 2022
5132ef8
managed post and replies requests in tweet page
nohaelboghdady May 12, 2022
6b380cf
Added Profile Picture
nohaelboghdady May 12, 2022
56621fa
update post css
nohaelboghdady May 12, 2022
72471aa
Update tweets.js
Mariam85 May 13, 2022
1303342
merging backend modifications
NouranFoda May 13, 2022
76cd1da
Merge branch 'Backend' into BE_userProfile
Abuelfadl May 14, 2022
1c8fa23
Merge pull request #39 from AhmedHabib00/BE_userProfile
Abuelfadl May 14, 2022
1dcce47
Notifications request
asmaalotfyy May 14, 2022
a91213f
handle infinite scroll
nohaelboghdady May 14, 2022
965e15c
merged with Post
nohaelboghdady May 14, 2022
4c425c3
Merge branch 'frontend' of https://github.com/marriamokasha/Whisper i…
amr-zayed May 14, 2022
fc787d6
json names
asmaalotfyy May 14, 2022
b91f854
merging notifications
asmaalotfyy May 14, 2022
12ca4a7
merge notifications
AbdulrehmanSuliman May 14, 2022
7b6c59f
merge notifications conflict
AbdulrehmanSuliman May 14, 2022
a758484
try to solve notifications
AbdulrehmanSuliman May 14, 2022
520ddd6
fixed a bug in facebook login
NouranFoda May 14, 2022
fcb35cc
admin and tweetbox tests
amr-zayed May 14, 2022
2c5a19c
Merge branch 'frontend' of https://github.com/marriamokasha/Whisper i…
amr-zayed May 14, 2022
6df691e
Merge branch 'Backend' of https://github.com/marriamokasha/Whisper in…
NouranFoda May 14, 2022
f1e51e6
facebook auth integration
AbdulrehmanSuliman May 14, 2022
5ca8908
Minor changes
amr-zayed May 14, 2022
982b46e
Merge branch 'integration' of https://github.com/marriamokasha/Whispe…
amr-zayed May 14, 2022
2ebb16c
Edit post bookmarks
MohdFarag May 14, 2022
72c6a98
integrating bookmarks v1
amr-zayed May 14, 2022
66d6726
Merge branch 'integration' of https://github.com/marriamokasha/Whispe…
amr-zayed May 14, 2022
4a06c04
Integrating post services
amr-zayed May 14, 2022
0c8ec3a
Done bookmarks
MohdFarag May 15, 2022
cbaf90a
Merge branch 'BE_users' into Backend
MohdFarag May 15, 2022
694e9d0
Merge branch 'Backend' of https://github.com/marriamokasha/Whisper in…
MohdFarag May 15, 2022
996e8d0
loaders added
AbdulrehmanSuliman May 16, 2022
f88345b
resolving scrolling errors
amr-zayed May 16, 2022
6c7c234
Merge branch 'integration' of https://github.com/marriamokasha/Whispe…
amr-zayed May 16, 2022
961eedc
Requests and changing searchbar
asmaalotfyy May 16, 2022
d49ef30
Merge branch 'Backend' into integration
MohdFarag May 16, 2022
3c6d912
Merge branch 'integration' of https://github.com/marriamokasha/Whispe…
MohdFarag May 16, 2022
b1f2158
integrating tweet page services
amr-zayed May 16, 2022
0a88f6f
Merge branch 'integration' of https://github.com/marriamokasha/Whispe…
amr-zayed May 16, 2022
6addbb5
Update tweets.js
Mariam85 May 16, 2022
464b022
Update admin.js
MohdFarag May 16, 2022
5c72518
Update tweets.js
Mariam85 May 16, 2022
794d14d
Edit displayname
MohdFarag May 16, 2022
b6098e4
Merge branch 'integration' of https://github.com/marriamokasha/Whispe…
MohdFarag May 16, 2022
f65f685
Merge branch 'Backend' of https://github.com/marriamokasha/Whisper in…
NouranFoda May 16, 2022
a9b6821
solving conflicts
asmaalotfyy May 16, 2022
e79cd7a
modified get role and set password responses
NouranFoda May 16, 2022
73a7440
resolving conflicts
amr-zayed May 16, 2022
27b5fe5
Merging FE_Search on frontend
amr-zayed May 16, 2022
7602b6a
merge conflicts resolving
NouranFoda May 16, 2022
01c3838
merging search on frontend
amr-zayed May 16, 2022
8dc8c10
adding searchbar
amr-zayed May 16, 2022
4c4bb1c
Merge branch 'integration' of https://github.com/marriamokasha/Whispe…
amr-zayed May 16, 2022
7532587
bookmarks done
AbdulrehmanSuliman May 16, 2022
6a49343
Merge branch 'integration' of https://github.com/AhmedHabib00/Whisper…
AbdulrehmanSuliman May 16, 2022
07c6b40
adding banning functionalities
amr-zayed May 16, 2022
2e621a7
Merge branch 'integration' of https://github.com/AhmedHabib00/Whisper…
AbdulrehmanSuliman May 16, 2022
95514ba
reset password userId
AbdulrehmanSuliman May 16, 2022
fd2059b
adding control delay to searchbar
amr-zayed May 16, 2022
054b85e
Merge branch 'integration' of https://github.com/marriamokasha/Whispe…
amr-zayed May 16, 2022
b24869b
solving problems in search
amr-zayed May 17, 2022
25620af
Edit spaces
MohdFarag May 17, 2022
93fe900
Merge branch 'integration' of https://github.com/marriamokasha/Whispe…
MohdFarag May 17, 2022
ae12e6e
login text
AbdulrehmanSuliman May 17, 2022
3dfc3ca
Merge branch 'integration' of https://github.com/AhmedHabib00/Whisper…
AbdulrehmanSuliman May 17, 2022
28ebb30
Fix error "Please verify that the package.json has a valid "main" entry"
MohdFarag May 17, 2022
d06756d
Merge branch 'integration' of https://github.com/marriamokasha/Whispe…
MohdFarag May 17, 2022
0c3c770
server url
AbdulrehmanSuliman May 17, 2022
98ab83b
Merge branch 'integration' of https://github.com/AhmedHabib00/Whisper…
AbdulrehmanSuliman May 17, 2022
093b44f
fix integration bugs
AbdulrehmanSuliman May 17, 2022
5078489
try integration bugs- remove github depend
AbdulrehmanSuliman May 17, 2022
5d7023b
try integration bugs- remove yarn.lock
AbdulrehmanSuliman May 17, 2022
ba95545
Delete config.env
NouranFoda Jun 26, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
db update
  • Loading branch information
AbdulrehmanSuliman committed Apr 26, 2022
commit b1f74a0768a9d2017b8693012497ddc51a7f908e
The diff you're trying to view is too large. We only load the first 3000 changed files.
12 changes: 12 additions & 0 deletions Back-End/node_modules/.bin/acorn

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Back-End/node_modules/.bin/acorn.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions Back-End/node_modules/.bin/acorn.ps1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Back-End/node_modules/.bin/browserslist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Back-End/node_modules/.bin/browserslist.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions Back-End/node_modules/.bin/browserslist.ps1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Back-End/node_modules/.bin/color-support

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Back-End/node_modules/.bin/color-support.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions Back-End/node_modules/.bin/color-support.ps1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Back-End/node_modules/.bin/ejs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Back-End/node_modules/.bin/ejs.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions Back-End/node_modules/.bin/ejs.ps1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Back-End/node_modules/.bin/escodegen

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Back-End/node_modules/.bin/escodegen.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions Back-End/node_modules/.bin/escodegen.ps1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Back-End/node_modules/.bin/esgenerate

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Back-End/node_modules/.bin/esgenerate.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions Back-End/node_modules/.bin/esgenerate.ps1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Back-End/node_modules/.bin/esparse

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Back-End/node_modules/.bin/esparse.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading