Skip to content

Commit

Permalink
Merge pull request #103 from paulmojicatech/modeling-book-tracker
Browse files Browse the repository at this point in the history
Modeling book tracker
  • Loading branch information
paulmojicatech authored Aug 27, 2024
2 parents fe71aef + 5454293 commit be4ba0f
Show file tree
Hide file tree
Showing 67 changed files with 34,134 additions and 25,124 deletions.
10 changes: 8 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,18 @@
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
}
]
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,5 @@ libs/fantalytic-web-scraper/output/*
apps/fantalytic-public/src/assets/stats/*
apps/fantalytic-api/local.settings.json

.nx/cache
.nx/cache
.nx/workspace-data
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@

/.nx/cache
.angular

/.nx/workspace-data
6 changes: 3 additions & 3 deletions apps/disney-planner-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "apps/disney-planner-e2e/src",
"tags": [],
"implicitDependencies": ["disney-planner"],
"targets": {
"e2e": {
"executor": "@nx/cypress:cypress",
Expand All @@ -27,7 +29,5 @@
"lintFilePatterns": ["apps/disney-planner-e2e/**/*.{js,ts}"]
}
}
},
"tags": [],
"implicitDependencies": ["disney-planner"]
}
}
6 changes: 3 additions & 3 deletions apps/disney-planner/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
"projectType": "application",
"prefix": "disney",
"sourceRoot": "apps/disney-planner/src",
"tags": [],
"tags": [],
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/apps/disney-planner",
"index": "apps/disney-planner/src/index.html",
"index": "apps/disney-planner/src/index.html",
"polyfills": ["zone.js"],
"tsConfig": "apps/disney-planner/tsconfig.app.json",
"tsConfig": "apps/disney-planner/tsconfig.app.json",
"inlineStyleLanguage": "scss",
"main": "apps/disney-planner/src/main.ts",
"assets": [
Expand Down
6 changes: 3 additions & 3 deletions apps/fantalytic-mobile-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/fantalytic-mobile-e2e/src",
"projectType": "application",
"tags": [],
"implicitDependencies": ["fantalytic-mobile"],
"targets": {
"e2e": {
"executor": "@nx/cypress:cypress",
Expand All @@ -24,7 +26,5 @@
"lintFilePatterns": ["apps/fantalytic-mobile-e2e/**/*.{js,ts}"]
}
}
},
"tags": [],
"implicitDependencies": ["fantalytic-mobile"]
}
}
4 changes: 2 additions & 2 deletions apps/fantalytic-mobile/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"projectType": "application",
"sourceRoot": "apps/fantalytic-mobile/src",
"prefix": "pmt",
"tags": [],
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
Expand Down Expand Up @@ -192,6 +193,5 @@
}
}
}
},
"tags": []
}
}
2 changes: 1 addition & 1 deletion apps/fantalytic-mobile/src/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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 {} from '@angular/common/http';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
export const appConfig: ApplicationConfig = {
providers: [
Expand Down
6 changes: 3 additions & 3 deletions apps/fantalytic-public-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/fantalytic-public-e2e/src",
"projectType": "application",
"tags": [],
"implicitDependencies": ["fantalytic-public"],
"targets": {
"e2e": {
"executor": "@nx/cypress:cypress",
Expand All @@ -24,7 +26,5 @@
"lintFilePatterns": ["apps/fantalytic-public-e2e/**/*.{js,ts}"]
}
}
},
"tags": [],
"implicitDependencies": ["fantalytic-public"]
}
}
4 changes: 2 additions & 2 deletions apps/fantalytic-public/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"projectType": "application",
"sourceRoot": "apps/fantalytic-public/src",
"prefix": "pmt",
"tags": [],
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
Expand Down Expand Up @@ -95,6 +96,5 @@
"jestConfig": "apps/fantalytic-public/jest.config.ts"
}
}
},
"tags": []
}
}
2 changes: 1 addition & 1 deletion apps/fantalytic-public/src/app/app.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { HttpClientModule } from '@angular/common/http';
import {} from '@angular/common/http';
import { ApplicationConfig, importProvidersFrom } from '@angular/core';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { Route, RouterModule } from '@angular/router';
Expand Down
6 changes: 3 additions & 3 deletions apps/fantalytic-ssr/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "apps/fantalytic-ssr/src",
"tags": [],
"targets": {
"build": {
"executor": "@nx/vite:build",
Expand All @@ -15,7 +16,7 @@
"options": {
"main": "apps/fantalytic-ssr/src/main.ts",
"configFile": "apps/fantalytic-ssr/vite.config.ts",
"outputPath": "dist/apps/fantalytic-ssr/client"
"outputPath": "dist/apps/fantalytic-ssr"
},
"defaultConfiguration": "production",
"configurations": {
Expand Down Expand Up @@ -65,6 +66,5 @@
"executor": "@nx/vite:test",
"outputs": ["{projectRoot}/coverage"]
}
},
"tags": []
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { HttpClient } from '@angular/common/http';
import { Injectable, inject } from '@angular/core';
import { Topic, parseESPNRSSFeed } from 'libs/fantalytic-shared-v2/src';
import { Topic, parseESPNRSSFeed } from '@pmt/fantalytic-shared-v2';
import { Observable, catchError, map, throwError } from 'rxjs';

@Injectable({
Expand Down
12 changes: 10 additions & 2 deletions apps/fantalytic-ssr/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,22 @@

import analog from '@analogjs/platform';
import { visualizer } from 'rollup-plugin-visualizer';
import { defineConfig, Plugin, splitVendorChunkPlugin } from 'vite';
import { defineConfig, Plugin } from 'vite';
import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';

// https://vitejs.dev/config/
export default defineConfig(({ mode }) => {
return {
root: __dirname,
publicDir: 'src/public',

optimizeDeps: {
include: ['@angular/common', '@angular/forms'],
},
build: {
outDir: '../../dist/apps/fantalytic-ssr/client',
reportCompressedSize: true,
commonjsOptions: { transformMixedEsModules: true },
target: ['es2020'],
},
plugins: [
Expand Down Expand Up @@ -45,9 +49,13 @@ export default defineConfig(({ mode }) => {
}),
nxViteTsPaths(),
visualizer() as Plugin,
splitVendorChunkPlugin(),
],
test: {
reporters: ['default'],
coverage: {
reportsDirectory: '../../coverage/apps/fantalytic-ssr',
provider: 'v8',
},
globals: true,
environment: 'jsdom',
setupFiles: ['src/test-setup.ts'],
Expand Down
4 changes: 2 additions & 2 deletions apps/fantalytic-web-scraper-cron/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/fantalytic-web-scraper-cron/src",
"projectType": "application",
"tags": [],
"targets": {
"build": {
"executor": "@nx/webpack:webpack",
Expand Down Expand Up @@ -47,6 +48,5 @@
"lintFilePatterns": ["apps/fantalytic-web-scraper-cron/**/*.ts"]
}
}
},
"tags": []
}
}
6 changes: 3 additions & 3 deletions apps/grocery-list-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/grocery-list-e2e/src",
"projectType": "application",
"tags": [],
"implicitDependencies": ["grocery-list"],
"targets": {
"e2e": {
"executor": "@nx/cypress:cypress",
Expand All @@ -24,7 +26,5 @@
"lintFilePatterns": ["apps/grocery-list-e2e/**/*.{js,ts}"]
}
}
},
"tags": [],
"implicitDependencies": ["grocery-list"]
}
}
4 changes: 2 additions & 2 deletions apps/grocery-list/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/grocery-list/src",
"projectType": "application",
"tags": [],
"targets": {
"build": {
"executor": "@nx/web:webpack",
Expand Down Expand Up @@ -78,6 +79,5 @@
"jestConfig": "apps/grocery-list/jest.config.ts"
}
}
},
"tags": []
}
}
6 changes: 3 additions & 3 deletions apps/marvel-web-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/marvel-web-e2e/src",
"projectType": "application",
"tags": [],
"implicitDependencies": ["marvel-web"],
"targets": {
"e2e": {
"executor": "@nx/cypress:cypress",
Expand All @@ -23,7 +25,5 @@
"lintFilePatterns": ["apps/marvel-web-e2e/**/*.{js,ts}"]
}
}
},
"tags": [],
"implicitDependencies": ["marvel-web"]
}
}
4 changes: 2 additions & 2 deletions apps/marvel-web/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"projectType": "application",
"sourceRoot": "apps/marvel-web/src",
"prefix": "pmt",
"tags": [],
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
Expand Down Expand Up @@ -89,6 +90,5 @@
"jestConfig": "apps/marvel-web/jest.config.js"
}
}
},
"tags": []
}
}
6 changes: 3 additions & 3 deletions apps/marvintherapy-public-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/marvintherapy-public-e2e/src",
"projectType": "application",
"tags": [],
"implicitDependencies": ["marvintherapy-public"],
"targets": {
"e2e": {
"executor": "@nx/cypress:cypress",
Expand All @@ -23,7 +25,5 @@
"lintFilePatterns": ["apps/marvintherapy-public-e2e/**/*.{js,ts}"]
}
}
},
"tags": [],
"implicitDependencies": ["marvintherapy-public"]
}
}
4 changes: 2 additions & 2 deletions apps/marvintherapy-public/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/marvintherapy-public",
"projectType": "application",
"tags": [],
"targets": {
"build": {
"executor": "@nx/next:build",
Expand Down Expand Up @@ -48,6 +49,5 @@
"lintFilePatterns": ["apps/marvintherapy-public/**/*.{ts,tsx,js,jsx}"]
}
}
},
"tags": []
}
}
10 changes: 10 additions & 0 deletions apps/modeling-book-tracker-e2e/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": ["plugin:cypress/recommended", "../../.eslintrc.json"],
"ignorePatterns": ["!**/*"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {}
}
]
}
10 changes: 10 additions & 0 deletions apps/modeling-book-tracker-e2e/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';

import { defineConfig } from 'cypress';

export default defineConfig({
e2e: {
...nxE2EPreset(__filename, { cypressDir: 'src' }),
baseUrl: 'http://localhost:4200',
},
});
29 changes: 29 additions & 0 deletions apps/modeling-book-tracker-e2e/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "modeling-book-tracker-e2e",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "apps/modeling-book-tracker-e2e/src",
"tags": [],
"implicitDependencies": ["modeling-book-tracker"],
"targets": {
"e2e": {
"executor": "@nx/cypress:cypress",
"options": {
"cypressConfig": "apps/modeling-book-tracker-e2e/cypress.config.ts",
"testingType": "e2e",
"devServerTarget": "modeling-book-tracker:serve"
},
"configurations": {
"production": {
"devServerTarget": "modeling-book-tracker:serve:production"
},
"ci": {
"devServerTarget": "modeling-book-tracker:serve-static"
}
}
},
"lint": {
"executor": "@nx/eslint:lint"
}
}
}
Loading

0 comments on commit be4ba0f

Please sign in to comment.