From a8b4c42e32b1d28e4c8fd56c4b06f214aa22c867 Mon Sep 17 00:00:00 2001
From: benjamyn <benjamyn.love@gmail.com>
Date: Wed, 22 Jan 2020 22:43:19 +1100
Subject: [PATCH] Moved parts of the html separate files

---
 shop.py                |  1 -
 templates/addForm.html |  7 ++++++
 templates/auth.html    | 10 +--------
 templates/header.html  |  9 ++++++++
 templates/index.html   | 48 ++++--------------------------------------
 templates/list.html    | 25 ++++++++++++++++++++++
 templates/mobile.html  | 42 +++---------------------------------
 7 files changed, 49 insertions(+), 93 deletions(-)
 create mode 100644 templates/addForm.html
 create mode 100644 templates/header.html
 create mode 100644 templates/list.html
diff --git a/shop.py b/shop.py
index c9fbf5e..7dc7f06 100644
--- a/shop.py
+++ b/shop.py
@@ -67,7 +67,6 @@ def index():
 
 @app.route('/post', methods=['POST'])
 def handle_data():
-    pprint(request.form)
     if "addValue" in request.form:
         for x in request.form:
             # print(x)
diff --git a/templates/addForm.html b/templates/addForm.html
new file mode 100644
index 0000000..88097bf
--- /dev/null
+++ b/templates/addForm.html
@@ -0,0 +1,7 @@
+<form action="/post" method="post">
+    Name:<br>
+    <input type="text" name="name" value=""><br>
+    Item:<br>
+    <input type="text" name="item" value=""><br><br>
+    <input type="submit" name="addValue"value="Submit">
+</form>
\ No newline at end of file
diff --git a/templates/auth.html b/templates/auth.html
index 3f75c0e..93307b5 100644
--- a/templates/auth.html
+++ b/templates/auth.html
@@ -1,12 +1,4 @@
-<!doctype html>
-<html lang="en">
-    <head>
-        <title>Shopping List</title>
-         <!-- Latest compiled and minified CSS -->
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-        <link rel="stylesheet" content="text/css" href="/static/css/main.css"/>
-    </head>
+ {% include "header.html" %}
     <body>
         <h1 class="container" style="text-align: center">{{ data["title"] }}</h1>
 
diff --git a/templates/header.html b/templates/header.html
new file mode 100644
index 0000000..db08c1f
--- /dev/null
+++ b/templates/header.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <title>Shopping List</title>
+         <!-- Latest compiled and minified CSS -->
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        <link rel="stylesheet" content="text/css" href="/static/css/main.css"/>
+    </head>
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 2c3b0c9..4ba6f15 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,52 +1,12 @@
-<!doctype html>
-<html lang="en">
-    <head>
-        <title>This is my site</title>
-         <!-- Latest compiled and minified CSS -->
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-        <link rel="stylesheet" content="text/css" href="/static/css/main.css"/>
-    </head>
+{% include "header.html" %}
     <body>
         <h1 class="container" style="text-align: center">{{ data["title"] }}</h1>
         <aside>
-                <form action="/post" method="post">
-                    Name:<br>
-                    <input type="text" name="name" value=""><br>
-                    Item:<br>
-                    <input type="text" name="item" value=""><br><br>
-                    <input type="submit" name="addValue"value="Submit">
-                  </form>
-                  </aside>
+            {% include "addForm.html" %}
+        </aside>
         <div class="container" id="memes">
-            <table class="table-striped table">
-                    <thead class="thead-dark">
-                            <tr>
-                              <th scope="col">Item</th>
-                              <th scope="col">Requester</th>
-                              <th scope="col">Gottem?</th>
-                              <th scope="col">Remove</th>
-                            </tr>
-            {% for x in data["results"] %}
-            <tr id="row-{{x[0]}}">
-                <td>{{x[1]}}</td>
-                <td>{{x[4]}}</td>
-                
-                <td> {% if x[3] == 0 %}
-                        <form><button type="submit" formaction="/post" formmethod="POST" name="got" value="{{x[0]}}">No</button></form>
-                     {% else %}
-                        yes
-                     {% endif %}</td>
-            <td><form>
-            <button type="submit" formaction="/post" formmethod="POST" name="rem" value="{{x[0]}}">Remove</button>
-            </form>
-            </td>
-            </tr>
-            {% endfor %}
-            </table>
-
+            {% include "list.html" %}
         </div>
-
         <!-- jQuery library -->
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
 
diff --git a/templates/list.html b/templates/list.html
new file mode 100644
index 0000000..3ab6a88
--- /dev/null
+++ b/templates/list.html
@@ -0,0 +1,25 @@
+<table class="table-striped table">
+    <thead class="thead-dark">
+            <tr>
+              <th scope="col">Item</th>
+              <th scope="col">Requester</th>
+              <th scope="col">Gottem?</th>
+              <th scope="col">Remove</th>
+            </tr>
+{% for x in data["results"] %}
+<tr id="row-{{x[0]}}">
+<td>{{x[1]}}</td>
+<td>{{x[4]}}</td>
+
+<td> {% if x[3] == 0 %}
+        <form><button type="submit" formaction="/post" formmethod="POST" name="got" value="{{x[0]}}">No</button></form>
+     {% else %}
+        yes
+     {% endif %}</td>
+<td><form>
+<button type="submit" formaction="/post" formmethod="POST" name="rem" value="{{x[0]}}">Remove</button>
+</form>
+</td>
+</tr>
+{% endfor %}
+</table>
\ No newline at end of file
diff --git a/templates/mobile.html b/templates/mobile.html
index 52dd24f..1afd8ce 100644
--- a/templates/mobile.html
+++ b/templates/mobile.html
@@ -1,47 +1,11 @@
-<!doctype html>
-<html lang="en">
-    <head><meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-        <title>Shopping List</title>
-         <!-- Latest compiled and minified CSS -->
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-        <link rel="stylesheet" content="text/css" href="/static/css/main.css"/>
-    </head>
+{% include "header.html" %}
     <body>
         <h1 class="container" style="text-align: center">{{ data["title"] }}</h1>
         <div class="" style=" text-align: center">
-                <form action="/post" method="post">
-                    Name: <input type="text" name="name" value=""><br>
-                    Item: <input type="text" name="item" value=""><br><br>
-                    <input type="submit" name="addValue" value="Submit"/>
-                  </form>
+            {% include "addForm.html" %}
         </div>
         <div class="container" id="memes">
-            <table class="table-striped table">
-                    <thead class="thead-dark">
-                            <tr>
-                              <th scope="col">Item</th>
-                              <th scope="col">Requester</th>
-                              <th scope="col">Gottem?</th>
-                              <th scope="col">Remove</th>
-                            </tr>
-            {% for x in data["results"] %}
-            <tr id="row-{{x[0]}}">
-                <td>{{x[1]}}</td>
-                <td>{{x[4]}}</td>
-                
-                <td> {% if x[3] == 0 %}
-                        <form><button type="submit" formaction="/post" formmethod="POST" name="got" value="{{x[0]}}">No</button></form>
-                     {% else %}
-                        yes
-                     {% endif %}</td>
-            <td><form>
-            <button type="submit" formaction="/post" formmethod="POST" name="rem" value="{{x[0]}}">Remove</button>
-            </form>
-            </td>
-            </tr>
-            {% endfor %}
-            </table>
+            {% include "list.html" %}
 
         </div>
 
