Commit 9b33eccc authored by achinta's avatar achinta

fix: some design and dynamic dashboard icon

parent 5a41bd79
.content-container{
height: 100%;
}
\ No newline at end of file
<div class="container"> <div class="container">
<div class="top_yellow_line"></div> <!-- <div class="top_yellow_line"></div> -->
<!-- <div class="header_box"> <!-- <div class="header_box">
<div class="menu_icon">menu</div> <div class="menu_icon">menu</div>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
display: flex; display: flex;
height: 100%; height: 100%;
flex-direction: column; flex-direction: column;
background: #FFBF00;
.header_box { .header_box {
background-color: white; background-color: white;
// color: white; // color: white;
...@@ -56,21 +56,21 @@ ...@@ -56,21 +56,21 @@
} }
.headerLastBottom_yellow_line { .headerLastBottom_yellow_line {
background-color: #FFBF00; // background-color: #FFBF00;
height: 40px; height: var(--divider-height);
width: 100%; // width: 100%;
} }
.chooseSchoolSection { .chooseSchoolSection {
background: linear-gradient(to right, #EFEFEF, #E5D7E4); background: linear-gradient(to right, #EFEFEF, #E5D7E4);
margin: -20px 0; // margin: -20px 0;
border-radius: 20px 20px 0 0; border-radius: 20px 20px 0 0;
height: 100%; height: 100%;
padding: 0 30px; padding: 0 20px;
.select_school { .select_school {
margin-bottom: 10px; margin-bottom: 10px;
margin-top: 50px; margin-top: 30px;
span { span {
......
...@@ -4,66 +4,69 @@ ...@@ -4,66 +4,69 @@
<img class="login_logo" [ngSrc]="loggedSchoolLogo" alt="Logo" width="80" height="80" /> <img class="login_logo" [ngSrc]="loggedSchoolLogo" alt="Logo" width="80" height="80" />
<p> {{schoolHeader}} </p> <p> {{schoolHeader}} </p>
</div> </div>
<div class="top_blue_line"></div> <!-- <div class="top_blue_line"></div> -->
<div class="NumberOtp"> <div class="login-wrapper">
<div class="login_outer"> <div class="custom_gap">
<div class="phone_section">
<form class="login_form" [formGroup]="loginForm">
<h5>Welcome</h5> </div>
<mat-radio-group aria-label="Select an option" formControlName="role" > <div class="phone_section login_outer">
<mat-radio-button value="student">Student</mat-radio-button> <form class="login_form" [formGroup]="loginForm">
<mat-radio-button value="EDITOR">Teacher</mat-radio-button>
</mat-radio-group> <h5>Welcome</h5>
<mat-radio-group aria-label="Select an option" formControlName="role" >
<mat-radio-button value="student">Student</mat-radio-button>
<mat-radio-button value="EDITOR">Teacher</mat-radio-button>
</mat-radio-group>
<p>Enter your mobile number to continue</p> <p>Enter your mobile number to continue</p>
<div class="mat_input_container" > <div class="mat_input_container" >
<mat-form-field class="full_width"> <mat-form-field class="full_width">
<span class="material-symbols-outlined" matPrefix> <span class="material-symbols-outlined" matPrefix>
person person
</span> </span>
<input type="number" class="inputStyle" matInput placeholder="{{ 'Enter your number' }}" #input <input type="number" class="inputStyle" matInput placeholder="{{ 'Enter your number' }}" #input
formControlName="phoneNo" [readonly]="otpSend" [disabled]="otpSend" /> formControlName="phoneNo" [readonly]="otpSend" [disabled]="otpSend" />
</mat-form-field> </mat-form-field>
<ng-container <ng-container
*ngIf="loginForm.controls.phoneNo.invalid && loginForm.controls.phoneNo.dirty || loginForm.controls.phoneNo.invalid && loginForm.controls.phoneNo.touched"> *ngIf="loginForm.controls.phoneNo.invalid && loginForm.controls.phoneNo.dirty || loginForm.controls.phoneNo.invalid && loginForm.controls.phoneNo.touched">
<span class="error_text" *ngIf="loginForm.controls.phoneNo.hasError('required')">This field is <span class="error_text" *ngIf="loginForm.controls.phoneNo.hasError('required')">This field is
required</span> required</span>
<span class="error_text" *ngIf="loginForm.controls.phoneNo.hasError('pattern')">Phone number must be 10 <span class="error_text" *ngIf="loginForm.controls.phoneNo.hasError('pattern')">Phone number must be 10
digits.</span> digits.</span>
</ng-container> </ng-container>
</div> </div>
<app-rounded-button-full-width [buttonText]="'Send OTP'" [enableThrottling]="true" <app-rounded-button-full-width [buttonText]="'Send OTP'" [enableThrottling]="true"
(onClickEventEmitter)="sendOtp()" [ngClass]="{'d-none': otpSend}"/> (onClickEventEmitter)="sendOtp()" [ngClass]="{'d-none': otpSend}"/>
<div class="mat_input_container" [ngClass]="{'d-none': !otpSend}" > <div class="mat_input_container" [ngClass]="{'d-none': !otpSend}" >
<mat-form-field class="full_width"> <mat-form-field class="full_width">
<span class="material-symbols-outlined" matPrefix> lock </span> <span class="material-symbols-outlined" matPrefix> lock </span>
<input matInput placeholder="{{ 'Enter OTP' }}" [type]="hidePassword ? 'password' : 'text'" <input matInput placeholder="{{ 'Enter OTP' }}" [type]="hidePassword ? 'password' : 'text'"
formControlName="otp" /> formControlName="otp" />
<span class="material-symbols-outlined pointer" matSuffix (click)="hidePassword = !hidePassword"> <span class="material-symbols-outlined pointer" matSuffix (click)="hidePassword = !hidePassword">
{{ hidePassword ? "visibility_off" : "visibility" }} {{ hidePassword ? "visibility_off" : "visibility" }}
</span> </span>
<!-- <mat-hint *ngIf="!passwordInput.value">Enter your password</mat-hint> --> <!-- <mat-hint *ngIf="!passwordInput.value">Enter your password</mat-hint> -->
</mat-form-field> </mat-form-field>
<ng-container <ng-container
*ngIf="loginForm.controls.otp.invalid && loginForm.controls.otp.dirty || loginForm.controls.otp.invalid && loginForm.controls.otp.touched"> *ngIf="loginForm.controls.otp.invalid && loginForm.controls.otp.dirty || loginForm.controls.otp.invalid && loginForm.controls.otp.touched">
<span class="error_text" *ngIf="loginForm.controls.otp.hasError('required')">Otp is required</span> <span class="error_text" *ngIf="loginForm.controls.otp.hasError('required')">Otp is required</span>
<span class="error_text" *ngIf="loginForm.controls.otp.hasError('pattern')">OTP must be 4 digits</span> <span class="error_text" *ngIf="loginForm.controls.otp.hasError('pattern')">OTP must be 4 digits</span>
</ng-container> </ng-container>
</div> </div>
<app-rounded-button-full-width [buttonText]="'Enter OTP'" [buttonIconName]="'login'" [enableThrottling]="true" <app-rounded-button-full-width [buttonText]="'Enter OTP'" [buttonIconName]="'login'" [enableThrottling]="true"
(onClickEventEmitter)="authenticate()" [ngClass]="{'d-none': !otpSend}" /> (onClickEventEmitter)="authenticate()" [ngClass]="{'d-none': !otpSend}" />
</form> </form>
<!-- <div class="error_txt" *ngIf="errorMessage"> <!-- <div class="error_txt" *ngIf="errorMessage">
<span class="api_error_message">fdgsgs</span> <span class="api_error_message">fdgsgs</span>
</div> --> </div> -->
</div>
</div> </div>
</div> </div>
<!-- <div class="NumberOtp">
</div> -->
</div> </div>
\ No newline at end of file
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
align-items: center; align-items: center;
gap: 10px; gap: 10px;
padding: 0 20px; padding: 0 20px;
p{
p {
font-size: 20px; font-size: 20px;
font-weight: 500; font-weight: 500;
color: #37393A; color: #37393A;
...@@ -19,6 +20,9 @@ ...@@ -19,6 +20,9 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
background: linear-gradient(to right, #EFEFEF, #E5D7E4); background: linear-gradient(to right, #EFEFEF, #E5D7E4);
padding: 10px 30px;
border-radius: 20px 20px 0 0;
// padding: 0 20px; // padding: 0 20px;
// display: flex; // display: flex;
// justify-content: center; // justify-content: center;
...@@ -28,7 +32,7 @@ ...@@ -28,7 +32,7 @@
.phone_section { .phone_section {
// padding: 20px; // padding: 20px;
margin: unset; // margin: unset;
h5 { h5 {
font-size: 22px; font-size: 22px;
...@@ -49,21 +53,21 @@ ...@@ -49,21 +53,21 @@
} }
.top_blue_line { // .top_blue_line {
width: 100%; // width: 100%;
height: 37px; // height: 37px;
background-color: #2C5EC5; // background-color: #2C5EC5;
} // }
.NumberOtp { // .NumberOtp {
background: linear-gradient(to right, #EFEFEF, #E5D7E4); // background: linear-gradient(to right, #EFEFEF, #E5D7E4);
margin-top: -20px; // margin-top: -20px;
border-radius: 20px 20px 0 0; // border-radius: 20px 20px 0 0;
padding: 0 30px; // padding: 0 30px;
padding-top: 30px; // padding-top: 30px;
height: 100%; // height: 100%;
} // }
.login_wrapper { .login_wrapper {
display: flex; display: flex;
...@@ -91,7 +95,14 @@ ...@@ -91,7 +95,14 @@
} }
} }
.login-wrapper {
height: 100%;
background-color: #2C5EC5;
}
.custom_gap {
height: var(--divider-height);
}
.login_wrapper::ng-deep { .login_wrapper::ng-deep {
...@@ -148,6 +159,6 @@ ...@@ -148,6 +159,6 @@
} }
} }
.d-none{ .d-none {
display: none; display: none;
} }
\ No newline at end of file
<a [routerLink]="cardLink"> <a [routerLink]="cardLink">
<div class="colored_card"> <div class="colored_card">
<span class="material-symbols-outlined iconDashboardLeft">assignment_add</span> <span class="material-symbols-outlined iconDashboardLeft">{{CardIcon}}</span>
<p class="cardTextOneHeading">{{cardTextOneHeading}}</p> <p class="cardTextOneHeading">{{cardTextOneHeading}}</p>
<p class="cardTextOne">{{cardTextOne}}</p> <p class="cardTextOne">{{cardTextOne}}</p>
<!-- <p class="cardTextTwoHeading">{{cardTextTwoHeading}}</p> <!-- <p class="cardTextTwoHeading">{{cardTextTwoHeading}}</p>
......
...@@ -18,5 +18,6 @@ export class ColoredCardComponent { ...@@ -18,5 +18,6 @@ export class ColoredCardComponent {
@Input() cardTextTwo: string = ''; @Input() cardTextTwo: string = '';
@Input() cardLink: string = ''; @Input() cardLink: string = '';
@Input() CardImage: string = ''; @Input() CardImage: string = '';
@Input() CardIcon: string = 'assignment_add';
} }
.topbar_logo { .topbar_logo {
width: 10%; width: 10%;
padding: 10px 0px; padding: 10px 0px;
padding-left: 22px; padding-left: 18px;
img { img {
width: 100%; width: 100%;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
[cardLink]="assignmentUrl" [cardLink]="assignmentUrl"
[cardTextTwoHeading]="'Assignment'" [cardTextTwoHeading]="'Assignment'"
[cardTextTwo]="''" [cardTextTwo]="''"
[CardIcon]="'assignment_add'"
class="portal_card_colored_card" class="portal_card_colored_card"
/> />
<app-colored-card <app-colored-card
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
'./assets/image/Mobile_banking_app_with_secure_payment.svg' './assets/image/Mobile_banking_app_with_secure_payment.svg'
" "
class="portal_card_colored_card" class="portal_card_colored_card"
[CardIcon]="'nest_clock_farsight_analog'"
/> />
<app-colored-card <app-colored-card
[cardTextOneHeading]="'Exam Schedule'" [cardTextOneHeading]="'Exam Schedule'"
...@@ -45,6 +46,7 @@ ...@@ -45,6 +46,7 @@
[cardTextTwo]="''" [cardTextTwo]="''"
[CardImage]="'./assets/image/Digital_receipts_for_online_payments.svg'" [CardImage]="'./assets/image/Digital_receipts_for_online_payments.svg'"
class="portal_card_colored_card" class="portal_card_colored_card"
[CardIcon]="'calendar_month'"
/> />
</div> </div>
......
...@@ -2,19 +2,20 @@ ...@@ -2,19 +2,20 @@
<div class="portal_viewer"> <div class="portal_viewer">
<div class="top_bar"> <div class="top_bar">
<div class="top_yellow_line"></div> <!-- <div class="top_yellow_line"></div> -->
<app-top-bar /> <app-top-bar />
<div class="top_blue_line"></div> <!-- <div class="top_blue_line"></div> -->
</div> </div>
<div class="sidebar {{isSidebarOpen?'active':''}}"> <div class="sidebar {{isSidebarOpen?'active':''}}">
<app-sidebar /> <app-sidebar />
</div> </div>
<div *ngIf="isSidebarOpen" class="sidebar_wrapper_inner_overlay" (click)="closeSidebar()"></div> <div *ngIf="isSidebarOpen" class="sidebar_wrapper_inner_overlay" (click)="closeSidebar()"></div>
<div class="portal_wrapper">
<div class="portal_renderer"> <div class="common_divider"></div>
<div class="portal_renderer_inner"> <div class="portal_renderer">
<router-outlet /> <router-outlet />
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -10,6 +10,14 @@ ...@@ -10,6 +10,14 @@
padding-left: 20px; padding-left: 20px;
height: 100%; height: 100%;
} }
.portal_wrapper{
background-color: #2C5EC5;
width: 100%;
}
.common_divider{
height: var(--divider-height);
}
.portal_renderer { .portal_renderer {
width: calc(100% - 250px); width: calc(100% - 250px);
...@@ -17,18 +25,21 @@ ...@@ -17,18 +25,21 @@
background: linear-gradient(to right, #EFEFEF, #E5D7E4); background: linear-gradient(to right, #EFEFEF, #E5D7E4);
border-radius: 20px 20px 0 0; border-radius: 20px 20px 0 0;
// background: var(--secondary-bg-color); // background: var(--secondary-bg-color);
// padding: 20px 20px;
min-height: 84dvh; min-height: 84dvh;
padding-bottom: 20px; padding: 20px 10px;
margin-top: -40px; // margin-top: -40px;
// .portal_renderer_inner {
// background: linear-gradient(to right, #EFEFEF, #E5D7E4);
// width: 100%;
// border-radius: 20px 20px 0 0;
.portal_renderer_inner {
width: 100%;
background: linear-gradient(to right, #EFEFEF, #E5D7E4);
// background-color: var(--primary-bg-color); // background-color: var(--primary-bg-color);
border-radius: 20px 20px 0 0; // border-radius: 20px 20px 0 0;
padding: 20px 35px; // padding: 20px 35px;
margin: unset; // margin: unset;
} // }
} }
.top_bar { .top_bar {
...@@ -66,7 +77,9 @@ ...@@ -66,7 +77,9 @@
.portal_renderer .portal_renderer_inner { .portal_renderer .portal_renderer_inner {
width: 94%; width: 94%;
border-radius: 10px; // border-radius: 10px;
// border-radius: 20px 20px 0 0;
padding: 20px 0px; padding: 20px 0px;
margin: 0 auto; margin: 0 auto;
} }
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
--border-radius-small: 5px; --border-radius-small: 5px;
--border-radius-mid: 10px; --border-radius-mid: 10px;
--border-radius-large: 20px; --border-radius-large: 20px;
--divider-height:25px;
} }
......
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