new document

Author: floresfxf

package.json

@@ -40,9 +40,12 @@
     "cookie-parser": "^1.4.3",
     "css-loader": "^0.28.4",
     "draft-js": "^0.10.1",
+    "electron": "^1.6.11",
+    "electron-store": "^1.2.0",
     "express": "^4.15.3",
     "express-session": "^1.15.4",
     "express-validator": "^3.2.1",
+    "fs": "0.0.1-security",
     "history": "^4.6.3",
     "immutable": "^3.8.1",
     "material-ui": "^0.18.7",

reactApp/Components/Directory.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link } from 'react-router-dom';
+import { Link, Redirect} from 'react-router-dom';
 import {List, ListItem} from 'material-ui/List';
 import ActionInfo from 'material-ui/svg-icons/action/info';
 import Divider from 'material-ui/Divider';
@@ -31,6 +31,7 @@ class Directory extends React.Component {
       isOpen: false,
       docName: '',
       docPass: '',
+      newDocId: '',
     }
   }
   logout(){
@@ -57,6 +58,7 @@ class Directory extends React.Component {
     .catch((err)=>console.log(err))
   }
   componentDidMount(){
+    console.log(this.props.store.get('userId'));
     this.ownedByAll()
   }
   filter(event, value){
@@ -151,7 +153,29 @@ class Directory extends React.Component {
     })
   }
   newDocument(){
-    
+    fetch('http://localhost:3000/documents/new/' + this.props.store.get('userId'), {
+        method: 'POST',
+        headers: {
+            "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+            title: this.state.docName,
+            //password: newPassword,
+            //   collaborators: newCollaborators
+
+        })
+    })
+    .then((response) => {
+        return response.json()
+    })
+    .then((resp) => {
+      console.log("DOC", resp.document);
+      console.log("DOCID", resp.document._id);
+      this.setState({
+        newDocId: resp.document._id
+      })
+    })
+    .catch((err)=>console.log(err))
   }
   render() {
       const testDoc = {
@@ -179,6 +203,13 @@ class Directory extends React.Component {
         primary={true}
       />,
     ];
+    console.log(this.state.newDocId);
+    if (this.state.newDocId){
+      return (
+
+        <Redirect to={"/editor/"+this.state.newDocId} />
+      )
+    }
     return (
       <div>
         <h1 style={{textAlign: 'center', fontSize: '40px', paddingTop: '20px'}} >Document Directory</h1>
@@ -198,7 +229,7 @@ class Directory extends React.Component {
                 open={this.state.modalOpen}
                 onRequestClose={this.modalClose.bind(this)}
                 >
-                  <form className="commentForm" onSubmit={this.handleSubmit}>
+                  <form className="commentForm" onSubmit={this.newDocument.bind(this)}>
                       <input
                         type="text"
                         placeholder="Your Document Name"

reactApp/Components/Login.js

@@ -32,6 +32,14 @@ export default class Login extends React.Component {
     };
 
   }
+
+  componentDidMount(){
+    if (this.props.store.get('userId')){
+      this.setState({
+        loggedin:true,
+      })
+    }
+  }
   handleSubmit(){
     console.log("in submit");
     fetch('http://localhost:3000/login', {
@@ -49,6 +57,7 @@ export default class Login extends React.Component {
     .then((response) => response.json())
     .then((resp) => {
       console.log(resp.user);
+      this.props.store.set('userId', resp.user._id);
       this.setState({email: '', password: '', loggedin: true, user: resp.user});
     })
   }

reactApp/Components/MyEditor.js

@@ -113,6 +113,8 @@ class MyEditor extends React.Component {
     }
 
     componentDidMount() {
+      console.log(this.props);
+      console.log(this.props.match);
       console.log(this.props.match.params.docId);
         fetch('http://localhost:3000/documents/'+this.props.match.params.docId)
         .then((response) => {
@@ -121,7 +123,7 @@ class MyEditor extends React.Component {
         })
         .then((resp) => {
             console.log("pulled doc", resp.document);
-            const contentState = convertFromRaw( JSON.parse(resp.document.content) );
+            const contentState = convertFromRaw( JSON.parse(resp.document.content) ) ;
             var currentDocument = Object.assign({}, resp.document, {content: contentState})
             this.setState({saved: false, currentDocument: currentDocument, collaborators: currentDocument.collaborators, title: currentDocument.title, editorState: EditorState.createWithContent(contentState) })
             console.log('document collaborators ', currentDocument.collaborators);

reactApp/Components/Root.js

@@ -6,6 +6,7 @@ import Directory from './Directory';
 import MyEditor from './MyEditor'
 import Register from './Register.js'
 
+
 class Root extends React.Component {
   constructor(props){
     super(props);
@@ -36,14 +37,15 @@ class Root extends React.Component {
   render() {
     console.log(this.state);
     return (
-      <Router history={this.props.history}  >
+      <Router history={this.props.history}  store={this.props.store}>
 
 
         <Switch>
-          <Route exact path="/" component={Login}/>
+          {/* <Route exact path="/" component={Login}/> */}
+          <Route exact path="/" render={(props) => <Login store={this.props.store}/>}/>
           <Route exact path="/register" component={Register}/>
-          <Route exact path="/directory/" component={Directory} />
-          <Route path="/editor/:docId" component={MyEditor} />
+          <Route exact path="/directory/" render={(props) => <Directory store={this.props.store}/>} />
+          <Route path="/editor/:docId" render={(props) => <MyEditor {...props} store={this.props.store}/>} />
           <Route path ="/" component={Login}/>
         </Switch>
       </Router>

reactApp/app.js

@@ -6,7 +6,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Router, Route } from 'react-router';
+import { Router, Route, } from 'react-router';
 import Root from './Components/Root.js'
 import createHashHistory from 'history/createHashHistory';
 import MyEditor from './Components/MyEditor.js'
@@ -15,6 +15,8 @@ import Login from './Components/Login.js'
 import {Editor, EditorState, convertFromRaw, convertToRaw} from 'draft-js';
 import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
 import injectTapEventPlugin from 'react-tap-event-plugin';
+const Store = window.require('electron-store');
+const store = new Store();
 // var injectTapEventPlugin = require("react-tap-event-plugin");
 import 'bulma/css/bulma.css'
 import 'draft-js/dist/Draft.css';
@@ -48,9 +50,9 @@ const App = () => (
 
 ReactDOM.render(
 
-  <MuiThemeProvider>
-      <Root history={history}/>
-  </MuiThemeProvider>,
+  <MuiThemeProvider >
+      <Root store={store} history={history}/>
+    </MuiThemeProvider>,
 
   // <App />,