diff --git a/public/assets/stylesheets/historydriver.css b/public/assets/stylesheets/historydriver.css index c7b182a86970333e8732e6aeb6592181f6b43b4a..9d928d42ebfd0232e77bc5cb6a69d0d4f84f140b 100644 --- a/public/assets/stylesheets/historydriver.css +++ b/public/assets/stylesheets/historydriver.css @@ -257,3 +257,13 @@ a.whitelink { margin-left: 36px; border: 1px solid black; } + +.errmsg { + background-color: lightgreen; + margin-top: 24px; + border-radius: 7px; + border: 3px solid green; + border-color: darkgreen; + width: 370px; + text-align: center; +} \ No newline at end of file diff --git a/public/assets/stylesheets/historypenumpang.css b/public/assets/stylesheets/historypenumpang.css index 055731dbc0f74fb7fcc15fc243e94c25e51fe18b..0ef46749126730822697b859acc6be4016ef4923 100644 --- a/public/assets/stylesheets/historypenumpang.css +++ b/public/assets/stylesheets/historypenumpang.css @@ -256,4 +256,14 @@ a.whitelink { width: 120px; margin-left: 36px; border: 1px solid black; +} + +.errmsg { + background-color: lightgreen; + margin-top: 24px; + border-radius: 7px; + border: 3px solid green; + border-color: darkgreen; + width: 370px; + text-align:center; } \ No newline at end of file diff --git a/readme.md b/readme.md new file mode 100644 index 0000000000000000000000000000000000000000..0853712d1a27465fe853099ffbfa3c554d869c2e --- /dev/null +++ b/readme.md @@ -0,0 +1,60 @@ +### YESBOSS - Website Ojek Online Clone +--- +##### IF3110 Pengembangan Aplikasi Berbasis Web +--- + +#### Deskripsi Singkat + +> Simple Clone Ojek Online App based on web. + +#### Anggota Tim +1. [Robby Syaifullah] +(http://gitlab.informatika.org/robbysyaifullah) - 13515013 +2. [Taufan Mahaputra] +(http://gitlab.informatika.org/taufanmahaputra) - 13515028 +3. [M Rafli] +(http://gitlab.informatika.org/mraflif31) - 13515115 + +#### Tools +1. _Back-end :_ PHP +2. _Database :_ MySQL +3. _Front-end :_ Javascript, HTML, dan CSS + +#### Pembagian Tugas +##### <p style="color:green">Tampilan</p> +| No. | Interface | NIM | +|---|---|---| +|1| Order Ojek | 13515115 | +|2| Select Driver | 13515115 | +|3| Complete Order| 13515115 | +|4| Login | 13515028, 13515115 | +|5| Register | 13515028, 13515115 | +|6| Profile | 13515028 | +|7| Edit Profile | 13515013, 13515028 | +|9| Edit Preferred Location | 13515013, 13515028 | +|9| History Penumpang | 13515013, 13515028 | +|10| History Driver | 13515013, 13515028 | + +##### <p style="color:green">Fungsionalitas</p> +| No. | Functionality | NIM | +|---|---|---| +|1| Order Ojek | 13515115 | +|2| Select Driver| 13515115 | +|3| Complete Order | 13515115 | +|4| Login | 13515028 | +|5| Register | 13515028 | +|6| Profile | 13515028, 13515115 | +|7| Edit Profile | 13515028 | +|8| Edit Preferred Location | 13515028 | +|9| History Penumpang | 13515013, 13515028 | +|10| History Driver | 13515013, 13515028 | + +##### Mocks +[Link] (public/mocks) + +#### License +---- + +MIT + + diff --git a/src/history-driver.php b/src/history-driver.php index 01bf4412e0e81c7368a742e3c22f60833162ce9e..955aa1856569272cdc9953d4ca237af1dfe5ba9e 100644 --- a/src/history-driver.php +++ b/src/history-driver.php @@ -20,7 +20,10 @@ $count = mysqli_num_rows($result); $counter = 0; if($count == 0) { - echo "Error: " . $query . "<br>" . mysqli_error($db); + echo "<div class=\"errmsg\"> + <p>No Transaction Yet</p> + <p>Let's use YESBOSS now!</p> + </div>"; } else { while ($result_array = mysqli_fetch_array($result)) { diff --git a/src/history-penumpang.php b/src/history-penumpang.php index bad3cb5b096c2bfb3bf9de6685514d9542b9b1af..9808afc2322c9a90049a97bbf095461be78f0b72 100644 --- a/src/history-penumpang.php +++ b/src/history-penumpang.php @@ -25,7 +25,10 @@ $count = mysqli_num_rows($result); $x=0; if($count == 0) { - echo "Error: " . $query . "<br>" . mysqli_error($db); + echo "<div class=\"errmsg\"> + <p>No Transaction Yet</p> + <p>Let's use YESBOSS now!</p> + </div>"; } else { while ($result_array = mysqli_fetch_array($result)) { diff --git a/src/login.php b/src/login.php index 3222f4971184e9e54ab4d47949a3eacc9c494b0d..38000a59a72303c6c0b0382c2189c6188e5ff053 100644 --- a/src/login.php +++ b/src/login.php @@ -8,12 +8,13 @@ $result = mysqli_query($db, $query); $count = mysqli_num_rows($result); if($count == 1) { - echo "fuck"; $_SESSION['login_user'] = $username; header("location: ../public/profile.php?user=$username"); } else { - echo "string"; + echo "<script> alert('Email or password invalid!'); + window.location = \"../public/index.php\"; + </script>"; } } diff --git a/src/uploads/robby/8925.jpg b/src/uploads/robby/8925.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ede4ebcceddacea649c798348c728146b7ad487b Binary files /dev/null and b/src/uploads/robby/8925.jpg differ diff --git a/src/uploads/robby/robby.PNG b/src/uploads/robby/robby.PNG new file mode 100644 index 0000000000000000000000000000000000000000..2801ee6ccd9c08563e7dcab25f9896f6570bf066 Binary files /dev/null and b/src/uploads/robby/robby.PNG differ