Merge bef1378 into 8fdc739

Easybuoy · Mar 12, 2019 · c080f0f · c080f0f
2 parents 8fdc739 + bef1378
commit c080f0f
Show file tree

Hide file tree

Showing 34 changed files with 1,418 additions and 1,303 deletions.
diff --git a/README.md b/README.md
@@ -87,6 +87,7 @@ You need Nodejs Installed to be able to run this project on your machine.
 | Register User                   | POST          | /api/v1/auth/signup                           | PRIVATE       |
 | Login User                      | POST          | /api/v1/auth/login                            | PUBLIC        |
 | Make Store Attendant an Admin   | POST          | /api/v1/auth/makeadmin                        | PRIVATE       |
+| Get Current User Details        | GET           | /api/v1/auth/current                          | PRIVATE       |
 | Get All Store Attendants        | GET           | /api/v1/auth/attendants                       | PRIVATE       |
 | Create New Product              | POST          | /api/v1/products                              | PRIVATE       |
 | Get All Products                | GET           | /api/v1/products                              | PRIVATE       |

diff --git a/UI/admin_category.html b/UI/admin_category.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="description" content="A web application that helps store owners manage sales and product inventory records.">
+        <meta name="keywords" content="Store Manager">
+        <title>Store Manager | Category</title>
+        <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
+        <link rel="stylesheet" href="css/style.css">
+        <link rel="icon" type="image/ico" sizes="32x32" href="img/favicon.ico">
+
+    </head>
+
+    <body>
+
+        <nav class="navbar">
+            <span class="open-slide">
+                <a href="#" id="openslidemenu" onclick="openSlideMenu()">
+                <svg width="30" height="30">
+                        <path d="M0,5 30,5" stroke="#ffffff"
+                        stroke-width="5"/>
+                        <path d="M0,14 30,14" stroke="#ffffff"
+                        stroke-width="5"/>
+                        <path d="M0,23 30,23" stroke="#ffffff"
+                        stroke-width="5"/>
+                </svg>
+            </a></span>
+
+            <ul>
+                <li><a href="store_attendant_profile.html" style="padding-top: 10px"><div><img id="userimg" src="../assets/uploads/users/default-avatar.png"> </div></a></li>
+                <li id="appnameli"><a href="dashboard.html"><h1 id="appname"><span class="highlight">Store</span> Manager</h1></a></li>
+            </ul>
+        </nav>
+
+
+        <div id="side-menu" class="side-nav">
+            <a href="#" class="btn-close" onclick="closeSlideMenu()">&times;</a>
+            <li><a href="admin_dashboard.html">Dashboard</a></li>
+            <li><a href="admin_create_product.html">Create Product</a></li>
+            <li><a href="admin_view_products.html">View Products</a></li>
+            <li><a href="admin_create_sales_attendant.html">Create Sales Attendant</a></li>
+            <li><a href="admin_view_sales.html">View Sales</a></li>
+            <li class="current"><a href="admin_category.html">Category</a></li>
+            <li><a href="index.html">Logout</a></li>
+        </div>
+
+        <div id="main">
+            <div class="container">
+            <section class="topmargin">
+                <div class="container">
+                        <div id="create_sales_assistant">
+                                <h1 class="text-center">Create New Category</h1>
+                        <form method="POST" action="index.html">
+                                <h2>Category Name</h2>
+                                <input type="text" name="productname" placeholder="Enter Name">
+                                <input type="submit" name="" class="button_1" value="Create Category">
+
+                            </form>   
+                    </div>
+                    <hr>
+                    <div class="container text-center">
+                        <table class="table">
+                                <caption>Categories</caption>
+                                <thead>
+                                  <tr>
+                                    <th scope="col">Category Name</th>
+                                    <th scope="col">Edit</th>
+                                    <th scope="col">Delete</th>
+                                  </tr>
+                                </thead>
+                                <tbody>
+                                  <tr>
+                                    <td data-label="Date">Fashion</td>
+                                    <td data-label="Product"><button class="button_1">Edit</button></td>
+                                    <td data-label="Product"><button class="button_2">Delete</button></td>
+                                  </tr>
+                                  <tr>
+                                    <td data-label="Date">Electronics</td>
+                                    <td data-label="Product"><button class="button_1">Edit</button></td>
+                                    <td data-label="Product"><button class="button_2">Delete</button></td>
+                                      </tr>
+                                      <tr>
+                                        <td data-label="Date">Gaming</td>
+                                        <td data-label="Product"><button class="button_1">Edit</button></td>
+                                        <td data-label="Product"><button class="button_2">Delete</button></td>
+                                          </tr>
+                                </tbody>
+                              </table>
+                </div>
+                </div>
+            </section>
+        </div>
+
+
+        <footer id="footer">
+            <p>Store Manager Copyright &copy; 2018</p>
+        </footer>
+
+    <script src="js/main.js"></script>
+    </body>
+
+</html>
diff --git a/UI/admin_dashboard.html b/UI/admin_dashboard.html
@@ -43,7 +43,7 @@
             <li><a href="admin_view_products.html">View Products</a></li>
             <li><a href="admin_create_sales_attendant.html">Create Sales Attendant</a></li>
             <li><a href="admin_view_sales.html">View Sales</a></li>
-            <li><a href="admin_asign_product_to_category.html">Assign Products</a></li>
+            <li><a href="admin_category.html">Category</a></li>
             <li><a href="index.html">Logout</a></li>
         </div>