update to latest

paulmojicatech · May 14, 2023 · db84ad1 · db84ad1
1 parent 6d5fe32
commit db84ad1
Show file tree

Hide file tree

Showing 63 changed files with 38,881 additions and 8,809 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,7 +1,7 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx"],
   "rules": {
     "semi": ["error"],
     "quotes": ["error", "single"]
@@ -10,7 +10,7 @@
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -27,12 +27,12 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript"],
+      "extends": ["plugin:@nx/typescript"],
       "rules": {}
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     }
   ]

diff --git a/apps/fantalytic-mobile-e2e/project.json b/apps/fantalytic-mobile-e2e/project.json
@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/fantalytic-mobile-e2e/cypress.json",
         "devServerTarget": "fantalytic-mobile:serve:development",
@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/fantalytic-mobile-e2e/**/*.{js,ts}"]

diff --git a/apps/fantalytic-mobile/project.json b/apps/fantalytic-mobile/project.json
@@ -87,7 +87,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "apps/fantalytic-mobile/src/**/*.ts",
@@ -96,7 +96,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/fantalytic-mobile"],
       "options": {
         "jestConfig": "apps/fantalytic-mobile/jest.config.js",

diff --git a/apps/fantalytic-mobile/src/app/app.config.ts b/apps/fantalytic-mobile/src/app/app.config.ts
@@ -0,0 +1,24 @@
+import { ApplicationConfig } from '@angular/core';
+import { enableProdMode, importProvidersFrom } from '@angular/core';
+import { Route, RouterModule } from '@angular/router';
+import { IonicModule } from '@ionic/angular';
+import { StoreModule } from '@ngrx/store';
+import { sharedReducer } from './app/ngrx/reducers/shared.reducer';
+import { EffectsModule } from '@ngrx/effects';
+import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+import { HttpClientModule } from '@angular/common/http';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+export const appConfig: ApplicationConfig = {
+  providers: [
+    importProvidersFrom(
+      RouterModule.forRoot(routes),
+      IonicModule.forRoot(),
+      StoreModule.forRoot({}),
+      StoreModule.forFeature('shared', sharedReducer),
+      EffectsModule.forRoot([]),
+      StoreDevtoolsModule.instrument({}),
+      HttpClientModule,
+      BrowserAnimationsModule
+    ),
+  ],
+};
diff --git a/apps/fantalytic-mobile/src/main.ts b/apps/fantalytic-mobile/src/main.ts
@@ -1,18 +1,11 @@
-import {HttpClientModule} from '@angular/common/http';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import { enableProdMode, importProvidersFrom } from '@angular/core';
+import { appConfig } from './app/app.config';
+
 import { bootstrapApplication } from '@angular/platform-browser';
-import { Route, RouterModule } from '@angular/router';
-import { EffectsModule } from '@ngrx/effects';
-import { StoreModule } from '@ngrx/store';
-import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 
 import { AppComponent } from './app/app.component';
 import { TopicEffects } from './app/topics/ngrx/effects/topics.effects';
 import { topicsReducer } from './app/topics/ngrx/reducer/topics.reducer';
 import { environment } from './environments/environment';
-import { IonicModule } from '@ionic/angular';
-import { sharedReducer } from './app/ngrx/reducers/shared.reducer';
 
 if (environment.production) {
   enableProdMode();
@@ -21,45 +14,35 @@ if (environment.production) {
 const routes: Route[] = [
   {
     path: 'tabs',
-    loadComponent: () => import('./app/tabs/tabs.page').then(p => p.TabsPage),
+    loadComponent: () => import('./app/tabs/tabs.page').then((p) => p.TabsPage),
     children: [
       {
         path: 'topics',
-        loadComponent: () => import('./app/topics/topics.component').then(c => c.TopicsComponent),
+        loadComponent: () =>
+          import('./app/topics/topics.component').then(
+            (c) => c.TopicsComponent
+          ),
         providers: [
           importProvidersFrom(
             StoreModule.forFeature('topics', topicsReducer),
             EffectsModule.forFeature([TopicEffects])
-          )
-        ]
+          ),
+        ],
       },
       {
         path: 'fantasy-football',
-        loadChildren: () => import('./app/fantasy-football/const/fantasy-football-routes.const').then(m => m.fantasyFootballRoutes)
-      }
-    ]
+        loadChildren: () =>
+          import(
+            './app/fantasy-football/const/fantasy-football-routes.const'
+          ).then((m) => m.fantasyFootballRoutes),
+      },
+    ],
   },
   {
     path: '',
     pathMatch: 'full',
-    redirectTo: 'tabs/topics'
+    redirectTo: 'tabs/topics',
   },
 ];
 
