Skip to content
This repository was archived by the owner on Jan 4, 2019. It is now read-only.

Commit

Permalink
refactor(merged changed from Master (initialized GitFlow)):
Browse files Browse the repository at this point in the history
  • Loading branch information
gallayl committed Jul 5, 2017
2 parents 18615a2 + 7265269 commit a6be2a2
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ documentation
npm-debug.log
debug.log
dist
.nyc_output
.nyc_output
package-lock.json
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ notifications:
on_failure: always # options: [always|never|change] default: always
on_start: never # options: [always|never|change] default: always
node_js:
- '8'
- '7'
- '6'
before_script:
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat)](https://github.com/semantic-release/semantic-release)
[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=flat)](http://commitizen.github.io/cz-cli/)
[![Greenkeeper badge](https://badges.greenkeeper.io/SenseNet/sn-redux.svg)](https://greenkeeper.io/)
<<<<<<< HEAD
=======

>>>>>>> master

sn-redux is a convention driven way of building sensenet ECM applications using Redux. It contains all the action types, actions and reducers for [built-in sensenet Actions
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@
},
"homepage": "https://sensenet.com",
"dependencies": {
"@reactivex/rxjs": "^5.4.0",
"@reactivex/rxjs": "^5.4.2",
"normalizr": "^3.2.3",
"nyc": "^11.0.1",
"redux": "^3.6.0",
"redux-logger": "^3.0.6",
"redux-observable": "^0.14.1",
"rimraf": "^2.6.1",
"rxjs": "^5.4.0",
"sn-client-js": "^2.0.0-RC.2"
"sn-client-js": "^2.0.0"
},
"devDependencies": {
"@types/chai": "^4.0.0",
Expand All @@ -89,7 +89,7 @@
"typedoc": "^0.7.1",
"typedoc-md-theme": "^1.0.1",
"typedoc-plugin-external-module-name": "^1.0.9",
"typescript": "^2.3.2"
"typescript": "^2.4.1"
},
"czConfig": {
"path": "node_modules/cz-conventional-changelog"
Expand Down
2 changes: 1 addition & 1 deletion src/Actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export module Actions {
* @param content {Content} Content that have to be created in the Content Respository.
* @returns {Object} Returns a redux action with the properties type, path of the parent and content.
*/
export const CreateContent = <T extends Content, K extends T['options']>(path: string, contentType: { new(arg: K, arg2: Repository.IRepository<any, any>): T}, contentOptions: K) => ({ type: 'CREATE_CONTENT_REQUEST', content: contentOptions, path, contentType });
export const CreateContent = <T extends Content, K extends T['options']>(path: string, contentType: { new(arg: K, arg2: Repository.BaseRepository): T}, contentOptions: K) => ({ type: 'CREATE_CONTENT_REQUEST', content: contentOptions, path, contentType });
/**
* Action creator for the step when Content creation on the server ends successfully.
* @param response {any} JSON response of the ajax request.
Expand Down
2 changes: 1 addition & 1 deletion src/Epics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export module Epics {
export function createContentEpic(action$, store, dependencies?: { repository: Repository }) {
return action$.ofType('CREATE_CONTENT_REQUEST')
.mergeMap(action => {
return dependencies.repository.Content.Create(action.path, action.content, action.contentType)
return dependencies.repository.Content.Post(action.path, action.content, action.contentType)
.map(Actions.CreateContentSuccess)
.catch(error => Observable.of(Actions.CreateContentFailure(error)))
})
Expand Down
4 changes: 2 additions & 2 deletions src/Store.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createStore, applyMiddleware } from 'redux';
import * as createLogger from 'redux-logger'
import { createLogger } from 'redux-logger'
import { createEpicMiddleware } from 'redux-observable';
import { Epics } from './Epics';
import { Reducers } from './Reducers';
Expand Down Expand Up @@ -77,7 +77,7 @@ export module Store {
else {
middlewareArray = [...middlewares, epicMiddleware];
}
const loggerMiddleware = (createLogger as any)();
const loggerMiddleware = createLogger();
middlewareArray.push(loggerMiddleware);
if (persistedState && typeof persistedState !== 'undefined') {
return createStore(
Expand Down
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"preserveConstEnums": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"skipLibCheck": true,
"outDir": "./dist"
},
"exclude": [
Expand Down

0 comments on commit a6be2a2

Please sign in to comment.