siv2r · Sukriti-sood · Jun 15, 2021 · Jun 15, 2021 · Jun 16, 2021 · Jun 17, 2021
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/config.yml b/.github/config.yml
diff --git a/.github/workflows/Issue-assign.yml b/.github/workflows/Issue-assign.yml
diff --git a/.github/workflows/autoblack.yml b/.github/workflows/autoblack.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.htaccess b/.htaccess
diff --git a/Dockerfile b/Dockerfile
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/build.md b/build.md
diff --git a/css/404.css b/css/404.css
diff --git a/css/backToTop.css b/css/backToTop.css
diff --git a/css/blueContentTable.css b/css/blueContentTable.css
diff --git a/css/button-style.css b/css/button-style.css
diff --git a/css/customFileInput.css b/css/customFileInput.css
diff --git a/css/form-style.css b/css/form-style.css
diff --git a/css/greenContentTable.css b/css/greenContentTable.css
diff --git a/css/searchBar.css b/css/searchBar.css
diff --git a/css/table-style.css b/css/table-style.css
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
diff --git a/docs/CreatePR.md b/docs/CreatePR.md
diff --git a/docs/build.md b/docs/build.md
diff --git a/docs/newContributors.md b/docs/newContributors.md
diff --git a/docs/shortNotest.md b/docs/shortNotest.md
diff --git a/functions/README.md b/functions/README.md
diff --git a/functions/cmdLine.func.php b/functions/cmdLine.func.php
diff --git a/functions/json.func.php b/functions/json.func.php
diff --git a/functions/scoring.func.php b/functions/scoring.func.php
diff --git a/functions/scoringFunctions.md b/functions/scoringFunctions.md
diff --git a/generate_json/cmpGraph.php b/generate_json/cmpGraph.php
diff --git a/generate_json/jsonDump.php b/generate_json/jsonDump.php
diff --git a/global_match/findGlobalMatch.php b/global_match/findGlobalMatch.php
diff --git a/global_match/hovering.py b/global_match/hovering.py
diff --git a/global_match/jsonConversion.py b/global_match/jsonConversion.py
diff --git a/global_match/learnings.txt b/global_match/learnings.txt
diff --git a/global_match/precomputation.py b/global_match/precomputation.py
diff --git a/global_match/requirements.txt b/global_match/requirements.txt
diff --git a/global_match/solution.py b/global_match/solution.py
diff --git a/global_match/steps.md b/global_match/steps.md
diff --git a/images/avatar.jpg b/images/avatar.jpg
diff --git a/images/blank-avatar.png b/images/blank-avatar.png
diff --git a/images/blue-avatar.png b/images/blue-avatar.png
diff --git a/images/card-with-images-data.png b/images/card-with-images-data.png
diff --git a/images/darkBackground.jpg b/images/darkBackground.jpg
diff --git a/images/form-background.png b/images/form-background.png
diff --git a/images/kidney.png b/images/kidney.png
diff --git a/images/kidney_chain.png b/images/kidney_chain.png
diff --git a/images/red-avatar.png b/images/red-avatar.png
diff --git a/images/user.png b/images/user.png
diff --git a/include/addAdmin.php b/include/addAdmin.php
diff --git a/include/deleteData.inc.php b/include/deleteData.inc.php
diff --git a/include/findPairwiseMatch.inc.php b/include/findPairwiseMatch.inc.php
diff --git a/include/footer.inc.php b/include/footer.inc.php
@@ -1,4 +1,6 @@
-
+  <div class="container-fluid fixed-bottom" style="    background-image: linear-gradient(to right top, #2f2034, #373049, #3d415e, #405472, #416785);">
+      <p class="text-center m-0 py-3 text-light">| Copyright <?php  echo date("Y") ?> @kidney-exchange |</p>
+  </div>
 <!-- bootstrap js -->
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.bundle.min.js"
     integrity="sha384-JEW9xMcG8R+pH31jmWH6WWP0WintQrMb4s7ZOdauHnUtxwoG2vI5DkLtS3qm9Ekf"

diff --git a/include/functions.inc.php b/include/functions.inc.php
diff --git a/include/getHosp.inc.php b/include/getHosp.inc.php
diff --git a/include/getPairData.inc.php b/include/getPairData.inc.php
diff --git a/include/hlaValues.inc.php b/include/hlaValues.inc.php
diff --git a/include/kidney_chain.png b/include/kidney_chain.png
diff --git a/include/login.inc.php b/include/login.inc.php
diff --git a/include/logout.inc.php b/include/logout.inc.php
diff --git a/include/matchFunctions.inc.php b/include/matchFunctions.inc.php
diff --git a/include/signup.inc.php b/include/signup.inc.php
diff --git a/include/toggleStatus.inc.php b/include/toggleStatus.inc.php
diff --git a/include/updatePair.inc.php b/include/updatePair.inc.php
diff --git a/js/backToTop.js b/js/backToTop.js
diff --git a/js/editPairForm.js b/js/editPairForm.js
diff --git a/js/fixRowspanHover.js b/js/fixRowspanHover.js
diff --git a/js/pairData.js b/js/pairData.js
diff --git a/js/reg-form.js b/js/reg-form.js
diff --git a/js/showpassword.js b/js/showpassword.js
diff --git a/js/validateHosp.js b/js/validateHosp.js
diff --git a/pages/404.php b/pages/404.php
diff --git a/pages/dataOverview.php b/pages/dataOverview.php
@@ -25,14 +25,8 @@
 
       /* On screens that are 992px or less, set the background color to blue */
   @media screen and (max-width: 992px) {
-    .smallhide
-    {
-      display:none;
-    }
-    th,td
-    {
-      width:25vw !important;
-    }
+
+
     th
     {
       font-size:17px;
@@ -43,13 +37,29 @@
       color:#fff !important;
     }
   }
