Skip to content

Commit

Permalink
Merge pull request #81 from TACC/development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@wjallen
wjallen authored Oct 16, 2024
2 parents d576951 + f67e649 commit f49e924
Show file tree
Hide file tree
Showing 34 changed files with 24,752 additions and 3,675 deletions.
4,421 changes: 2,399 additions & 2,022 deletions frontend/.pnp.cjs
View file

Large diffs are not rendered by default.

Binary file modified frontend/.yarn/install-state.gz
View file
Binary file not shown.
20,096 changes: 20,096 additions & 0 deletions frontend/package-lock.json
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions frontend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"dependencies": {
"@craco/craco": "^7.1.0",
"axios": "^1.7.4",
"bootstrap": "^5.3.3",
"braces": "^3.0.3",
"chart.js": "^4.4.3",
"d3-fetch": "^3.0.1",
Expand All @@ -21,15 +22,18 @@
"postcss": "^8.4.41",
"rc-slider": "^11.1.5",
"react": "^18.3.1",
"react-bootstrap": "^2.10.5",
"react-chartjs-2": "^5.2.0",
"react-dom": "^18.3.1",
"react-grid-layout": "^1.4.4",
"react-leaflet": "^4.2.1",
"react-resizable": "^3.0.5",
"react-resizeable": "^0.2.6",
"react-router-dom": "^6.27.0",
"react-scripts": "^5.0.1",
"react-select": "^5.8.0",
"react-window": "^1.8.10",
"reactstrap": "^9.2.3",
"web-vitals": "^4.2.3",
"ws": "^8.17.1"
},
Expand Down
126 changes: 18 additions & 108 deletions frontend/src/App.css
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,6 @@
.App {
display: flex;
flex-direction: column; /* Arrange children horizontally */
align-items: center;
}

.content {
display: flex;
justify-content: center;
}

header {
margin-bottom: 20px;
}

.parametersContainer {
width: 250px; /* Adjust width as needed */
padding: 10px;
background-color: #ffffff;
border: 1px solid #ccc;
margin-left: 10px; /* Add space between map and parameters */
}
/* .App {
text-align: center;
} */

