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
f7b8595a
Commit
f7b8595a
authored
Jun 18, 2025
by
achinta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change : design
parent
c8e0f93a
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
28 additions
and
22 deletions
+28
-22
src/app/auth/before-login/before-login.component.html
src/app/auth/before-login/before-login.component.html
+1
-1
src/app/auth/login/login.component.html
src/app/auth/login/login.component.html
+5
-6
src/app/component-library/white-card/white-card.component.html
...pp/component-library/white-card/white-card.component.html
+1
-1
src/app/component-library/white-card/white-card.component.scss
...pp/component-library/white-card/white-card.component.scss
+10
-3
src/app/component-library/white-card/white-card.component.ts
src/app/component-library/white-card/white-card.component.ts
+2
-0
src/app/portal/assignment/assignment/assignment.component.ts
src/app/portal/assignment/assignment/assignment.component.ts
+2
-4
src/app/portal/assignment/service/prepare-assignment-table-data.service.ts
...signment/service/prepare-assignment-table-data.service.ts
+1
-1
src/app/portal/navigation/model/sidebar/menu.ts
src/app/portal/navigation/model/sidebar/menu.ts
+1
-1
src/app/portal/navigation/topbar/topbar.component.html
src/app/portal/navigation/topbar/topbar.component.html
+2
-2
src/app/portal/portal-dashboard/portal-dashboard.component.html
...p/portal/portal-dashboard/portal-dashboard.component.html
+1
-1
src/app/portal/portal/portal.component.scss
src/app/portal/portal/portal.component.scss
+1
-1
src/app/portal/routine/service/prepare-routine-table-data.service.ts
...tal/routine/service/prepare-routine-table-data.service.ts
+1
-1
No files found.
src/app/auth/before-login/before-login.component.html
View file @
f7b8595a
...
...
@@ -22,7 +22,7 @@
</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'"
/>
(emitWhiteCardClick)=
"selectedSchool('boys')"
[cardLink]=
"loginUrl"
[
isBoys]=
"true"
[
cardImg]=
"'./assets/image/b_logo.png'"
/>
<div
class=
"color-boys"
></div>
</div>
</div>
...
...
src/app/auth/login/login.component.html
View file @
f7b8595a
...
...
@@ -17,17 +17,16 @@
<mat-radio-button
value=
"EDITOR"
>
Teacher
</mat-radio-button>
</mat-radio-group>
<p>
Enter your
username and password
to continue
</p>
<p>
Enter your
mobile number
to continue
</p>
<div
class=
"mat_input_container"
[ngClass]=
"{'d-none': otpSend}"
>
<div
class=
"mat_input_container"
>
<mat-form-field
class=
"full_width"
>
<span
class=
"material-symbols-outlined"
matPrefix
>
person
</span>
<input
class=
"inputStyle"
matInput
placeholder=
"{{ 'Enter your number' }}"
#input
formControlName=
"phoneNo"
/>
formControlName=
"phoneNo"
[readonly]=
"otpSend"
[disabled]=
"otpSend"
/>
</mat-form-field>
<ng-container
...
...
@@ -38,7 +37,7 @@
digits.
</span>
</ng-container>
</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}"
/>
<div
class=
"mat_input_container"
[ngClass]=
"{'d-none': !otpSend}"
>
...
...
@@ -58,7 +57,7 @@
</ng-container>
</div>
<app-rounded-button-full-width
[buttonText]=
"'
Sign in
'"
[buttonIconName]=
"'login'"
[enableThrottling]=
"true"
<app-rounded-button-full-width
[buttonText]=
"'
Enter OTP
'"
[buttonIconName]=
"'login'"
[enableThrottling]=
"true"
(onClickEventEmitter)=
"authenticate()"
[ngClass]=
"{'d-none': !otpSend}"
/>
</form>
<!-- <div class="error_txt" *ngIf="errorMessage">
...
...
src/app/component-library/white-card/white-card.component.html
View file @
f7b8595a
...
...
@@ -10,7 +10,7 @@
<p
class=
"card_heading"
*ngIf=
"cardTextHeading"
>
{{ cardTextHeading }}
</p>
<div
class=
"card_icon_direction"
><span
class=
"material-symbols-outlined"
>
<div
class=
"card_icon_direction"
[ngClass]=
"{'card_icon_direction_boys': isBoys}"
><span
class=
"material-symbols-outlined"
>
north_east
</span></div>
<p
class=
"card_paragraph"
*ngIf=
"cardTextParagraph"
>
...
...
src/app/component-library/white-card/white-card.component.scss
View file @
f7b8595a
...
...
@@ -15,6 +15,7 @@ a {
align-items
:
center
;
text-align
:
left
;
gap
:
20px
;
// .card_img{
// img{
// height: 80px;
...
...
@@ -36,9 +37,15 @@ a {
// margin-top: 10px;
// margin-bottom: 18px;
}
.card_icon_direction
{
padding
:
10px
;
background
:
yellow
;
background
:
var
(
--
accent-color
)
;
border-radius
:
50%
;
color
:
white
;
}
.card_icon_direction_boys
{
background
:
yellow
;
color
:
black
;
}
}
\ No newline at end of file
src/app/component-library/white-card/white-card.component.ts
View file @
f7b8595a
...
...
@@ -19,6 +19,8 @@ export class WhiteCardComponent {
@
Input
()
cardTextIcon
:
string
=
''
;
@
Input
()
cardLink
:
string
=
''
;
@
Input
()
cardImg
:
string
=
''
;
@
Input
()
isBoys
:
boolean
=
false
;
@
Output
()
emitWhiteCardClick
:
EventEmitter
<
null
>
=
new
EventEmitter
<
null
>
();
}
src/app/portal/assignment/assignment/assignment.component.ts
View file @
f7b8595a
...
...
@@ -76,15 +76,13 @@ export class AssignmentComponent implements OnInit {
}
private
_getAssignments
():
void
{
// fieldName: assigned_on,assigned_on
// operators: gt,lt
// fieldValues: hhfj,nfw
let
dateRangeFieldname
=
''
;
let
dateRangeFieldOperator
=
''
;
let
dateRangeFieldValue
=
''
;
if
(
this
.
range
.
value
.
start
&&
this
.
range
.
value
.
end
){
dateRangeFieldname
=
'
assigned_on,assigned_on
'
;
dateRangeFieldname
=
'
last_submission_date,last_submission_date
'
;
dateRangeFieldOperator
=
'
ge,le
'
;
dateRangeFieldValue
=
`
${
this
.
_datePipe
.
transform
(
this
.
range
.
value
.
start
,
'
yyyy-MM-dd
'
)}
,
${
this
.
_datePipe
.
transform
(
this
.
range
.
value
.
end
,
'
yyyy-MM-dd
'
)}
`
...
...
src/app/portal/assignment/service/prepare-assignment-table-data.service.ts
View file @
f7b8595a
...
...
@@ -32,7 +32,7 @@ export class PrepareAssignmentTableDataService {
public
prepareMatTableColumn
():
CustomTableColumn
[]
{
let
columnArray
=
[
{
key
:
'
section_details
'
,
label
:
'
Section
'
},
//
{ key: 'section_details', label: 'Section' },
{
key
:
'
subject
'
,
label
:
'
Subject
'
},
{
key
:
'
last_date
'
,
label
:
'
Last Date
'
},
{
key
:
'
action
'
,
label
:
'
Action
'
},
...
...
src/app/portal/navigation/model/sidebar/menu.ts
View file @
f7b8595a
...
...
@@ -93,7 +93,7 @@ export class Menu {
Menu
.
AssignmentItems
,
Menu
.
RoutineItems
,
Menu
.
ExamItems
,
Menu
.
ProfileItems
//
Menu.ProfileItems
];
...
...
src/app/portal/navigation/topbar/topbar.component.html
View file @
f7b8595a
<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"
...
...
src/app/portal/portal-dashboard/portal-dashboard.component.html
View file @
f7b8595a
...
...
@@ -2,7 +2,7 @@
<div
class=
"portal_dashboard_container"
>
<div
class=
"portal_dashboard_inner"
>
<div
class=
"portal_card_container"
>
@if (authService.getUserRole() === 'student') {
@if (authService.getUserRole() === 'student'
&&
studentDropdown.length > 1
) {
<div
class=
"student_dropdown"
>
<mat-form-field
class=
"full_width"
>
<mat-label
>
Select Student
</mat-label>
...
...
src/app/portal/portal/portal.component.scss
View file @
f7b8595a
...
...
@@ -67,7 +67,7 @@
.portal_renderer
.portal_renderer_inner
{
width
:
94%
;
border-radius
:
10px
;
padding
:
20px
2
0px
;
padding
:
20px
0px
;
margin
:
0
auto
;
}
}
...
...
src/app/portal/routine/service/prepare-routine-table-data.service.ts
View file @
f7b8595a
...
...
@@ -35,7 +35,7 @@ export class PrepareRoutineTableDataService {
let
columnArray
=
[
// { key: 'class_details', label: 'Class' },
{
key
:
'
section_details
'
,
label
:
'
Section
'
},
//
{ key: 'section_details', label: 'Section' },
{
key
:
'
details
'
,
label
:
'
Details
'
},
{
key
:
'
action
'
,
label
:
'
Action
'
},
];
...
...
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