+.table-wrapper{
+  margin: 7% 0;
+}
+    @media screen and (max-width: 992px) {
+
+    .content-table td, .content-table th
+    {
+      padding:0;
+    }
+
+    .table-wrapper{
+      margin: 7% 0%;
+      border: 2px solid
+    }
+
+    }
   </style>
 
 
     <?php include("../templates/navBar.php") ?>
 
-  <div class="container-fluid mt-5 py-5 px-0 idtable">
-   <table>
+    <div class="table-wrapper table-responsive">
+   <table class="content-table table-condensed">
       <tr>
         <th>Pair ID</th>
         <th>Patient ID</th>

diff --git a/pages/dataSearch.php b/pages/dataSearch.php
diff --git a/pages/dataSummary.php b/pages/dataSummary.php
@@ -16,11 +16,10 @@
   <style>
     /* --------------------Background--------------------------- */
 
-    body{
-      background-color: seashell;
-      background-repeat: no-repeat;
-      background-size: cover;
-    } 
+    body {
+    height: 100vh;
+    background-image: linear-gradient(to right bottom, #0c1138, #131c45, #192752, #20335f, #273f6c, #274b76, #28567f, #2b6287, #316f8b, #3d7b8e, #4e8690, #619193);
+}
 
     /* ------------------------Table styles------------------------- */
     #patientTable {
@@ -38,14 +37,20 @@
       font-size: 30px;
       margin: 50px auto 10px auto;
     }
-    @media screen and (max-width: 992px) {
-    .navbar , .content-table ,#footer
-    {
-      width: 235vw !important; 
+
+    .table-wrapper{
+      margin: 4%;
     }
+    @media screen and (max-width: 992px) {
+
     .content-table td, .content-table th
     {
-      padding:6px;
+      padding:0;
+    }
+
+    .table-wrapper{
+      margin: 4%;
+      border: 2px solid
     }
 
     }
@@ -62,14 +67,27 @@
   line-height: 40px;
   color: #fff;
 }
+
+.nav-item .nav-link , .dropdown-item
+{
+  color:#fff;
+  font-weight:400;
+  background:none;
+  padding:20px 0 !important;
+  text-transform: uppercase;
+  font-size:1.1rem;
+  letter-spacing: 2px;
+}
   </style>
   <div class="nav-container">
     <?php include("../templates/navBar.php") ?>
   </div>
 <!-- Back to top button -->
 <a id="button" style="text-decoration:none"></a>
   <h2 class="heading">Patients</h2>
-  <table class="content-table" id="patientTable">
+  <div class="table-wrapper table-responsive">
+
+  <table class="content-table table-condensed" id="patientTable">
     <tr>
       <th>ID</th>
       <th>Name</th>
@@ -116,8 +134,12 @@
     <?php endforeach; ?>
   </table>
 
+  </div>
+
+
   <h2 class="heading">Donors</h2>
-  <table class="content-table" id="donorTable">
+  <div class="table-wrapper table-responsive">
+  <table style="margin: 7% auto;" class="content-table" id="donorTable">
     <tr>
       <th>ID</th>
       <th>Name</th>
@@ -153,5 +175,6 @@
     <?php endforeach; ?>
 
   </table>
+  </div>
   <script src="../js/backToTop.js"></script>
 <?php include_once("../include/footer.inc.php") ?>
diff --git a/pages/displayGlobalMatch.php b/pages/displayGlobalMatch.php
diff --git a/pages/displayPairwiseMatch.php b/pages/displayPairwiseMatch.php
diff --git a/pages/displayRegHosp.php b/pages/displayRegHosp.php
diff --git a/pages/editPairForm.php b/pages/editPairForm.php
diff --git a/pages/form-process.php b/pages/form-process.php
diff --git a/pages/globalMatch.php b/pages/globalMatch.php
diff --git a/pages/jsonData.php b/pages/jsonData.php
@@ -29,58 +29,80 @@
 }
 /* -------------------------CSS Grids-----------------------------*/
 
-.grid-container {
-  margin-top: 50px;
-  display: grid;
-  grid-template-columns: auto auto auto;
-  padding: 30px;
-  background-color: rgba(239, 225, 220, 0.8);
-}
 
