Skip to content
Snippets Groups Projects
Commit f4412fa9 authored by kukuhbr's avatar kukuhbr
Browse files

debug commit | @kukuhbr

parent dbccfc3d
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/edit-profile.css
+ 7
− 1
View file @ f4412fa9
...@@ -108,7 +108,13 @@ input:checked + .toggle:before { ...@@ -108,7 +108,13 @@ input:checked + .toggle:before {
#save-button { #save-button {
text-align: right; text-align: right;
padding-top: 20px; padding-top: 10px;
padding-bottom: 20px;
}
#back-button {
padding-top: 10px;
padding-bottom: 20px;
} }
#back { #back {
......
src/history-driver.php
+ 91
− 1
View file @ f4412fa9
...@@ -4,13 +4,101 @@ ...@@ -4,13 +4,101 @@
<head> <head>
<title>Tugas Besar 1 IF3110</title> <title>Tugas Besar 1 IF3110</title>
<link rel="stylesheet" type="text/css" href="history.css"> <link rel="stylesheet" type="text/css" href="history.css">
<link href="https://fonts.googleapis.com/css?family=Oswald:600" rel="stylesheet"> <link rel="stylesheet" type="text/css" href="index.css">
<link href="https://fonts.googleapis.com/css?family=Oswald:600" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Lora" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Lora" rel="stylesheet">
<script>
var clickedButton = null;
function buttonHighlight(i) {
if(clickedButton != null) {
clickedButton.className = "menu-buttons";
}
clickedButton = document.getElementById(i);
clickedButton.className = "menu-buttons-clicked";
}
function loadOrderDoc() {
var xhttp;
if(window.XMLHttpRequest) {
xhttp = new XMLHttpRequest();
} else {
xhttp = new ActiveXObject("Microsoft.XMLHTTP");
}
xhttp.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
document.getElementById("loadable").innerHTML =
this.responseText;
}
};
xhttp.open("GET", "orderdestination.php", true);
xhttp.send();
}
function loadHistoryDoc() {
var xhttp;
if(window.XMLHttpRequest) {
xhttp = new XMLHttpRequest();
} else {
xhttp = new ActiveXObject("Microsoft.XMLHTTP");
}
xhttp.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
document.getElementById("loadable").innerHTML =
this.responseText;
}
};
xhttp.open("GET", "history-penumpang.php", true);
xhttp.send();
}
function loadProfileDoc() {
var xhttp;
if(window.XMLHttpRequest) {
xhttp = new XMLHttpRequest();
} else {
xhttp = new ActiveXObject("Microsoft.XMLHTTP");
}
xhttp.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
document.getElementById("loadable").innerHTML =
this.responseText;
}
};
xhttp.open("GET", "profile.php", true);
xhttp.send();
}
</script>
</head> </head>
<body> <body>
<?php <?php
echo ' echo '
<div class="header-wrapper">
<div class="user-logo">
<div class="pr-ojek-logo">
<div class="logo">
<span class="pr">PR</span>-<span class="ojek">OJEK</span>
</div>
<div class="slogan">
wushh... wushh... ngeeeeeenggg...
</div>
</div>
<div class="user-wrapper">
Hi, <span class="username">bocanhesen</span> ! <br>
<a href="#">Logout</a>
</div>
</div>
<div class="menu-wrapper">
<button type="button" onclick="loadOrderDoc(); buttonHighlight(\'order\')" id="order" class="menu-buttons">ORDER</button>
<button type="button" onclick="loadHistoryDoc(); buttonHighlight(\'history\')" id="history" class="menu-buttons">HISTORY</button>
<button type="button" onclick="loadProfileDoc(); buttonHighlight(\'profile\')" id="profile" class="menu-buttons">MY PROFILE</button>
</div>
</div>
<div id="loadable" class="loadable">
<div class="space3"></div> <div class="space3"></div>
<div class="contenthistory"> <div class="contenthistory">
...@@ -38,6 +126,8 @@ ...@@ -38,6 +126,8 @@
</div> </div>
<div class="space3"></div> <div class="space3"></div>
</div>
' '
?> ?>
</body> </body>
......
src/history-penumpang.php
+ 19
− 1
View file @ f4412fa9
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<head> <head>
<title>Tugas Besar 1 IF3110</title> <title>Tugas Besar 1 IF3110</title>
<link rel="stylesheet" type="text/css" href="history.css"> <link rel="stylesheet" type="text/css" href="history.css">
<link rel="stylesheet" type="text/css" href="index.css">
<link href="https://fonts.googleapis.com/css?family=Oswald:600" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Oswald:600" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Lora" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Lora" rel="stylesheet">
</head> </head>
...@@ -11,7 +12,24 @@ ...@@ -11,7 +12,24 @@
<body> <body>
<?php <?php
echo ' echo '
<div class="header-wrapper">
<div class="history-wrapper">
<transaksihistory>TRANSACTION HISTORY</transaksihistory>
<div class="space1"></div>
<div class="menu-wrapper">
<button type="button" id="hmpo" style="background: rgb(70,93,67); color: #FFFFFF" class="history-menu-buttons">MY PREVIOUS ORDERS</button>
<a href="history-driver.php">
<button type="button" id="hdriver" class="history-menu-buttons">DRIVER HISTORY</button>
</a>
</div>
<div id="loadableHistory" class="loadableHistory"></div>
<div class="space3"></div> <div class="space3"></div>
<div class="contenthistory"> <div class="contenthistory">
......
src/history.css
+ 3
− 36
View file @ f4412fa9
.header-wrapper { .history-wrapper {
width: 500px; width: 500px;
text-align: center; text-align: left;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
border: 1px solid black;
} }
.containerhistory { .containerhistory {
...@@ -14,14 +13,6 @@ ...@@ -14,14 +13,6 @@
border: 1px solid black; border: 1px solid black;
} }
.pr {
color: rgb(2, 112, 44);
}
.ojek {
color: rgb(213, 0, 39);
}
.history { .history {
margin: 8px; margin: 8px;
} }
...@@ -52,14 +43,6 @@ projek { ...@@ -52,14 +43,6 @@ projek {
width: 30%; width: 30%;
} }
.pr {
color: rgb(2, 112, 44);
}
.ojek {
color: rgb(213, 0, 39);
}
.namauser { .namauser {
font-weight: bold; font-weight: bold;
} }
...@@ -272,7 +255,7 @@ isiComment { ...@@ -272,7 +255,7 @@ isiComment {
padding: 0.5px; padding: 0.5px;
} }
.menu-buttons { .history-menu-buttons {
display: inline-block; display: inline-block;
width: 50%; width: 50%;
padding: 8px 0; padding: 8px 0;
...@@ -282,22 +265,6 @@ isiComment { ...@@ -282,22 +265,6 @@ isiComment {
color: rgb(51,51,51); color: rgb(51,51,51);
} }
.menu-buttons-clicked {
display: inline-block;
width: 50%;
padding: 8px 0;
font-weight: bold;
border: 1px solid;
background: rgb(70,93,67);
color: rgb(255,255,255);
}
.loadableHistory { .loadableHistory {
}
.menu-wrapper {
width: 100%;
display: flex;
flex-direction: row;
} }
\ No newline at end of file
src/index.css
+ 1
− 0
View file @ f4412fa9
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
.menu-wrapper { .menu-wrapper {
margin: 6px; margin: 6px;
font-size: 0;
} }
.menu-buttons { .menu-buttons {
......
src/index.html
+ 2
− 38
View file @ f4412fa9
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
this.responseText; this.responseText;
} }
}; };
xhttp.open("GET", "history.php", true); xhttp.open("GET", "history-penumpang.php", true);
xhttp.send(); xhttp.send();
} }
...@@ -64,45 +64,9 @@ ...@@ -64,45 +64,9 @@
xhttp.open("GET", "profile.php", true); xhttp.open("GET", "profile.php", true);
xhttp.send(); xhttp.send();
} }
function loadHistoryMPO() {
var xhttp;
if(window.XMLHttpRequest) {
xhttp = new XMLHttpRequest();
} else {
xhttp = new ActiveXObject("Microsoft.XMLHTTP");
}
xhttp.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
document.getElementById("loadableHistory").innerHTML =
this.responseText;
}
};
xhttp.open("GET", "history-penumpang.php", true);
xhttp.send();
}
function loadHistoryDriver() {
var xhttp;
if(window.XMLHttpRequest) {
xhttp = new XMLHttpRequest();
} else {
xhttp = new ActiveXObject("Microsoft.XMLHTTP");
}
xhttp.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
document.getElementById("loadableHistory").innerHTML =
this.responseText;
}
};
xhttp.open("GET", "history-driver.php", true);
xhttp.send();
}
</script>
</script> </script>
</head> </head>
<body onload="loadOrderDoc(); buttonHighlight('order')"> <body>
<div class="header-wrapper"> <div class="header-wrapper">
<div class="user-logo"> <div class="user-logo">
<div class="pr-ojek-logo"> <div class="pr-ojek-logo">
......
src/login.php
+ 1
− 1
View file @ f4412fa9
...@@ -60,7 +60,7 @@ if (isset($_POST['submit'])) { ...@@ -60,7 +60,7 @@ if (isset($_POST['submit'])) {
} }
if ($psw === $pswconfirm) { if ($psw === $pswconfirm) {
header("Location: profile.php?id_active=". $id); header("Location: index.html?id_active=". $id);
} else { } else {
echo "<script>alert('Wrong password!')</script>"; echo "<script>alert('Wrong password!')</script>";
exit; exit;
......
src/profile.php
+ 1
− 7
View file @ f4412fa9
...@@ -4,12 +4,6 @@ ...@@ -4,12 +4,6 @@
echo ' echo '
<link rel="stylesheet" href="profile.css" /> <link rel="stylesheet" href="profile.css" />
<link itemprop="url" href="https://fonts.googleapis.com/css?family=Oswald:600" rel="stylesheet"> <link itemprop="url" href="https://fonts.googleapis.com/css?family=Oswald:600" rel="stylesheet">
<script>
function editProfile() {
var obj = document.getElementById("profile-wrapper");
obj.style.display = "none";
}
</script>
<div class="profile-wrapper" id="profile-wrapper"> <div class="profile-wrapper" id="profile-wrapper">
<span class="my-profile"> <span class="my-profile">
MY PROFILE MY PROFILE
...@@ -36,7 +30,7 @@ ...@@ -36,7 +30,7 @@
<span class="preferred-locations"> <span class="preferred-locations">
PREFERRED LOCATIONS: PREFERRED LOCATIONS:
</span> </span>
<a href="edit-preferred-locations.html"> <a href="edit-preferred-locations.php">
<img class="edit-image" src="../images/edit.png" /> <img class="edit-image" src="../images/edit.png" />
</a> </a>
<ul class="preferred-locations-list"> <ul class="preferred-locations-list">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment