diff --git a/css/default_style.css b/css/default_style.css
index 8c57ea6d890a417aadf5e1858b2dc33d7004cb6b..8d5c9ee9ef52afc0fab534e04ff659f73365a376 100755
--- a/css/default_style.css
+++ b/css/default_style.css
@@ -1,14 +1,19 @@
.frame {
- height: 550px;
width: 360px;
+ height: 450px;
margin: 50px auto;
- border: 0.5px solid black;
- padding-left: 20px;
padding-right: 20px;
+ padding-left: 20px;
+ border-top: 0.5px solid black;
+ border-bottom: 0.5px solid black;
+ border-left: 0.5px solid black;
+ border-right: 0.5px solid black;
+ font-family: calibri light;
}
.frame h1,h2 {
text-align: center;
+ font-family: franklin gothic;
}
.button {
@@ -51,6 +56,24 @@ a:hover {
.menu {
border: 0.5px solid black;
- width: 199px;
+ width: 119px;
float: left;
+<<<<<<< HEAD
+}
+=======
+ text-align: center;
+ font-family: calibri;
+}
+
+.menu > h3 {
+ margin-top: 5%;
+ margin-bottom: 5%
+}
+
+.menu_container {
+ background-color: red;
+ width: 360px;
+ margin-left: auto;
+ margin-right: auto;
}
+>>>>>>> e4cb031f91cc3a69608d1c077166b3a49967d20f
diff --git a/css/header.css b/css/header.css
index 1dda58a6ce2764f149dc6de7689df76414fe4512..6e015048ce8061bf823ce80b17eafc39df6f882f 100644
--- a/css/header.css
+++ b/css/header.css
@@ -1,5 +1,4 @@
.header {
- border-bottom-style: solid;
height: 55px;
}
.logo {
@@ -24,8 +23,3 @@
margin: 0 ;
margin-top: 10px;
}
-/*.menu {
- text-align: center;
- background-color: rgb(65,62,119);
- height: 20px;
-}*/
diff --git a/order/order.php b/order/order.php
index fd7af2c6fad42de77261b3b05c58fa869e94311e..363a94980170ea05e45c60b8c9f2a11f31c0a240 100644
--- a/order/order.php
+++ b/order/order.php
@@ -2,30 +2,28 @@
<html>
<head>
<title>U Wanna Call Me Beibh?</title>
- <link rel="stylesheet" type="text/css" href="../css/main.css">
+ <link rel="stylesheet" type="text/css" href="../css/default_style.css">
<link rel="stylesheet" type="text/css" href="../css/order.css">
- <script type="text/javascript">
- function setURL(url) {
- document.getElementById('content_iframe').src = url;
- }
- </script>
+ <link rel="stylesheet" type="text/css" href="../css/header.css">
</head>
<body>
-<<<<<<< HEAD
<div class="frame">
- <p>Order</p>
- <div class="frame" id="container">
- <div class="button" id="first">
- <input type="button" name="select_location" onclick="setURL('select_location.html')" >
+ <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="button" id="second">
- <input type="button" name="select_driver" onclick="setURL('select_driver.html')">
- </div>
- <div class="button" id="third">
- <input type="button" name="complete_order" onclick="setURL('complete_order.html')">
- </div>
-
- <iframe id="content_iframe" src=""/>
</div>
</body>
</html>
diff --git a/profile_page/profile.php b/profile_page/profile.php
index fe0ee7107ff1831532a3653cd38719227aa266f1..6e1a1b5dfbe66d59e90b4948c694ccbe90b34f4c 100755
--- a/profile_page/profile.php
+++ b/profile_page/profile.php
@@ -26,7 +26,7 @@
mysqli_close($con);
?>
</div>
- <div style="background-color: white; max-width: 600px; margin-left: auto; margin-right: auto">
+ <div class="menu_container">
<?php include'../template/menu.php';?>
</div>
<div class="profile_container">
diff --git a/template/menu.php b/template/menu.php
index 35d90f758e5aafd506d44043a857df98c7d0094c..076fde02b49f75e85f0d84a574dc7b7e673b0bcc 100644
--- a/template/menu.php
+++ b/template/menu.php
@@ -1,18 +1,18 @@
<?php
echo '
- <a href="order/order.php" name="order_link">
+ <a href="../order/order.php?id='. $user_id .'" name="order_link">
<div class="menu" id="order_link">
- <h2>Order</h2>
+ <h3>ORDER</h3>
</div>
</a>
- <a href="history/history.php" name="history_link">
+ <a href="../history/history.php?id='. $user_id .'" name="history_link">
<div class="menu" id="history_link">
- <h2>History</h2>
+ <h3>HISTORY</h3>
</div>
</a>
- <a href="profile/profile.php" name="profile_link">
+ <a href="../profile/profile.php?id='. $user_id .'" name="profile_link">
<div class="menu" id="profile_link">
- <h2>My Profile</h2>
+ <h3>MY PROFILE</h3>
</div>
</a>
';