diff --git a/src/components/profile/Category.jsx b/src/components/profile/Category.jsx index e673c17..cce21a9 100644 --- a/src/components/profile/Category.jsx +++ b/src/components/profile/Category.jsx @@ -9,7 +9,7 @@ export class Category extends Component { render() { var { user } = this.props; - var changePassDate = Date.now() - (1000 * 60 * 60 * 24 * 30 * 3); + console.log(user); return (
@@ -63,7 +63,7 @@ export class Category extends Component {
Пароль:
- Изменён + Изменён
@@ -94,7 +94,7 @@ export class Category extends Component {
UUID:
-
{user.uuid || 'df936908-b2e1-544d-96f8-2977ec213022'}
+
{user.uuid}
diff --git a/src/components/user/User.js b/src/components/user/User.js index f8523d3..49f954e 100644 --- a/src/components/user/User.js +++ b/src/components/user/User.js @@ -17,6 +17,7 @@ export default class User { const defaults = { id: null, + uuid: null, token: '', username: '', email: '', @@ -24,7 +25,8 @@ export default class User { goal: null, // the goal with wich user entered site isGuest: true, isActive: true, - shouldChangePassword: false // TODO: нужно ещё пробросить причину необходимости смены + shouldChangePassword: false, // TODO: нужно ещё пробросить причину необходимости смены + passwordChangedAt: null }; const user = Object.keys(defaults).reduce((user, key) => { @@ -51,10 +53,12 @@ export default class User { export const userShape = PropTypes.shape({ id: PropTypes.number, + uuid: PropTypes.string, token: PropTypes.string, username: PropTypes.string, email: PropTypes.string, avatar: PropTypes.string, isGuest: PropTypes.bool.isRequired, - isActive: PropTypes.bool.isRequired + isActive: PropTypes.bool.isRequired, + passwordChangedAt: PropTypes.number });