diff --git a/client/src/app/app.routes.ts b/client/src/app/app.routes.ts index 55abc21..ea52a6c 100644 --- a/client/src/app/app.routes.ts +++ b/client/src/app/app.routes.ts @@ -1,6 +1,6 @@ import { Routes } from '@angular/router'; import { ScreenSend } from './screens/screen-send/screen-send'; -import { ScreenReceive } from './screens/screen-receive/screen-receive'; +import { ScreenRequest } from './screens/screen-request/screen-request'; import { ScreenProfile } from './screens/screen-profile/screen-profile'; import { ScreenLogin } from './screens/screen-login/screen-login'; import { authGuard } from './services/auth-guard'; @@ -22,7 +22,7 @@ export const routes: Routes = [ }, { path:'receive', - component: ScreenReceive, + component: ScreenRequest, canActivate: [authGuard], }, { diff --git a/client/src/app/screens/screen-receive/screen-receive.html b/client/src/app/screens/screen-request/screen-request.html similarity index 100% rename from client/src/app/screens/screen-receive/screen-receive.html rename to client/src/app/screens/screen-request/screen-request.html diff --git a/client/src/app/screens/screen-receive/screen-receive.less b/client/src/app/screens/screen-request/screen-request.less similarity index 100% rename from client/src/app/screens/screen-receive/screen-receive.less rename to client/src/app/screens/screen-request/screen-request.less diff --git a/client/src/app/screens/screen-receive/screen-receive.spec.ts b/client/src/app/screens/screen-request/screen-request.spec.ts similarity index 62% rename from client/src/app/screens/screen-receive/screen-receive.spec.ts rename to client/src/app/screens/screen-request/screen-request.spec.ts index 9c4af7b..a4f08bf 100644 --- a/client/src/app/screens/screen-receive/screen-receive.spec.ts +++ b/client/src/app/screens/screen-request/screen-request.spec.ts @@ -1,17 +1,17 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ScreenReceive } from './screen-receive'; +import { ScreenRequest } from './screen-request'; describe('ScreenReceive', () => { - let component: ScreenReceive; - let fixture: ComponentFixture; + let component: ScreenRequest; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ScreenReceive], + imports: [ScreenRequest], }).compileComponents(); - fixture = TestBed.createComponent(ScreenReceive); + fixture = TestBed.createComponent(ScreenRequest); component = fixture.componentInstance; await fixture.whenStable(); }); diff --git a/client/src/app/screens/screen-receive/screen-receive.ts b/client/src/app/screens/screen-request/screen-request.ts similarity index 87% rename from client/src/app/screens/screen-receive/screen-receive.ts rename to client/src/app/screens/screen-request/screen-request.ts index 107debc..4ec975b 100644 --- a/client/src/app/screens/screen-receive/screen-receive.ts +++ b/client/src/app/screens/screen-request/screen-request.ts @@ -6,12 +6,12 @@ import { APIService } from '../../services/api'; import { Modal } from '../../components/modal/modal'; @Component({ - selector: 'app-screen-receive', + selector: 'app-screen-request', imports: [FormsModule, QrCodeComponent], - templateUrl: './screen-receive.html', - styleUrl: './screen-receive.less', + templateUrl: './screen-request.html', + styleUrl: './screen-request.less', }) -export class ScreenReceive { +export class ScreenRequest { private modalService = inject(NgbModal); api = inject(APIService); @ViewChild('qrTemplate') qrTemplate !: TemplateRef; diff --git a/client/src/app/screens/screen-send/screen-send.ts b/client/src/app/screens/screen-send/screen-send.ts index 88be295..4895620 100644 --- a/client/src/app/screens/screen-send/screen-send.ts +++ b/client/src/app/screens/screen-send/screen-send.ts @@ -3,12 +3,12 @@ import { FormsModule } from '@angular/forms'; import { APIService } from '../../services/api'; import { NotificationService } from '../../services/notification'; import QrScanner from 'qr-scanner'; -import { NgbModal, NgbSlide } from '@ng-bootstrap/ng-bootstrap'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { Modal } from '../../components/modal/modal'; @Component({ selector: 'app-screen-send', - imports: [FormsModule, NgbSlide], + imports: [FormsModule], templateUrl: './screen-send.html', styleUrl: './screen-send.less', }) @@ -54,8 +54,6 @@ export class ScreenSend { const modalRef = this.modalService.open(Modal); modalRef.componentInstance.title = 'Scan a QR Code'; modalRef.componentInstance.body = this.templScanner; - - } closeScanner(){} } \ No newline at end of file