Skip to content
This repository has been archived by the owner on Jul 1, 2024. It is now read-only.

develop to master merge #41

Merged
merged 35 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
d2df668
Update package.json
Vidyaaa24 Oct 4, 2023
2165575
Update .gitignore
Vidyaaa24 Oct 5, 2023
82b3d2d
Update package-lock.json
Vidyaaa24 Oct 10, 2023
805d593
Update reset-user-password.component.ts
Vidyaaa24 Oct 14, 2023
52639c0
Update reset-user-password.component.ts
Vidyaaa24 Oct 14, 2023
f9596e1
Update login.component.ts
Vidyaaa24 Oct 14, 2023
b435ca3
Update reset-user-password.component.ts
Vidyaaa24 Oct 16, 2023
add6699
Serviceline CDSS changes
Oct 17, 2023
dfe4500
Merge pull request #33 from bshivani7/develop
devikasuresh20 Oct 17, 2023
d481e7a
serviceline patching
Oct 17, 2023
026f2be
Merge branch 'develop' of https://github.com/bshivani7/Admin-UI into …
Oct 17, 2023
38dc4df
serviceline changes
Oct 18, 2023
d3e37a8
Merge pull request #34 from bshivani7/develop
helenKaryamsetty Oct 18, 2023
8e85773
Merge pull request #30 from Vidyaaa24/develop
devikasuresh20 Oct 19, 2023
b242b4a
Revert "Update package.json"
devikasuresh20 Oct 31, 2023
89f79c9
Merge pull request #35 from PSMRI/revert-30-develop
devikasuresh20 Oct 31, 2023
5789f5f
Client cross site scripting
swetatech24 Nov 6, 2023
2603e4a
Merge pull request #36 from swetatech24/develop
devikasuresh20 Nov 6, 2023
c7dd4e7
Add CI build process, update Java packages, update Node
drtechie Nov 7, 2023
db9fc10
Update readme
drtechie Nov 7, 2023
287d72b
Update pom.xml dependencies
drtechie Nov 7, 2023
794b203
Remove --prod and --aot from build-ci script - failures due to uglifyjs
drtechie Nov 12, 2023
eeb2edc
Merge pull request #37 from drtechie/develop
drtechie Nov 21, 2023
da16979
allwed period character for item code input field
Nov 28, 2023
d99931f
Merge pull request #39 from KpParth/develop
devikasuresh20 Nov 29, 2023
5924faf
e sanjeevani flag issue in admin
Dec 11, 2023
4b496d3
changed the flag condition as per suggestion in admin
Dec 12, 2023
2ffdc58
Merge pull request #40 from KpParth/develop
devikasuresh20 Dec 12, 2023
8437a7c
Corrected API name from swymed to videoConsultation (#42)
devikasuresh20 Dec 27, 2023
0abb46a
CodeQl issue fixed: Use of password hash with insufficient computatio…
Jan 29, 2024
64c50bc
test
Jan 29, 2024
51db5a9
CodeQl issue fixed: Use of password hash with insufficient computatio…
Jan 29, 2024
54e139a
Merge pull request #43 from pramit-d/develop
devikasuresh20 Jan 31, 2024
45f222b
Revert "CodeQl issue fixed: Use of password hash with insufficient co…
NeerajK007 Feb 5, 2024
d7be511
Merge pull request #44 from PSMRI/revert-43-develop
devikasuresh20 Feb 5, 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
6 changes: 4 additions & 2 deletions .angular-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"prefix": "app",
"styles": [
"styles.css",
"theme.scss",
"theme.scss",
"../node_modules/material-design-icons/iconfont/material-icons.css",
"../node_modules/bootstrap/dist/css/bootstrap.min.css",
"../node_modules/font-awesome/css/font-awesome.css"
Expand All @@ -34,7 +34,9 @@
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts",
"test": "environments/environment.test.ts"
"test": "environments/environment.test.ts",
"ci": "environments/environment.ci.ts",
"local": "environments/environment.local.ts"
}
}
],
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,6 @@ package-lock.json
package-lock.json
src/assets/git-version.json
package-lock.json

src/environments/environment.local.ts
src/environments/environment.ci.ts
1 change: 1 addition & 0 deletions .java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17.0
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v16
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.7.18
17 changes: 14 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ This microservice is built on Java, Spring boot framework and MySQL DB.

Prerequisites
* Admin-API module should be running
* JDK 1.8
* JDK 17
* Maven
* Nodejs
* Nodejs v16
* Springboot V2
* MySQL

Expand All @@ -38,8 +38,11 @@ Run the development server.
* npm start

## Configuration
The admin module can be configured by editing the config.js file. This file contains all of the settings for the module, such as the database connection string, the user authentication mechanism, and the role hierarchy.
The available profiles include dev, local, test, and ci.
Refer to `src/environments/environment.ci.template` file and ensure that the right environment variables are set for the build.

Packing with `ci` profile calls `build-ci` script in `package.json`.
It creates a `environment.ci.ts` file with all environment variables used in the generated build.

## Usage
All the features have been exposed as REST endpoints.
Expand Down Expand Up @@ -79,3 +82,11 @@ Before running the tests make sure you are serving the app via `ng serve`.

To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
-->


## Building war files

To build deployable war files
```bash
mvn -B package --file pom.xml -P <profile_name>
```
Loading
Loading