diff --git a/AdminPortal/.angular-cli.json b/AdminPortal/.angular-cli.json deleted file mode 100644 index 0cdc583d..00000000 --- a/AdminPortal/.angular-cli.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "project": { - "name": "admin-portal" - }, - "apps": [ - { - "root": "src", - "outDir": "dist", - "assets": [ - "assets", - "favicon.ico" - ], - "index": "index.html", - "main": "main.ts", - "polyfills": "polyfills.ts", - "test": "test.ts", - "tsconfig": "tsconfig.app.json", - "testTsconfig": "tsconfig.spec.json", - "prefix": "app", - "styles": [ - "styles.css" - ], - "scripts": [], - "environmentSource": "environments/environment.ts", - "environments": { - "dev": "environments/environment.ts", - "prod": "environments/environment.prod.ts" - } - } - ], - "e2e": { - "protractor": { - "config": "./protractor.conf.js" - } - }, - "lint": [ - { - "project": "src/tsconfig.app.json" - }, - { - "project": "src/tsconfig.spec.json" - }, - { - "project": "e2e/tsconfig.e2e.json" - } - ], - "test": { - "karma": { - "config": "./karma.conf.js" - } - }, - "defaults": { - "styleExt": "css", - "component": {} - } -} diff --git a/AdminPortal/.gitignore b/AdminPortal/.gitignore index 54bfd200..7b0d8ba0 100644 --- a/AdminPortal/.gitignore +++ b/AdminPortal/.gitignore @@ -40,3 +40,6 @@ testem.log # System Files .DS_Store Thumbs.db + +# Angular build cache +/.angular diff --git a/AdminPortal/README.md b/AdminPortal/README.md index 39592049..4363a272 100644 --- a/AdminPortal/README.md +++ b/AdminPortal/README.md @@ -1,6 +1,6 @@ # AdminPortal -This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.1.2. +This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.1.2 and now runs on Angular 20.3 (requires Node.js ^20.19, ^22.12 or >=24). ## Development server @@ -12,17 +12,12 @@ Run `ng generate component component-name` to generate a new component. You can ## Build -Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build. +Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. `ng build` defaults to the production configuration; use `ng build --configuration development` for an unoptimized build. ## Running unit tests Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io). -## Running end-to-end tests - -Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/). -Before running the tests make sure you are serving the app via `ng serve`. - ## Further help To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). diff --git a/AdminPortal/angular.json b/AdminPortal/angular.json new file mode 100644 index 00000000..48f6bb89 --- /dev/null +++ b/AdminPortal/angular.json @@ -0,0 +1,85 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "admin-portal": { + "projectType": "application", + "schematics": { + "@schematics/angular:component": { + "standalone": false + } + }, + "root": "", + "sourceRoot": "src", + "prefix": "app", + "architect": { + "build": { + "builder": "@angular/build:application", + "options": { + "outputPath": "dist", + "index": "src/index.html", + "browser": "src/main.ts", + "polyfills": [ + "zone.js" + ], + "tsConfig": "src/tsconfig.app.json", + "assets": [ + "src/assets", + "src/favicon.ico" + ], + "styles": [ + "src/styles.css" + ] + }, + "configurations": { + "production": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "outputHashing": "all" + }, + "development": { + "optimization": false, + "extractLicenses": false, + "sourceMap": true + } + }, + "defaultConfiguration": "production" + }, + "serve": { + "builder": "@angular/build:dev-server", + "configurations": { + "production": { + "buildTarget": "admin-portal:build:production" + }, + "development": { + "buildTarget": "admin-portal:build:development" + } + }, + "defaultConfiguration": "development" + }, + "test": { + "builder": "@angular/build:karma", + "options": { + "polyfills": [ + "zone.js", + "zone.js/testing" + ], + "tsConfig": "src/tsconfig.spec.json", + "assets": [ + "src/assets", + "src/favicon.ico" + ], + "styles": [ + "src/styles.css" + ] + } + } + } + } + } +} diff --git a/AdminPortal/e2e/app.e2e-spec.ts b/AdminPortal/e2e/app.e2e-spec.ts deleted file mode 100644 index 8d340969..00000000 --- a/AdminPortal/e2e/app.e2e-spec.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { AdminPortalPage } from './app.po'; - -describe('admin-portal App', () => { - let page: AdminPortalPage; - - beforeEach(() => { - page = new AdminPortalPage(); - }); - - it('should display welcome message', () => { - page.navigateTo(); - expect(page.getParagraphText()).toEqual('Welcome to app!!'); - }); -}); diff --git a/AdminPortal/e2e/app.po.ts b/AdminPortal/e2e/app.po.ts deleted file mode 100644 index 77d89936..00000000 --- a/AdminPortal/e2e/app.po.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { browser, by, element } from 'protractor'; - -export class AdminPortalPage { - navigateTo() { - return browser.get('/'); - } - - getParagraphText() { - return element(by.css('app-root h1')).getText(); - } -} diff --git a/AdminPortal/e2e/tsconfig.e2e.json b/AdminPortal/e2e/tsconfig.e2e.json deleted file mode 100644 index e2a9a2fc..00000000 --- a/AdminPortal/e2e/tsconfig.e2e.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/e2e", - "module": "commonjs", - "target": "es5", - "types": [ - "jasmine", - "node" - ] - } -} diff --git a/AdminPortal/karma.conf.js b/AdminPortal/karma.conf.js deleted file mode 100644 index 4d9ab9d9..00000000 --- a/AdminPortal/karma.conf.js +++ /dev/null @@ -1,33 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/0.13/config/configuration-file.html - -module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', '@angular/cli'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage-istanbul-reporter'), - require('@angular/cli/plugins/karma') - ], - client:{ - clearContext: false // leave Jasmine Spec Runner output visible in browser - }, - coverageIstanbulReporter: { - reports: [ 'html', 'lcovonly' ], - fixWebpackSourcePaths: true - }, - angularCli: { - environment: 'dev' - }, - reporters: ['progress', 'kjhtml'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false - }); -}; diff --git a/AdminPortal/package.json b/AdminPortal/package.json index 3d588882..a08b2e3d 100644 --- a/AdminPortal/package.json +++ b/AdminPortal/package.json @@ -6,44 +6,33 @@ "ng": "ng", "start": "ng serve", "build": "ng build", - "test": "ng test", - "lint": "ng lint", - "e2e": "ng e2e" + "test": "ng test" }, "private": true, "dependencies": { - "@angular/animations": "^4.0.0", - "@angular/common": "^4.0.0", - "@angular/compiler": "^4.0.0", - "@angular/core": "^4.0.0", - "@angular/forms": "^4.0.0", - "@angular/http": "^4.0.0", - "@angular/platform-browser": "^4.0.0", - "@angular/platform-browser-dynamic": "^4.0.0", - "@angular/router": "^4.0.0", - "auth0-js": "^8.8.0", - "core-js": "^2.4.1", - "rxjs": "^5.1.0", - "zone.js": "^0.8.4" + "@angular/animations": "^20.3.25", + "@angular/common": "^20.3.25", + "@angular/compiler": "^20.3.25", + "@angular/core": "^20.3.25", + "@angular/forms": "^20.3.25", + "@angular/platform-browser": "^20.3.25", + "@angular/platform-browser-dynamic": "^20.3.25", + "@angular/router": "^20.3.25", + "rxjs": "~7.8.0", + "tslib": "^2.3.0", + "zone.js": "~0.15.0" }, "devDependencies": { - "@angular/cli": "1.1.2", - "@angular/compiler-cli": "^4.0.0", - "@angular/language-service": "^4.0.0", - "@types/jasmine": "2.5.45", - "@types/node": "~6.0.60", - "codelyzer": "~3.0.1", - "jasmine-core": "~2.6.2", - "jasmine-spec-reporter": "~4.1.0", - "karma": "~1.7.0", - "karma-chrome-launcher": "~2.1.1", - "karma-cli": "~1.0.1", - "karma-jasmine": "~1.1.0", - "karma-jasmine-html-reporter": "^0.2.2", - "karma-coverage-istanbul-reporter": "^1.2.1", - "protractor": "~5.1.2", - "ts-node": "~3.0.4", - "tslint": "~5.3.2", - "typescript": "~2.3.3" + "@angular/build": "^20.3.0", + "@angular/cli": "^20.3.0", + "@angular/compiler-cli": "^20.3.25", + "@types/jasmine": "~5.1.0", + "jasmine-core": "~5.7.0", + "karma": "~6.4.0", + "karma-chrome-launcher": "~3.2.0", + "karma-coverage": "~2.2.0", + "karma-jasmine": "~5.1.0", + "karma-jasmine-html-reporter": "~2.1.0", + "typescript": "~5.8.0" } } diff --git a/AdminPortal/protractor.conf.js b/AdminPortal/protractor.conf.js deleted file mode 100644 index 7ee3b5ee..00000000 --- a/AdminPortal/protractor.conf.js +++ /dev/null @@ -1,28 +0,0 @@ -// Protractor configuration file, see link for more information -// https://github.com/angular/protractor/blob/master/lib/config.ts - -const { SpecReporter } = require('jasmine-spec-reporter'); - -exports.config = { - allScriptsTimeout: 11000, - specs: [ - './e2e/**/*.e2e-spec.ts' - ], - capabilities: { - 'browserName': 'chrome' - }, - directConnect: true, - baseUrl: 'http://localhost:4200/', - framework: 'jasmine', - jasmineNodeOpts: { - showColors: true, - defaultTimeoutInterval: 30000, - print: function() {} - }, - onPrepare() { - require('ts-node').register({ - project: 'e2e/tsconfig.e2e.json' - }); - jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); - } -}; diff --git a/AdminPortal/src/app/app.component.spec.ts b/AdminPortal/src/app/app.component.spec.ts index 7d2799ce..cfb2117a 100644 --- a/AdminPortal/src/app/app.component.spec.ts +++ b/AdminPortal/src/app/app.component.spec.ts @@ -1,9 +1,9 @@ -import { TestBed, async } from '@angular/core/testing'; +import { TestBed, waitForAsync } from '@angular/core/testing'; import { AppComponent } from './app.component'; describe('AppComponent', () => { - beforeEach(async(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ AppComponent @@ -11,19 +11,19 @@ describe('AppComponent', () => { }).compileComponents(); })); - it('should create the app', async(() => { + it('should create the app', waitForAsync(() => { const fixture = TestBed.createComponent(AppComponent); const app = fixture.debugElement.componentInstance; expect(app).toBeTruthy(); })); - it(`should have as title 'app'`, async(() => { + it(`should have as title 'app'`, waitForAsync(() => { const fixture = TestBed.createComponent(AppComponent); const app = fixture.debugElement.componentInstance; expect(app.title).toEqual('app'); })); - it('should render title in a h1 tag', async(() => { + it('should render title in a h1 tag', waitForAsync(() => { const fixture = TestBed.createComponent(AppComponent); fixture.detectChanges(); const compiled = fixture.debugElement.nativeElement; diff --git a/AdminPortal/src/app/app.component.ts b/AdminPortal/src/app/app.component.ts index ff63e050..24961d07 100644 --- a/AdminPortal/src/app/app.component.ts +++ b/AdminPortal/src/app/app.component.ts @@ -3,7 +3,8 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-root', templateUrl: './app.component.html', - styleUrls: ['./app.component.css'] + styleUrls: ['./app.component.css'], + standalone: false }) export class AppComponent { title = 'app works!'; diff --git a/AdminPortal/src/app/app.module.ts b/AdminPortal/src/app/app.module.ts index a2881ba1..ffad2130 100644 --- a/AdminPortal/src/app/app.module.ts +++ b/AdminPortal/src/app/app.module.ts @@ -1,7 +1,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { HttpModule } from '@angular/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import { routing } from './app.routing'; @@ -32,13 +32,13 @@ import { AppointmentService } from './appointment.service'; imports: [ BrowserModule, FormsModule, - HttpModule, routing ], providers: [ LoginService, UserService, - AppointmentService + AppointmentService, + provideHttpClient(withInterceptorsFromDi()) ], bootstrap: [AppComponent] }) diff --git a/AdminPortal/src/app/app.routing.ts b/AdminPortal/src/app/app.routing.ts index e4d450ed..3647ad8f 100644 --- a/AdminPortal/src/app/app.routing.ts +++ b/AdminPortal/src/app/app.routing.ts @@ -38,4 +38,4 @@ const appRoutes: Routes = [ } ]; -export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); \ No newline at end of file +export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); \ No newline at end of file diff --git a/AdminPortal/src/app/appointment.service.spec.ts b/AdminPortal/src/app/appointment.service.spec.ts index 24ed2d35..c009755a 100644 --- a/AdminPortal/src/app/appointment.service.spec.ts +++ b/AdminPortal/src/app/appointment.service.spec.ts @@ -1,12 +1,14 @@ /* tslint:disable:no-unused-variable */ -import { TestBed, async, inject } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { AppointmentService } from './appointment.service'; describe('Service: Appointment', () => { beforeEach(() => { TestBed.configureTestingModule({ - providers: [AppointmentService] + providers: [AppointmentService, provideHttpClient(), provideHttpClientTesting()] }); }); diff --git a/AdminPortal/src/app/appointment.service.ts b/AdminPortal/src/app/appointment.service.ts index ad506808..efd02ac4 100644 --- a/AdminPortal/src/app/appointment.service.ts +++ b/AdminPortal/src/app/appointment.service.ts @@ -1,15 +1,15 @@ import { Injectable } from '@angular/core'; -import {Http, Headers} from '@angular/http'; +import { HttpClient } from '@angular/common/http'; @Injectable() export class AppointmentService { - constructor (private http:Http){} + constructor (private http: HttpClient){} getAppointmentList() { let url = "http://localhost:8080/api/appointment/all"; - return this.http.get(url, { withCredentials: true }); + return this.http.get(url, { withCredentials: true }); } confirmAppointment(id: number) { diff --git a/AdminPortal/src/app/appointment/appointment.component.spec.ts b/AdminPortal/src/app/appointment/appointment.component.spec.ts index 35bdaaea..a46be479 100644 --- a/AdminPortal/src/app/appointment/appointment.component.spec.ts +++ b/AdminPortal/src/app/appointment/appointment.component.spec.ts @@ -1,11 +1,19 @@ /* tslint:disable:no-unused-variable */ -import { TestBed, async } from '@angular/core/testing'; +import { TestBed } from '@angular/core/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { provideRouter } from '@angular/router'; import { AppointmentComponent } from './appointment.component'; +import { AppointmentService } from '../appointment.service'; describe('Component: Appointment', () => { it('should create an instance', () => { - let component = new AppointmentComponent(); + TestBed.configureTestingModule({ + declarations: [AppointmentComponent], + providers: [AppointmentService, provideHttpClient(), provideHttpClientTesting(), provideRouter([])] + }); + let component = TestBed.createComponent(AppointmentComponent).componentInstance; expect(component).toBeTruthy(); }); }); diff --git a/AdminPortal/src/app/appointment/appointment.component.ts b/AdminPortal/src/app/appointment/appointment.component.ts index 5be37e91..f6c69030 100644 --- a/AdminPortal/src/app/appointment/appointment.component.ts +++ b/AdminPortal/src/app/appointment/appointment.component.ts @@ -5,7 +5,8 @@ import {AppointmentService} from '../appointment.service'; @Component({ selector: 'app-appointment', templateUrl: './appointment.component.html', - styleUrls: ['./appointment.component.css'] + styleUrls: ['./appointment.component.css'], + standalone: false }) export class AppointmentComponent implements OnInit { @@ -18,7 +19,7 @@ export class AppointmentComponent implements OnInit { getAppointmentList() { this.appointmentService.getAppointmentList().subscribe( res => { - this.appointmentList = JSON.parse(JSON.parse(JSON.stringify(res))._body); + this.appointmentList = res; }, error => console.log(error) ) diff --git a/AdminPortal/src/app/login.service.spec.ts b/AdminPortal/src/app/login.service.spec.ts index 876a1be9..abef4e7e 100644 --- a/AdminPortal/src/app/login.service.spec.ts +++ b/AdminPortal/src/app/login.service.spec.ts @@ -1,12 +1,14 @@ /* tslint:disable:no-unused-variable */ -import { TestBed, async, inject } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { LoginService } from './login.service'; describe('Service: Login', () => { beforeEach(() => { TestBed.configureTestingModule({ - providers: [LoginService] + providers: [LoginService, provideHttpClient(), provideHttpClientTesting()] }); }); diff --git a/AdminPortal/src/app/login.service.ts b/AdminPortal/src/app/login.service.ts index a229f8f0..bb89b110 100644 --- a/AdminPortal/src/app/login.service.ts +++ b/AdminPortal/src/app/login.service.ts @@ -1,26 +1,25 @@ import { Injectable } from '@angular/core'; -import {Http, Headers} from '@angular/http'; -import {Observable} from 'rxjs/Observable'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class LoginService { - constructor (private http: Http) {} + constructor (private http: HttpClient) {} sendCredential(username: string, password: string) { let url = 'http://localhost:8080/index'; let params = 'username='+username+'&password='+password; - let headers = new Headers( + let headers = new HttpHeaders( { 'Content-Type': 'application/x-www-form-urlencoded' // 'Access-Control-Allow-Credentials' : true }); - return this.http.post(url, params, {headers: headers, withCredentials : true}); + return this.http.post(url, params, {headers: headers, withCredentials : true, responseType: 'text'}); } logout() { let url = 'http://localhost:8080/logout'; - return this.http.get(url, { withCredentials: true }); + return this.http.get(url, { withCredentials: true, responseType: 'text' }); } } diff --git a/AdminPortal/src/app/login/login.component.spec.ts b/AdminPortal/src/app/login/login.component.spec.ts index d7ef9dc6..2f70aac0 100644 --- a/AdminPortal/src/app/login/login.component.spec.ts +++ b/AdminPortal/src/app/login/login.component.spec.ts @@ -1,11 +1,21 @@ /* tslint:disable:no-unused-variable */ -import { TestBed, async } from '@angular/core/testing'; +import { TestBed } from '@angular/core/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { provideRouter } from '@angular/router'; +import { FormsModule } from '@angular/forms'; import { LoginComponent } from './login.component'; +import { LoginService } from '../login.service'; describe('Component: Login', () => { it('should create an instance', () => { - let component = new LoginComponent(); + TestBed.configureTestingModule({ + declarations: [LoginComponent], + imports: [FormsModule], + providers: [LoginService, provideHttpClient(), provideHttpClientTesting(), provideRouter([])] + }); + let component = TestBed.createComponent(LoginComponent).componentInstance; expect(component).toBeTruthy(); }); }); diff --git a/AdminPortal/src/app/login/login.component.ts b/AdminPortal/src/app/login/login.component.ts index 2bdef359..9e7de6a7 100644 --- a/AdminPortal/src/app/login/login.component.ts +++ b/AdminPortal/src/app/login/login.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from '@angular/core'; -import {Observable} from 'rxjs/Observable'; import {LoginService} from '../login.service'; @Component({ selector: 'app-login', templateUrl: './login.component.html', - styleUrls: ['./login.component.css'] + styleUrls: ['./login.component.css'], + standalone: false }) export class LoginComponent implements OnInit { diff --git a/AdminPortal/src/app/navbar/navbar.component.spec.ts b/AdminPortal/src/app/navbar/navbar.component.spec.ts index 4e5f590e..94814c03 100644 --- a/AdminPortal/src/app/navbar/navbar.component.spec.ts +++ b/AdminPortal/src/app/navbar/navbar.component.spec.ts @@ -1,14 +1,19 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { provideRouter } from '@angular/router'; import { NavbarComponent } from './navbar.component'; +import { LoginService } from '../login.service'; describe('NavbarComponent', () => { let component: NavbarComponent; let fixture: ComponentFixture; - beforeEach(async(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ NavbarComponent ] + declarations: [ NavbarComponent ], + providers: [ LoginService, provideHttpClient(), provideHttpClientTesting(), provideRouter([]) ] }) .compileComponents(); })); diff --git a/AdminPortal/src/app/navbar/navbar.component.ts b/AdminPortal/src/app/navbar/navbar.component.ts index 019989bd..b37c78e5 100644 --- a/AdminPortal/src/app/navbar/navbar.component.ts +++ b/AdminPortal/src/app/navbar/navbar.component.ts @@ -5,7 +5,8 @@ import { Router } from '@angular/router'; @Component({ selector: 'app-navbar', templateUrl: './navbar.component.html', - styleUrls: ['./navbar.component.css'] + styleUrls: ['./navbar.component.css'], + standalone: false }) export class NavbarComponent implements OnInit { diff --git a/AdminPortal/src/app/primary-transaction/primary-transaction.component.spec.ts b/AdminPortal/src/app/primary-transaction/primary-transaction.component.spec.ts index 53ef10f0..5d47b5e6 100644 --- a/AdminPortal/src/app/primary-transaction/primary-transaction.component.spec.ts +++ b/AdminPortal/src/app/primary-transaction/primary-transaction.component.spec.ts @@ -1,11 +1,19 @@ /* tslint:disable:no-unused-variable */ -import { TestBed, async } from '@angular/core/testing'; +import { TestBed } from '@angular/core/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { provideRouter } from '@angular/router'; import { PrimaryTransactionComponent } from './primary-transaction.component'; +import { UserService } from '../user.service'; describe('Component: PrimaryTransaction', () => { it('should create an instance', () => { - let component = new PrimaryTransactionComponent(); + TestBed.configureTestingModule({ + declarations: [PrimaryTransactionComponent], + providers: [UserService, provideHttpClient(), provideHttpClientTesting(), provideRouter([])] + }); + let component = TestBed.createComponent(PrimaryTransactionComponent).componentInstance; expect(component).toBeTruthy(); }); }); diff --git a/AdminPortal/src/app/primary-transaction/primary-transaction.component.ts b/AdminPortal/src/app/primary-transaction/primary-transaction.component.ts index 6687dcd2..8cdda1e2 100644 --- a/AdminPortal/src/app/primary-transaction/primary-transaction.component.ts +++ b/AdminPortal/src/app/primary-transaction/primary-transaction.component.ts @@ -5,7 +5,8 @@ import { ActivatedRoute, Params } from '@angular/router'; @Component({ selector: 'app-primary-transaction', templateUrl: './primary-transaction.component.html', - styleUrls: ['./primary-transaction.component.css'] + styleUrls: ['./primary-transaction.component.css'], + standalone: false }) export class PrimaryTransactionComponent implements OnInit { @@ -23,8 +24,8 @@ export class PrimaryTransactionComponent implements OnInit { getPrimaryTransactionList() { this.userService.getPrimaryTransactionList(this.username).subscribe( res => { - console.log(JSON.parse(JSON.stringify(res))._body); - this.primaryTransactionList = JSON.parse(JSON.parse(JSON.stringify(res))._body); + console.log(res); + this.primaryTransactionList = res; }, error => console.log(error) ) diff --git a/AdminPortal/src/app/savings-transaction/savings-transaction.component.spec.ts b/AdminPortal/src/app/savings-transaction/savings-transaction.component.spec.ts index ae9acce8..8a2e8f44 100644 --- a/AdminPortal/src/app/savings-transaction/savings-transaction.component.spec.ts +++ b/AdminPortal/src/app/savings-transaction/savings-transaction.component.spec.ts @@ -1,11 +1,19 @@ /* tslint:disable:no-unused-variable */ -import { TestBed, async } from '@angular/core/testing'; +import { TestBed } from '@angular/core/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { provideRouter } from '@angular/router'; import { SavingsTransactionComponent } from './savings-transaction.component'; +import { UserService } from '../user.service'; describe('Component: SavingsTransaction', () => { it('should create an instance', () => { - let component = new SavingsTransactionComponent(); + TestBed.configureTestingModule({ + declarations: [SavingsTransactionComponent], + providers: [UserService, provideHttpClient(), provideHttpClientTesting(), provideRouter([])] + }); + let component = TestBed.createComponent(SavingsTransactionComponent).componentInstance; expect(component).toBeTruthy(); }); }); diff --git a/AdminPortal/src/app/savings-transaction/savings-transaction.component.ts b/AdminPortal/src/app/savings-transaction/savings-transaction.component.ts index be370b90..f19d2592 100644 --- a/AdminPortal/src/app/savings-transaction/savings-transaction.component.ts +++ b/AdminPortal/src/app/savings-transaction/savings-transaction.component.ts @@ -6,7 +6,8 @@ import { ActivatedRoute, Params } from '@angular/router'; @Component({ selector: 'app-savings-transaction', templateUrl: './savings-transaction.component.html', - styleUrls: ['./savings-transaction.component.css'] + styleUrls: ['./savings-transaction.component.css'], + standalone: false }) export class SavingsTransactionComponent implements OnInit { @@ -24,8 +25,8 @@ export class SavingsTransactionComponent implements OnInit { getSavingsTransactionList() { this.userService.getSavingsTransactionList(this.username).subscribe( res => { - console.log(JSON.parse(JSON.stringify(res))._body); - this.savingsTransactionList = JSON.parse(JSON.parse(JSON.stringify(res))._body); + console.log(res); + this.savingsTransactionList = res; }, error => console.log(error) ) diff --git a/AdminPortal/src/app/user-account/user-account.component.spec.ts b/AdminPortal/src/app/user-account/user-account.component.spec.ts index 994b34a6..18f8ef5e 100644 --- a/AdminPortal/src/app/user-account/user-account.component.spec.ts +++ b/AdminPortal/src/app/user-account/user-account.component.spec.ts @@ -1,14 +1,19 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { provideRouter } from '@angular/router'; import { UserAccountComponent } from './user-account.component'; +import { UserService } from '../user.service'; describe('UserAccountComponent', () => { let component: UserAccountComponent; let fixture: ComponentFixture; - beforeEach(async(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ UserAccountComponent ] + declarations: [ UserAccountComponent ], + providers: [ UserService, provideHttpClient(), provideHttpClientTesting(), provideRouter([]) ] }) .compileComponents(); })); diff --git a/AdminPortal/src/app/user-account/user-account.component.ts b/AdminPortal/src/app/user-account/user-account.component.ts index 872546c7..4b60ce1d 100644 --- a/AdminPortal/src/app/user-account/user-account.component.ts +++ b/AdminPortal/src/app/user-account/user-account.component.ts @@ -5,7 +5,8 @@ import { UserService } from '../user.service'; @Component({ selector: 'app-user-account', templateUrl: './user-account.component.html', - styleUrls: ['./user-account.component.css'] + styleUrls: ['./user-account.component.css'], + standalone: false }) export class UserAccountComponent implements OnInit { @@ -18,7 +19,7 @@ export class UserAccountComponent implements OnInit { getUsers() { this.userService.getUsers().subscribe( res => { - this.userList = JSON.parse(JSON.parse(JSON.stringify(res))._body); + this.userList = res; }, error => console.log(error) ) diff --git a/AdminPortal/src/app/user.service.spec.ts b/AdminPortal/src/app/user.service.spec.ts index 79eb5480..c41d82f0 100644 --- a/AdminPortal/src/app/user.service.spec.ts +++ b/AdminPortal/src/app/user.service.spec.ts @@ -1,12 +1,14 @@ /* tslint:disable:no-unused-variable */ -import { TestBed, async, inject } from '@angular/core/testing'; +import { TestBed, inject } from '@angular/core/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; import { UserService } from './user.service'; describe('Service: User', () => { beforeEach(() => { TestBed.configureTestingModule({ - providers: [UserService] + providers: [UserService, provideHttpClient(), provideHttpClientTesting()] }); }); diff --git a/AdminPortal/src/app/user.service.ts b/AdminPortal/src/app/user.service.ts index bde10a38..223f5268 100644 --- a/AdminPortal/src/app/user.service.ts +++ b/AdminPortal/src/app/user.service.ts @@ -1,25 +1,25 @@ import { Injectable } from '@angular/core'; -import {Http, Headers} from '@angular/http'; +import { HttpClient } from '@angular/common/http'; @Injectable() export class UserService { - constructor (private http:Http){} + constructor (private http: HttpClient){} getUsers() { let url = "http://localhost:8080/api/user/all"; - return this.http.get(url, { withCredentials: true }); + return this.http.get(url, { withCredentials: true }); } getPrimaryTransactionList(username: string) { let url = "http://localhost:8080/api/user/primary/transaction?username="+username; - return this.http.get(url, { withCredentials: true }); + return this.http.get(url, { withCredentials: true }); } getSavingsTransactionList(username: string) { let url = "http://localhost:8080/api/user/savings/transaction?username="+username; - return this.http.get(url, { withCredentials: true }); + return this.http.get(url, { withCredentials: true }); } enableUser (username: string) { diff --git a/AdminPortal/src/main.ts b/AdminPortal/src/main.ts index 62a67974..a9ca1caf 100644 --- a/AdminPortal/src/main.ts +++ b/AdminPortal/src/main.ts @@ -1,5 +1,3 @@ -import './polyfills.ts'; - import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; diff --git a/AdminPortal/src/polyfills.ts b/AdminPortal/src/polyfills.ts deleted file mode 100644 index fd01cc9f..00000000 --- a/AdminPortal/src/polyfills.ts +++ /dev/null @@ -1,73 +0,0 @@ -/** - * This file includes polyfills needed by Angular and is loaded before the app. - * You can add your own extra polyfills to this file. - * - * This file is divided into 2 sections: - * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers. - * 2. Application imports. Files imported after ZoneJS that should be loaded before your main - * file. - * - * The current setup is for so-called "evergreen" browsers; the last versions of browsers that - * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera), - * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile. - * - * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html - */ - -/*************************************************************************************************** - * BROWSER POLYFILLS - */ - -/** IE9, IE10 and IE11 requires all of the following polyfills. **/ -// import 'core-js/es6/symbol'; -// import 'core-js/es6/object'; -// import 'core-js/es6/function'; -// import 'core-js/es6/parse-int'; -// import 'core-js/es6/parse-float'; -// import 'core-js/es6/number'; -// import 'core-js/es6/math'; -// import 'core-js/es6/string'; -// import 'core-js/es6/date'; -// import 'core-js/es6/array'; -// import 'core-js/es6/regexp'; -// import 'core-js/es6/map'; -// import 'core-js/es6/weak-map'; -// import 'core-js/es6/set'; - -/** IE10 and IE11 requires the following for NgClass support on SVG elements */ -// import 'classlist.js'; // Run `npm install --save classlist.js`. - -/** IE10 and IE11 requires the following to support `@angular/animation`. */ -// import 'web-animations-js'; // Run `npm install --save web-animations-js`. - - -/** Evergreen browsers require these. **/ -import 'core-js/es6/reflect'; -import 'core-js/es7/reflect'; - - -/** ALL Firefox browsers require the following to support `@angular/animation`. **/ -// import 'web-animations-js'; // Run `npm install --save web-animations-js`. - - - -/*************************************************************************************************** - * Zone JS is required by Angular itself. - */ -import 'zone.js/dist/zone'; // Included with Angular CLI. - - - -/*************************************************************************************************** - * APPLICATION IMPORTS - */ - -/** - * Date, currency, decimal and percent pipes. - * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10 - */ -// import 'intl'; // Run `npm install --save intl`. -/** - * Need to import at least one locale-data with intl. - */ -// import 'intl/locale-data/jsonp/en'; diff --git a/AdminPortal/src/test.ts b/AdminPortal/src/test.ts deleted file mode 100644 index cd612eeb..00000000 --- a/AdminPortal/src/test.ts +++ /dev/null @@ -1,32 +0,0 @@ -// This file is required by karma.conf.js and loads recursively all the .spec and framework files - -import 'zone.js/dist/long-stack-trace-zone'; -import 'zone.js/dist/proxy.js'; -import 'zone.js/dist/sync-test'; -import 'zone.js/dist/jasmine-patch'; -import 'zone.js/dist/async-test'; -import 'zone.js/dist/fake-async-test'; -import { getTestBed } from '@angular/core/testing'; -import { - BrowserDynamicTestingModule, - platformBrowserDynamicTesting -} from '@angular/platform-browser-dynamic/testing'; - -// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any. -declare const __karma__: any; -declare const require: any; - -// Prevent Karma from running prematurely. -__karma__.loaded = function () {}; - -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment( - BrowserDynamicTestingModule, - platformBrowserDynamicTesting() -); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); -// Finally, start Karma to run the tests. -__karma__.start(); diff --git a/AdminPortal/src/tsconfig.app.json b/AdminPortal/src/tsconfig.app.json index 5e2507db..167dfc3c 100644 --- a/AdminPortal/src/tsconfig.app.json +++ b/AdminPortal/src/tsconfig.app.json @@ -2,12 +2,12 @@ "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/app", - "module": "es2015", - "baseUrl": "", "types": [] }, - "exclude": [ - "test.ts", - "**/*.spec.ts" + "files": [ + "main.ts" + ], + "include": [ + "**/*.d.ts" ] } diff --git a/AdminPortal/src/tsconfig.spec.json b/AdminPortal/src/tsconfig.spec.json index 510e3f1f..1a837a8d 100644 --- a/AdminPortal/src/tsconfig.spec.json +++ b/AdminPortal/src/tsconfig.spec.json @@ -2,17 +2,10 @@ "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/spec", - "module": "commonjs", - "target": "es5", - "baseUrl": "", "types": [ - "jasmine", - "node" + "jasmine" ] }, - "files": [ - "test.ts" - ], "include": [ "**/*.spec.ts", "**/*.d.ts" diff --git a/AdminPortal/src/typings.d.ts b/AdminPortal/src/typings.d.ts deleted file mode 100644 index ef5c7bd6..00000000 --- a/AdminPortal/src/typings.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -/* SystemJS module definition */ -declare var module: NodeModule; -interface NodeModule { - id: string; -} diff --git a/AdminPortal/tsconfig.json b/AdminPortal/tsconfig.json index a35a8ee3..8d877e7f 100644 --- a/AdminPortal/tsconfig.json +++ b/AdminPortal/tsconfig.json @@ -2,18 +2,16 @@ "compileOnSave": false, "compilerOptions": { "outDir": "./dist/out-tsc", - "baseUrl": "src", "sourceMap": true, "declaration": false, - "moduleResolution": "node", - "emitDecoratorMetadata": true, + "skipLibCheck": true, + "isolatedModules": true, "experimentalDecorators": true, - "target": "es5", - "typeRoots": [ - "node_modules/@types" - ], + "importHelpers": true, + "target": "ES2022", + "module": "preserve", "lib": [ - "es2016", + "ES2022", "dom" ] } diff --git a/AdminPortal/tslint.json b/AdminPortal/tslint.json deleted file mode 100644 index dd117b38..00000000 --- a/AdminPortal/tslint.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "rulesDirectory": [ - "node_modules/codelyzer" - ], - "rules": { - "arrow-return-shorthand": true, - "callable-types": true, - "class-name": true, - "comment-format": [ - true, - "check-space" - ], - "curly": true, - "eofline": true, - "forin": true, - "import-blacklist": [ - true, - "rxjs" - ], - "import-spacing": true, - "indent": [ - true, - "spaces" - ], - "interface-over-type-literal": true, - "label-position": true, - "max-line-length": [ - true, - 140 - ], - "member-access": false, - "member-ordering": [ - true, - "static-before-instance", - "variables-before-functions" - ], - "no-arg": true, - "no-bitwise": true, - "no-console": [ - true, - "debug", - "info", - "time", - "timeEnd", - "trace" - ], - "no-construct": true, - "no-debugger": true, - "no-duplicate-super": true, - "no-empty": false, - "no-empty-interface": true, - "no-eval": true, - "no-inferrable-types": [ - true, - "ignore-params" - ], - "no-misused-new": true, - "no-non-null-assertion": true, - "no-shadowed-variable": true, - "no-string-literal": false, - "no-string-throw": true, - "no-switch-case-fall-through": true, - "no-trailing-whitespace": true, - "no-unnecessary-initializer": true, - "no-unused-expression": true, - "no-use-before-declare": true, - "no-var-keyword": true, - "object-literal-sort-keys": false, - "one-line": [ - true, - "check-open-brace", - "check-catch", - "check-else", - "check-whitespace" - ], - "prefer-const": true, - "quotemark": [ - true, - "single" - ], - "radix": true, - "semicolon": [ - "always" - ], - "triple-equals": [ - true, - "allow-null-check" - ], - "typedef-whitespace": [ - true, - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - } - ], - "typeof-compare": true, - "unified-signatures": true, - "variable-name": false, - "whitespace": [ - true, - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type" - ], - "directive-selector": [ - true, - "attribute", - "app", - "camelCase" - ], - "component-selector": [ - true, - "element", - "app", - "kebab-case" - ], - "use-input-property-decorator": true, - "use-output-property-decorator": true, - "use-host-property-decorator": true, - "no-input-rename": true, - "no-output-rename": true, - "use-life-cycle-interface": true, - "use-pipe-transform-interface": true, - "component-class-suffix": true, - "directive-class-suffix": true, - "no-access-missing-member": true, - "templates-use-public": true, - "invoke-injectable": true - } -}