Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
Lamarts mobile app angular
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Arko Dey Bhowmick
Lamarts mobile app angular
Commits
890af766
Commit
890af766
authored
Apr 29, 2025
by
achinta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: logo on login before page
parent
70042f91
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
58 additions
and
17 deletions
+58
-17
src/app/auth/before-login/before-login.component.html
src/app/auth/before-login/before-login.component.html
+9
-4
src/app/auth/before-login/before-login.component.scss
src/app/auth/before-login/before-login.component.scss
+15
-0
src/app/auth/before-login/before-login.component.ts
src/app/auth/before-login/before-login.component.ts
+2
-1
src/app/auth/login/login.component.ts
src/app/auth/login/login.component.ts
+2
-2
src/app/component-library/white-card/white-card.component.html
...pp/component-library/white-card/white-card.component.html
+6
-0
src/app/component-library/white-card/white-card.component.scss
...pp/component-library/white-card/white-card.component.scss
+16
-4
src/app/component-library/white-card/white-card.component.ts
src/app/component-library/white-card/white-card.component.ts
+4
-2
src/app/portal/navigation/service/logout.service.ts
src/app/portal/navigation/service/logout.service.ts
+1
-1
src/app/portal/profile/change-password/change-password.component.html
...al/profile/change-password/change-password.component.html
+3
-3
src/assets/image/b_logo.png
src/assets/image/b_logo.png
+0
-0
src/assets/image/g_logo.png
src/assets/image/g_logo.png
+0
-0
No files found.
src/app/auth/before-login/before-login.component.html
View file @
890af766
<div
class=
"container"
>
<div
class=
"container"
>
<div
class=
"girls_login_container"
>
<div
class=
"girls_login_container"
>
<div
class=
"select_school"
>
<span>
Select Your School
</span>
</div>
<app-white-card
<app-white-card
[cardTextHeading]=
"'
Boys
'"
[cardTextHeading]=
"'
La Martiniere for Boys, Kolkata
'"
[cardTextIcon]=
"'boy'"
[cardLink]=
"loginUrl"
[cardLink]=
"loginUrl"
[cardImg]=
"'./assets/image/b_logo.png'"
/>
/>
</div>
</div>
<div
class=
"boys_login_container"
>
<div
class=
"boys_login_container"
>
<app-white-card
<app-white-card
[cardTextHeading]=
"'
Girls
'"
[cardTextHeading]=
"'
La Martiniere for Girls, Kolkata
'"
[cardTextIcon]=
"'girl'"
[cardLink]=
"loginUrl"
[cardLink]=
"loginUrl"
[cardImg]=
"'./assets/image/g_logo.png'"
/>
/>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/app/auth/before-login/before-login.component.scss
View file @
890af766
...
@@ -4,4 +4,19 @@
...
@@ -4,4 +4,19 @@
justify-content
:
center
;
justify-content
:
center
;
height
:
100%
;
height
:
100%
;
gap
:
30px
;
gap
:
30px
;
flex-direction
:
column
;
.girls_login_container
,
.boys_login_container
{
margin
:
10px
;
}
.select_school
{
text-align
:
center
;
margin-bottom
:
10px
;
span
{
color
:
rgb
(
169
169
169
);
font-size
:
20px
;
font-weight
:
500
;
}
}
}
}
\ No newline at end of file
src/app/auth/before-login/before-login.component.ts
View file @
890af766
...
@@ -9,7 +9,8 @@ import { RequestMapperService } from '../../mappers/request-mapper.service';
...
@@ -9,7 +9,8 @@ import { RequestMapperService } from '../../mappers/request-mapper.service';
imports
:
[
imports
:
[
CommonModule
,
CommonModule
,
MatCardModule
,
MatCardModule
,
WhiteCardComponent
WhiteCardComponent
,
],
],
templateUrl
:
'
./before-login.component.html
'
,
templateUrl
:
'
./before-login.component.html
'
,
styleUrl
:
'
./before-login.component.scss
'
styleUrl
:
'
./before-login.component.scss
'
...
...
src/app/auth/login/login.component.ts
View file @
890af766
...
@@ -42,8 +42,8 @@ export class LoginComponent {
...
@@ -42,8 +42,8 @@ export class LoginComponent {
public
hidePassword
:
boolean
=
true
;
public
hidePassword
:
boolean
=
true
;
public
loginForm
=
new
FormGroup
({
public
loginForm
=
new
FormGroup
({
email
:
new
FormControl
(
'
baswajit@majhi.com
'
,
[
Validators
.
required
]),
email
:
new
FormControl
(
''
,
[
Validators
.
required
]),
password
:
new
FormControl
(
'
P@$$w0rd
'
,
[
Validators
.
required
]),
password
:
new
FormControl
(
''
,
[
Validators
.
required
]),
});
});
public
authenticate
():
void
{
public
authenticate
():
void
{
...
...
src/app/component-library/white-card/white-card.component.html
View file @
890af766
...
@@ -3,6 +3,12 @@
...
@@ -3,6 +3,12 @@
<span
class=
"material-symbols-outlined card_icon"
*ngIf=
"cardTextIcon"
>
<span
class=
"material-symbols-outlined card_icon"
*ngIf=
"cardTextIcon"
>
{{ cardTextIcon }}
{{ cardTextIcon }}
</span>
</span>
<div
class=
"card_img"
*ngIf=
"cardImg"
>
<img
[ngSrc]=
"cardImg"
alt=
""
width=
"100"
height=
"100"
>
</div>
<p
class=
"card_heading"
*ngIf=
"cardTextHeading"
>
<p
class=
"card_heading"
*ngIf=
"cardTextHeading"
>
{{ cardTextHeading }}
{{ cardTextHeading }}
...
...
src/app/component-library/white-card/white-card.component.scss
View file @
890af766
a
{
a
{
text-decoration
:
none
;
text-decoration
:
none
;
}
}
.white_card
:hover
{
.white_card
:hover
{
background-color
:
#d2d2d2
;
background-color
:
#d2d2d2
;
}
}
.white_card
{
.white_card
{
background-color
:
var
(
--
secondary-bg-color
);
background-color
:
var
(
--
secondary-bg-color
);
padding
:
30px
;
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
;
display
:
flex
;
p
{
align-items
:
center
;
text-align
:
left
;
gap
:
20px
;
// .card_img{
// img{
// height: 80px;
// width: 80px;
// }
// }
p
{
margin
:
0
;
margin
:
0
;
}
}
.card_icon
{
.card_icon
{
font-size
:
40px
;
font-size
:
40px
;
color
:
var
(
--
primary-color
);
color
:
var
(
--
primary-color
);
...
@@ -24,4 +36,4 @@ a {
...
@@ -24,4 +36,4 @@ a {
// margin-top: 10px;
// margin-top: 10px;
// margin-bottom: 18px;
// margin-bottom: 18px;
}
}
}
}
\ No newline at end of file
src/app/component-library/white-card/white-card.component.ts
View file @
890af766
import
{
CommonModule
}
from
'
@angular/common
'
;
import
{
CommonModule
,
NgOptimizedImage
}
from
'
@angular/common
'
;
import
{
Component
,
Input
}
from
'
@angular/core
'
;
import
{
Component
,
Input
}
from
'
@angular/core
'
;
import
{
RouterModule
}
from
'
@angular/router
'
;
import
{
RouterModule
}
from
'
@angular/router
'
;
...
@@ -6,7 +6,8 @@ import { RouterModule } from '@angular/router';
...
@@ -6,7 +6,8 @@ import { RouterModule } from '@angular/router';
selector
:
'
app-white-card
'
,
selector
:
'
app-white-card
'
,
imports
:
[
imports
:
[
CommonModule
,
CommonModule
,
RouterModule
RouterModule
,
NgOptimizedImage
],
],
templateUrl
:
'
./white-card.component.html
'
,
templateUrl
:
'
./white-card.component.html
'
,
styleUrl
:
'
./white-card.component.scss
'
styleUrl
:
'
./white-card.component.scss
'
...
@@ -17,5 +18,6 @@ export class WhiteCardComponent {
...
@@ -17,5 +18,6 @@ export class WhiteCardComponent {
@
Input
()
cardTextParagraph
:
string
=
''
;
@
Input
()
cardTextParagraph
:
string
=
''
;
@
Input
()
cardTextIcon
:
string
=
''
;
@
Input
()
cardTextIcon
:
string
=
''
;
@
Input
()
cardLink
:
string
=
''
;
@
Input
()
cardLink
:
string
=
''
;
@
Input
()
cardImg
:
string
=
''
;
}
}
src/app/portal/navigation/service/logout.service.ts
View file @
890af766
...
@@ -28,7 +28,7 @@ export class LogoutService {
...
@@ -28,7 +28,7 @@ export class LogoutService {
localStorage
.
clear
();
localStorage
.
clear
();
localStorage
.
setItem
(
'
theme_mode
'
,
themeMode
??
''
);
localStorage
.
setItem
(
'
theme_mode
'
,
themeMode
??
''
);
this
.
_router
.
navigate
([
RequestMapperService
.
LOGIN_URL
]).
then
(()
=>
{
this
.
_router
.
navigate
([
RequestMapperService
.
BEFORE_
LOGIN_URL
]).
then
(()
=>
{
// window.location.reload();
// window.location.reload();
this
.
_toaster
.
success
(
message
,
'
Ok
'
);
this
.
_toaster
.
success
(
message
,
'
Ok
'
);
});
});
...
...
src/app/portal/profile/change-password/change-password.component.html
View file @
890af766
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<mat-form-field
class=
"full_width"
>
<mat-form-field
class=
"full_width"
>
<mat-label>
Current Password
</mat-label>
<mat-label>
Current Password
</mat-label>
<input
<input
type=
"
text
"
type=
"
password
"
matInput
matInput
placeholder=
"Current Password"
placeholder=
"Current Password"
#input
#input
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<mat-form-field
class=
"full_width"
>
<mat-form-field
class=
"full_width"
>
<mat-label>
New Password
</mat-label>
<mat-label>
New Password
</mat-label>
<input
<input
type=
"
text
"
type=
"
password
"
matInput
matInput
placeholder=
"New Password"
placeholder=
"New Password"
#input
#input
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
<mat-form-field
class=
"full_width"
>
<mat-form-field
class=
"full_width"
>
<mat-label>
Confirm Password
</mat-label>
<mat-label>
Confirm Password
</mat-label>
<input
<input
type=
"
text
"
type=
"
password
"
matInput
matInput
placeholder=
"Confirm Password"
placeholder=
"Confirm Password"
#input
#input
...
...
src/assets/image/b_logo.png
0 → 100644
View file @
890af766
28.1 KB
src/assets/image/g_logo.png
0 → 100644
View file @
890af766
21.6 KB
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment