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.

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

live chat and friend request together #32

Merged
merged 9 commits into from
Dec 7, 2019
Merged

live chat and friend request together #32

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3e913e6
fix typo mistake
Nov 19, 2019
69f33c8
adjust mongoose.connect
Nov 19, 2019
bd7a167
added to gitignore
Nov 19, 2019
4868548
added to git ignore
Nov 19, 2019
60be72e
Merge pull request #6 from Adham-Elias-Botours/test-adham
NoerGitKat Nov 25, 2019
4402f73
create endpoints for sending, accepting, cancelling friend request. M…
salih18 Dec 2, 2019
dafca0d
added scoket io etc to friend request
salih18 Dec 4, 2019
7972d0d
chat app and friend request combined
salih18 Dec 7, 2019
5823b04
add private route for FriendPosts
Dec 7, 2019
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
7 changes: 6 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
node_modules/
config/production.json
client/node_modules/
config/production.json
client/debug.log
config/default.json
package-lock.json

233 changes: 233 additions & 0 deletions client/package-lock.json
View file
Open in desktop

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

1 change: 1 addition & 0 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"redux": "^4.0.1",
"redux-devtools-extension": "^2.13.8",
"redux-thunk": "^2.3.0",
"socket.io-client": "^2.3.0",
"uuid": "^3.3.2"
},
"scripts": {
Expand Down
9 changes: 9 additions & 0 deletions client/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@
integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf"
crossorigin="anonymous"
/>
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap-grid.min.css"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why Bootstrap???

/>

<link
href="https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap"
rel="stylesheet"
/>
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<title>Welcome To DevConnector</title>
</head>
Expand Down
Loading