Develop

.eslintrc.json

@@ -39,6 +39,21 @@
         "eqeqeq": 1
       }
     },
+    {
+      "files": [
+        "*.js"
+      ],
+      "parserOptions": {
+        "ecmaVersion": 2020
+      },
+      "env": {
+        "node": true,
+        "es6": true
+      },
+      "extends": [
+        "eslint:recommended"
+      ]
+    },
     {
       "files": [
         "*.html"

.github/workflows/build-on-pull-request.yml

@@ -7,21 +7,28 @@ jobs:
   Build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+      - name: Checkout code with submodule
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
+          submodules: true
+          fetch-depth: 0
+
+      - name: Update submodules
+        run: |
+          git submodule init
+          git submodule update --recursive
 
       - name: Setup JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu'
 
 
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: 18
 
@@ -30,8 +37,6 @@ jobs:
           npm config set legacy-peer-deps true
           npm install -g @angular/cli
           npm install typescript@5.1.3 --save-dev
-          npm install ng2-smart-table@1.2.1
-          npm install node-sass
           npm install --force
-          npm run build  
+          npm run build-ci
 

.github/workflows/commit-lint.yml

@@ -0,0 +1,30 @@
+name: Commit Compliance
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code with submodule
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          submodules: true
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
+      - name: Install dependencies
+        run: npm ci --legacy-peer-deps
+
+      - name: Run commitlint on PR
+        run: |
+          npx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }} --verbose

.github/workflows/lint_audit.yml

@@ -0,0 +1,12 @@
+name: ESLint and NPM Audit
+
+on:
+  push:
+    branches: [main, master, develop]
+  pull_request:
+    branches: [main, master, develop]
+
+jobs:
+  lint-and-audit:
+    uses: PSMRI/.github/.github/workflows/lint_audit.yml@main
+

.github/workflows/package.yml

@@ -16,16 +16,16 @@ jobs:
     steps:
 
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
           java-version: '17'
           distribution: 'zulu'
 
     - name: Set up Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v4
       with:
           node-version: 18
 
@@ -34,16 +34,14 @@ jobs:
         npm config set legacy-peer-deps true
         npm install -g @angular/cli
         npm install typescript@5.1.3 --save-dev
-        npm install ng2-smart-table@1.2.1
-        npm install node-sass
         npm install --force
-        npm run build
+        npm run build-ci
 
     - name: Create WAR file
-      run: jar -cvf ecd-ui-next.war -C dist .     
+      run: jar -cvf ecd-ui.war -C dist .     
 
     - name: Upload WAR file as artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: ECD-UI
-        path: ecd-ui-next.war
+        path: dist/ecd-ui/ecd-ui.war

.github/workflows/sast.yml

@@ -35,24 +35,24 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
 
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
 
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
 
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

.gitignore

@@ -5,6 +5,7 @@
 /tmp
 /out-tsc
 /bazel-out
+/environments/enckey.ts``
 
 # Node
 /node_modules
@@ -42,4 +43,5 @@ testem.log
 Thumbs.db
 /.vscode
 src/environments/environment.ci.ts
+src/environments/environment.ts
 target

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Common-UI"]
+	path = Common-UI
+	url = https://github.com/PSMRI/Common-UI.git

.husky/commit-msg

@@ -0,0 +1 @@
+commitlint --edit ./.git/COMMIT_EDITMSG

.husky/pre-commit

@@ -0,0 +1 @@
+npx lint-staged

.nvmrc

@@ -1 +1 @@
-v16
+v18

CODE_OF_CONDUCT.md