.App-logo {
height: 40vmin;
Expand Down Expand Up @@ -57,6 +38,20 @@ header {
}


.content {
display: flex;
justify-content: center;
}


.parametersContainer {
width: 250px; /* Adjust width as needed */
padding: 10px;
background-color: #ffffff;
border: 1px solid #ccc;
margin-left: 10px; /* Add space between map and parameters */
}

.form-container {
display: flex;
}
Expand Down Expand Up @@ -101,63 +96,6 @@ header {
margin-right: 10px; /* Adjust margin as needed */
}

/* App.css */

.table-container {
display: flex;
flex-direction: column;
position: relative;
z-index: 10;
height: 100%;
width: 100%;
margin: 0 auto; /* Center the container */
padding: 20px; /* Add padding for better spacing */
box-sizing: border-box; /* Ensure padding is included in the width */
overflow: auto; /* Allow scrolling if content overflows */
border: 2px solid #ccc; /* Add a border around the container */
border-radius: 8px; /* Optional: Add rounded corners */
}

.table-scroll {
max-height: 100%; /* Use full height of the container */
overflow-y: auto; /* Allow vertical scrolling if needed */
}

table {
width: 100%;
border-collapse: collapse;
border: 1px solid #ccc; /* Add border around the table */
}

th, td {
padding: 8px 12px;
border: 1px solid #ddd; /* Add borders between cells */
text-align: left;
white-space: nowrap; /* Prevent wrapping */
}

th {
position: relative;
}

.sort-button {
background: transparent;
border: none;
cursor: pointer;
font-size: 16px;
padding: 0;
margin-left: 8px;
color: black; /* Inherit color to match text */
position: absolute;
right: 8px;
position: relative;
z-index: 10;
}

.sort-button:focus {
outline: none; /* Remove focus outline */
}

.button-container {
display: flex;
gap: 10px; /* Space between buttons */
Expand Down Expand Up @@ -191,32 +129,4 @@ th {

.section {
width: 100%;
}

.even-row {
background-color: #f2f2f2; /* Set the background color for even rows */
}

.odd-row {
background-color: #ffffff; /* Set the background color for odd rows */
}

.search-container {
display: flex;
align-items: center;
}

.search-icon {
width: 20px; /* Adjust size as needed */
height: 20px; /* Adjust size as needed */
margin-right: 8px; /* Space between icon and input */
}

.search-input {
padding: 8px 16px;
border: 1px solid #ccc;
border-radius: 4px;
font-size: 14px;
flex: 1; /* Take remaining space */
}

}
32 changes: 16 additions & 16 deletions frontend/src/components/AddInitialCases.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ input[type="radio"],
padding: 8px;
margin-bottom: 0.15em;
height: 20%;
width: 97%;
width: 100%;
border: 1px solid #ccc;
}

Expand All @@ -44,34 +44,34 @@ button {
}

/* Tooltip Section -- In the Modal */
.tooltip {
.tooltips {
display: inline-block;
position: relative;
cursor: pointer;
margin-left: 5px;
font-weight: bold;
}

.tooltip-text {
.tooltips-text {
visibility: hidden;
background-color: white;
color: black;
font-weight: lighter;
border-radius: 6px;
border: 2px solid black;
padding: 10px;
padding: 7px;
position: absolute;
z-index: 9999;
bottom: 100%;
z-index: 9999 !important;
bottom: 0;
left: 50%;
margin-left: -250px;
margin-left: -300px;
opacity: 0;
transition: opacity 0.3s;
text-align: left;
width: 18em;
width: 18.5em;
}

.tooltip:hover .tooltip-text {
.tooltips:hover .tooltips-text {
visibility: visible;
opacity: 1;
}
Expand Down Expand Up @@ -166,8 +166,8 @@ h3 {
font-family: Arial, sans-serif;
}

.parameter-item {
margin-bottom: 10px;
.parameter-items {
margin-bottom: 0px;
}

.parameter-label {
Expand All @@ -176,13 +176,13 @@ h3 {

.parameter-value {
font-weight: bold;
margin-top: 10px;
margin-top: 5px;
}

.parameter-separator {
margin: 10px 0;
margin: 5px 0;
border: none;
border-top: 1px solid #ccc;
border-top: 1px solid #7e7e7e;
}

.section-separator {
Expand All @@ -194,7 +194,7 @@ h3 {

/* Start of Initial Cases Section -- Left Panel*/
.initial-cases-section {
margin-top: 20px;
margin-top: 10px;
position: relative;
padding: 10px;
transition: background-color 0.3s ease;
Expand All @@ -209,7 +209,7 @@ h3 {
font-size: 16px;
}

.initial-case-item {
.initial-case-items {
margin-bottom: 10px;
}

Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/AddInitialCases.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ const AddInitialCases = ({ counties, onClose, casesChange }) => {

return (
<div>
<h3>You can add multiple initial cases.</h3>
<br></br>
<h6>You can add multiple initial cases.</h6>
<form className="add-initial-cases-form" onSubmit={handleSubmit}>
<div className="form-group">
<label htmlFor="county">Location</label>
Expand Down
18 changes: 9 additions & 9 deletions frontend/src/components/Antivirals.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ const Antivirals = ({ onSubmit }) => {
<form className="intervention-form" onSubmit={handleSetParams}>
<div className="form-group">
<label htmlFor="antiviralEffectiveness">Antiviral Effectiveness
<span className="tooltip"><img src={toggletip} alt="Tooltip" className="toggletip-icon"/>
<span className="tooltip-text">The probability that an individual treated within the treatment window will recover.</span>
<span className="tooltips"><img src={toggletip} alt="Tooltip" className="toggletip-icon"/>
<span className="tooltips-text">The probability that an individual treated within the treatment window will recover.</span>
</span>
</label>
<input
Expand All @@ -77,8 +77,8 @@ const Antivirals = ({ onSubmit }) => {

<div className="form-group">
<label htmlFor="antiviralWastageFactor">Antiviral Wastage Factor (days)
<span className="tooltip"><img src={toggletip} alt="Tooltip" className="toggletip-icon"/>
<span className="tooltip-text">Half of the antiviral stockpile will be wasted after N days.</span>
<span className="tooltips"><img src={toggletip} alt="Tooltip" className="toggletip-icon"/>
<span className="tooltips-text">Half of the antiviral stockpile will be wasted after N days.</span>
</span>
</label>
<input
Expand All @@ -99,8 +99,8 @@ const Antivirals = ({ onSubmit }) => {
<form className="intervention-form" onSubmit={handleAddStockpile}>
<div className="form-group">
<label htmlFor="antiviralStockpileDay">New Stockpile Day
<span className="tooltip"><img src={toggletip} alt="Tooltip" className="toggletip-icon"/>
<span className="tooltip-text">Specify day that new antiviral stockpile becomes available.</span>
<span className="tooltips"><img src={toggletip} alt="Tooltip" className="toggletip-icon"/>
<span className="tooltips-text">Specify day that new antiviral stockpile becomes available.</span>
</span>
</label>
<input
Expand All @@ -117,8 +117,8 @@ const Antivirals = ({ onSubmit }) => {

<div className="form-group">
<label htmlFor="antiviralStockpileAmount">New Stockpile Amount
<span className="tooltip"><img src={toggletip} alt="Tooltip" className="toggletip-icon"/>
<span className="tooltip-text">Specify number of antivirals in new stockpile.</span>
<span className="tooltips"><img src={toggletip} alt="Tooltip" className="toggletip-icon"/>
<span className="tooltips-text">Specify number of antivirals in new stockpile.</span>
</span>
</label>
<input
Expand All @@ -135,7 +135,7 @@ const Antivirals = ({ onSubmit }) => {
<button type="submit" className="save_button">Add New Antiviral Stockpile</button>
</form>

<h3>Added Stockpiles</h3>
<h5>Added Stockpiles</h5>
<table className="avs-table">
<thead>
<tr>
Expand Down
Loading

0 comments on commit f49e924

Please sign in to comment.