Merge pull request #32 from HackYourFuture/combine-live-chat-friend-req

live chat and friend request together
HackYourFuture · Dec 7, 2019 · 88aa3c6 · 88aa3c6
2 parents 6b1df56 + 5823b04
commit 88aa3c6
Show file tree

Hide file tree

Showing 37 changed files with 1,966 additions and 282 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,7 @@
 node_modules/
-config/production.json
+client/node_modules/
+config/production.json
+client/debug.log
+config/default.json
+package-lock.json
+
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -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": {

diff --git a/client/public/index.html b/client/public/index.html
@@ -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"
+    />
+
+    <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>