Commit f1c552fe authored by Dibyendu Biswas's avatar Dibyendu Biswas

ui changes

parent 0f063436
<div class="container"> <div class="container">
<div class="girls_login_container"> <div class="top_yellow_line"></div>
<!-- <div class="header_box">
<div class="menu_icon">menu</div>
<div class="profile_icon">Profile</div>
</div>
<div class="headerBottom_yellow_line"></div> -->
<div class="welcomeMartiniere"> Welcome to<br/>
La Martiniere Kolkata</div>
<div class="headerLastBottom_yellow_line"></div>
<div class="chooseSchoolSection">
<div class="select_school"> <div class="select_school">
<span>Select Your School</span> <span>Choose Your School</span>
</div> </div>
<app-white-card <div class="girls_login_container">
[cardTextHeading]="'La Martiniere for Girls, Kolkata'"
(emitWhiteCardClick)="selectedSchool('girls')"
[cardLink]="loginUrl"
[cardImg]="'./assets/image/g_logo.png'"
/>
</div>
<div class="boys_login_container">
<app-white-card
[cardTextHeading]="'La Martiniere for Boys, Kolkata'"
(emitWhiteCardClick)="selectedSchool('boys')"
[cardLink]="loginUrl"
[cardImg]="'./assets/image/b_logo.png'"
/> <app-white-card [cardTextHeading]="'La Martiniere for Girls, Kolkata'"
(emitWhiteCardClick)="selectedSchool('girls')" [cardLink]="loginUrl" [cardImg]="'./assets/image/g_logo.png'"
/>
</div>
<div class="boys_login_container">
<app-white-card [cardTextHeading]="'La Martiniere for Boys, Kolkata'"
(emitWhiteCardClick)="selectedSchool('boys')" [cardLink]="loginUrl" [cardImg]="'./assets/image/b_logo.png'" />
<div class="color-boys"></div>
</div>
</div> </div>
</div> </div>
\ No newline at end of file
.container{ .container {
// width: 100%;
// align-items: center;
// justify-content: center;
// gap: 30px;
display: flex; display: flex;
align-items: center;
justify-content: center;
height: 100%; height: 100%;
gap: 30px; flex-direction: column;
flex-direction: column;
.girls_login_container,
.boys_login_container{ .top_yellow_line {
margin: 10px; background-color: #FFBF00;
height: 20px;
// width: 100%;
}
.header_box {
background-color: white;
// color: white;
display: flex;
align-items: center;
justify-content: space-between;
padding: 10px 15px;
.menu_icon,
.profile_icon {
font-size: 24px;
cursor: pointer;
}
.title_block {
text-align: center;
span {
font-size: 12px;
display: block;
}
h3 {
font-size: 16px;
margin: 0;
font-weight: 500;
font-style: italic;
}
}
}
.headerBottom_yellow_line {
background-color: #FFBF00;
height: 15px;
width: 100%;
}
.welcomeMartiniere {
background-color: #2C5EC5;
color: white;
// height: 80px;
font-size: 28px;
font-weight: 500;
font-style: italic;
padding: 40px 30px;
font-family: 'Georgia', sans-serif;
} }
.select_school{
text-align: center; .headerLastBottom_yellow_line {
margin-bottom: 10px; background-color: #FFBF00;
span{ height: 40px;
color: rgb(169 169 169); width: 100%;
font-size: 20px; }
font-weight: 500;
.chooseSchoolSection {
background: linear-gradient(to right, #EFEFEF, #E5D7E4);
margin: -20px 0;
border-radius: 20px 20px 0 0;
height: 100%;
padding: 0 30px;
.select_school {
margin-bottom: 10px;
margin-top: 50px;
span {
color: #37393A;
font-size: 22px;
font-weight: 500;
}
} }
} }
.girls_login_container,
.boys_login_container {
margin: 10px 0;
}
} }
\ No newline at end of file
<div class="login_outer"> <div class="loginPage">
<div class="phone_section"> <div class="top_yellow_line"></div>
<div class="logo_section"> <div class="logo_section">
<img class="login_logo" <img class="login_logo" [ngSrc]="loggedSchoolLogo" alt="Logo" width="80" height="80" />
[ngSrc]="loggedSchoolLogo" <p>La Martiniere for Girls</p>
alt="Logo" </div>
width="100" <div class="top_blue_line"></div>
height="100"
/>
</div>
<h5>Welcome</h5>
<p>Enter your username and password to continue</p>
<form class="login_form" [formGroup]="loginForm"> <div class="NumberOtp">
<div class="login_outer">
<div class="phone_section">
<div class="mat_input_container"> <h5>Welcome</h5>
<p>Enter your username and password to continue</p>
<mat-form-field class="full_width"> <form class="login_form" [formGroup]="loginForm">
<span class="material-symbols-outlined" matPrefix>
person
</span>
<input
matInput
placeholder="{{ 'Enter user name' }}"
#input
formControlName="email"
/>
</mat-form-field>
<ng-container *ngIf="loginForm.controls.email.invalid && loginForm.controls.email.dirty || loginForm.controls.email.invalid && loginForm.controls.email.touched"> <div class="mat_input_container">
<span class="error_text" *ngIf="loginForm.controls.email.hasError('required')">This field is required
</span>
</ng-container>
</div>
<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> lock </span> person
<input </span>
matInput <input class="inputStyle" matInput placeholder="{{ 'Enter your number' }}" #input formControlName="email" />
placeholder="{{ 'Enter password' }}" </mat-form-field>
[type]="hidePassword ? 'password' : 'text'"
formControlName="password"
/>
<span class="material-symbols-outlined pointer" matSuffix (click)="hidePassword = !hidePassword">
{{ hidePassword ? "visibility_off" : "visibility" }}
</span>
<!-- <mat-hint *ngIf="!passwordInput.value">Enter your password</mat-hint> -->
</mat-form-field>
<ng-container *ngIf="loginForm.controls.password.invalid && loginForm.controls.password.dirty || loginForm.controls.password.invalid && loginForm.controls.password.touched">
<span class="error_text" *ngIf="loginForm.controls.password.hasError('required')">Password is required
</span>
</ng-container>
</div>
<app-rounded-button-full-width <ng-container
[buttonText]="'Sign in'" *ngIf="loginForm.controls.email.invalid && loginForm.controls.email.dirty || loginForm.controls.email.invalid && loginForm.controls.email.touched">
[buttonIconName]="'login'" <span class="error_text" *ngIf="loginForm.controls.email.hasError('required')">This field is required
[enableThrottling]="true" </span>
(onClickEventEmitter)="authenticate()" </ng-container>
/> </div>
</form>
<div class="error_txt" *ngIf="errorMessage"> <div class="mat_input_container">
<!-- <span class="api_error_message">{{errorMessage}}</span> --> <mat-form-field class="full_width">
<span class="api_error_message">fdgsgs</span> <span class="material-symbols-outlined" matPrefix> lock </span>
<input matInput placeholder="{{ 'Enter your OTP' }}" [type]="hidePassword ? 'password' : 'text'"
formControlName="password" />
<span class="material-symbols-outlined pointer" matSuffix (click)="hidePassword = !hidePassword">
{{ hidePassword ? "visibility_off" : "visibility" }}
</span>
<!-- <mat-hint *ngIf="!passwordInput.value">Enter your password</mat-hint> -->
</mat-form-field>
<ng-container
*ngIf="loginForm.controls.password.invalid && loginForm.controls.password.dirty || loginForm.controls.password.invalid && loginForm.controls.password.touched">
<span class="error_text" *ngIf="loginForm.controls.password.hasError('required')">Password is required
</span>
</ng-container>
</div>
<app-rounded-button-full-width [buttonText]="'Sign in'" [buttonIconName]="'login'" [enableThrottling]="true"
(onClickEventEmitter)="authenticate()" />
</form>
<div class="error_txt" *ngIf="errorMessage">
<!-- <span class="api_error_message">{{errorMessage}}</span> -->
<span class="api_error_message">fdgsgs</span>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
.login_outer { .loginPage {
display: flex; height: 100%;
align-items: center;
justify-content: center;
min-height: 100vh;
.phone_section{
padding: 20px;
}
.logo_section { .logo_section {
width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: start;
align-items: center;
gap: 10px;
padding: 0 20px;
p{
font-size: 20px;
font-weight: 500;
color: #37393A;
}
} }
}
.login_wrapper { .login_outer {
display: flex; width: 100%;
justify-content: center; height: 100%;
align-items: center; background: linear-gradient(to right, #EFEFEF, #E5D7E4);
height: 550px; // padding: 0 20px;
// display: flex;
.main_content { // justify-content: center;
width: 50%; // align-items: center;
// min-height: 100vh;
// width: 100%;
.phone_section {
// padding: 20px;
margin: unset;
h5 {
font-size: 22px;
font-weight: 600;
color: #37393A;
margin: unset;
margin-top: 30px;
}
p {
font-size: 12px;
font-weight: 400;
color: #37393A;
}
}
} }
.img_section { .top_yellow_line {
width: 50%; width: 100%;
align-self: stretch; height: 20px;
background-color: #ffc107;
} }
.img_content { .top_blue_line {
background-image: url("/assets/image/login_img.png");
height: 100%;
width: 100%; width: 100%;
background-repeat: no-repeat; height: 37px;
border-radius: 30px; background-color: #2C5EC5;
background-position: center;
background-size: cover;
} }
}
.login_wrapper::ng-deep { .NumberOtp {
background: linear-gradient(to right, #EFEFEF, #E5D7E4);
margin-top: -20px;
border-radius: 20px 20px 0 0;
padding: 0 30px;
padding-top: 30px;
height: 100%;
.mat-mdc-form-field-icon-prefix {
padding-right: 10px;
} }
.mdc-text-field--filled:not(.mdc-text-field--disabled) .mdc-line-ripple::before { .login_wrapper {
border-bottom-color: rgb(179 171 171 / 42%); display: flex;
} justify-content: center;
align-items: center;
height: 550px;
.main_content {
width: 50%;
}
.img_section {
width: 50%;
align-self: stretch;
}
.mdc-text-field--filled:not(.mdc-text-field--disabled) .mdc-line-ripple::after { .img_content {
background: var(--accent-color); background-image: url("/assets/image/login_img.png");
height: 100%;
width: 100%;
background-repeat: no-repeat;
border-radius: 30px;
background-position: center;
background-size: cover;
}
} }
.mat-mdc-text-field-wrapper {
background: var(--secondary-bg-color);
color: var(--primary-color);
padding-left: 16px;
padding-right: 10px;
input {
.login_wrapper::ng-deep {
.mat-mdc-form-field-icon-prefix {
padding-right: 10px;
}
.mdc-text-field--filled:not(.mdc-text-field--disabled) .mdc-line-ripple::before {
border-bottom-color: rgb(179 171 171 / 42%);
}
.mdc-text-field--filled:not(.mdc-text-field--disabled) .mdc-line-ripple::after {
background: var(--accent-color);
}
.mat-mdc-text-field-wrapper {
background: var(--secondary-bg-color);
color: var(--primary-color); color: var(--primary-color);
padding-left: 16px;
padding-right: 10px;
&::placeholder { input {
color: var(--primary-color); color: var(--primary-color);
&::placeholder {
color: var(--primary-color);
}
} }
} }
}
}
.api_error_message { }
text-align: center;
display: block;
}
.mat_input_container { .api_error_message {
position: relative; text-align: center;
margin-bottom: 10px; display: block;
}
.error_text { .mat_input_container {
position: absolute; position: relative;
width: 100%;
margin-top: -10px;
margin-bottom: 10px; margin-bottom: 10px;
left: 0;
bottom: -7px; .error_text {
position: absolute;
width: 100%;
margin-top: -10px;
margin-bottom: 10px;
left: 0;
bottom: -7px;
}
} }
} }
\ 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>
<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>
<p class="cardTextTwo">{{cardTextTwo}}</p> <p class="cardTextTwo">{{cardTextTwo}}</p> -->
<span class="material-symbols-outlined iconDashboardRight">visibility</span>
<img [ngSrc]="CardImage" width="100" height="100"/> <!-- <img [ngSrc]="CardImage" width="100" height="100"/> -->
</div> </div>
</a> </a>
\ No newline at end of file
...@@ -3,10 +3,14 @@ a { ...@@ -3,10 +3,14 @@ a {
text-decoration: none; text-decoration: none;
} }
.colored_card{ .colored_card{
background: var(--accent-gradient); // background: var(--accent-gradient);
background: linear-gradient(to top, #ACC1EE, #2C5EC5);
display: flex;
justify-content: space-between;
align-items: center;
border-radius: 16px; border-radius: 16px;
position: relative; position: relative;
padding: 20px 30px; padding: 40px 30px;
overflow: hidden; overflow: hidden;
box-shadow: var(--box-shadow-small); box-shadow: var(--box-shadow-small);
p { p {
...@@ -31,7 +35,17 @@ a { ...@@ -31,7 +35,17 @@ a {
margin-top: 6px; margin-top: 6px;
margin-bottom: 14px; margin-bottom: 14px;
} }
.iconDashboardLeft{
font-size: 48px;
color: white;
}
.iconDashboardRight{
font-size: 38px;
color: white;
}
.cardTextOneHeading{
font-size: 22px;
}
img { img {
position: absolute; position: absolute;
bottom: -43px; bottom: -43px;
......
...@@ -5,5 +5,9 @@ ...@@ -5,5 +5,9 @@
// } // }
.no_record{ .no_record{
background-color: white;
text-align: center; text-align: center;
padding: 20px 10px;
margin-top: 0px;
} }
\ No newline at end of file
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
.mat-mdc-form-field-input-control.mdc-text-field__input, .mat-mdc-form-field-input-control.mdc-text-field__input,
.mat-mdc-text-field-wrapper .mat-mdc-form-field-input-control { .mat-mdc-text-field-wrapper .mat-mdc-form-field-input-control {
font-size: 15px; font-size: 15px;
} }
.mat-mdc-form-field-icon-prefix { .mat-mdc-form-field-icon-prefix {
padding-right: 10px; padding-right: 10px;
......
...@@ -4,18 +4,18 @@ ...@@ -4,18 +4,18 @@
{{ cardTextIcon }} {{ cardTextIcon }}
</span> </span>
<div class="card_img" *ngIf="cardImg"> <div class="card_img" *ngIf="cardImg">
<img [ngSrc]="cardImg" alt="" <img [ngSrc]="cardImg" alt="" width="100" height="100">
width="100"
height="100"
>
</div> </div>
<p class="card_heading" *ngIf="cardTextHeading"> <p class="card_heading" *ngIf="cardTextHeading">
{{ cardTextHeading }} {{ cardTextHeading }}
</p> </p>
<div class="card_icon_direction"><span class="material-symbols-outlined">
north_east
</span></div>
<p class="card_paragraph" *ngIf="cardTextParagraph"> <p class="card_paragraph" *ngIf="cardTextParagraph">
{{ cardTextParagraph }} {{ cardTextParagraph }}
</p> </p>
</div> </div>
</a> </a>
\ No newline at end of file
...@@ -8,7 +8,7 @@ a { ...@@ -8,7 +8,7 @@ a {
.white_card { .white_card {
background-color: var(--secondary-bg-color); background-color: var(--secondary-bg-color);
padding: 30px; padding: 22px;
box-shadow: var(--box-shadow-small); box-shadow: var(--box-shadow-small);
border-radius: var(--border-radius-mid); border-radius: var(--border-radius-mid);
display: flex; display: flex;
...@@ -36,4 +36,9 @@ a { ...@@ -36,4 +36,9 @@ a {
// margin-top: 10px; // margin-top: 10px;
// margin-bottom: 18px; // margin-bottom: 18px;
} }
.card_icon_direction {
padding: 10px;
background: yellow;
border-radius: 50%;
}
} }
\ No newline at end of file
...@@ -10,3 +10,4 @@ ...@@ -10,3 +10,4 @@
margin-bottom: 20px; margin-bottom: 20px;
} }
<div class="topbar_navigation_wrapper"> <div class="topbar_navigation_wrapper">
<div class="topbar_logo"> <div class="topbar_logo">
<button class="topbar_menu_button" (click)="toggleSidebar()"> <!-- <button class="topbar_menu_button" (click)="toggleSidebar()">
<span class="material-symbols-outlined"> <span class="material-symbols-outlined">
menu menu
</span> </span>
</button> </button> -->
<img <img
[ngSrc]="loggedSchoolLogo" [ngSrc]="loggedSchoolLogo"
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
</div> </div>
</div> </div>
<div class="topbar_navigation_items topbar_navigation_icon"> <div class="topbar_navigation_items topbar_navigation_icon">
<span class="material-symbols-outlined top_bar_icon" (click)="logout()"> <span class="material-symbols-outlined top_bar_icon" (click)="logout()">
logout logout
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
margin-left: 11px; margin-left: 11px;
.top_bar_icon { .top_bar_icon {
font-size: 28px;
color: var(--primary-color); color: var(--primary-color);
cursor: pointer; cursor: pointer;
} }
...@@ -126,10 +127,10 @@ ...@@ -126,10 +127,10 @@
} }
.topbar_profile_menu .user_profile_info .user_name { .topbar_profile_menu .user_profile_info .user_name {
font-size: 12px; font-size: 14px;
} }
.topbar_profile_menu .user_profile_info .user_role{ .topbar_profile_menu .user_profile_info .user_role{
font-size: 10px; font-size: 12px;
} }
.topbar_profile_menu .user_profile_info .user_image { .topbar_profile_menu .user_profile_info .user_image {
......
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
[cardLink]="assignmentUrl" [cardLink]="assignmentUrl"
[cardTextTwoHeading]="'Assignment'" [cardTextTwoHeading]="'Assignment'"
[cardTextTwo]="''" [cardTextTwo]="''"
[CardImage]="
'./assets/image/charts_and_calculations_for_business_analytics.svg'
"
class="portal_card_colored_card" class="portal_card_colored_card"
/> />
<app-colored-card <app-colored-card
......
<!-- <p>portal-viewer works!</p> --> <!-- <p>portal-viewer works!</p> -->
<div class="portal_viewer"> <div class="portal_viewer">
<div class="top_bar"> <div class="top_bar">
<div class="top_yellow_line"></div>
<app-top-bar /> <app-top-bar />
<div class="top_blue_line"></div>
</div> </div>
<div class="sidebar {{isSidebarOpen?'active':''}}"> <div class="sidebar {{isSidebarOpen?'active':''}}">
<app-sidebar /> <app-sidebar />
</div> </div>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
height: 100%; height: 100%;
// margin-top: 30px; // margin-top: 30px;
.sidebar { .sidebar {
width: 250px; width: 250px;
...@@ -13,26 +14,42 @@ ...@@ -13,26 +14,42 @@
.portal_renderer { .portal_renderer {
width: calc(100% - 250px); width: calc(100% - 250px);
display: flex; display: flex;
background: var(--secondary-bg-color); background: linear-gradient(to right, #EFEFEF, #E5D7E4);
border-radius: 20px 20px 0 0;
// background: var(--secondary-bg-color);
min-height: 84dvh; min-height: 84dvh;
padding-bottom: 20px; padding-bottom: 20px;
margin-top: -40px;
.portal_renderer_inner { .portal_renderer_inner {
width: 98%; width: 100%;
background-color: var(--primary-bg-color); background: linear-gradient(to right, #EFEFEF, #E5D7E4);
border-radius: 20px; // background-color: var(--primary-bg-color);
border-radius: 20px 20px 0 0;
padding: 20px 35px; padding: 20px 35px;
margin: unset;
} }
} }
.top_yellow_line {
background: #FFBF00;
height: 20px;
}
.top_bar { .top_bar {
width: 100%; width: 100%;
background-color: var(--secondary-bg-color); background-color: var(--secondary-bg-color);
margin-top: 30px; // margin-top: 30px;
}
.top_blue_line {
padding-bottom: 30px;
background: #2C5EC5;
height: 20px;
} }
@media only screen and (max-width: 999px) and (min-width: 300px) { @media only screen and (max-width: 999px) and (min-width: 300px) {
.sidebar { .sidebar {
width: 300px; width: 300px;
background-color: var(--secondary-bg-color); background-color: var(--secondary-bg-color);
......
...@@ -4,9 +4,11 @@ ...@@ -4,9 +4,11 @@
font-family: var(--font-light); font-family: var(--font-light);
.mat-mdc-header-row { .mat-mdc-header-row {
background: var(--accent-color); // background: var(--accent-color);
background: #2C5EC5;
border: none; border: none;
color: white; color: white;
} }
.mat-mdc-footer-row { .mat-mdc-footer-row {
background: var(--accent-color); background: var(--accent-color);
......
...@@ -43,7 +43,8 @@ $secondary-color-light: rgb(133 130 130); ...@@ -43,7 +43,8 @@ $secondary-color-light: rgb(133 130 130);
$accent-color-light: rgba(169, 146, 246, 1); $accent-color-light: rgba(169, 146, 246, 1);
$primary-color-white-light: #fff; $primary-color-white-light: #fff;
$error-color-light: red; $error-color-light: red;
$accent-gradient-light: linear-gradient(4deg, rgba(57,4,235,1) 0%, rgba(201,185,255,1) 100%); $accent-gradient-light: #4571CD;
// $accent-gradient-light: linear-gradient(4deg, rgba(57,4,235,1) 0%, rgba(201,185,255,1) 100%);
$box-shadow-small-light: 1px 5px 12px -6px rgb(0 0 0 / 28%); $box-shadow-small-light: 1px 5px 12px -6px rgb(0 0 0 / 28%);
$border-color-light: #0000001f; $border-color-light: #0000001f;
......
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