Skip to content

Commit 85406a8

Browse files
committed
created user module
1 parent 071238e commit 85406a8

File tree

14 files changed

+50
-27
lines changed

14 files changed

+50
-27
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import Model from '../../models/Model'
2+
3+
class User extends Model {
4+
constructor(props) {
5+
super(props)
6+
7+
this.initialize(props)
8+
}
9+
10+
initialize(props) {
11+
super.initialize(props)
12+
13+
this.name = props.name || ''
14+
this.email = props.email || ''
15+
this.phone = props.phone || ''
16+
this.about = props.about || ''
17+
}
18+
}
19+
20+
export default User

resources/assets/js/pages/users/edit/Page.js renamed to resources/assets/js/modules/user/pages/edit/Page.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import React, { Component } from 'react'
33
import PropTypes from 'prop-types'
44
import _ from 'lodash'
5-
import { userUpdateRequest } from '../../../store/services/user'
5+
import { userUpdateRequest } from '../../service'
66
import { Validator } from 'ree-validate'
77

88
// import components

resources/assets/js/pages/users/edit/index.js renamed to resources/assets/js/modules/user/pages/edit/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// import libs
1010
import { connect } from 'react-redux'
11-
import User from '../../../models/User'
11+
import User from '../../User'
1212

1313
// import components
1414
import Page from './Page'
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import Edit from "./pages/edit"
2+
3+
export default [
4+
{
5+
path: '/users/:id/edit',
6+
exact: true,
7+
auth: true,
8+
component: Edit,
9+
},
10+
]

resources/assets/js/store/services/user.js renamed to resources/assets/js/modules/user/service.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Http from '../../utils/Http'
22
import Transformer from '../../utils/Transformer'
3-
import { userActions } from '../actions'
3+
import * as userActions from './store/actions'
44

55
export function userUpdateRequest(params) {
66
return dispatch => (
@@ -16,7 +16,7 @@ export function userUpdateRequest(params) {
1616
error: null,
1717
statusCode,
1818
};
19-
19+
2020
if (statusCode === 422) {
2121
const resetErrors = {
2222
errors: err.response.data,
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// user action types
2+
export const USER_UPDATE = 'USER_UPDATE'
3+
export const USER_UNSET = 'USER_UNSET'
4+
5+
export default {
6+
USER_UPDATE,
7+
USER_UNSET,
8+
}

resources/assets/js/store/actions/user.js renamed to resources/assets/js/modules/user/store/actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {
1010
USER_UPDATE,
1111
USER_UNSET,
12-
} from '../action-types';
12+
} from './action-types';
1313

1414
export function userUpdate(payload) {
1515
return {

resources/assets/js/store/reducers/user.js renamed to resources/assets/js/modules/user/store/reducer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import User from '../../models/User'
2-
import { USER_UPDATE , USER_UNSET } from '../action-types'
3-
import { AUTH_LOGOUT, AUTH_USER } from '../../modules/auth/store/action-types'
1+
import User from '../User'
2+
import { USER_UPDATE , USER_UNSET } from './action-types'
3+
import { AUTH_LOGOUT, AUTH_USER } from '../../auth/store/action-types'
44

55
const initialState = Object.assign({}, new User({}))
66

resources/assets/js/routes/routes.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
1-
import EditUser from '../pages/users/edit'
21
import Articles from '../pages/articles/list'
32
import AddArticle from '../pages/articles/add'
43
import EditArticle from '../pages/articles/edit'
54

65
// import modular routes
76
import webRoutes from "../modules/web/routes"
87
import authRoutes from "../modules/auth/routes"
8+
import userRoutes from "../modules/user/routes"
99

1010
const routes = [
11-
{
12-
path: '/users/:id/edit',
13-
exact: true,
14-
auth: true,
15-
component: EditUser,
16-
},
1711
{
1812
path: '/articles',
1913
exact: true,
@@ -34,4 +28,4 @@ const routes = [
3428
},
3529
]
3630

37-
export default [...webRoutes, ...authRoutes, ...routes]
31+
export default [...webRoutes, ...authRoutes, ...userRoutes, ...routes]

0 commit comments

Comments
 (0)