1 files changed, 54 insertions, 33 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 85e2795..ba9e322 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -198,8 +198,11 @@ var crud_action = exports.crud_action = function crud_action(type, method, fn) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.destroy = undefined;
 exports.crud_fetch = crud_fetch;
+exports.post = post;
 exports.postBody = postBody;
+exports.put = put;
 
 var _nodeFetch = __webpack_require__(/*! node-fetch */ "./node_modules/node-fetch/browser.js");
 
@@ -298,6 +301,7 @@ function _destroy(data) {
     }
   };
 }
+exports.destroy = _destroy;
 function error(err) {
   console.warn(err);
 }
@@ -1940,28 +1944,30 @@ exports.authLoading = authLoading;
 exports.InvalidCredentialsException = InvalidCredentialsException;
 exports.login = login;
 exports.signup = signup;
-exports.getCurrentUser = getCurrentUser;
+exports.checkin = checkin;
 
 var _types = __webpack_require__(/*! ../types */ "./app/client/types.js");
 
-var types = _interopRequireWildcard(_types);
+var _types2 = _interopRequireDefault(_types);
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+var _crud = __webpack_require__(/*! ../api/crud.fetch */ "./app/client/api/crud.fetch.js");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var setToken = exports.setToken = function setToken(data) {
-  return { type: types.auth.set_token, data: data };
+  return { type: _types2.default.auth.set_token, data: data };
 };
 var setError = exports.setError = function setError(data) {
-  return { type: types.auth.set_error, data: data };
+  return { type: _types2.default.auth.set_error, data: data };
 };
 var setCurrentUser = exports.setCurrentUser = function setCurrentUser(data) {
-  return { type: types.auth.set_current_user, data: data };
+  return { type: _types2.default.auth.set_current_user, data: data };
 };
 function logout() {
-  return { type: types.auth.logout_user };
+  return { type: _types2.default.auth.logout_user };
 }
 function authLoading() {
-  return { type: types.auth.loading };
+  return { type: _types2.default.auth.loading };
 }
 
 function InvalidCredentialsException(message) {
@@ -1969,15 +1975,24 @@ function InvalidCredentialsException(message) {
   this.name = 'InvalidCredentialsException';
 }
 
+var api = {
+  login: '/api/login',
+  logout: '/api/logout',
+  signup: '/api/signup',
+  checkin: '/api/checkin'
+};
+
 function login(username, password) {
   return function (dispatch) {
     dispatch(authLoading());
-    apiClient().post(api.GET_TOKEN, {
+    fetch(api.login, (0, _crud.put)({
       username: username,
       password: password
-    }).then(function (response) {
-      dispatch(setToken(response.data.token));
-      dispatch(getCurrentUser());
+    })).then(function (req) {
+      return req.json();
+    }).then(function (data) {
+      dispatch(setToken(data.token));
+      dispatch(checkin());
     }).catch(function (error) {
       dispatch(setError(true));
       if (error.response.status === 400) {
@@ -1991,8 +2006,10 @@ function login(username, password) {
 function signup(data) {
   return function (dispatch) {
     dispatch(authLoading());
-    apiClient().post(api.SIGNUP, data).then(function (response) {
-      console.log(response.data);
+    fetch(api.signup, (0, _crud.put)(data)).then(function (req) {
+      return req.json();
+    }).then(function (data) {
+      console.log(data);
       dispatch(login(data.username, data.password));
     }).catch(function (error) {
       console.log(error);
@@ -2005,11 +2022,14 @@ function signup(data) {
   };
 }
 
-function getCurrentUser() {
+function checkin() {
   return function (dispatch) {
     dispatch(authLoading());
-    apiClient().get(api.CURRENT_USER).then(function (response) {
-      dispatch(setCurrentUser(response.data));
+    fetch(api.checkin).then(function (req) {
+      return req.json();
+    }).then(function (data) {
+      console.log(data);
+      dispatch(setCurrentUser(data));
       console.log('set current user');
     }).catch(function (error) {
       if (error.response.status === 400) {
@@ -2369,14 +2389,14 @@ var Login = function (_Component) {
             name: 'username',
             type: 'text',
             value: this.state.username,
-            onChange: this.handleChange
+            onInput: this.handleChange
           }),
           (0, _preact.h)(_common.TextInput, {
             title: 'Password',
             name: 'password',
             type: 'password',
             value: this.state.password,
-            onChange: this.handleChange
+            onInput: this.handleChange
           }),
           (0, _preact.h)(
             _common.Button,
@@ -2526,11 +2546,13 @@ var _reactRouterDom = __webpack_require__(/*! react-router-dom */ "./node_module
 
 var _auth = __webpack_require__(/*! ./auth.actions */ "./app/client/auth/auth.actions.js");
 
-var _auth2 = _interopRequireDefault(_auth);
+var actions = _interopRequireWildcard(_auth);
 
 var _common = __webpack_require__(/*! ../common */ "./app/client/common/index.js");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -2561,12 +2583,8 @@ var Signup = function (_Component) {
 
   _createClass(Signup, [{
     key: 'handleChange',
-    value: function handleChange(e) {
-      var _setState;
-
-      var name = e.target.name;
-      var value = e.target.value;
-      this.setState((_setState = {}, _defineProperty(_setState, name, value), _defineProperty(_setState, 'error', null), _setState));
+    value: function handleChange(value, name) {
+      this.setState(_defineProperty({}, name, value));
     }
   }, {
     key: 'validate',
@@ -2583,7 +2601,10 @@ var Signup = function (_Component) {
       if (!this.validate) {
         return this.props.actions.setError('bad password');
       }
-      this.props.actions.signup(this.state);
+
+      var user = _objectWithoutProperties(this.state, []);
+
+      this.props.actions.signup(user);
     }
   }, {
     key: 'render',
@@ -2611,28 +2632,28 @@ var Signup = function (_Component) {
             name: 'username',
             type: 'text',
             value: this.state.username,
-            onChange: this.handleChange
+            onInput: this.handleChange
           }),
           (0, _preact.h)(_common.TextInput, {
             title: 'Password',
             name: 'password',
             type: 'password',
             value: this.state.password,
-            onChange: this.handleChange
+            onInput: this.handleChange
           }),
           (0, _preact.h)(_common.TextInput, {
             title: 'Password again :)',
             name: 'password2',
             type: 'password',
             value: this.state.password2,
-            onChange: this.handleChange
+            onInput: this.handleChange
           }),
           (0, _preact.h)(
             _common.Button,
             {
               loading: this.props.auth.loading
             },
-            'Login'
+            'Sign up'
           ),
           this.renderAuthError()
         )
@@ -2663,7 +2684,7 @@ var mapStateToProps = function mapStateToProps(state) {
 
 var mapDispatchToProps = function mapDispatchToProps(dispatch) {
   return {
-    actions: (0, _redux.bindActionCreators)(_extends({}, _auth2.default), dispatch)
+    actions: (0, _redux.bindActionCreators)(_extends({}, actions), dispatch)
   };
 };