create article module

moeen-basra · moeen-basra · commit 7591d9b9cc67 · 2018-01-11T01:20:34.000+04:00
diff --git a/resources/assets/js/common/articles/listing/index.js b/resources/assets/js/common/articles/listing/index.js
@@ -1,6 +1,6 @@
 // libs
 import { connect } from 'react-redux'
-import Article from '../../../models/Article'
+import Article from '../../../modules/article/Article'
 
 // components
 import Articles from './components/Articles'
diff --git a/resources/assets/js/models/User.js b/resources/assets/js/models/User.js
diff --git a/resources/assets/js/modules/article/Article.js b/resources/assets/js/modules/article/Article.js
@@ -1,24 +1,24 @@
 import moment from 'moment'
-import Model from './Model'
-import User from './User'
+import Model from '../../models/Model'
+import User from '../../modules/user/User'
 
 class Article extends Model {
   constructor(props) {
     super(props)
-    
+
     this.initialize(props)
   }
-  
+
   initialize(props) {
     super.initialize(props)
-    
+
     this.slug = props.slug || ''
     this.title = props.title || ''
     this.description = props.description || ''
     this.content = props.content || ''
     this.published = props.published || false
     this.publishedAt = props.publishedAt ? moment(props.publishedAt) : null
-    
+
     // relate user model
     this.user = props.user ? new User(props.user) : null
   }
diff --git a/resources/assets/js/modules/article/pages/add/Page.js b/resources/assets/js/modules/article/pages/add/Page.js
@@ -2,7 +2,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import _ from 'lodash'
-import { articleAddRequest } from '../../../store/services/article'
+import { articleAddRequest } from '../../service'
 import { Validator } from 'ree-validate'
 
 // import components
diff --git a/resources/assets/js/modules/article/pages/add/components/Form.js b/resources/assets/js/modules/article/pages/add/components/Form.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import MyEditor from '../../../../common/wysiwyg-editor'
+import MyEditor from '../../../../../common/wysiwyg-editor'
 
 const displayName = 'ArticleFrom'
 const propTypes = {
diff --git a/resources/assets/js/modules/article/pages/add/index.js b/resources/assets/js/modules/article/pages/add/index.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux'
-import Article from '../../../models/Article'
+import Article from '../../Article'
 
 // import components
 import Page from './Page'
diff --git a/resources/assets/js/modules/article/pages/edit/Page.js b/resources/assets/js/modules/article/pages/edit/Page.js
@@ -2,7 +2,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import _ from 'lodash'
-import { articleEditRequest, articleUpdateRequest } from '../../../store/services/article'
+import { articleEditRequest, articleUpdateRequest } from '../../service'
 import { Validator } from 'ree-validate'
 
 // import components
diff --git a/resources/assets/js/modules/article/pages/edit/components/Form.js b/resources/assets/js/modules/article/pages/edit/components/Form.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import MyEditor from '../../../../common/wysiwyg-editor'
+import MyEditor from '../../../../../common/wysiwyg-editor'
 
 const displayName = 'ArticleFrom'
 const propTypes = {
diff --git a/resources/assets/js/modules/article/pages/edit/index.js b/resources/assets/js/modules/article/pages/edit/index.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux'
-import Article from '../../../models/Article'
+import Article from '../../Article'
 
 // import components
 import Page from './Page'
diff --git a/resources/assets/js/modules/article/pages/list/Page.js b/resources/assets/js/modules/article/pages/list/Page.js
@@ -2,7 +2,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import moment from 'moment'
-import { articleListRequest, articleUpdateRequest, articleRemoveRequest } from '../../../store/services/article'
+import { articleListRequest, articleUpdateRequest, articleRemoveRequest } from '../../service'
 
 // import components
 import ArticleRow from './components/ArticleRow'
diff --git a/resources/assets/js/modules/article/pages/list/components/ArticleRow.js b/resources/assets/js/modules/article/pages/list/components/ArticleRow.js
diff --git a/resources/assets/js/modules/article/pages/list/components/Pagination.js b/resources/assets/js/modules/article/pages/list/components/Pagination.js
diff --git a/resources/assets/js/modules/article/pages/list/index.js b/resources/assets/js/modules/article/pages/list/index.js
@@ -1,6 +1,6 @@
 // import libs
 import { connect } from 'react-redux'
-import Article from '../../../models/Article'
+import Article from '../../Article'
 
 // import components
 import Page from './Page'
diff --git a/resources/assets/js/modules/article/routes.js b/resources/assets/js/modules/article/routes.js
@@ -0,0 +1,24 @@
+import Articles from "./pages/list"
+import EditArticle from "./pages/edit"
+import AddArticle from "./pages/add"
+
+export default [
+  {
+    path: '/articles',
+    exact: true,
+    auth: true,
+    component: Articles,
+  },
+  {
+    path: '/articles/create',
+    exact: true,
+    auth: true,
+    component: AddArticle,
+  },
+  {
+    path: '/articles/:id/edit',
+    exact: true,
+    auth: true,
+    component: EditArticle,
+  },
+]
diff --git a/resources/assets/js/modules/article/service.js b/resources/assets/js/modules/article/service.js
@@ -1,6 +1,6 @@
 import Http from '../../utils/Http'
 import Transformer from '../../utils/Transformer'
-import { articleActions } from '../actions'
+import * as articleActions from './store/actions'
 
 function transformRequest(parms) {
   return Transformer.send(parms)
@@ -24,7 +24,7 @@ export function articleAddRequest(params) {
             error: null,
             statusCode,
           };
-          
+
           if (statusCode === 422) {
             const resetErrors = {
               errors: err.response.data,
@@ -56,7 +56,7 @@ export function articleUpdateRequest(params) {
             error: null,
             statusCode,
           };
-          
+
           if (statusCode === 422) {
             const resetErrors = {
               errors: err.response.data,
@@ -92,7 +92,7 @@ export function articleListRequest({pageNumber = 1, url = '/articles'}) {
     if (pageNumber > 1) {
       url = url + `?page=${pageNumber}`
     }
-    
+
     Http.get(url)
       .then((res) => {
         dispatch(articleActions.list(transformResponse(res.data)))
diff --git a/resources/assets/js/modules/article/store/action-types.js b/resources/assets/js/modules/article/store/action-types.js
@@ -1,6 +1,3 @@
-
-
-// article action types
 export const ARTICLE_LIST = 'ARTICLE_LIST'
 export const ARTICLE_ADD = 'ARTICLE_ADD'
 export const ARTICLE_UPDATE = 'ARTICLE_UPDATE'
@@ -11,4 +8,4 @@ export default {
   ARTICLE_ADD,
   ARTICLE_UPDATE,
   ARTICLE_REMOVE,
-}
+}
diff --git a/resources/assets/js/modules/article/store/actions.js b/resources/assets/js/modules/article/store/actions.js
@@ -11,7 +11,7 @@ import {
   ARTICLE_UPDATE,
   ARTICLE_REMOVE,
   ARTICLE_LIST,
-} from '../action-types';
+} from './action-types';
 
 export function add(payload) {
   return {
@@ -39,4 +39,4 @@ export function list(payload) {
     type: ARTICLE_LIST,
     payload
   }
-}
+}
diff --git a/resources/assets/js/modules/article/store/reducer.js b/resources/assets/js/modules/article/store/reducer.js
@@ -1,10 +1,9 @@
-import _ from 'lodash'
 import {
   ARTICLE_ADD,
   ARTICLE_UPDATE,
   ARTICLE_REMOVE,
   ARTICLE_LIST,
-} from '../action-types'
+} from './action-types'
 
 const initialState = {
   currentPage: 0,
@@ -36,13 +35,13 @@ const reducer = (state = initialState, { type, payload = null }) => {
 
 function add(state, payload) {
   const article = state.data.find((article) => (article.id === payload.id))
-  
+
   if (!article) {
     const data = [...state.data, payload]
-    
+
     return Object.assign({}, state, { data })
   }
-  
+
   return update(state, payload)
 }
 
@@ -53,19 +52,19 @@ function update(state, payload) {
     }
     return obj
   })
-  
+
   return Object.assign({}, state, { data })
 }
 
 function remove(state, id) {
   const data = state.data.filter(obj => obj.id !== id)
-  
+
   return Object.assign({}, state, { data })
 }
 
 function list(state, payload) {
   state = Object.assign({}, payload)
-  
+
   return state
 }
 
diff --git a/resources/assets/js/modules/web/pages/blog/details/Page.js b/resources/assets/js/modules/web/pages/blog/details/Page.js
@@ -2,7 +2,7 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import DocumentTitle from 'react-document-title';
-import {articleFetchRequest} from '../../../../../store/services/article'
+import {articleFetchRequest} from '../../../../article/service'
 import {APP_TITLE} from '../../../../../values/index'
 
 class Page extends Component {
diff --git a/resources/assets/js/modules/web/pages/blog/details/index.js b/resources/assets/js/modules/web/pages/blog/details/index.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux'
-import Article from '../../../../../models/Article'
+import Article from '../../../../article/Article'
 
 // import components
 import Page from './Page'
diff --git a/resources/assets/js/modules/web/pages/blog/list/Page.js b/resources/assets/js/modules/web/pages/blog/list/Page.js
@@ -5,7 +5,7 @@ import PropTypes from "prop-types"
 import Articles from "../../../../../common/articles/listing/index"
 
 // import services
-import { articleListRequest } from "../../../../../store/services/article"
+import { articleListRequest } from "../../../../article/service"
 
 class Page extends Component {
   static displayName = "HomePage"
diff --git a/resources/assets/js/modules/web/pages/home/Page.js b/resources/assets/js/modules/web/pages/home/Page.js
@@ -6,7 +6,7 @@ import Header from "./components/Header"
 import Articles from "../../../../common/articles/listing"
 
 // import services
-import { articleListRequest } from "../../../../store/services/article"
+import { articleListRequest } from "../../../article/service"
 
 class Page extends Component {
   static displayName = "HomePage"
diff --git a/resources/assets/js/routes/routes.js b/resources/assets/js/routes/routes.js
@@ -1,31 +1,7 @@
-import Articles from '../pages/articles/list'
-import AddArticle from '../pages/articles/add'
-import EditArticle from '../pages/articles/edit'
-
 // import modular routes
 import webRoutes from "../modules/web/routes"
 import authRoutes from "../modules/auth/routes"
 import userRoutes from "../modules/user/routes"
+import articleRoutes from "../modules/article/routes"
 
-const routes = [
-  {
-    path: '/articles',
-    exact: true,
-    auth: true,
-    component: Articles,
-  },
-  {
-    path: '/articles/create',
-    exact: true,
-    auth: true,
-    component: AddArticle,
-  },
-  {
-    path: '/articles/:id/edit',
-    exact: true,
-    auth: true,
-    component: EditArticle,
-  },
-]
-
-export default [...webRoutes, ...authRoutes, ...userRoutes, ...routes]
+export default [...webRoutes, ...authRoutes, ...userRoutes, ...articleRoutes]
diff --git a/resources/assets/js/store/actions/index.js b/resources/assets/js/store/actions/index.js
diff --git a/resources/assets/js/store/config.js b/resources/assets/js/store/config.js
@@ -3,7 +3,7 @@
  */
 import { createStore, applyMiddleware, compose } from 'redux'
 import thunk from 'redux-thunk'
-import { createLogger } from 'redux-logger'
+// import { createLogger } from 'redux-logger'
 import rootReducer from './reducers'
 
 export default function (initialState = {}) {
diff --git a/resources/assets/js/store/reducers.js b/resources/assets/js/store/reducers.js
@@ -0,0 +1,7 @@
+import { combineReducers } from 'redux'
+
+import auth from '../modules/auth/store/reduer'
+import user from '../modules/user/store/reducer'
+import articles from '../modules/article/store/reducer'
+
+export default combineReducers({ auth, user, articles })
diff --git a/resources/assets/js/store/reducers/index.js b/resources/assets/js/store/reducers/index.js
diff --git a/resources/assets/js/store/services/index.js b/resources/assets/js/store/services/index.js
