Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MOSIP-31091 changed get font size type to any from number #626

Merged
merged 3 commits into from
Jan 11, 2024
Merged

MOSIP-31091 changed get font size type to any from number #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03f07dc
MOSIP-31091 changed get font size type to any from number
Madhuravas Jan 9, 2024
503d730
[DSD-4191] fixed build issues
syedsalman3753 Jan 11, 2024
ecead4f
Merge pull request #3 from syedsalman3753/develop
Madhuravas Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resident-ui/src/app/core/services/font-size.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class FontSizeService {
fontSize: any = this.fontSizesList[this.currentFontSize];
constructor() { }

setFontSize(size: number): void {
setFontSize(size: any): void {
if (size == 12) {
this.fontSize = this.fontSizesList['12px'];
}
Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/booking/center-selection/center-selection.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ export class CenterSelectionComponent implements OnInit, OnDestroy {
}
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/dashboard/dashboard/dashboard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
}
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/downloaduin/downloaduin/downloaduin.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ export class DownloadUinComponent implements OnInit {
});
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/getuin/getuin/getuin.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ export class GetuinComponent implements OnInit {
});
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/dashboard/dashboard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
}
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/grievance/grievance.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export class GrievanceComponent implements OnInit {
}
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ export class LockunlockauthComponent implements OnInit, OnDestroy {
},400)
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/personalisedcard/personalisedcard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ export class PersonalisedcardComponent implements OnInit, OnDestroy {
return dialogRef;
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ export class RevokevidComponent implements OnInit, OnDestroy {
this.selectedValue = event.source.value;
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/sharewithpartner/sharewithpartner.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ export class SharewithpartnerComponent implements OnInit, OnDestroy {
this.router.navigateByUrl('uinservices/viewhistory');
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ export class TrackservicerequestComponent implements OnInit, OnDestroy {
// this.router.navigate(["grievanceRedressal"],{state:{eventId:eventId}})
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy {
this.matTabLabel = event.tab.textLabel;
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ export class ViewhistoryComponent implements OnInit, OnDestroy {
}, 500)
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/verify/verify/verify.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ export class VerifyComponent implements OnInit, OnDestroy {
this.displaySeconds = "00"
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/shared/dialog/dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ export class DialogComponent implements OnInit {
logOut(){
this.redirectService.redirect(window.location.href);
}
get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}
logOutBtn(){
Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/shared/header/header.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
]);
}

get fontSize(): number {
get fontSize(): any {
return this.fontSizeService.fontSize;
}

Expand Down
3 changes: 3 additions & 0 deletions residenttest/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM selenium/standalone-chrome:latest

USER root

ARG SOURCE
ARG COMMIT_HASH
ARG COMMIT_ID
Expand Down Expand Up @@ -33,6 +35,7 @@ USER ${container_user_uid}:${container_user_gid}

COPY --chown=${container_user_uid}:${container_user} --chmod=771 ./entrypoint.sh ${work_dir}/entrypoint.sh
COPY --chown=${container_user}:${container_user} ./src/main/resources/ ${work_dir}
COPY --chown=${container_user}:${container_user} ./target/residentui*.jar ${work_dir}

# set working directory
WORKDIR ${work_dir}
Expand Down
69 changes: 20 additions & 49 deletions residenttest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,55 +247,6 @@
<argLine>-Dfile.encoding=UTF-8</argLine>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>make-jar-executable</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- Create a shell script to run the JAR file with executable permission -->
<chmod file="${project.build.directory}/*.jar" perm="ugo+rx"/>
</target>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>populate-git-commit-information</id>
<goals>
<goal>revision</goal>
</goals>
<configuration>
<verbose>true</verbose>
<dateFormat>MM/dd/yyyy HH:mm:ss Z</dateFormat>
<abbrevLength>8</abbrevLength>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
</configuration>
</execution>
</executions>
<configuration>
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
</configuration>
</plugin>




<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down Expand Up @@ -356,6 +307,26 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>make-jar-executable</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- Create a shell script to run the JAR file with executable permission -->
<chmod file="${project.build.directory}/*.jar" perm="ugo+rx"/>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
Loading