summaryrefslogtreecommitdiff
path: root/public/bundle.js
diff options
context:
space:
mode:
Diffstat (limited to 'public/bundle.js')
-rw-r--r--public/bundle.js162
1 files changed, 108 insertions, 54 deletions
diff --git a/public/bundle.js b/public/bundle.js
index 096d653..9f503eb 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -12155,9 +12155,11 @@ var LoggedInView = function (_React$Component) {
_this.state = {
user: Object.assign({}, props.user),
+ meals: [],
mode: 'meals'
};
_this.updateUser = _this.updateUser.bind(_this);
+ _this.updateMeals = _this.updateMeals.bind(_this);
_this.toggleMode = _this.toggleMode.bind(_this);
return _this;
}
@@ -12165,13 +12167,21 @@ var LoggedInView = function (_React$Component) {
_createClass(LoggedInView, [{
key: 'toggleMode',
value: function toggleMode() {
- this.state.mode = this.state.mode == 'meals' ? 'users' : 'meals';
+ this.setState({ mode: this.state.mode == 'meals' ? 'users' : 'meals' });
}
}, {
key: 'updateUser',
value: function updateUser(user) {
this.setState({
- user: user
+ user: user,
+ mode: 'meals'
+ });
+ }
+ }, {
+ key: 'updateMeals',
+ value: function updateMeals(user) {
+ this.setState({
+ meals: meals
});
}
}, {
@@ -12179,9 +12189,15 @@ var LoggedInView = function (_React$Component) {
value: function render() {
var activity = null;
if (this.state.mode == 'meals') {
- activity = _react2.default.createElement(_MealList2.default, { user: this.state.user, currentUser: this.props.user });
+ activity = _react2.default.createElement(_MealList2.default, { user: this.state.user,
+ currentUser: this.props.user,
+ onUpdate: this.updateMeals
+ });
} else {
- activity = _react2.default.createElement(_UserList2.default, { user: this.state.user, currentUser: this.props.user, updateUser: this.updateUser });
+ activity = _react2.default.createElement(_UserList2.default, { user: this.state.user,
+ currentUser: this.props.user,
+ updateUser: this.updateUser
+ });
}
return _react2.default.createElement(
'div',
@@ -12269,21 +12285,19 @@ var LoggedOutView = function (_React$Component) {
}, {
key: 'render',
value: function render() {
- var loginVisible = this.state.modal == 'login';
- var signupVisible = this.state.modal == 'signup';
- return _react2.default.createElement(
- 'div',
- null,
- _react2.default.createElement(Welcome, {
+ if (this.state.modal == 'login') {
+ return _react2.default.createElement(LoginForm, {
+ visible: true,
+ onClose: this.closeModal });
+ } else if (this.state.modal == 'signup') {
+ return _react2.default.createElement(SignupForm, {
+ visible: true,
+ onClose: this.closeModal });
+ } else {
+ return _react2.default.createElement(Welcome, {
onLoginClick: this.showLogin,
- onSignupClick: this.showSignup }),
- _react2.default.createElement(LoginForm, {
- visible: loginVisible,
- onClose: this.closeModal }),
- _react2.default.createElement(SignupForm, {
- visible: signupVisible,
- onClose: this.closeModal })
- );
+ onSignupClick: this.showSignup });
+ }
}
}]);
@@ -12387,6 +12401,7 @@ var LoginForm = function (_React$Component3) {
{ onSubmit: this.handleSubmit },
_react2.default.createElement('input', { type: 'email',
name: 'email',
+ autoFocus: true,
placeholder: 'Email address',
onChange: this.updateState
}),
@@ -12476,6 +12491,7 @@ var SignupForm = function (_React$Component4) {
{ onSubmit: this.handleSubmit },
_react2.default.createElement('input', { type: 'email',
name: 'email',
+ autoFocus: true,
placeholder: 'Email address',
onChange: this.updateState
}),
@@ -12490,7 +12506,7 @@ var SignupForm = function (_React$Component4) {
name: 'goal',
min: '0',
max: '100000',
- placeholder: 'Calorie Goal',
+ placeholder: 'Goal',
onChange: this.updateState
}),
_react2.default.createElement('br', null),
@@ -12646,7 +12662,7 @@ var MealFilter = function (_React$Component) {
value: function render() {
var _this3 = this;
- var times = [[0, 11, 'Breakfast'], [12, 15, 'Lunch'], [15, 23, 'Dinner'], [0, 23, 'All']].map(function (r, i) {
+ var times = [[0, 11, 'Breakfast'], [12, 15, 'Lunch'], [16, 23, 'Dinner'], [0, 23, 'All']].map(function (r, i) {
var start = r[0];
var end = r[1];
var name = r[2];
@@ -12824,7 +12840,6 @@ var MealList = function (_React$Component) {
}, {
key: 'loadMeals',
value: function loadMeals(meals) {
- console.log(meals);
this.setState({ data: meals });
}
}, {
@@ -12842,7 +12857,6 @@ var MealList = function (_React$Component) {
onClick: _this2.pickMeal,
onDelete: _this2.handleDelete });
});
- console.log(_this2.props.user.goal, group.calories);
var isOverLimit = group.calories > _this2.props.user.goal ? 'isOverLimit' : 'isUnderLimit';
return _react2.default.createElement(
'div',
@@ -12856,13 +12870,12 @@ var MealList = function (_React$Component) {
'span',
{ className: 'calories ' + isOverLimit },
group.calories,
- ' cal.'
+ ' cal'
),
_react2.default.createElement('br', null),
mealitems
);
});
- console.log(items);
if (!items.length) {
items.push(_react2.default.createElement(
'div',
@@ -13182,36 +13195,46 @@ var UserList = function (_React$Component) {
var _this = _possibleConstructorReturn(this, (UserList.__proto__ || Object.getPrototypeOf(UserList)).call(this));
- console.log("WHAT");
+ console.log("USER");
_this.state = {
- users: []
+ data: []
};
- // client.service('users').find({
- // query: {
- // '$sort': { 'date': '-1' },
- // token: client.get('token'),
- // },
- // }).then((data) => {
- // this.setState(data)
- // }).catch((error) => {
- // console.error(error)
- // })
+ _client2.default.service('users').find({
+ query: {
+ '$sort': { 'email': '1' },
+ token: _client2.default.get('token')
+ }
+ }).then(function (data) {
+ _this.setState(data);
+ }).catch(function (error) {
+ console.error(error);
+ });
_this.pick.bind(_this);
+ console.log(props);
return _this;
}
_createClass(UserList, [{
key: 'pick',
- value: function pick() {}
+ value: function pick(user) {
+ // bubble this up..
+ console.log(user);
+ console.log(this);
+ this.props.updateUser(user);
+ }
}, {
key: 'render',
value: function render() {
var _this2 = this;
- var items = this.state.users.map(function (item, i) {
+ console.log(this.state.data);
+ var items = this.state.data.map(function (user, i) {
return _react2.default.createElement(UserItem, { key: user.id,
user: user,
- onClick: _this2.pick,
+ activeUser: _this2.props.user,
+ onClick: function onClick(user) {
+ return _this2.pick(user);
+ },
onDelete: _this2.handleDelete });
});
return _react2.default.createElement(
@@ -13261,27 +13284,33 @@ var UserItem = function (_React$Component2) {
var user = this.props.user;
// const canEdit = this.props.user.userid === this.props.currentUser.id ? 'canEdit' : ''
+ var userClass = this.props.user.id == this.props.activeUser.id ? 'active' : '';
var canEdit = 'canEdit';
- var date = parseDate(meal.date);
- var time = parseTime(meal.date);
+ var date = parseDate(user.updatedAt);
+ var time = parseTime(user.updatedAt);
return _react2.default.createElement(
'div',
{ className: 'user row ' + canEdit, onClick: function onClick() {
- return _this5.props.onClick(meal);
+ return _this5.props.onClick(_this5.props.user);
} },
_react2.default.createElement(
'div',
- { className: 'name' },
- meal.name
+ { className: 'email ' + userClass },
+ user.email
),
_react2.default.createElement(
'div',
{ className: 'calories' },
- meal.calories,
+ user.goal,
' cal'
),
_react2.default.createElement(
'div',
+ { className: 'role ' + user.role },
+ user.role
+ ),
+ _react2.default.createElement(
+ 'div',
{ className: 'date' },
date
),
@@ -13302,6 +13331,14 @@ var UserItem = function (_React$Component2) {
return UserItem;
}(_react2.default.Component);
+function parseDate(d) {
+ return new Date(d).toISOString().substr(0, 10);
+}
+
+function parseTime(d) {
+ return new Date(d).toISOString().substr(11, 5);
+}
+
/***/ }),
/* 101 */
/***/ (function(module, exports, __webpack_require__) {
@@ -47911,25 +47948,42 @@ var Menu = function (_React$Component) {
key: 'render',
value: function render() {
var user = this.props.user;
+ var currentUser = this.props.currentUser;
+ var observing = user.id !== currentUser.id;
var items = [];
+ if (observing) {
+ items.push(_react2.default.createElement(
+ 'li',
+ { key: 'observing' },
+ _react2.default.createElement(
+ 'i',
+ null,
+ 'Viewing'
+ ),
+ ' ',
+ user.email
+ ));
+ } else {
+ items.push(_react2.default.createElement(
+ 'li',
+ { key: 'hello' },
+ 'Hello ',
+ currentUser.email
+ ));
+ }
items.push(_react2.default.createElement(
'li',
- { key: 'hello' },
- 'Hello ',
- user.email
- ));
- items.push(_react2.default.createElement(
- 'li',
- { key: 'goal', onClick: this.setGoal },
+ { key: 'goal', onMouseDown: this.setGoal },
_react2.default.createElement(
'a',
{ href: '#' },
'Goal'
),
': ',
- user.goal
+ user.goal,
+ ' cal'
));
- switch (user.role) {
+ switch (currentUser.role) {
case 'admin':
if (this.props.user.id !== this.props.currentUser.id) {
items.push(_react2.default.createElement(
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-10 15:19:36 +0000