Merge branch 'try-ng-redux' into GEOV-135-timeline

Author: joschne

client/package-lock.json

@@ -13,6 +13,9 @@
   },
   "private": true,
   "dependencies": {
+    "@angular-redux/form": "^6.7.0",
+    "@angular-redux/router": "^7.0.0",
+    "@angular-redux/store": "^7.1.1",
     "@angular/animations": "^5.2.8",
     "@angular/cli": "^1.2.6",
     "@angular/common": "^5.2.8",
@@ -26,14 +29,21 @@
     "@angular/platform-server": "^5.2.8",
     "@angular/router": "^5.2.8",
     "@ng-bootstrap/ng-bootstrap": "^1.0.0",
+    "@redux-utilities/reduce-reducers": "^0.1.5",
     "angular-playground": "^4.0.0",
     "angular2-elastic-input": "^1.4.2",
     "bootstrap": "^4.0.0",
     "core-js": "^2.4.1",
     "d3": "^5.0.0",
     "element-resize-detector": "^1.1.14",
+    "flux-standard-action": "^2.0.1",
     "font-awesome": "^4.7.0",
     "ng2-slim-loading-bar": "^4.0.0",
+    "ngx-auto-unsubscribe": "^2.3.0",
+    "ramda": "^0.25.0",
+    "redux": "^3.7.2",
+    "redux-logger": "^3.0.6",
+    "redux-observable": "^0.18.0",
     "rxjs": "^5.1.0",
     "socket.io-client": "^2.0.3",
     "typescript": "~2.5.0",
@@ -45,6 +55,7 @@
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
+    "@types/redux-logger": "^3.0.5",
     "@types/socket.io-client": "^1.4.29",
     "codelyzer": "~3.0.1",
     "jasmine-core": "~2.6.2",

client/package.json

@@ -2,6 +2,8 @@ import { NgModule } from '@angular/core';
 import { Route, Routes, RouterModule } from '@angular/router';
 import { AuthGuard } from './core';
 import { HomeComponent } from './modules/home/pages/home.component';
+import { ProjectListComponent } from './modules/projects/components/project-list/project-list.component';
+import { ProjectsModule } from './modules/projects/projects.module';
 
 
 
@@ -29,16 +31,11 @@ const routes: Routes = [
       },
       {
         path: '',
-        loadChildren: './modules/login-and-registration/login-and-registration.module#LoginAndRegistrationModule',
-      },
-      {
-        path: 'account',
         loadChildren: './modules/account/account.module#AccountModule',
-        canActivate: [AuthGuard]
       },
       {
         path: 'projects',
-        loadChildren: './modules/projects/projects.module#ProjectsModule',
+        loadChildren: () => ProjectsModule,
         canActivate: [AuthGuard]
       },
       fallbackRoute

client/src/app/app-routing.module.ts

@@ -1,2 +1,3 @@
 <ng2-slim-loading-bar color="inherit"></ng2-slim-loading-bar>
+
 <router-outlet></router-outlet>

client/src/app/app.component.html

@@ -1,28 +1,30 @@
-import { Component, HostListener} from '@angular/core';
+import { Component, HostListener } from '@angular/core';
 import { EntityEditorService } from './core';
+import { NgRedux, select } from '@angular-redux/store';
 
 @Component({
   selector: 'gv-root',
   host: {
     '(window:keydown)': 'keydown($event)',
     '(window:keyup)': 'keyup($event)'
-   },
+  },
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.scss']
 })
 export class AppComponent {
 
-  constructor(private entityEditor: EntityEditorService){
+  constructor(
+    private entityEditor: EntityEditorService
+  ) {}
 
-  }
 
   keydown($event) {
-    if($event.key === 'Alt'){
+    if ($event.key === 'Alt') {
       // this.entityEditor.showDfhId = true;
     }
   };
   keyup($event) {
-    if($event.key === 'Alt'){
+    if ($event.key === 'Alt') {
       // this.entityEditor.showDfhId = false;
     }
   };

client/src/app/app.component.ts

@@ -3,16 +3,16 @@ import { NgModule, LOCALE_ID } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-
 import { registerLocaleData } from '@angular/common';
 import localeDeCh from '@angular/common/locales/de-CH';
-
 registerLocaleData(localeDeCh);
 
 // Third party imports
-import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
-import {ElasticInputModule} from 'angular2-elastic-input';
-import {SlimLoadingBarModule} from 'ng2-slim-loading-bar';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { ElasticInputModule } from 'angular2-elastic-input';
+import { SlimLoadingBarModule } from 'ng2-slim-loading-bar';
+import { NgReduxModule } from '@angular-redux/store';
+import { NgReduxRouterModule } from '@angular-redux/router';
 
 // Own imports
 import { AppRoutingModule } from './app-routing.module';
@@ -21,13 +21,18 @@ import { HomeModule } from './modules/home/home.module';
 import { AuthGuard, ActiveAccountService, ActiveProjectService, SDKBrowserModule, EntityEditorService } from './core';
 import { PassiveLinkModule } from './shared';
 import { ControlMessagesModule, LanguageSearchTypeaheadModule } from './shared';
-
+import { StoreModule } from './core/store/module';
+import { InformationModule } from './modules/information/information.module';
+import { ProjectsModule } from './modules/projects/projects.module';
 
 @NgModule({
   declarations: [
     AppComponent
   ],
   imports: [
+    NgReduxRouterModule,
+    NgReduxModule,
+    StoreModule,
     SDKBrowserModule.forRoot(),
     NgbModule.forRoot(),
     ElasticInputModule.forRoot(),
@@ -38,10 +43,11 @@ import { ControlMessagesModule, LanguageSearchTypeaheadModule } from './shared';
     FormsModule,
     ReactiveFormsModule,
     AppRoutingModule,
-    HomeModule,
+    ProjectsModule,
     PassiveLinkModule,
     ControlMessagesModule,
-    LanguageSearchTypeaheadModule
+    LanguageSearchTypeaheadModule,
+    // InformationModule
   ],
   providers: [
     EntityEditorService,
@@ -50,7 +56,7 @@ import { ControlMessagesModule, LanguageSearchTypeaheadModule } from './shared';
     AuthGuard,
     { provide: LOCALE_ID, useValue: 'de-CH' }
   ],
-  entryComponents : [
+  entryComponents: [
     AppComponent
   ],
   bootstrap: [AppComponent]

client/src/app/app.module.ts

@@ -6,6 +6,8 @@ import { LoopBackAuth } from '../sdk/services/core/auth.service';
 import { AccountApi } from '../sdk/services/custom/Account';
 import { environment } from '../../../environments/environment';
 import { LoopBackConfig } from '../sdk/lb.config';
+import { AccountActions } from '../../modules/account/api/actions';
+
 
 @Injectable()
 export class ActiveAccountService {
@@ -16,7 +18,7 @@ export class ActiveAccountService {
 
   constructor(
     private authService: LoopBackAuth,
-    private userApi: AccountApi,
+    private userApi: AccountApi
   ) {
     LoopBackConfig.setBaseURL(environment.baseUrl);
     LoopBackConfig.setApiVersion(environment.apiVersion);

client/src/app/core/active-account/active-account.service.ts

@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import { FluxStandardAction } from 'flux-standard-action';
+import { Project } from 'app/core';
+
+interface MetaData { };
+type Payload = Project;
+export type ActiveProjectAction = FluxStandardAction<Payload, MetaData>;
+
+
+@Injectable()
+export class ActiveProjectActions {
+
+    static ACTIVE_PROJECT_UPDATED = 'ACTIVE_PROJECT_UPDATED';
+
+    activeProjectUpdated(payload:Payload):ActiveProjectAction {
+        return {
+            type: ActiveProjectActions.ACTIVE_PROJECT_UPDATED,
+            payload,
+            meta:null,
+        }
+    } 
+
+}