Commit 728de15a authored by Χάρης Παπαδόπουλος's avatar Χάρης Παπαδόπουλος
Browse files

updated to latest versions. Fixing subscriptioning bug(WIP)

parent 8074c820
......@@ -3,7 +3,7 @@ import { Injectable } from "@angular/core";
import { AppSettings } from '../../app.settings';
import { HelperDataService } from '../../services/helper-data-service';
import {Http, Headers, RequestOptions} from '@angular/http';
import { NgRedux, select } from 'ng2-redux';
import { NgRedux, select } from '@angular-redux/store';
import { IAppState } from '../../store/store';
import { ILoginInfo } from '../../store/logininfo/logininfo.types';
import {Router, ActivatedRoute, Params} from '@angular/router';
......
......@@ -6,7 +6,7 @@ import {Observable} from "rxjs/Observable";
import {IStudentDataFields, IStudentDataField} from '../../store/studentdatafields';
import {Http, Headers, RequestOptions} from '@angular/http';
import {Removetags} from '../../pipes/removehtmltags';
import { NgRedux, select } from 'ng2-redux';
import { NgRedux, select } from '@angular-redux/store';
import { IAppState } from '../../store/store';
import { ILoginInfo } from '../../store/logininfo/logininfo.types';
import {Router, ActivatedRoute, Params} from '@angular/router';
......
......@@ -8,7 +8,9 @@ import {
from '@angular/router';
import './globalstyles.css';
//import '../../myschool/main.scss';
import { DevToolsExtension, NgRedux, select } from 'ng2-redux';
import { DevToolsExtension, NgRedux, select } from '@angular-redux/store';
// import createLogger from 'redux-logger';
import {
IAppState,
rootReducer,
......@@ -16,6 +18,14 @@ import {
// enhancers,
} from '../store';
import {
applyMiddleware,
Store,
combineReducers,
compose,
createStore
} from 'redux';
@Component({
selector: 'main',
template: `
......@@ -49,6 +59,7 @@ export default class Main {
}); */
const tools = _devTools.enhancer({
// deserializeState: reimmutify,
});
......
......@@ -2,7 +2,7 @@ import {Injectable} from '@angular/core';
import {BehaviorSubject} from "rxjs/Rx";
import 'rxjs/add/operator/map';
import { AppSettings } from '../app.settings';
import { NgRedux, select } from 'ng2-redux';
import { NgRedux, select } from '@angular-redux/store';
import { IAppState } from '../store/store';
import { ILoginInfo, ILoginInfoToken } from '../store/logininfo/logininfo.types';
import { LOGININFO_INITIAL_STATE } from '../store/logininfo/logininfo.initial-state';
......
......@@ -7,7 +7,7 @@ import { ISectorField } from "../store/sectorfields/sectorfields.types";
import { IRegionRecord, IRegionSchoolRecord, IRRegion, IRRegionSchool } from "../store/regionschools/regionschools.types";
import { ISector, ISectors, ISectorCourse } from "../store/sectorcourses/sectorcourses.types";
import { AppSettings } from "../app.settings";
import { NgRedux, select } from "ng2-redux";
import { NgRedux, select } from "@angular-redux/store";
import { IAppState } from "../store/store";
import { ILoginInfo, ILoginInfoToken } from "../store/logininfo/logininfo.types";
import { LOGININFO_INITIAL_STATE } from "../store/logininfo/logininfo.initial-state";
......
// import * as persistState from 'redux-localstorage';
import * as createLogger from 'redux-logger';
// import {createLogger} from 'redux-logger';
import createLogger = require("redux-logger");
// import {applyMiddleware} from 'redux';
import { IAppState, rootReducer, deimmutify } from './store';
import { ICourseField, ICourseFields } from './coursefields/coursefields.types';
import { ISectorField, ISectorFields } from './sectorfields/sectorfields.types';
......@@ -35,10 +37,20 @@ export {
ICriteria
};
const logger = createLogger({
level: 'info',
collapsed: true,
stateTransformer: deimmutify
})
export const middleware = [
createLogger({
logger
];
/* export const middleware = [
Logger({
level: 'info',
collapsed: true,
stateTransformer: deimmutify
})
];
]; */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment