From 0a9bb7ed9a0807ebcd1e1175e4febff840eebfc6 Mon Sep 17 00:00:00 2001
From: "fariz.tumbuan" <13515050@std.stei.itb.ac.id>
Date: Fri, 6 Oct 2017 19:34:00 +0800
Subject: [PATCH] Bikin page awal history. ganti menu.php buat direct ke laman
yang benar. kelas subheader, title, dan title h1 dipindah ke
default_style.css
---
css/default_style.css | 11 ++++++++++
css/history.css | 9 ++++++++
css/profile.css | 11 +---------
history/transaction_history.php | 37 +++++++++++++++++++++++++++++++++
template/menu.php | 2 +-
5 files changed, 59 insertions(+), 11 deletions(-)
create mode 100644 history/transaction_history.php
diff --git a/css/default_style.css b/css/default_style.css
index 8dca10a5..cf87617f 100755
--- 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;
+}
+
diff --git a/css/history.css b/css/history.css
index e69de29b..c106793f 100755
--- a/css/history.css
+++ b/css/history.css
@@ -0,0 +1,9 @@
+.history_container {
+ margin-top: 10%;
+ height: 50%;
+ border: 1px solid red;
+}
+
+.history_container > * {
+ border: 1px solid red;
+}
\ No newline at end of file
diff --git a/css/profile.css b/css/profile.css
index 313eecee..7f8bf4f1 100755
--- 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;
diff --git a/history/transaction_history.php b/history/transaction_history.php
new file mode 100644
index 00000000..382bb296
--- /dev/null
+++ b/history/transaction_history.php
@@ -0,0 +1,37 @@
+<!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
diff --git a/template/menu.php b/template/menu.php
index 076fde02..35d738d4 100644
--- 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>
--
GitLab