Sabrina and I fixed store.dispatch error

Signed-off-by: anthonydevelops <[email protected]>

client/server.js

@@ -139,8 +139,9 @@ io.on('connection', socket => {
 
             // Decode tar
             buffer = Buffer.from(value, 'base64').toString();
-            
+
             // Emit the socket to send the buffer back to the client
+            console.log("Success")
             socket.emit('SEND_TEMPLATE_TO_CLIENT', buffer);
         })
     })
@@ -149,14 +150,14 @@ io.on('connection', socket => {
     socket.on('DOWNLOAD_TAR', project => {
 
         fetch(`http://${agent}/v1/templates`)
-            .then(response => { 
+            .then(response => {
                 return response.json().catch(err => console.error(err))
             })
             .then(json => {
 
                 // Create object from string response
                 const data = JSON.parse(JSON.stringify(json.TarFile))
-                
+
                 // Convert from base64
                 buffer = Buffer.from(data, 'base64')
 
@@ -167,7 +168,7 @@ io.on('connection', socket => {
 
                 console.log("Tar file generation complete")
             }).catch(err => console.error(err))
-            
+
     })
 })
 

client/src/components/Generator/Header/Header.js

@@ -1,12 +1,12 @@
- import React from 'react';
+import React from 'react';
 import 'chai/register-expect';
 import Swal from 'sweetalert2'
 import ContentEditable from 'react-contenteditable'
 import { Divider, Grid, Segment } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
 
 import store from '../../../redux/store/index';
-import { addCurrProject, saveProjectToKV, loadProjectFromKV, downloadTar } from "../../../redux/actions/index";
+import { addCurrProject, saveProjectToKV, loadProjectFromKV } from "../../../redux/actions/index";
 
 import '../../../styles_CSS/Generator/Header/Header.css';
 
@@ -55,9 +55,10 @@ class Header extends React.Component {
     store.dispatch(loadProjectFromKV(store.getState().currProject.projectName));
   }
 
-  downloadTar() {
+  async downloadTar() {
     //console.log('header.js redux access: ' + JSON.stringify(pluginModule.template))
-    store.dispatch( downloadTar(store.getState().currProject) )
+    // store.dispatch( downloadTar(store.getState().currProject) )
+    console.log(store.getState().template)
   }
 
   //Function will communicate if user edited the project name
@@ -91,10 +92,10 @@ class Header extends React.Component {
               />
             </div>
             <a href={`/template/template.tgz`} onClick={this.downloadTar} download>
-              <img 
-                  className={this.props.downloadable ? "download-image" : 'download-gray-image'}
-                  src={this.props.downloadable ? '/images/download.png' : '/images/download_gray.png'}
-                  alt='oops'>
+              <img
+                className={this.props.downloadable ? "download-image" : 'download-gray-image'}
+                src={this.props.downloadable ? '/images/download.png' : '/images/download_gray.png'}
+                alt='oops'>
               </img>
             </a>
           </Grid.Column>

client/src/redux/reducers/index.js

@@ -17,8 +17,6 @@ import { RETURN_TEMPLATE } from "../constants/action-types";
 
 import { socket } from '../../index';
 
-let pluginModule = require('../../components/Model');
-
 var initialState = {
   currPopupID: null,
   projects: [],
@@ -53,7 +51,10 @@ function rootReducer(state = initialState, action) {
   }
   //Retreives the template from the server
   else if (action.type === RETURN_TEMPLATE) {
-    pluginModule.template = JSON.parse(action.template);
+    console.log(action.template)
+    return Object.assign({}, {
+      template: state.projects.concat(action.template)
+    })
   }
   //Emits the server to call GENERATE_PROJECT
   else if (action.type === GENERATE_CURR_PROJECT) {

client/src/utils/socket.js

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import io from 'socket.io-client'
+import store from '../redux/store/index';
 
 const socket = io('http://localhost:8000');
 
@@ -26,12 +27,12 @@ const configureSocket = dispatch => {
 
     // Returns the project from server to client
     socket.on('SEND_PROJECT_TO_CLIENT', project => {
-        dispatch({ type: 'RETURN_LOAD_PROJECT', project })
+        store.dispatch({ type: 'RETURN_LOAD_PROJECT', project })
     });
 
     // Returns the template from server to client
     socket.on('SEND_TEMPLATE_TO_CLIENT', template => {
-        dispatch({ type: 'RETURN_TEMPLATE', template });
+        store.dispatch({ type: 'RETURN_TEMPLATE', template });
     });
 
     return socket