Categories working

HarshShah1997 · Aug 12, 2016 · 9c2084e · 9c2084e
1 parent d0a88cb
commit 9c2084e
Show file tree

Hide file tree

Showing 13 changed files with 283 additions and 187 deletions.
diff --git a/database.db b/database.db
diff --git a/main.py b/main.py
diff --git a/static/uploads/Kinkaku_Ji_by_Elizabeth_K_Joseph.jpg b/static/uploads/Kinkaku_Ji_by_Elizabeth_K_Joseph.jpg
diff --git a/static/uploads/Mountainous_View_by_Sven_Scheuermeier.jpg b/static/uploads/Mountainous_View_by_Sven_Scheuermeier.jpg
diff --git a/static/uploads/The_Sky_Is_The_Limit_by_Kaushik_Panchal.jpg b/static/uploads/The_Sky_Is_The_Limit_by_Kaushik_Panchal.jpg
diff --git a/static/uploads/Untitled_0026_by_Mike_Sinko.jpg b/static/uploads/Untitled_0026_by_Mike_Sinko.jpg
diff --git a/static/uploads/Untitled_7019_by_Mike_Sinko.jpg b/static/uploads/Untitled_7019_by_Mike_Sinko.jpg
diff --git a/static/uploads/Untitled_by_Aaron_Burden.jpg b/static/uploads/Untitled_by_Aaron_Burden.jpg
diff --git a/static/uploads/Untitled_by_Troy_Jarrell.jpg b/static/uploads/Untitled_by_Troy_Jarrell.jpg
diff --git a/static/uploads/Yellow_Jacket_by_Manuel_Frei.png b/static/uploads/Yellow_Jacket_by_Manuel_Frei.png
diff --git a/templates/displayCategory.html b/templates/displayCategory.html
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>Category: {{categoryName}}</title>
+<link rel="stylesheet" href={{ url_for('static', filename='css/home.css') }} />
+<link rel="stylesheet" href={{ url_for('static', filename='css/topStyle.css') }} />
+</head>
+<body>
+<div id="title">
+	<a href="/">
+		<img id="logo" src= {{ url_for('static', filename='images/logo.png') }} />
+	</a>
+	<form>
+		<input id="searchBox" type="text" name="searchQuery">
+		<input id="searchButton" type="submit" value="Search">
+	</form>
+
+	{% if not loggedIn %}
+	<div id="signInButton">
+		<a class="link" href="/loginForm">Sign In</a>
+	</div>
+	{% else %}
+	<div id="displayUserId">Hello, <br>{{firstName}}</div>
+	<div id="signInButton">
+		<a class="link" href="/logout">Sign Out</a>
+	</div>
+	{% endif %}
+	<div id="kart">
+		<a class="link" href="/cart">
+			<img src={{url_for('static', filename='images/shoppingCart.png')}} id="cartIcon" />
+			CART {{noOfItems}}
+		</a>
+	</div>
+</div>
+
+<div>
+	<h2>Showing all products of Category {{categoryName}}:</h2>
+	{% for itemData in data %}
+	<table>
+		<tr id="productName">
+			{% for row in itemData %}
+			<td>
+				{{row[1]}}
+			</td>
+			{% endfor %}
+		</tr>
+		<tr id="productImage">
+			{% for row in itemData %}
+			<td>
+				<a href="/productDescription?productId={{row[0]}}">
+					<img src={{ url_for('static', filename='uploads/' + row[3]) }} id="itemImage" />
+				</a>
+			</td>
+			{% endfor %}
+		</tr>
+		<tr id="productPrice">
+			{% for row in itemData %}
+			<td>
+				${{row[2]}}
+			</td>
+			{% endfor %}
+		</tr>
+	</table>
+	{% endfor %}
+</div>
+</body>
+</html>
diff --git a/templates/home.html b/templates/home.html
@@ -43,6 +43,7 @@ <h2>Shop by Category: </h2>
 	</div>
 	<div>
 		<h2>Items</h2>
+		{% for data in itemData %}
 		<table>
 			<tr id="productName">
 				{% for row in data %}
@@ -68,6 +69,7 @@ <h2>Items</h2>
 				{% endfor %}
 			</tr>
 		</table>
+		{% endfor %}
 	</div>
 </div>
 </body>

diff --git a/templates/login.html b/templates/login.html
@@ -8,7 +8,7 @@
 	<p>Email: <input type="text" name="email"></p>
 	<p>Password: <input type="password" name="password"></p>
 	<p><input type="submit"></p>
-	<a href="/register.html">Register here</a>
+	<a href="/registerationForm">Register here</a>
 </form>
 
 </body>