update

Author: mysiar

package.json

@@ -43,7 +43,7 @@
     "lint": "eslint src",
     "build": "babel src -d lib --ignore '*.test.js'",
     "watch": "babel --watch src -d lib --ignore '*.test.js'",
-    "test-gen": "rm -rf ./tmp && npm run build && ./lib/index.js https://demo.api-platform.com ./tmp",
+    "test-gen": "rm -rf ./tmp && npm run build && ./lib/index.js  https://demo.api-platform.com ./tmp/react && ./lib/index.js https://demo.api-platform.com ./tmp/react-native -g react-native",
     "test-gen-env": "rm -rf ./tmp && npm run build && API_PLATFORM_CLIENT_GENERATOR_ENTRYPOINT=https://demo.api-platform.com API_PLATFORM_CLIENT_GENERATOR_OUTPUT=./tmp ./lib/index.js"
   },
   "bin": {

src/generators/ReactNativeCrudGenerator.js

@@ -55,8 +55,15 @@ export default class ReactNativeCrudGenerator {
     console.log(chalk.green(`
 // import reducers
 import ${titleLc} from './reducers/${titleLc}/';
+<<<<<<< HEAD
 // Add the reducer
 combineReducers(${titleLc},{/* ... */}),
+=======
+
+// Add the reducer
+combineReducers(${titleLc},{/* ... */}),
+
+>>>>>>> 3d43b1f377ef84d790d6022c6f61df5301c28246
 `));
   }
 

src/index.js

@@ -12,8 +12,12 @@ program
   .usage('entrypoint outputDirectory')
   .option('-r, --resource [resourceName]', 'Generate CRUD for the given resource')
   .option('-p, --hydra-prefix [hydraPrefix]', 'The hydra prefix used by the API', 'hydra:')
+<<<<<<< HEAD
   .option('-g, --generator [generator]', 'The generator to use, one of "react", "react-native", "angular", etc.', 'react')
   .option('-t, --template-directory [templateDirectory]', 'The templates directory base to use. Final directory will be ${templateDirectory}/${generator}', `${__dirname}/../templates/`)
+=======
+  .option('-g, --generator [generator]', 'The generator to use, one of "react", "react-native" ', 'react')
+>>>>>>> 3d43b1f377ef84d790d6022c6f61df5301c28246
   .parse(process.argv);
 
 if (2 !== program.args.length && (!process.env.API_PLATFORM_CLIENT_GENERATOR_ENTRYPOINT || !process.env.API_PLATFORM_CLIENT_GENERATOR_OUTPUT)) {

templates/react/utils/helpers.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { API_PATH } from '../api/_entrypoint';
+import { API_PATH } from '../../react-common/actions/api/_entrypoint';
 
 export function itemToLinks(items) {
   return Array.isArray(items) ? items.map(item => createLink(item)) : createLink(items);