Skip to content

Commit

Permalink
Migrate to Angular redux2 store (#1667)
Browse files Browse the repository at this point in the history
* Main commit to use a package instead of the code

* Final commit - Fix compilation

* Fix tests

* Added missing peer dependency

* Remove unneeded comment
  • Loading branch information
HarelM authored Dec 17, 2021
1 parent 4006c78 commit 0c75355
Show file tree
Hide file tree
Showing 101 changed files with 220 additions and 1,946 deletions.
90 changes: 82 additions & 8 deletions IsraelHiking.Web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion IsraelHiking.Web/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"dependencies": {
"@angular-redux2/store": "^2.1.3",
"@angular/animations": "12.2.8",
"@angular/cdk": "12.2.8",
"@angular/common": "12.2.8",
Expand Down Expand Up @@ -42,6 +43,7 @@
"@turf/simplify": "6.5.0",
"angulartics2": "^10.0.0",
"base64-arraybuffer": "^1.0.1",
"broadcast-channel": "^4.8.0",
"cordova-android": "^10.1.1",
"core-js": "^3.18.1",
"d3-regression": "^1.3.9",
Expand All @@ -67,7 +69,7 @@
"photoswipe": "^4.1.3",
"piexifjs": "1.0.6",
"platform": "^1.3.6",
"redux": "^4.1.1",
"redux": "^4.1.2",
"redux-undo": "^1.0.1",
"rxjs": "6.6.3",
"stream": "0.0.2",
Expand Down
2 changes: 1 addition & 1 deletion IsraelHiking.Web/src/application/application.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ import { FileTransfer } from "@ionic-native/file-transfer/ngx";
import { SocialSharing } from "@ionic-native/social-sharing/ngx";
import { WebIntent } from "@ionic-native/web-intent/ngx";
import { DeviceOrientation } from "@ionic-native/device-orientation/ngx";
import { NgReduxModule } from "@angular-redux2/store";
// services
import { NgReduxModule } from "./reducers/infra/ng-redux.module";
import { ScrollToModule } from "./infra/scroll-to/scroll-to.module";
import { GetTextCatalogService } from "./services/gettext-catalog.service";
import { AuthorizationService } from "./services/authorization.service";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { Component, OnInit, OnDestroy } from "@angular/core";

import { Router, ActivatedRoute } from "@angular/router";
import { Subscription } from "rxjs";
import { NgRedux } from "@angular-redux2/store";

import { RouteStrings } from "../services/hash.service";
import { SidebarService } from "../services/sidebar.service";
import { DataContainerService } from "../services/data-container.service";
import { FitBoundsService } from "../services/fit-bounds.service";
import { SetFileUrlAndBaseLayerAction, SetShareUrlAction } from "../reducers/in-memory.reducer";
import { NgRedux } from "../reducers/infra/ng-redux.module";
import type { ApplicationState } from "../models/models";

@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Component } from "@angular/core";
import { Observable } from "rxjs";
import { NgRedux, select } from "@angular-redux2/store";

import { BaseMapComponent } from "./base-map.component";
import { ResourcesService } from "../services/resources.service";
import { NgRedux, select } from "../reducers/infra/ng-redux.module";
import type { ApplicationState, Language } from "../models/models";

@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component } from "@angular/core";
import { NgRedux } from "@angular-redux2/store";

import { BaseMapComponent } from "./base-map.component";
import { ResourcesService } from "../services/resources.service";
import { NgRedux } from "../reducers/infra/ng-redux.module";
import { SetPannedAction } from "../reducers/in-memory.reducer";
import type { ApplicationState } from "../models/models";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Component } from "@angular/core";
import { MatDialogRef } from "@angular/material/dialog";
import { Observable } from "rxjs";
import { select, NgRedux } from "@angular-redux2/store";

import { BaseMapComponent } from "../base-map.component";
import { ResourcesService } from "../../services/resources.service";
import { RunningContextService } from "../../services/running-context.service";
import { ToastService } from "../../services/toast.service";
import { LoggingService } from "../../services/logging.service";
import { select, NgRedux } from "../../reducers/infra/ng-redux.module";
import { ConfigurationActions, SetBatteryOptimizationTypeAction } from "../../reducers/configuration.reducer";
import type { ApplicationState, BatteryOptimizationType } from "../../models/models";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Component } from "@angular/core";
import { MatDialog, MatDialogRef } from "@angular/material/dialog";
import { every } from "lodash-es";
import { NgRedux } from "@angular-redux2/store";

import { BaseMapComponent } from "../base-map.component";
import { ShareDialogComponent } from "./share-dialog.component";
Expand All @@ -10,7 +11,6 @@ import { FileService, FormatViewModel } from "../../services/file.service";
import { ResourcesService } from "../../services/resources.service";
import { ToastService } from "../../services/toast.service";
import { LoggingService } from "../../services/logging.service";
import { NgRedux } from "../../reducers/infra/ng-redux.module";
import { SetOfflineLastModifiedAction } from "../../reducers/offline.reducer";
import type { ApplicationState, DataContainer } from "../../models/models";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Component } from "@angular/core";
import { MatDialog, MatDialogConfig, MatDialogRef } from "@angular/material/dialog";
import { AnimationOptions } from "ngx-lottie";
import { NgRedux } from "@angular-redux2/store";

