From a92483d627f65dd3f880960c1177dfac7152ea65 Mon Sep 17 00:00:00 2001
From: Alexander Davis <AlexanderEDavis@users.noreply.github.com>
Date: Fri, 14 Aug 2020 22:42:21 +0100
Subject: [PATCH] New Existing Launch (#98)

Changed CSS padding for some cards.
---
 app/public/existing.php    | 193 ++++++++++++++++++++++---------------
 app/public/newexisting.php | 172 ---------------------------------
 2 files changed, 117 insertions(+), 248 deletions(-)
 delete mode 100644 app/public/newexisting.php

diff --git a/app/public/existing.php b/app/public/existing.php
index e32a276..2a4c6f7 100644
--- a/app/public/existing.php
+++ b/app/public/existing.php
@@ -5,7 +5,8 @@
     if (is_signed_in()) {
       $open_requests = get_my_open_requests($db);
       $closed_requests = get_my_closed_requests($db);
-      $subscriptions = get_subscribed_requests($db);
+      $open_subscriptions = get_open_subscribed_requests($db);
+      $closed_subscriptions = get_closed_subscribed_requests($db);
     }
 ?>
 
@@ -22,97 +23,138 @@
       </p>
     </div>
   </section>
-
   <?php if (is_signed_in()) { ?>
     <section>
       <div class="card mx-auto" style="width: 80%;margin-bottom: 50px;">
         <div class="card-header">
           <span class="mdi mdi-ticket-outline"></span> My Requests
         </div>
-        <ul class="list-group list-group-flush">
-          <?php
-            if (count($open_requests) == 0) {
-              echo("<center><b>No open tickets</b></center>");
-            } else {
-              foreach($open_requests as $tkt) {
-          ?>
-          <li class="list-group-item">
-            <div class="container">
-              <div class="row">
-                <div class="col-10">
-                  <span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span>
-                  <span><b><?php echo($tkt['title']); ?></b></span>
-                  <p class="m-0"><?php echo($tkt['description']); ?></p>
-                </div>
-                <div class="col-2">
-                  <a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
-                </div>
-              </div>
+        <nav>
+          <div class="nav nav-tabs" id="my-tab" role="tablist">
+            <a id="nav-my-open-tab" class="nav-link active" data-toggle="tab" role="tab" aria-selected="false" href="#my-open" aria-controls="nav-my-open">Open</a>
+            <a id="nav-my-closed-tab" class="nav-link" data-toggle="tab" role="tab" aria-selected="true" href="#my-closed" aria-controls="nav-my-closed">Closed</a>
+          </div>
+        </nav>
+        <div class="tab-content" id="my-tabContent">
+          <!-- Open requests content -->
+          <div id="my-open" class="tab-pane fade active show" role="tabpanel" aria-labelledby="nav-my-open">
+             <ul class="list-group list-group-flush">
+               <?php
+                 if (count($open_requests) == 0) {
+                   echo("<center><b>No open tickets</b></center>");
+                 } else {
+                   foreach($open_requests as $tkt) {
+               ?>
+               <li class="list-group-item">
+                 <div class="container">
+                   <div class="row">
+                     <div class="col-10">
+                       <span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span>
+                       <span><b><?php echo($tkt['title']); ?></b></span>
+                       <p class="m-0"><?php echo($tkt['description']); ?></p>
+                     </div>
+                     <div class="col-2">
+                       <a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
+                     </div>
+                   </div>
+                 </div>
+               </li>
+               <?php } } ?>
+             </ul>
             </div>
-          </li>
-          <?php } } ?>
-        </ul>
+            <!-- Closed requests content -->
+            <div id="my-closed" class="tab-pane fade" role="tabpanel" aria-labelledby="nav-my-closed">
+              <ul class="list-group list-group-flush">
+                <?php
+                if (count($closed_requests) == 0) {
+                  echo("<center><b>No closed tickets</b></center>");
+                } else {
+                  foreach($closed_requests as $tkt) {
+                    ?>
+                    <li class="list-group-item">
+                      <div class="container">
+                        <div class="row">
+                          <div class="col-10">
+                            <span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span><span><b><?php echo($tkt['title']); ?></b></span>
+                            <p class="m-0"><?php echo($tkt['description']); ?></p>
+                          </div>
+                          <div class="col-2">
+                            <a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
+                          </div>
+                        </div>
+                      </div>
+                    </li>
+                  <?php } } ?>
+                </ul>
+              </div>
+        </div>
       </div>
     </section>
-
-      <section>
-        <div class="card mx-auto" style="width: 80%;;margin-bottom: 50px;">
+    <section>
+      <div class="col-sm">
+        <div class="card mx-auto" style="width: 80%; margin-bottom: 10px;">
           <div class="card-header">
-            <span class="mdi mdi-ticket-outline"></span> My Closed Requests
+            <span class="mdi mdi-rss"></span> My Subscribed Requests
           </div>
-          <ul class="list-group list-group-flush">
-            <?php
-              if (count($closed_requests) == 0) {
-                echo("<center><b>No closed tickets</b></center>");
-              } else {
-                foreach($closed_requests as $tkt) {
-            ?>
-            <li class="list-group-item">
-              <div class="container">
-                <div class="row">
-                  <div class="col-10">
-                    <span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span><span><b><?php echo($tkt['title']); ?></b></span>
-                    <p class="m-0"><?php echo($tkt['description']); ?></p>
-                  </div>
-                  <div class="col-2">
-                    <a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
-                  </div>
-                </div>
-              </div>
-            </li>
-            <?php } } ?>
-          </ul>
-        </div>
-        <div class="col-sm">
-          <div class="card mx-auto" style="width: 80%; margin-bottom: 50px;">
-            <div class="card-header">
-              <span class="mdi mdi-rss"></span> My Subscribed Requests
+          <nav>
+            <div class="nav nav-tabs" id="sub-tab" role="tablist">
+              <a id="nav-sub-open-tab" class="nav-link active" data-toggle="tab" role="tab" aria-selected="false" href="#sub-open" aria-controls="nav-sub-open">Open</a>
+              <a id="nav-sub-closed-tab" class="nav-link" data-toggle="tab" role="tab" aria-selected="true" href="#sub-closed" aria-controls="nav-sub-closed">Closed</a>
             </div>
-            <ul class="list-group list-group-flush">
-              <?php
-                if (count($subscriptions) == 0) {
-                  echo("<center><b>No subscribed tickets</b></center>");
-                } else {
-                  foreach($subscriptions as $sub) { ?>
-              <li class="list-group-item">
-                <div class="container">
-                  <div class="row">
-                    <div class="col-10">
-                      <span class="requestinfo text-muted">#<?php echo sprintf("%'.05d\n", $sub["id"]); ?> </span><span><b><?php echo($sub['title']); ?></b></span> <span style="display: inline;" class="text-muted"><?php echo("(Creator: " . get_user_name($db, $sub['created_by']) . ")"); ?></span>
-                      <p class="m-0"><?php echo($sub['description']); ?></p>
-                    </div>
-                    <div class="col-2">
-                      <a class="btn btn-success float-right" href="view?rid=<?php echo($sub["uuid"]); ?>" role="button">Go</a>
+          </nav>
+          <div class="tab-content" id="sub-tabContent">
+            <!-- Open Subscribed requests content -->
+            <div id="sub-open" class="tab-pane fade active show" role="tabpanel" aria-labelledby="nav-sub-open">
+              <ul class="list-group list-group-flush">
+                <?php
+                  if (count($open_subscriptions) == 0) {
+                    echo("<center><b>No subscribed tickets</b></center>");
+                  } else {
+                    foreach($open_subscriptions as $sub) { ?>
+                <li class="list-group-item">
+                  <div class="container">
+                    <div class="row">
+                      <div class="col-10">
+                        <span class="requestinfo text-muted">#<?php echo sprintf("%'.05d\n", $sub["id"]); ?> </span><span><b><?php echo($sub['title']); ?></b></span> <span style="display: inline;" class="text-muted"><?php echo("(Creator: " . get_user_name($db, $sub['created_by']) . ")"); ?></span>
+                        <p class="m-0"><?php echo($sub['description']); ?></p>
+                      </div>
+                      <div class="col-2">
+                        <a class="btn btn-success float-right" href="view?rid=<?php echo($sub["uuid"]); ?>" role="button">Go</a>
+                      </div>
                     </div>
                   </div>
-                </div>
-              </li>
-              <?php } } ?>
-            </ul>
+                </li>
+                <?php } } ?>
+              </ul>
+            </div>
+            <div id="sub-closed" class="tab-pane fade" role="tabpanel" aria-labelledby="nav-sub-closed">
+              <ul class="list-group list-group-flush">
+                <?php
+                  if (count($closed_subscriptions) == 0) {
+                    echo("<center><b>No subscribed tickets</b></center>");
+                  } else {
+                    foreach($closed_subscriptions as $sub) { ?>
+                <li class="list-group-item">
+                  <div class="container">
+                    <div class="row">
+                      <div class="col-10">
+                        <span class="requestinfo text-muted">#<?php echo sprintf("%'.05d\n", $sub["id"]); ?> </span><span><b><?php echo($sub['title']); ?></b></span> <span style="display: inline;" class="text-muted"><?php echo("(Creator: " . get_user_name($db, $sub['created_by']) . ")"); ?></span>
+                        <p class="m-0"><?php echo($sub['description']); ?></p>
+                      </div>
+                      <div class="col-2">
+                        <a class="btn btn-success float-right" href="view?rid=<?php echo($sub["uuid"]); ?>" role="button">Go</a>
+                      </div>
+                    </div>
+                  </div>
+                </li>
+                <?php } } ?>
+              </ul>
+            </div>
           </div>
-        </section>
         </div>
       </section>
+    </div>
+  </section>
     <?php } else { ?>
       <section>
         <div class='alert alert-danger alert-dismissible fade show' role='alert'>
@@ -123,7 +165,6 @@
         </div>
       </section>
     <?php } ?>
-
 </main>
 
 <?php
diff --git a/app/public/newexisting.php b/app/public/newexisting.php
deleted file mode 100644
index bc97787..0000000
--- a/app/public/newexisting.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-    $PAGE_NAME = "Existing requests";
-    require_once __DIR__ . "/../includes/header.php";
-
-    if (is_signed_in()) {
-      $open_requests = get_my_open_requests($db);
-      $closed_requests = get_my_closed_requests($db);
-      $open_subscriptions = get_open_subscribed_requests($db);
-      $closed_subscriptions = get_closed_subscribed_requests($db);
-    }
-?>
-
-
-
-<!-- Begin page content -->
-<main role="main" class="flex-shrink-0">
-
-  <section class="jumbotron text-center">
-    <div class="container">
-      <h1>Existing requests</h1>
-      <p class="lead text-muted">
-        Here you can find all of your requests, and other requests that you are subscribed to.
-      </p>
-    </div>
-  </section>
-  <?php if (is_signed_in()) { ?>
-    <section>
-      <div class="card mx-auto" style="width: 80%;margin-bottom: 50px;">
-        <div class="card-header">
-          <span class="mdi mdi-ticket-outline"></span> My Requests
-        </div>
-        <nav>
-          <div class="nav nav-tabs" id="my-tab" role="tablist">
-            <a id="nav-my-open-tab" class="nav-link active" data-toggle="tab" role="tab" aria-selected="false" href="#my-open" aria-controls="nav-my-open">Open</a>
-            <a id="nav-my-closed-tab" class="nav-link" data-toggle="tab" role="tab" aria-selected="true" href="#my-closed" aria-controls="nav-my-closed">Closed</a>
-          </div>
-        </nav>
-        <div class="tab-content" id="my-tabContent">
-          <!-- Open requests content -->
-          <div id="my-open" class="tab-pane fade active show" role="tabpanel" aria-labelledby="nav-my-open">
-             <ul class="list-group list-group-flush">
-               <?php
-                 if (count($open_requests) == 0) {
-                   echo("<center><b>No open tickets</b></center>");
-                 } else {
-                   foreach($open_requests as $tkt) {
-               ?>
-               <li class="list-group-item">
-                 <div class="container">
-                   <div class="row">
-                     <div class="col-10">
-                       <span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span>
-                       <span><b><?php echo($tkt['title']); ?></b></span>
-                       <p class="m-0"><?php echo($tkt['description']); ?></p>
-                     </div>
-                     <div class="col-2">
-                       <a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
-                     </div>
-                   </div>
-                 </div>
-               </li>
-               <?php } } ?>
-             </ul>
-            </div>
-            <!-- Closed requests content -->
-            <div id="my-closed" class="tab-pane fade" role="tabpanel" aria-labelledby="nav-my-closed">
-              <ul class="list-group list-group-flush">
-                <?php
-                if (count($closed_requests) == 0) {
-                  echo("<center><b>No closed tickets</b></center>");
-                } else {
-                  foreach($closed_requests as $tkt) {
-                    ?>
-                    <li class="list-group-item">
-                      <div class="container">
-                        <div class="row">
-                          <div class="col-10">
-                            <span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span><span><b><?php echo($tkt['title']); ?></b></span>
-                            <p class="m-0"><?php echo($tkt['description']); ?></p>
-                          </div>
-                          <div class="col-2">
-                            <a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
-                          </div>
-                        </div>
-                      </div>
-                    </li>
-                  <?php } } ?>
-                </ul>
-              </div>
-        </div>
-      </div>
-    </section>
-    <section>
-      <div class="col-sm">
-        <div class="card mx-auto" style="width: 80%; margin-bottom: 50px;">
-          <div class="card-header">
-            <span class="mdi mdi-rss"></span> My Subscribed Requests
-          </div>
-          <nav>
-            <div class="nav nav-tabs" id="sub-tab" role="tablist">
-              <a id="nav-sub-open-tab" class="nav-link active" data-toggle="tab" role="tab" aria-selected="false" href="#sub-open" aria-controls="nav-sub-open">Open</a>
-              <a id="nav-sub-closed-tab" class="nav-link" data-toggle="tab" role="tab" aria-selected="true" href="#sub-closed" aria-controls="nav-sub-closed">Closed</a>
-            </div>
-          </nav>
-          <div class="tab-content" id="sub-tabContent">
-            <!-- Open Subscribed requests content -->
-            <div id="sub-open" class="tab-pane fade active show" role="tabpanel" aria-labelledby="nav-sub-open">
-              <ul class="list-group list-group-flush">
-                <?php
-                  if (count($open_subscriptions) == 0) {
-                    echo("<center><b>No subscribed tickets</b></center>");
-                  } else {
-                    foreach($open_subscriptions as $sub) { ?>
-                <li class="list-group-item">
-                  <div class="container">
-                    <div class="row">
-                      <div class="col-10">
-                        <span class="requestinfo text-muted">#<?php echo sprintf("%'.05d\n", $sub["id"]); ?> </span><span><b><?php echo($sub['title']); ?></b></span> <span style="display: inline;" class="text-muted"><?php echo("(Creator: " . get_user_name($db, $sub['created_by']) . ")"); ?></span>
-                        <p class="m-0"><?php echo($sub['description']); ?></p>
-                      </div>
-                      <div class="col-2">
-                        <a class="btn btn-success float-right" href="view?rid=<?php echo($sub["uuid"]); ?>" role="button">Go</a>
-                      </div>
-                    </div>
-                  </div>
-                </li>
-                <?php } } ?>
-              </ul>
-            </div>
-            <div id="sub-closed" class="tab-pane fade" role="tabpanel" aria-labelledby="nav-sub-closed">
-              <ul class="list-group list-group-flush">
-                <?php
-                  if (count($closed_subscriptions) == 0) {
-                    echo("<center><b>No subscribed tickets</b></center>");
-                  } else {
-                    foreach($closed_subscriptions as $sub) { ?>
-                <li class="list-group-item">
-                  <div class="container">
-                    <div class="row">
-                      <div class="col-10">
-                        <span class="requestinfo text-muted">#<?php echo sprintf("%'.05d\n", $sub["id"]); ?> </span><span><b><?php echo($sub['title']); ?></b></span> <span style="display: inline;" class="text-muted"><?php echo("(Creator: " . get_user_name($db, $sub['created_by']) . ")"); ?></span>
-                        <p class="m-0"><?php echo($sub['description']); ?></p>
-                      </div>
-                      <div class="col-2">
-                        <a class="btn btn-success float-right" href="view?rid=<?php echo($sub["uuid"]); ?>" role="button">Go</a>
-                      </div>
-                    </div>
-                  </div>
-                </li>
-                <?php } } ?>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </section>
-    </div>
-  </section>
-    <?php } else { ?>
-      <section>
-        <div class='alert alert-danger alert-dismissible fade show' role='alert'>
-          You need to log in to access this page.
-          <button type='button' class='close' data-dismiss='alert' aria-label='Close'>
-            <span aria-hidden='true'>&times;</span>
-          </button>
-        </div>
-      </section>
-    <?php } ?>
-</main>
-
-<?php
-    require_once __DIR__ . "/../includes/footer.php";
-?>