Merge pull request #66 from React-Proto/bug/filepath

Removing hard coding of src folder.

Author: refinedblessing

src/actions/components.js

@@ -136,7 +136,7 @@ export const handleTransform = (id, {
 
 // Application generation options
 // cosnt genOptions = [
-//   'Export into existing project.', 'Export with create-react-app.', 'Export with starter repo'
+//   'Export into existing project.', 'Export with starter repo.', 'Export with create-react-app.'
 // ];
 
 export const createApplication = ({
@@ -155,7 +155,7 @@ export const createApplication = ({
         dispatch({
           type: CREATE_APPLICATION_SUCCESS,
         });
-        dispatch(exportFiles({ path: `${path}/${appName}/src`, components }));
+        dispatch(exportFiles({ path: `${path}/${appName}`, components }));
       })
       .catch(err => dispatch({
         type: CREATE_APPLICATION_ERROR,

src/containers/MainContainer.jsx

@@ -44,7 +44,7 @@ class MainContainer extends Component {
     repoUrl: '',
     image: '',
     modal: null,
-    genOptions: ['Export into existing project.', 'Export with create-react-app.', 'Export with starter repo'],
+    genOptions: ['Export into existing project.', 'Export with starter repo.', 'Export with create-react-app.'],
     genOption: 0,
     draggable: false,
     toggleClass: true,
@@ -172,7 +172,7 @@ class MainContainer extends Component {
     this.setState({ genOption });
     // closeModal
     this.closeModal();
-    if (genOption === 2) {
+    if (genOption === 1) {
       this.displayUrlModal();
     } else {
       // Choose app dir

src/reducers/componentReducer.js

@@ -60,7 +60,14 @@ const initialApplicationState = {
 const componentReducer = (state = initialApplicationState, action) => {
   switch (action.type) {
     case LOAD_INIT_DATA:
-      return { ...state, ...action.payload.data, loading: false };
+      return {
+        ...state,
+        ...action.payload.data,
+        loading: false,
+        appDir: '',
+        successOpen: false,
+        errorOpen: false,
+      };
     case ADD_COMPONENT:
       return addComponent(state, action.payload);
     case UPDATE_COMPONENT:

src/utils/createApplication.util.js

@@ -4,19 +4,19 @@ const execFile = util.promisify(require('child_process').execFile);
 
 // Application generation options
 // cosnt genOptions = [
-//   'Export into existing project.', 'Export with create-react-app.', 'Export with starter repo'
+//   'Export into existing project.', 'Export with starter repo', 'Export with create-react-app.'
 // ];
 
 async function createApplicationUtil({
   path, appName, genOption, repoUrl,
 }) {
   if (genOption === 2) {
-    return repoUrl ? execFile('git', ['clone', repoUrl, appName], { cwd: path }) : null;
+    return [
+      await execFile('npm', ['i', '-g', 'create-react-app'], { cwd: path }),
+      await execFile('create-react-app', [appName], { cwd: path }),
+    ];
   }
-  return [
-    await execFile('npm', ['i', '-g', 'create-react-app']),
-    await execFile('create-react-app', [appName], { cwd: path }),
-  ];
+  return repoUrl ? execFile('git', ['clone', repoUrl, appName], { cwd: path }) : null;
 }
 
 export default createApplicationUtil;

src/utils/createFiles.util.js

@@ -5,11 +5,12 @@ import componentRender from './componentRender.util';
 const createFiles = (data, path) => {
   let dir = path;
   if (!dir.match(/components|\*$/)) {
+    if (fs.existsSync(`${dir}/src`)) {
+      dir = `${dir}/src`;
+    }
     dir = `${dir}/components`;
     if (!fs.existsSync(dir)) {
-      fs.mkdir(dir, (err) => {
-        if (err) console.error(err);
-      });
+      fs.mkdirSync(dir);
     }
   }
   const promises = [];