import { BaseMapComponent } from "../base-map.component";
import { NgRedux } from "../../reducers/infra/ng-redux.module";
import { ResourcesService } from "../../services/resources.service";
import { ConfigurationActions } from "../../reducers/configuration.reducer";
import { RunningContextService } from "../../services/running-context.service";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Component } from "@angular/core";
import { MatDialog } from "@angular/material/dialog";
import { NgRedux } from "@angular-redux2/store";

import { BaseMapComponent } from "../base-map.component";
import { ResourcesService } from "../../services/resources.service";
import { NgRedux } from "../../reducers/infra/ng-redux.module";
import { ApplicationState, LanguageCode } from "../../models/models";

@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { HttpClient } from "@angular/common/http";
import { Observable } from "rxjs";
import { select } from "@angular-redux2/store";

import { BaseMapComponent } from "../../base-map.component";
import { ResourcesService } from "../../../services/resources.service";
import { MapService } from "../../../services/map.service";
import { ToastService } from "../../../services/toast.service";
import { LayersService } from "../../../services/layers/layers.service";
import { select } from "../../../reducers/infra/ng-redux.module";
import type { LayerData, ApplicationState, EditableLayer, Location } from "../../../models/models";

export abstract class LayerBaseDialogComponent extends BaseMapComponent {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Component, ViewChild, ElementRef, AfterViewInit, HostListener, Inject } from "@angular/core";
import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from "@angular/material/dialog";
import { SocialSharing } from "@ionic-native/social-sharing/ngx";
import { NgRedux } from "@angular-redux2/store";

import { BaseMapComponent } from "../base-map.component";
import { AddSimplePoiDialogComponent } from "./add-simple-poi-dialog.component";
Expand All @@ -10,7 +11,6 @@ import { ImageResizeService } from "../../services/image-resize.service";
import { NavigateHereService } from "../../services/navigate-here.service";
import { RunningContextService } from "../../services/running-context.service";
import { HashService } from "../../services/hash.service";
import { NgRedux } from "../../reducers/infra/ng-redux.module";
import { UpdatePrivatePoiAction, DeletePrivatePoiAction } from "../../reducers/routes.reducer";
import type { LinkData, MarkerData, ApplicationState } from "../../models/models";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Component, Inject } from "@angular/core";
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
import { NgRedux } from "@angular-redux2/store";

import { BaseMapComponent } from "../base-map.component";
import { AddSimplePoiDialogComponent } from "./add-simple-poi-dialog.component";
import { PrivatePoiEditDialogComponent } from "./private-poi-edit-dialog.component";
import { ResourcesService } from "../../services/resources.service";
import { ImageGalleryService } from "../../services/image-gallery.service";
import { SelectedRouteService } from "../../services/layers/routelayers/selected-route.service";
import { NgRedux } from "../../reducers/infra/ng-redux.module";
import { AddPrivatePoiAction } from "../../reducers/routes.reducer";
import type { ApplicationState, MarkerData, LinkData } from "../../models/models";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, ViewEncapsulation } from "@angular/core";
import { NgRedux } from "../../../reducers/infra/ng-redux.module";
import { NgRedux } from "@angular-redux2/store";

import { ResourcesService } from "../../../services/resources.service";
import { ToastService } from "../../../services/toast.service";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import invert from "invert-color";
import { NgRedux } from "@angular-redux2/store";

import { BaseMapComponent } from "../../base-map.component";
import { ResourcesService } from "../../../services/resources.service";
import { ToastService } from "../../../services/toast.service";
import { RoutesFactory } from "../../../services/layers/routelayers/routes.factory";
import { SelectedRouteService } from "../../../services/layers/routelayers/selected-route.service";
import { NgRedux } from "../../../reducers/infra/ng-redux.module";
import { SetOpacityAndWeightAction } from "../../../reducers/route-editing-state.reducer";
import type { ApplicationState, RouteData } from "../../../models/models";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Component, ViewEncapsulation, Inject } from "@angular/core";
import { MAT_DIALOG_DATA } from "@angular/material/dialog";
import { NgRedux } from "@angular-redux2/store";

import { RouteBaseDialogComponent } from "./route-base-dialog.component";
import { ResourcesService } from "../../../services/resources.service";
Expand All @@ -9,7 +10,6 @@ import { ToastService } from "../../../services/toast.service";
import { RoutesFactory } from "../../../services/layers/routelayers/routes.factory";
import { SelectedRouteService } from "../../../services/layers/routelayers/selected-route.service";
import { SpatialService } from "../../../services/spatial.service";
import { NgRedux } from "../../../reducers/infra/ng-redux.module";
import { DeleteRouteAction, ChangeRoutePropertiesAction } from "../../../reducers/routes.reducer";
import type { DataContainer, RouteData, ApplicationState, LatLngAlt } from "../../../models/models";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { FormControl } from "@angular/forms";
import { SocialSharing } from "@ionic-native/social-sharing/ngx";
import { take, orderBy } from "lodash-es";
import { Observable, Subscription } from "rxjs";
import { select, NgRedux } from "@angular-redux2/store";

import { BaseMapComponent } from "../base-map.component";
import { ShareDialogComponent } from "./share-dialog.component";
Expand All @@ -13,7 +14,6 @@ import { ShareUrlsService } from "../../services/share-urls.service";
import { DataContainerService } from "../../services/data-container.service";
import { RunningContextService } from "../../services/running-context.service";
import { RecordedRouteService } from "../../services/recorded-route.service";
import { select, NgRedux } from "../../reducers/infra/ng-redux.module";
import type { ApplicationState, ShareUrl } from "../../models/models";

@Component({
Expand Down
Loading

0 comments on commit 0c75355

Please sign in to comment.