-.grid-item {
-  padding: 20px;
-  font-size: 25px;
-  text-align: left;
-  font-family: "Open Sans"
-}
 
 .left {
   text-align: left;
 }
+.row,.col{
+  padding: 3%;
+}
 
+.head{
+  font-size: 3.5vh;
+}
 .doubleSpan {
   grid-column-end: span 2;
 }
 
+.wrapper{
+  height: 90vh;
+}
+
+
+.wrapper .container{
+  background: #769f9c;
+}
+@media screen and (max-width:450px) {
+  .head{
+    font-size: 4.5vw;
+  }
+  .button{
+   font-size: 3.5vw; 
+  }
+
+  .button{
+    padding: 0;
+    width: fit-content;
+  }
+}
+
 </style>
 
 <div class="nav-container">
   <?php include("../templates/navBar.php") ?>
 </div>
 
-<div class="wrapper">
+<div class="wrapper d-flex justify-content-center align-items-center">
 
-  <div class="grid-container">
-    <div class="grid-item">Database Dump</div>
-    <div class="grid-item doubleSpan">
+  <div class="container">
+  <div class="row">
+  <div class="col head">Database Dump</div>
+    <div class="col doubleSpan">
       <form method="post" action="/kidney-exchange/generate_json/jsonDump.php" class="search">
         <input type="submit" class="button searchBtn" name="submit" value="Download">
       </form>
     </div>
-    <div class="grid-item">Compatibility Graph </div>
-    <div class="grid-item doubleSpan">
+  </div>
+  <div class="row">
+  <div class="col head">Compatibility Graph </div>
+    <div class="col doubleSpan">
       <form method="post" action="/kidney-exchange/generate_json/cmpGraph.php" class="search">
         <input type="submit" class="button searchBtn" name="submit" value="Download">
       </form>
-    </div>
-    <div class="grid-item">Data upload (Yet to be implemented...)</div>
-    <div class="grid-item">
-      <form method="post" action="#" class="search">
-        <input type="file" class="custom-file-input" name="json" id="json">
-        <input type="submit" class="button searchBtn" name="submit" value="Upload">
+    </div>  
+  </div>
+
+  <div class="row">
+  <div class="col head">Data upload (Yet to be implemented...)</div>
+    <div class="col">
+      <form method="post" action="#" class="row search">
+        <input type="file" class="col custom-file-input" name="json" id="json">
+        <input type="submit" style="width: auto;" class=" col button searchBtn" name="submit" value="Upload">
       </form>
     </div>
   </div>
+  </div>
 
   <?php 
     if(isset($_GET['error'])) {

diff --git a/pages/login.php b/pages/login.php
diff --git a/pages/message.php b/pages/message.php
diff --git a/pages/pairData.php b/pages/pairData.php
diff --git a/pages/pairwiseMatch.php b/pages/pairwiseMatch.php
diff --git a/pages/reg-form.php b/pages/reg-form.php
@@ -796,8 +796,8 @@
       </div>
 
       <div id='btn-block'>
-        <button type="button" id='prev-btn'>Previous</button>
-        <button type="button" id='next-btn'>Next</button>
+        <button type="button" style="width: auto;" id='prev-btn'>Previous</button>
+        <button type="button" style="width: auto;" id='next-btn'>Next</button>
       </div>
 
     </form>

diff --git a/pages/register_hospital.php b/pages/register_hospital.php
diff --git a/pages/signup.php b/pages/signup.php
diff --git a/templates/d_hla.php b/templates/d_hla.php
diff --git a/templates/db-connect.php b/templates/db-connect.php
@@ -13,4 +13,4 @@
   die("Connection failed: " . mysqli_connect_error());
 }
 
-?>
+?>
diff --git a/templates/edit_dHla.php b/templates/edit_dHla.php
diff --git a/templates/edit_rHla.php b/templates/edit_rHla.php
diff --git a/templates/header.php b/templates/header.php
diff --git a/templates/navBar.php b/templates/navBar.php
@@ -52,6 +52,10 @@
 {
   background-color: #2d3358;
 }
+.navbar>.container{
+  width: 100%!important;
+  max-width: 100%!important;
+}
 /* On screens that are 992px or less, set the background color to blue */
 @media screen and (max-width: 992px) {
 
@@ -80,6 +84,14 @@
     font-family: "Open Sans";
     padding:14px;
   }
+
+}
+
+@media screen and (max-width: 350px) {
+  .navbar-brand{
+    font-size: 5vw;
+  }
+
 }
 </style>
 <nav class="navbar navbar-expand-lg">
@@ -90,9 +102,7 @@
     </button>
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
-        <li class="nav-item">
-          <a class="nav-link" href="/kidney-exchange/">Home</a>
-        </li>
+
         <?php
           if (isset($_SESSION['userId'])) {
             echo '<li class="nav-item dropdown">

diff --git a/templates/r_hla.php b/templates/r_hla.php