Commit 70042f91 authored by achinta's avatar achinta

feat: change password and before login page

parent bd2ffcb0
...@@ -36,6 +36,14 @@ export const routes: Routes = [ ...@@ -36,6 +36,14 @@ export const routes: Routes = [
).then((m) => m.AccessDeniedComponent), ).then((m) => m.AccessDeniedComponent),
data: { roles: [] }, data: { roles: [] },
}, },
{
path: RequestMapperService.BEFORE_LOGIN_URL,
loadComponent: () =>
import(
'./auth/before-login/before-login.component'
).then((m) => m.BeforeLoginComponent),
data: { roles: [] },
},
{ {
path: RequestMapperService.BASE_RELATIVE_URL, path: RequestMapperService.BASE_RELATIVE_URL,
redirectTo: RequestMapperService.PORTAL_URL, redirectTo: RequestMapperService.PORTAL_URL,
......
<div class="container">
<div class="girls_login_container">
<app-white-card
[cardTextHeading]="'Boys'"
[cardTextIcon]="'boy'"
[cardLink]="loginUrl"
/>
</div>
<div class="boys_login_container">
<app-white-card
[cardTextHeading]="'Girls'"
[cardTextIcon]="'girl'"
[cardLink]="loginUrl"
/>
</div>
</div>
\ No newline at end of file
.container{
display: flex;
align-items: center;
justify-content: center;
height: 100%;
gap: 30px;
}
\ No newline at end of file
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { BeforeLoginComponent } from './before-login.component';
describe('BeforeLoginComponent', () => {
let component: BeforeLoginComponent;
let fixture: ComponentFixture<BeforeLoginComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [BeforeLoginComponent]
})
.compileComponents();
fixture = TestBed.createComponent(BeforeLoginComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { CommonModule } from '@angular/common';
import { Component } from '@angular/core';
import {MatCardModule} from '@angular/material/card';
import { WhiteCardComponent } from "../../component-library/white-card/white-card.component";
import { RequestMapperService } from '../../mappers/request-mapper.service';
@Component({
selector: 'app-before-login',
imports: [
CommonModule,
MatCardModule,
WhiteCardComponent
],
templateUrl: './before-login.component.html',
styleUrl: './before-login.component.scss'
})
export class BeforeLoginComponent {
public loginUrl =`/${RequestMapperService.LOGIN_URL}`;
}
...@@ -13,7 +13,7 @@ export const authGuard: CanActivateFn = ( ...@@ -13,7 +13,7 @@ export const authGuard: CanActivateFn = (
else{ else{
router.navigate([RequestMapperService.LOGIN_URL]); router.navigate([RequestMapperService.BEFORE_LOGIN_URL]);
return false; return false;
} }
}; };
a { a {
text-decoration: none; text-decoration: none;
} }
.white_card:hover{
background-color: #d2d2d2;
}
.white_card { .white_card {
background-color: var(--secondary-bg-color); background-color: var(--secondary-bg-color);
padding: 28px 0px 15px; padding: 30px;
box-shadow: var(--box-shadow-small); box-shadow: var(--box-shadow-small);
border-radius: var(--border-radius-mid); border-radius: var(--border-radius-mid);
text-align: center; text-align: center;
p{
margin: 0;
}
.card_icon { .card_icon {
font-size: 40px; font-size: 40px;
color: var(--primary-color); color: var(--primary-color);
...@@ -17,7 +21,7 @@ a { ...@@ -17,7 +21,7 @@ a {
.card_heading { .card_heading {
font-family: var(--font-mid); font-family: var(--font-mid);
color: var(--primary-color); color: var(--primary-color);
margin-top: 10px; // margin-top: 10px;
margin-bottom: 18px; // margin-bottom: 18px;
} }
} }
...@@ -17,6 +17,7 @@ export class RequestMapperService { ...@@ -17,6 +17,7 @@ export class RequestMapperService {
public static readonly LOGIN_URL: string = 'login'; public static readonly LOGIN_URL: string = 'login';
public static readonly PORTAL_URL: string = 'portal'; public static readonly PORTAL_URL: string = 'portal';
public static readonly DASHBOARD_URL: string = 'dashboard'; public static readonly DASHBOARD_URL: string = 'dashboard';
public static readonly BEFORE_LOGIN_URL: string = 'login-for';
// assignment navigation // assignment navigation
public static readonly ASSIGNMENT_URL: string = 'assignment'; public static readonly ASSIGNMENT_URL: string = 'assignment';
......
...@@ -9,7 +9,10 @@ export class TransmissionMapperService { ...@@ -9,7 +9,10 @@ export class TransmissionMapperService {
public static readonly DEV_TRANSMISSION_URL: string = public static readonly DEV_TRANSMISSION_URL: string =
'https://magicoweb.com'; 'https://portal.lamartiniere.co';
// public static readonly PROFILE_CHANGE_BASE_URL: string =
// 'http://13.126.107.189:5011';
public static readonly LOGIN_TRANSMISSION_URL: string = public static readonly LOGIN_TRANSMISSION_URL: string =
TransmissionMapperService.DEV_TRANSMISSION_URL + '/webomagic-user/v1/user/login'; TransmissionMapperService.DEV_TRANSMISSION_URL + '/webomagic-user/v1/user/login';
...@@ -17,8 +20,11 @@ export class TransmissionMapperService { ...@@ -17,8 +20,11 @@ export class TransmissionMapperService {
public static readonly USER_PROFILE_TRANSMISSION_URL: string = public static readonly USER_PROFILE_TRANSMISSION_URL: string =
TransmissionMapperService.DEV_TRANSMISSION_URL + '/user/get-profile'; TransmissionMapperService.DEV_TRANSMISSION_URL + '/user/get-profile';
// public static readonly CHANGE_PASSWORD_TRANSMISSION_URL: string =
// TransmissionMapperService.PROFILE_CHANGE_BASE_URL + '/webomagic-user/v1/user/change-password?';
public static readonly CHANGE_PASSWORD_TRANSMISSION_URL: string = public static readonly CHANGE_PASSWORD_TRANSMISSION_URL: string =
TransmissionMapperService.DEV_TRANSMISSION_URL + '/webomagic-user/v1/user/change-password'; TransmissionMapperService.DEV_TRANSMISSION_URL + '/webomagic-user/v1/user/change-password?';
public static readonly GET_TRANSMISSION_URL: string = public static readonly GET_TRANSMISSION_URL: string =
TransmissionMapperService.DEV_TRANSMISSION_URL + '/webomagic/getWebDataSourceByWebsiteDataSourceForFilter?'; TransmissionMapperService.DEV_TRANSMISSION_URL + '/webomagic/getWebDataSourceByWebsiteDataSourceForFilter?';
......
...@@ -9,6 +9,7 @@ import { ToasterService } from '../../../component-library/toaster/toaster.servi ...@@ -9,6 +9,7 @@ import { ToasterService } from '../../../component-library/toaster/toaster.servi
import { AuthTransmissionService } from '../../../raintree/transmission/auth-transmission.service'; import { AuthTransmissionService } from '../../../raintree/transmission/auth-transmission.service';
import { TransmissionMapperService } from '../../../mappers/transmission-mapper.service'; import { TransmissionMapperService } from '../../../mappers/transmission-mapper.service';
import { RaintreeResponse } from '../../../raintree/interface/raintree-response'; import { RaintreeResponse } from '../../../raintree/interface/raintree-response';
import { UrlConfigService } from '../../service/url-config.service';
@Component({ @Component({
selector: 'app-change-password', selector: 'app-change-password',
...@@ -27,6 +28,7 @@ export class ChangePasswordComponent { ...@@ -27,6 +28,7 @@ export class ChangePasswordComponent {
public toaster = inject(ToasterService); public toaster = inject(ToasterService);
private _auth = inject(AuthTransmissionService); private _auth = inject(AuthTransmissionService);
private _urlConfig = inject(UrlConfigService);
public updatePasswordForm = new FormGroup({ public updatePasswordForm = new FormGroup({
currentPassword: new FormControl("", [Validators.required]), currentPassword: new FormControl("", [Validators.required]),
...@@ -43,22 +45,24 @@ export class ChangePasswordComponent { ...@@ -43,22 +45,24 @@ export class ChangePasswordComponent {
console.log(this.updatePasswordForm.value); console.log(this.updatePasswordForm.value);
// call API for change password // call API for change password
this._auth.changePassword( this._auth.changePassword(
TransmissionMapperService.CHANGE_PASSWORD_TRANSMISSION_URL, TransmissionMapperService.CHANGE_PASSWORD_TRANSMISSION_URL +
this._urlConfig.generateDatasourceConfigUrl({
old_password:`${this.updatePasswordForm.value.currentPassword}`,
new_password:`${this.updatePasswordForm.value.newPassword}`,
}),
{ {},
"old_password": `${this.updatePasswordForm.value.currentPassword}`,
"new_password": `${this.updatePasswordForm.value.newPassword}`
},
() => { }, () => { },
() => { }, () => { },
(response: RaintreeResponse) => { (response: RaintreeResponse) => {
console.log(response); console.log(response.message);
this.toaster.error(response.message)
}, },
(error) => { (error) => {
console.log(error); console.log(error);
// this.toaster.error(error)
}, },
() => { } () => { }
); );
......
...@@ -66,7 +66,7 @@ export class AuthTransmissionService extends TransmissionService { ...@@ -66,7 +66,7 @@ export class AuthTransmissionService extends TransmissionService {
onFailure: (error: string) => void, onFailure: (error: string) => void,
onComplete: () => void onComplete: () => void
): void { ): void {
this.executePostPayload( this.executePatchPayload(
url, url,
payload, payload,
onPreExecute, onPreExecute,
......
...@@ -19,7 +19,7 @@ export class JWTService { ...@@ -19,7 +19,7 @@ export class JWTService {
let authorizationToken = localStorage.getItem('Bearer') || ''; let authorizationToken = localStorage.getItem('Bearer') || '';
return new HttpHeaders({ return new HttpHeaders({
"user-id": userId, "user-id": userId,
"apikey": authorizationToken, "apiKey": authorizationToken,
'Content-Type': 'application/json', 'Content-Type': 'application/json',
// 'Project-Id': 278, // 'Project-Id': 278,
}); });
...@@ -31,7 +31,7 @@ export class JWTService { ...@@ -31,7 +31,7 @@ export class JWTService {
return new HttpHeaders({ return new HttpHeaders({
"user-id": userId, "user-id": userId,
"apikey": authorizationToken, "apiKey": authorizationToken,
}); });
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment