Skip to content

chore: resolve pom.xml merge conflict with main #87

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

Merged
snehar-nd merged 10 commits into from
Jun 30, 2026
Merged

chore: resolve pom.xml merge conflict with main #87

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
644b57e
Merge pull request #64 from PSMRI/release-3.6.0
5Amogh Jan 7, 2026
2d24829
docs(readme): add ECD-UI documentation link
DurgaPrasad-54 Jan 15, 2026
367cc56
docs(readme): format DeepWiki link in Documentation section
DurgaPrasad-54 Jan 15, 2026
4fa63aa
Update README with DeepWiki badge
DurgaPrasad-54 Jan 19, 2026
6702ac3
Merge pull request #65 from DurgaPrasad-54/main
drtechie Jan 19, 2026
c43c7ae
Bump version from 3.6.0 to 3.6.1 (#71)
snehar-nd Mar 18, 2026
4b58d0d
Merge pull request #73 from PSMRI/release-3.6.1
drtechie Mar 19, 2026
6c844fc
Merge pull request #78 from PSMRI/snehar-nd-patch-2
snehar-nd May 6, 2026
e09f9df
Merge pull request #82 from PSMRI/release-3.7.0
snehar-nd May 25, 2026
6df003a
chore: resolve pom.xml conflict, keep version 3.7.1
Jun 30, 2026
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
8 changes: 5 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# AMRIT - Early Childhood Developemnt (ECD) Service

[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
![Build Status](https://github.com/PSMRI/ECD-API/actions/workflows/sast-and-package.yml/badge.svg)
[![DeepWiki](https://img.shields.io/badge/DeepWiki-PSMRI%2FECD--UI-blue)](https://deepwiki.com/PSMRI/ECD-UI)


The Early Childhood Development (ECD) Initiative by the Ministry of Health and Family Welfare (MoHFW) aims to nurture the cognitive capital of the country by enabling young children to attain their fullest potential. The initiative focuses on the critical period of brain development, which includes the 270 days of pregnancy and the first two years of the child's life, also known as the first 1,000 days.

Expand Down Expand Up @@ -41,12 +42,13 @@ This microservice is built using Java and the Spring Boot framework, with MySQL
To install the ECD module, please follow these steps:

1. Clone the repository to your local machine.
2. Install the dependencies and build the module:
2. Clone the Common-ui repository, switch branch to release-3.6.1-ECD.
3. Install the dependencies and build the module:
- Run the command `npm install`.
- Run the command `npm run build`.
- Run the command `mvn clean install`.
- Run the command `npm start`.
3. Open your browser and access `http://localhost:4200/#/login` to view the login page of module.
4. Open your browser and access `http://localhost:4200/#/login` to view the login page of module.

## Building war files

Expand Down
Loading