@@ -118,11 +118,11 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage],
 version 2.0, available at
 [https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
 
-Community Impact Guidelines were inspired by 
+Community Impact Guidelines were inspired by
 [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
 For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available 
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
 at [https://www.contributor-covenant.org/translations][translations].
 
 [homepage]: https://www.contributor-covenant.org

CONTRIBUTING.md

@@ -3,21 +3,25 @@
 AMRIT is released under the GPLv3 license. If you would like to contribute something, or want to hack on the code this document should help you get started.
 
 # Code of Conduct
+
 This project adheres to the [Contributor Covenant](CODE_OF_CONDUCT.md).
-By participating, you are expected to uphold this code. Please report unacceptable behavior to amrit@piramalswasthya.org.
+By participating, you are expected to uphold this code. Please report unacceptable behavior to <amrit@piramalswasthya.org>.
 
 # Using GitHub Issues
+
 We use GitHub issues to track bugs and enhancements reported by the community.
-If you have a general usage question please ask on amrit@piramalswasthya.org.
+If you have a general usage question please ask on <amrit@piramalswasthya.org>.
 
 If you are reporting a bug, please help to speed up problem diagnosis by providing as much information as possible.
 Ideally, that would include a small sample project that reproduces the problem.
 
 # Reporting Security Vulnerabilities
+
 If you think you have found a security vulnerability in AMRIT please *DO NOT* disclose it publicly until we've had a chance to fix it.
-Please don't report security vulnerabilities using GitHub issues, instead drop an email to amrit@piramalswasthya.org by providing as much as information as possible.
+Please don't report security vulnerabilities using GitHub issues, instead drop an email to <amrit@piramalswasthya.org> by providing as much as information as possible.
 
 # Code Conventions and Housekeeping
+
 None of these are essential for a pull request, but they will all help.  They can also be added after the original pull request but before a merge.
 
 * Make sure all new `.java` files have a Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for.
@@ -29,4 +33,5 @@ None of these are essential for a pull request, but they will all help.  They ca
 * When writing a commit message please follow [these conventions](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 
 # Working with the Code
-For information on editing, building, and testing the code, see the [developer guide](https://psmri.github.io/PSMRI) page on the project wiki.
+
+For information on editing, building, and testing the code, see the [developer guide](https://github.com/PSMRI/PSMRI) page on the project wiki.

README.md

@@ -31,10 +31,9 @@ The Early Childhood Development (ECD) Initiative by the Ministry of Health and F
 
 This microservice is built using Java and the Spring Boot framework, with MySQL as the underlying database. Before building the ECD module, ensure you have the following prerequisites:
 
-- JDK 1.8
+- JDK 17
 - Maven
-- NPM / YARN
-- Spring Boot V2
+- Nodejs v18.10.0
 - MySQL
 
 ### Installation
@@ -52,6 +51,7 @@ To install the ECD module, please follow these steps:
 ## Building war files
 
 To build deployable war files
+
 ```bash
 mvn -B package --file pom.xml -P <profile_name>
 ```
@@ -68,6 +68,15 @@ All the features of the ECD service are exposed as REST endpoints. Please refer
 
 The ECD module offers comprehensive management capabilities for your application.
 
+## Filing Issues
+
+If you encounter any issues, bugs, or have feature requests, please file them in the [main AMRIT repository](https://github.com/PSMRI/AMRIT/issues). Centralizing all feedback helps us streamline improvements and address concerns efficiently.  
+
+## Join Our Community
+
+We’d love to have you join our community discussions and get real-time support!  
+Join our [Discord server](https://discord.gg/FVQWsf5ENS) to connect with contributors, ask questions, and stay updated.  
+
 <!-- # ECDUi
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 14.2.0.

WEB-INF/jboss-web.xml

@@ -0,0 +1,3 @@
+<jboss-web>
+  <context-root>/ecd</context-root>
+</jboss-web>

angular.json

@@ -13,14 +13,19 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/ecd-ui",
+            "outputPath": "dist/",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
-              "src/assets"
+              "src/assets",
+              {
+                "glob": "**/*",
+                "input": "WEB-INF",
+                "output": "WEB-INF"
+              }
             ],
             "styles": [
               "@angular/material/prebuilt-themes/indigo-pink.css",
@@ -90,7 +95,13 @@
               "vendorChunk": true,
               "extractLicenses": false,
               "sourceMap": true,
-              "namedChunks": true
+              "namedChunks": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.local.ts"
+                }
+              ]
             }
           },
           "defaultConfiguration": "production"
@@ -105,7 +116,10 @@
               "browserTarget": "ECD-ui:build:development"
             }
           },
-          "defaultConfiguration": "development"
+          "defaultConfiguration": "development",
+          "options":{
+            "port": 4209
+          }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",