Commit f1c552fe authored by Dibyendu Biswas's avatar Dibyendu Biswas

ui changes

parent 0f063436
<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">
<span>Select Your School</span>
<span>Choose Your School</span>
</div>
<app-white-card
[cardTextHeading]="'La Martiniere for Girls, Kolkata'"
(emitWhiteCardClick)="selectedSchool('girls')"
[cardLink]="loginUrl"
[cardImg]="'./assets/image/g_logo.png'"
<div class="girls_login_container">
<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'"
/>
<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>
\ No newline at end of file
.container{
.container {
// width: 100%;
// align-items: center;
// justify-content: center;
// gap: 30px;
display: flex;
align-items: center;
justify-content: center;
height: 100%;
gap: 30px;
flex-direction: column;
.girls_login_container,
.boys_login_container{
margin: 10px;
.top_yellow_line {
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;
}
.select_school{
.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;
}
.headerLastBottom_yellow_line {
background-color: #FFBF00;
height: 40px;
width: 100%;
}
.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;
span{
color: rgb(169 169 169);
font-size: 20px;
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="phone_section">
<div class="loginPage">
<div class="top_yellow_line"></div>
<div class="logo_section">
<img class="login_logo"
[ngSrc]="loggedSchoolLogo"
alt="Logo"
width="100"
height="100"
/>
<img class="login_logo" [ngSrc]="loggedSchoolLogo" alt="Logo" width="80" height="80" />
<p>La Martiniere for Girls</p>
</div>
<div class="top_blue_line"></div>
<div class="NumberOtp">
<div class="login_outer">
<div class="phone_section">
<h5>Welcome</h5>
<p>Enter your username and password to continue</p>
......@@ -19,15 +21,11 @@
<span class="material-symbols-outlined" matPrefix>
person
</span>
<input
matInput
placeholder="{{ 'Enter user name' }}"
#input
formControlName="email"
/>
<input class="inputStyle" matInput placeholder="{{ 'Enter your number' }}" #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">
<ng-container
*ngIf="loginForm.controls.email.invalid && loginForm.controls.email.dirty || loginForm.controls.email.invalid && loginForm.controls.email.touched">
<span class="error_text" *ngIf="loginForm.controls.email.hasError('required')">This field is required
</span>
</ng-container>
......@@ -36,33 +34,28 @@
<div class="mat_input_container">
<mat-form-field class="full_width">
<span class="material-symbols-outlined" matPrefix> lock </span>
<input
matInput
placeholder="{{ 'Enter password' }}"
[type]="hidePassword ? 'password' : 'text'"
formControlName="password"
/>
<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">
<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()"
/>
<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>
\ No newline at end of file
.login_outer {
.loginPage {
height: 100%;
.logo_section {
width: 100%;
display: flex;
justify-content: start;
align-items: center;
justify-content: center;
min-height: 100vh;
gap: 10px;
padding: 0 20px;
p{
font-size: 20px;
font-weight: 500;
color: #37393A;
}
}
.phone_section{
padding: 20px;
.login_outer {
width: 100%;
height: 100%;
background: linear-gradient(to right, #EFEFEF, #E5D7E4);
// padding: 0 20px;
// display: flex;
// justify-content: center;
// 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;
}
}
.logo_section {
display: flex;
justify-content: center;
}
}
.login_wrapper {
.top_yellow_line {
width: 100%;
height: 20px;
background-color: #ffc107;
}
.top_blue_line {
width: 100%;
height: 37px;
background-color: #2C5EC5;
}
.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%;
}
.login_wrapper {
display: flex;
justify-content: center;
align-items: center;
......@@ -38,14 +94,18 @@
background-position: center;
background-size: cover;
}
}
}
.login_wrapper::ng-deep {
.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%);
}
......@@ -54,12 +114,14 @@
background: var(--accent-color);
}
.mat-mdc-text-field-wrapper {
background: var(--secondary-bg-color);
color: var(--primary-color);
padding-left: 16px;
padding-right: 10px;
input {
color: var(--primary-color);
......@@ -69,14 +131,14 @@
}
}
}
}
.api_error_message {
.api_error_message {
text-align: center;
display: block;
}
}
.mat_input_container {
.mat_input_container {
position: relative;
margin-bottom: 10px;
......@@ -88,4 +150,5 @@
left: 0;
bottom: -7px;
}
}
}
\ No newline at end of file
<a [routerLink]="cardLink">
<div class="colored_card">
<span class="material-symbols-outlined iconDashboardLeft">assignment_add</span>
<p class="cardTextOneHeading">{{cardTextOneHeading}}</p>
<p class="cardTextOne">{{cardTextOne}}</p>
<p class="cardTextTwoHeading">{{cardTextTwoHeading}}</p>
<p class="cardTextTwo">{{cardTextTwo}}</p>
<img [ngSrc]="CardImage" width="100" height="100"/>
<!-- <p class="cardTextTwoHeading">{{cardTextTwoHeading}}</p>
<p class="cardTextTwo">{{cardTextTwo}}</p> -->
<span class="material-symbols-outlined iconDashboardRight">visibility</span>
<!-- <img [ngSrc]="CardImage" width="100" height="100"/> -->
</div>
</a>
\ No newline at end of file
......@@ -3,10 +3,14 @@ a {
text-decoration: none;
}
.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;
position: relative;
padding: 20px 30px;
padding: 40px 30px;
overflow: hidden;
box-shadow: var(--box-shadow-small);
p {
......@@ -31,7 +35,17 @@ a {
margin-top: 6px;
margin-bottom: 14px;
}
.iconDashboardLeft{
font-size: 48px;
color: white;
}
.iconDashboardRight{
font-size: 38px;
color: white;
}
.cardTextOneHeading{
font-size: 22px;
}
img {
position: absolute;
bottom: -43px;
......
......@@ -5,5 +5,9 @@
// }
.no_record{
background-color: white;
text-align: center;
padding: 20px 10px;
margin-top: 0px;
}
\ No newline at end of file
......@@ -9,6 +9,7 @@
.mat-mdc-form-field-input-control.mdc-text-field__input,
.mat-mdc-text-field-wrapper .mat-mdc-form-field-input-control {
font-size: 15px;
}
.mat-mdc-form-field-icon-prefix {
padding-right: 10px;
......
......@@ -4,15 +4,15 @@
{{ cardTextIcon }}
</span>
<div class="card_img" *ngIf="cardImg">
<img [ngSrc]="cardImg" alt=""
width="100"
height="100"
>
<img [ngSrc]="cardImg" alt="" width="100" height="100">
</div>
<p class="card_heading" *ngIf="cardTextHeading">
{{ cardTextHeading }}
</p>
<div class="card_icon_direction"><span class="material-symbols-outlined">
north_east
</span></div>
<p class="card_paragraph" *ngIf="cardTextParagraph">
{{ cardTextParagraph }}
</p>
......
......@@ -8,7 +8,7 @@ a {
.white_card {
background-color: var(--secondary-bg-color);
padding: 30px;
padding: 22px;
box-shadow: var(--box-shadow-small);
border-radius: var(--border-radius-mid);
display: flex;
......@@ -36,4 +36,9 @@ a {
// margin-top: 10px;
// margin-bottom: 18px;
}
.card_icon_direction {
padding: 10px;
background: yellow;
border-radius: 50%;
}
}
\ No newline at end of file
<div class="topbar_navigation_wrapper">
<div class="topbar_logo">
<button class="topbar_menu_button" (click)="toggleSidebar()">
<!-- <button class="topbar_menu_button" (click)="toggleSidebar()">
<span class="material-symbols-outlined">
menu
</span>
</button>
</button> -->
<img
[ngSrc]="loggedSchoolLogo"
......@@ -34,6 +34,8 @@
</div>
</div>
<div class="topbar_navigation_items topbar_navigation_icon">
<span class="material-symbols-outlined top_bar_icon" (click)="logout()">
logout
......
......@@ -30,6 +30,7 @@
margin-left: 11px;
.top_bar_icon {
font-size: 28px;
color: var(--primary-color);
cursor: pointer;
}
......@@ -126,10 +127,10 @@
}
.topbar_profile_menu .user_profile_info .user_name {
font-size: 12px;
font-size: 14px;
}
.topbar_profile_menu .user_profile_info .user_role{
font-size: 10px;
font-size: 12px;
}
.topbar_profile_menu .user_profile_info .user_image {
......
......@@ -23,9 +23,7 @@
[cardLink]="assignmentUrl"
[cardTextTwoHeading]="'Assignment'"
[cardTextTwo]="''"
[CardImage]="
'./assets/image/charts_and_calculations_for_business_analytics.svg'
"
class="portal_card_colored_card"
/>
<app-colored-card
......
<!-- <p>portal-viewer works!</p> -->
<div class="portal_viewer">
<div class="top_bar">
<div class="top_yellow_line"></div>
<app-top-bar />
<div class="top_blue_line"></div>
</div>
<div class="sidebar {{isSidebarOpen?'active':''}}">
......
......@@ -2,6 +2,7 @@
display: flex;
flex-wrap: wrap;
height: 100%;
// margin-top: 30px;
.sidebar {
width: 250px;
......@@ -13,22 +14,38 @@
.portal_renderer {
width: calc(100% - 250px);
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;
padding-bottom: 20px;
margin-top: -40px;
.portal_renderer_inner {
width: 98%;
background-color: var(--primary-bg-color);
border-radius: 20px;
width: 100%;
background: linear-gradient(to right, #EFEFEF, #E5D7E4);
// background-color: var(--primary-bg-color);
border-radius: 20px 20px 0 0;
padding: 20px 35px;
margin: unset;
}
}
.top_yellow_line {
background: #FFBF00;
height: 20px;
}
.top_bar {
width: 100%;
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) {
......
......@@ -4,9 +4,11 @@
font-family: var(--font-light);
.mat-mdc-header-row {
background: var(--accent-color);
// background: var(--accent-color);
background: #2C5EC5;
border: none;
color: white;
}
.mat-mdc-footer-row {
background: var(--accent-color);
......
......@@ -43,7 +43,8 @@ $secondary-color-light: rgb(133 130 130);
$accent-color-light: rgba(169, 146, 246, 1);
$primary-color-white-light: #fff;
$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%);
$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