socket

Waffelz · Aug 11, 2017 · b7b5803 · b7b5803
1 parent 87418af
commit b7b5803
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 13 deletions.
diff --git a/backend/routes/routes.js b/backend/routes/routes.js
@@ -13,7 +13,7 @@ var Document = models.Document;
 ///////////////////////////// END OF PUBLIC ROUTES /////////////////////////////
 
 router.use(function(req, res, next){
-  console.log('REQ', req)
+
   if (!req.user) {
     res.redirect('/login');
   } else {
@@ -31,16 +31,16 @@ router.use(function(req, res, next){
 // });
 
 router.post('/newdoc', function(req,res){
-  console.log("body", req.body);
+
   // console.log("req.user?", req.user);
-  Document.findById(id, function(err, dock){
+  Document.findById(req.user._id, function(err, dock){
     if (err){
       console.log("error in doc find");
     } else if (!dock){
         var doc = new Document({
           title: req.body.title,
           date: req.body.date,
-          author: req.user,
+          author: req.user._id,
           content: req.body.content
         })
         doc.save(function(err, doc) {
@@ -103,6 +103,7 @@ router.get('/protected', function(req, res, next) {
 });
 
 
+
 ///////////////////////////// END OF PRIVATE ROUTES /////////////////////////////
 
 module.exports = router;
diff --git a/backend/server.js b/backend/server.js
@@ -9,6 +9,9 @@ var bodyParser = require('body-parser');
 var passport = require('passport');
 var LocalStrategy = require('passport-local');
 var mongoose = require('mongoose');
+
+
+//connecting to db
 var connect = process.env.MONGODB_URI;
 var REQUIRED_ENV = "SECRET MONGODB_URI".split(" ");
 REQUIRED_ENV.forEach(function(el) {
@@ -24,6 +27,8 @@ var routes = require('./routes/routes');
 var auth = require('./routes/auth');
 //starting express
 const app = express()
+var server = require('http').Server(app);
+var io = require('socket.io')(server);
 app.use(bodyParser.json())
 // Example route
 app.get('/', function (req, res) {
@@ -67,7 +72,7 @@ app.use('/', auth(passport));
 app.use('/', routes);
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
-  var err = new Error('Not Found');//unfound goes here 
+  var err = new Error('Not Found');//unfound goes here
   err.status = 404;
   next(err);
 });
@@ -94,6 +99,28 @@ app.use(function(req, res, next) {
 //   });
 // });
 
-app.listen(3000, function () {
+io.on('connection', function (socket) {
+
+  socket.on('grabfile', function (data) {
+    console.log(data);
+    models.Document.findById({ _id: data.docid }, function (err, doc) {
+      // if there's an error, finish trying to authenticate (auth failed)
+      console.log('DOOOOOC', doc);
+      if (err) {
+        console.log('Error fetching doc', err);
+        socket.emit('errid', {err: err})
+        return done(err);
+      } else if(!doc){
+        console.log('not Found ')
+      } else {
+        console.log('HEEER', doc);
+        socket.emit('suc', {doc: doc.content})
+      }
+  });
+});
+})
+
+
+server.listen(3000, function () {
   console.log('Backend server for Electron App running on port 3000!')
 })
diff --git a/build/index.dev.html b/build/index.dev.html
@@ -10,7 +10,9 @@
     <div id="root"></div>
   </body>
 
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.3/socket.io.js"></script>
   <script src="http://localhost:8080/app.bundle.js"></script>
+
 </html>
 
 <!-- <!DOCTYPE html>

diff --git a/build/index.html b/build/index.html
@@ -10,5 +10,7 @@
     <div id="root"></div>
   </body>
 
+
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.3/socket.io.js"></script>
   <script src="./app.bundle.js"></script>
 </html>
diff --git a/reactApp/components/Docs.js b/reactApp/components/Docs.js
@@ -11,7 +11,7 @@ class Docs extends React.Component {
     this.state={
       modalOpen1: false,
       modalOpen2: false,
-
+      docid: '',
       title:'Untitled',
       docs: []
     }
@@ -56,6 +56,20 @@ class Docs extends React.Component {
     this.props.history.push('/editor')
 
   }
+  fetch(){
+    console.log(this.state.docid)
+    var socket = io.connect('http://localhost:3000');
+    socket.emit('grabfile', { docid: this.state.docid });
+    socket.on('errid', function(data){
+      alert('invalid: ', data)
+    })
+    socket.on('suc', (data)=>{
+      console.log('sucdoc returned', data)
+      console.log(this.props);
+      this.props.history.push('/editor')
+    })
+  }
+
   render(){
       var modalClass1 = classNames({
         'modal': true,
@@ -93,9 +107,9 @@ class Docs extends React.Component {
         <div className={modalClass2}>
           <div className="modal-background" onClick={(e)=>this.modal2Toggle(e)}></div>
           <div className="modal-content">
-            <div className="box">Doc Collab input
-            <input type='text'/>
-            <input type="submit" value="Create" onClick={(e)=>this.modal2Toggle(e)}/>
+            <div className="box">Enter doc id
+            <input type='text' onChange={(e)=>this.setState({docid: e.target.value})}/>
+            <input type="submit" value="Fetch" onClick={(e)=>{this.modal2Toggle(e), this.fetch()}}/>
           </div>
         </div>
           <button className="modal-close is-large" onClick={(e)=>this.modal2Toggle(e)}></button>
@@ -107,6 +121,9 @@ class Docs extends React.Component {
           {this.state.docs.map((doc)=><Link to={`/editor/${doc._id}`} key={doc._id} >{doc.title}</Link>)}
 
         </div>
+        <div>
+          <button onClick={()=>this.props.history.push('/')}>Logout</button>
+        </div>
       </div>
     )
   }
@@ -119,4 +136,3 @@ class Docs extends React.Component {
 // );
 
 export default Docs;
-
diff --git a/reactApp/components/Register.js b/reactApp/components/Register.js
@@ -38,8 +38,8 @@ submit(){
     email: this.state.email
   })
   .then((response)=> {
-    console.log("resp",response);
-    console.log("data",response.data);
+    // console.log("resp",response);
+    // console.log("data",response.data);
     if(response.data==='welcome'){
       self.props.history.push('/')
     }