Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ng 16 update #144

Merged
merged 5 commits into from
Aug 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 26 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opp",
"version": "1.2.0",
"version": "1.3.0",
"license": "MIT",
"engines": {
"node": ">=18.10.0",
Expand All @@ -21,22 +21,21 @@
"build:stats": "ng build --configuration production,local-stats",
"server:dist": "http-server ./dist/web/ -S -C cert/localhost.crt -K cert/localhost.key -P http://localhost:5000",
"source-map-explorer": "source-map-explorer dist/web/*es2018.js",
"bundle-report": "webpack-bundle-analyzer dist/web/stats.json",
"postinstall": "ngcc --properties es2020 browser module main"
"bundle-report": "webpack-bundle-analyzer dist/web/stats.json"
},
"private": true,
"dependencies": {
"@angular/animations": "^15.0.4",
"@angular/cdk": "^15.0.3",
"@angular/common": "^15.0.4",
"@angular/compiler": "^15.0.4",
"@angular/core": "^15.0.4",
"@angular/forms": "^15.0.4",
"@angular/material": "^15.0.3",
"@angular/platform-browser": "^15.0.4",
"@angular/platform-browser-dynamic": "^15.0.4",
"@angular/router": "^15.0.4",
"@angular/service-worker": "^15.0.4",
"@angular/animations": "^16.1.8",
"@angular/cdk": "^16.1.7",
"@angular/common": "^16.1.8",
"@angular/compiler": "^16.1.8",
"@angular/core": "^16.1.8",
"@angular/forms": "^16.1.8",
"@angular/material": "^16.1.7",
"@angular/platform-browser": "^16.1.8",
"@angular/platform-browser-dynamic": "^16.1.8",
"@angular/router": "^16.1.8",
"@angular/service-worker": "^16.1.8",
"@auth0/angular-jwt": "^5.0.2",
"@ngneat/elf": "^2.3.0",
"@ngneat/elf-cli-ng": "^1.0.0",
Expand All @@ -49,17 +48,17 @@
"papaparse": "^5.3.0",
"rxjs": "^7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.12.0"
"zone.js": "^0.13.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^15.0.4",
"@angular-eslint/builder": "15.1.0",
"@angular-eslint/eslint-plugin": "15.1.0",
"@angular-eslint/eslint-plugin-template": "15.1.0",
"@angular-eslint/template-parser": "15.1.0",
"@angular/cli": "^15.0.4",
"@angular/compiler-cli": "^15.0.4",
"@angular/language-service": "^15.0.4",
"@angular-devkit/build-angular": "^16.1.8",
"@angular-eslint/builder": "16.1.0",
"@angular-eslint/eslint-plugin": "16.1.0",
"@angular-eslint/eslint-plugin-template": "16.1.0",
"@angular-eslint/template-parser": "16.1.0",
"@angular/cli": "^16.1.8",
"@angular/compiler-cli": "^16.1.8",
"@angular/language-service": "^16.1.8",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.8",
"@types/node": "^18.11.0",
Expand All @@ -74,14 +73,14 @@
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng-mocks": "^14.5.0",
"ng-packagr": "^15.0.3",
"ng-mocks": "^14.11.0",
"ng-packagr": "^16.1.0",
"pre-commit": "^1.2.2",
"protractor": "~7.0.0",
"source-map-explorer": "^2.5.2",
"tailwindcss": "^3.2.4",
"ts-node": "~8.8.2",
"typescript": "~4.8.4",
"typescript": "5.1.6",
"webpack-bundle-analyzer": "^4.7.0"
},
"pre-commit": [
Expand All @@ -98,4 +97,4 @@
]
}
}
}
}
4 changes: 2 additions & 2 deletions src/app/auth/unauth-guard.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Injectable } from '@angular/core';
import { CanActivate, Router } from '@angular/router';
import { Router } from '@angular/router';
import { map, take } from 'rxjs/operators';
import { AuthService } from '../core/auth/auth.service';

@Injectable()
export class UnAuthGuard implements CanActivate {
export class UnAuthGuard {
constructor(private auth: AuthService, private router: Router) {}

canActivate() {
Expand Down
4 changes: 2 additions & 2 deletions src/app/content/services/auth-guard.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Injectable } from '@angular/core';
import { CanActivate, Router } from '@angular/router';
import { Router } from '@angular/router';
import { map, take } from 'rxjs/operators';
import { AuthService } from '../../core/auth/auth.service';

@Injectable()
export class AuthGuard implements CanActivate {
export class AuthGuard {
constructor(private auth: AuthService, private router: Router) {}

canActivate() {
Expand Down
4 changes: 2 additions & 2 deletions src/app/content/services/phrase-correct-guard.service.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Injectable } from '@angular/core';
import { CanActivate, Router } from '@angular/router';
import { Router } from '@angular/router';
import { take, tap } from 'rxjs/operators';
import { AuthStateService } from '../../core/auth/auth-state.service';

@Injectable()
export class PhraseCorrectGuardService implements CanActivate {
export class PhraseCorrectGuardService {
constructor(
private authStateService: AuthStateService,
private router: Router
Expand Down
4 changes: 2 additions & 2 deletions src/app/content/services/phrase-incorrect-guard.service.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Injectable } from '@angular/core';
import { CanActivate, Router } from '@angular/router';
import { Router } from '@angular/router';
import { map, tap } from 'rxjs/operators';
import { AuthStateService } from '../../core/auth/auth-state.service';

@Injectable()
export class PhraseIncorrectGuardService implements CanActivate {
export class PhraseIncorrectGuardService {
constructor(
private authStateService: AuthStateService,
private router: Router
Expand Down
Loading