Merge branch 'master' of http://gitlab.informatika.org/IF3110-2017-K02-OneHundred/TugasBesar1_2017

8743718a · Akmal Fadlurohman · 544070dc · 0a9bb7ed · 8743718a · 8743718a
Commit 8743718a authored 7 years ago by Akmal Fadlurohman
--- a/css/default_style.css
+++ b/css/default_style.css
@@ -73,3 +73,14 @@ a:hover {
    margin-right: auto;
 }

+.subheader {
+    height: 15%;
+}
+.title {
+    float: left;
+}
+.title h1 {
+    text-align: left;
+    margin: 0;
+}
+
--- a/css/history.css
+++ b/css/history.css
+.history_container {
+    margin-top: 10%;
+    height: 50%;
+    border: 1px solid red;
+}
+
+.history_container > * {
+	border: 1px solid red;
+}
\ No newline at end of file
--- a/css/profile.css
+++ b/css/profile.css
@@ -2,16 +2,7 @@
    margin-top: 10%;
    height: 50%;
 }
-.subheader {
-    height: 15%;
-}
-.title {
-    float: left;
-}
-.title h1 {
-    text-align: left;
-    margin: 0;
-}
+
 .edit_profile_button {
    float: right;
    margin-top: 10px;

--- a/history/transaction_history.php
+++ b/history/transaction_history.php
+<!DOCTYPE html>
+<html>
+<head>
+	<title>transaction history</title>
+	<link rel="stylesheet" type="text/css" href="../css/default_style.css">
+    <link rel="stylesheet" type="text/css" href="../css/history.css">
+    <link rel="stylesheet" type="text/css" href="../css/header.css">
+</head>
+<body>
+	<div class="frame">
+		<div class="header">
+			<?php
+                $user_id = $_GET['id'];
+                include '../database/dbconnect.php';
+                
+                $query=mysqli_query($con,"SELECT * FROM user WHERE user_id='".$user_id."'") or die(mysqli_error());
+                
+                if(mysqli_num_rows($query)!=0)
+                {
+                    $row=mysqli_fetch_assoc($query);
+                    $username = $row['username'];
+                    include("../template/header.php");
+                }
+                mysqli_close($con);
+            ?>
+		</div>
+		<div class="menu_container">
+            <?php include'../template/menu.php';?>
+        </div>
+        <div class="history_container">
+        	<div class="subheader">
+        		<div class="title"><h1>Transaction History</h1></div>
+        	</div>
+        </div>
+	</div>
+</body>
+</html>
\ No newline at end of file
--- a/template/menu.php
+++ b/template/menu.php
@@ -5,7 +5,7 @@
 		<h3>ORDER</h3>
 	</div>
 	</a>
-	<a href="../history/history.php?id='. $user_id .'" name="history_link">
+	<a href="../history/transaction_history.php?id='. $user_id .'" name="history_link">
 	<div class="menu" id="history_link">
 		<h3>HISTORY</h3>
 	</div>