Deleted useless constructors

Author: JeminiBo

server/app/routes/user_routes.js

@@ -19,8 +19,12 @@ module.exports = function (app, db) {
       if (err) {
         res.send({ 'error': 'An error has occurred' });
       } else {
-        console.log(item);
+        if(item){
         res.send(item);
+        }
+        else{
+          res.status('401').send('Пользователь не найден');
+        }
       }
     });
   }

src/api/index.js

@@ -1,6 +1,6 @@
 import request from 'superagent';
 
-
+/*
 export const signUp = (userName,userLogin,pass) =>{
  
 request 
@@ -14,6 +14,22 @@ request
     console.log(new Error(err.message))
 })
     
+}*/
+export const signUp = (userName,userLogin,pass) => {
+    return new Promise((resolve, reject) => {
+        request
+            .post('http://localhost:8000/api')
+            .send({name:userName, login: userLogin, password: pass })
+            .set('Content-Type', 'application/json')
+           
+            .then(function (res) {
+                resolve(alert('Пользователь зарегистрирован'));
+            })
+            .catch(function (err) {
+                console.log(err);
+                reject(new Error(err.message))
+            })
+    })
 }
 export const signIn = (userLogin, pass) => {
     return new Promise((resolve, reject) => {
@@ -26,6 +42,7 @@ export const signIn = (userLogin, pass) => {
                 resolve(res.body);
             })
             .catch(function (err) {
+                console.log(err);
                 reject(new Error(err.message))
             })
     })

src/redux/registration/registrationActions.jsx

@@ -1,38 +1,52 @@
-import {signUp,signIn} from"../../api/index.js"
+import { signUp, signIn } from "../../api/index.js"
 
 
-export const registrationUser = function (userName,userLogin, pass) {
-     signUp(userName,userLogin,pass);
-       
-    
-    return {
+export const registrationUser = (userName, userLogin, pass) => dispatch => {
+    signUp(userName, userLogin, pass).then((res) => dispatch({
         type: "ADD_USER",
         payload: {
             userName,
             userLogin,
             pass
         }
     }
+    )
+    )
+        .catch((err) => {
+
+            alert(err.message)
+        })
+
+
+
 };
 
-export const login = (userLogin, pass)=>dispatch=> {
-    signIn(userLogin,pass).then((res)=>dispatch({
-               
-            type: "LOGIN",
-            payload: {
-                userLogin: res.login,
-                pass:res.password
-            
+export const login = (userLogin, pass) => dispatch => {
+    signIn(userLogin, pass).then((res) => dispatch({
+
+        type: "LOGIN",
+        payload: {
+            userLogin: res.login,
+            pass: res.password
+
         }
     }
-));
 
-    
-   
+    ))
+        .catch((err) => {
+
+            alert(err.message)
+        })
+
+
+
+
+
+
 }
 export const logout = function () {
     return {
         type: "LOGOUT"
-        
+
     }
 }

src/redux/store/index.js

@@ -2,4 +2,4 @@ import { createStore, applyMiddleware } from 'redux';
 import thunk from 'redux-thunk';
 import reducer from '../index';
 
-export default createStore(reducer,applyMiddleware(thunk));
+export default createStore(reducer,window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__(),applyMiddleware(thunk));

webpack.config.js

@@ -10,28 +10,46 @@ module.exports = {
     resolve: {
         extensions: ['.js', '.jsx']
     },
-    module:{
-        rules:[
+    module: {
+        
+        rules: [
             {
-                test: /\.js?$/,
-                exclude: /node_modules/,
-                loader: 'babel-loader',
-                query: {
-                    presets: ['es2015','env', 'react']
+                test: /\.jsx?$/,
+                exclude: /(node_modules|bower_components)/,
+                use: {
+                    loader: 'babel-loader',
+                    options: {
+                        presets: [ 'react'],
+                        
+                    }
+                    
                 }
+                
+                
+            },
+            {
+                test: /\.css?$/,
+                use: [{ loader: 'style-loader' },
+                {
+                    loader: 'css-loader',
+                    options: {
+                        modules: true
+                    }
+                }]
             },
             {
-                test: /\.css$/,
+                test: /\.(gif|png|jpe?g|svg)$/i,
                 use: [
-                    { loader: 'style-loader' },
+                    'file-loader',
                     {
-                        loader: 'css-loader',
+                        loader: 'image-webpack-loader',
                         options: {
-                            modules: true
+                            bypassOnDebug: true
                         }
                     }
                 ]
             }
         ]
     }
+    
 };