Skip to content

Commit

Permalink
Merge pull request #1295 from mozzy11/develop
Browse files Browse the repository at this point in the history
update Read me and Global search bar styling
  • Loading branch information
mozzy11 authored Oct 31, 2024
2 parents 1a4ffa5 + 69d020b commit 7c09998
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 10 deletions.
23 changes: 17 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# OpenELIS Global 2

This is the OpenELIS rewrite onto Java Spring, and with all new technology and
features. Please see our [website](http://www.openelis-global.org/) for more
features. Please vist our [website](http://www.openelis-global.org/) for more
information.

You can find more information on how to set up OpenELIS at our
Expand All @@ -15,21 +15,32 @@ You can find more information on how to set up OpenELIS at our

[![End to End QA Tests Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/frontend-qa.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/frontend-qa.yml)

### For Implementers who Just want to run OpenELIS without Making any Code Changes
[![End to End QA Tests Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/build-installer.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/build-installer.yml)

### For Offline Installation Using the OpenELIS Global2 Installer

Download the OpenELIS Global Installer for each Release from the
[Release Assets](https://github.com/I-TECH-UW/OpenELIS-Global-2/releases)

see full
[installtion instructions](https://docs.openelis-global.org/en/latest/install/)
for Offline Installation

### For running OpenELIS Global2 in Docker with default Settings out of the Box

see [OpenELIS-Docker setup](https://github.com/I-TECH-UW/openelis-docker)

### Running OpenELIS in Docker For Devlopers with Intention of Making code Changes
### For Running OpenELIS Global2 from Source Code

#### Running docker compose With pre-released docker images
#### Running OpenELIS Global2 using docker compose With published docker images on dockerhub

docker-compose up -d

#### Running docker compose with docker images built directly from the source code
#### Running OpenELIS Global2 using docker compose with docker images built directly from the source code

docker-compose -f build.docker-compose.yml up -d --build

#### Running docker compose With locally compiled/built Artifacts (ie the War file and React code) For Developers
#### Running OpenELIS Global2 using docker compose With locally compiled/built Artifacts (ie the War file and React code)

1. Fork the
[OpenELIS-Global Repository](https://github.com/I-TECH-UW/OpenELIS-Global-2.git)
Expand Down
2 changes: 1 addition & 1 deletion dev.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
- ./volume/database/database.env
volumes:
# preserves the database between containers
- db-data:/var/lib/postgresql/data
- ./volume/database/data:/var/lib/postgresql/data
# files here will run on install
- ./volume/database/dbInit:/docker-entrypoint-initdb.d
networks:
Expand Down
7 changes: 4 additions & 3 deletions frontend/src/components/layout/search/searchBar.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.search-bar-container {
position: absolute;
display: flex;
width: 430px;
width: 100%;
top: 10px;
right: -30px;
box-shadow: 0em 0.1em 0.05em #ccc;
Expand All @@ -24,11 +24,12 @@

.patients {
overflow-y: auto;
width: 700px;
width: 100%;
max-height: 250px;
position: relative;
position: absolute;
background-color: #f0e7e7;
top: 45px;
right: -30px;
box-shadow: 0em 0.1em 0.5em #ccc;
}

Expand Down

0 comments on commit 7c09998

Please sign in to comment.