-bootstrapApplication(
-  AppComponent,
-  {
-    providers: [
-      importProvidersFrom(
-        RouterModule.forRoot(routes),
-        IonicModule.forRoot(),
-        StoreModule.forRoot({}),
-        StoreModule.forFeature('shared', sharedReducer),
-        EffectsModule.forRoot([]),
-        StoreDevtoolsModule.instrument({}),
-        HttpClientModule,
-        BrowserAnimationsModule
-      )
-    ]
-  }
-);
+bootstrapApplication(AppComponent, appConfig);
diff --git a/apps/fantalytic-public-e2e/project.json b/apps/fantalytic-public-e2e/project.json
@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/fantalytic-public-e2e/cypress.json",
         "devServerTarget": "fantalytic-public:serve:development",
@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/fantalytic-public-e2e/**/*.{js,ts}"]

diff --git a/apps/fantalytic-public/.eslintrc.json b/apps/fantalytic-public/.eslintrc.json
@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

diff --git a/apps/fantalytic-public/jest.config.ts b/apps/fantalytic-public/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'fantalytic-public',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/apps/fantalytic-public',
   transform: {
-    '^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+\\.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
   snapshotSerializers: [

diff --git a/apps/fantalytic-public/project.json b/apps/fantalytic-public/project.json
@@ -1,5 +1,6 @@
 {
   "name": "fantalytic-public",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "apps/fantalytic-public/src",
   "prefix": "pmt",
@@ -79,7 +80,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "apps/fantalytic-public/**/*.ts",
@@ -88,7 +89,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/fantalytic-public"],
       "options": {
         "jestConfig": "apps/fantalytic-public/jest.config.ts",

diff --git a/apps/fantalytic-public/src/app/app.config.ts b/apps/fantalytic-public/src/app/app.config.ts
@@ -0,0 +1,59 @@
+import { HttpClientModule } from '@angular/common/http';
+import { ApplicationConfig, importProvidersFrom } from '@angular/core';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { Route, RouterModule, provideRouter } from '@angular/router';
+import { EffectsModule, provideEffects } from '@ngrx/effects';
+import { StoreModule, provideStore } from '@ngrx/store';
+import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+import { FantasyFootballEffects } from './fantasy-football/ngrx/effects/fantasy-football.effects';
+import { fantasyFootballReducer } from './fantasy-football/ngrx/reducer/fantasy-football.reducer';
+import { MobileCheckerService } from './fantasy-football/services/mobile-checker.service';
+import { TopicEffects } from './topics/ngrx/effects/topics.effects';
+import { topicsReducer } from './topics/ngrx/reducer/topics.reducer';
+
+const routes: Route[] = [
+  {
+    path: 'topics',
+    loadComponent: () =>
+      import('../app/topics/topics.component').then((a) => a.TopicsComponent),
+    providers: [
+      importProvidersFrom(
+        StoreModule.forFeature('topics', topicsReducer),
+        EffectsModule.forFeature([TopicEffects])
+      )
+    ],
+  },
+  {
+    path: 'fantasy-football',
+    loadChildren: () =>
+      import('../app/fantasy-football/const/fantasy-football-routes.const').then(
+        (m) => m.FANTASY_FOOTBALL_ROUTES
+      ),
+    canActivate: [MobileCheckerService],
+    providers: [
+      importProvidersFrom(
+        StoreModule.forFeature('fantasyFootball', fantasyFootballReducer),
+        EffectsModule.forFeature([FantasyFootballEffects]),
+      )      
+    ],
+  },
+  {
+    path: '',
+    redirectTo: 'topics',
+    pathMatch: 'full',
+  },
+];
+
+
+export const appConfig: ApplicationConfig = { 
+  providers: [
+    importProvidersFrom(
+      RouterModule.forRoot(routes),
+      StoreModule.forRoot({}),
+      EffectsModule.forRoot([]),
+      StoreDevtoolsModule.instrument({}),
+      HttpClientModule,
+      BrowserAnimationsModule
+    ),
+  ],
+};
diff --git a/apps/fantalytic-public/src/app/fantasy-football/services/mobile-checker.service.ts b/apps/fantalytic-public/src/app/fantasy-football/services/mobile-checker.service.ts
@@ -1,10 +1,10 @@
 import { Injectable } from '@angular/core';
-import { CanActivate } from '@angular/router';
+
 
 @Injectable({
   providedIn: 'root'
 })
-export class MobileCheckerService implements CanActivate {
+export class MobileCheckerService  {
 
   canActivate(): boolean {
     if(/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {