Merge pull request #4 from brewsoftware/fix/Windows_build

Fix/windows build
eddyystop · Nov 23, 2016 · fe1ec17 · fe1ec17
2 parents 1f9cfad + fe46811
commit fe1ec17
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,12 @@ so you can focus on your app development.
 A local auth UI is provided for use,
 and as a working example of Feathers + Redux integration.
 
+## <a name="features"></a> Requirements
+
+ - Windows or Linux builds now working
+ - Minimum node Version 7.?.x
+ - npm versions (3.10.9, 3.9.5)
+
 [![Build Status](https://travis-ci.org/eddyystop/feathers-starter-react-redux-login-roles.svg?branch=master)](https://travis-ci.org/eddyystop/feathers-starter-react-redux-login-roles)
 
 ## <a name="features"></a> Features

diff --git a/client/screens/Users/UserRolesChange/Form.js b/client/screens/Users/UserRolesChange/Form.js
@@ -17,16 +17,16 @@ const renderUsers = ({ fields }) => {
         </tr>
       </thead>
       <tbody className={styleTable.tbody}>
-      {fields.map((userFieldName /* , index */) => (
-        <tr key={userFieldName}>
-          <td>
-            <Field name={`${userFieldName}.username`} component="input" disabled />
-          </td>
-          <td>
-            <Field name={`${userFieldName}.roles`} component="input" />
-          </td>
-        </tr>
-      ))}
+        {fields.map((userFieldName /* , index */) => (
+          <tr key={userFieldName}>
+            <td>
+              <Field name={`${userFieldName}.username`} component="input" disabled />
+            </td>
+            <td>
+              <Field name={`${userFieldName}.roles`} component="input" />
+            </td>
+          </tr>
+        ))}
       </tbody>
     </table>
   );

diff --git a/client/screens/Users/components/UsersNavBar.js b/client/screens/Users/components/UsersNavBar.js
@@ -126,7 +126,7 @@ const makeBarButtons = (screen) => {
             primaryText="Sign out"
           />
         </IconMenu>
-  );
+      );
 
     case 'user/signupvalidateemail':
     case 'user/forgotpwdreset': // eslint-disable-line no-case-declarations

diff --git a/package.json b/package.json
@@ -9,12 +9,12 @@
     "eslint:all": "eslint . --ext .js,.jsx",
     "prebuild": "rm -rf ./public/dist",
     "prebuild:dev": "rm -rf ./public/dist",
-    "build": "NODE_ENV=production webpack --config webpack.production.config.js --history-api-fallback --progress --colors",
-    "build:dev": "NODE_ENV=development webpack --config webpack.production.config.js --history-api-fallback --progress --colors",
-    "build:devserver": "NODE_ENV=devserver webpack-dev-server --config webpack.devserver.config.js --content-base public/dist/ | grep -v  \"\\[built\\]\"",
-    "start": "NODE_ENV=production node server/index.js",
-    "start:dev": "NODE_ENV=development node server/index.js",
-    "start:devserver": "NODE_ENV=devserver node server/index.js",
+    "build": "set NODE_ENV=production& webpack --config webpack.production.config.js --history-api-fallback --progress --colors",
+    "build:dev": "set NODE_ENV=development& webpack --config webpack.production.config.js --history-api-fallback --progress --colors",
+    "build:devserver": "set NODE_ENV=devserver& webpack-dev-server --config webpack.devserver.config.js --content-base public/dist/",
+    "start": "set NODE_ENV=production& node server/index.js",
+    "start:dev": "set NODE_ENV=development& node server/index.js",
+    "start:devserver": "set NODE_ENV=devserver& node server/index.js",
     "npm:patch": "npm version patch && npm publish",
     "npm:minor": "npm version minor && npm publish",
     "npm:major": "npm version major && npm publish",

diff --git a/server/helpers/emails.js b/server/helpers/emails.js
@@ -17,7 +17,7 @@ module.exports = function (action, user, params, cb) {
       console.log(`  This email is valid for the next ${email.expires.signUpEmailTokenTimeValidText}.`);
       return cb(null);
     case 'resend':
-      console.log(`-- Resending email to ${user.email} to verify new user\'s email addr`);
+      console.log(`-- Resending email to ${user.email} to verify new user's email addr`);
       console.log(`Dear ${user.username}, please click this link to verify your email addr.`);
       console.log(`  http://localhost:3030/user/verify/${user.verifyToken}`);
       console.log(`  This email is valid for the next ${email.expires.signUpEmailTokenTimeValidText}.`);