From a188a3d87bb6af2b6d54a107f39e81c8be3c7a88 Mon Sep 17 00:00:00 2001
From: Nur Latifah Ulfah <n.latifahulfah31@gmail.com>
Date: Sat, 7 Oct 2017 10:22:03 +0700
Subject: [PATCH] fix profile style

---
 src/css/fan.css    |  6 +++++-
 src/css/fan2.css   | 27 ++++++++++++++++++++++-----
 src/css/styles.css |  6 +++---
 src/dbconfig.php   |  2 +-
 src/profile.php    | 13 ++++++-------
 src/register.php   | 10 ++--------
 6 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/src/css/fan.css b/src/css/fan.css
index d10154d..54de30b 100644
--- a/src/css/fan.css
+++ b/src/css/fan.css
@@ -170,8 +170,12 @@ nav ul li a:hover {
   text-decoration: none;
   color: white;
   background: #465D43;
-
 }
+nav ul li a.active {
+  color: white;
+  background: #465D43;
+}
+
 /* Button */
 .btn-flat {
   cursor: pointer;
diff --git a/src/css/fan2.css b/src/css/fan2.css
index 8b1e412..63ad1fb 100644
--- a/src/css/fan2.css
+++ b/src/css/fan2.css
@@ -1,7 +1,7 @@
 /* Main Container */
 .card {
   margin-top: 20px;
-  width: 750px;
+  width: 40%;
 }
 
 /* Elements */
@@ -17,6 +17,16 @@
   text-align: center;
 }
 
+.box a {
+  display: block;
+  padding: 10px;
+}
+
+.box a:hover {
+  background-color: #465D43;
+  color: white;
+}
+
 .order-step {
   padding: 10px;
   margin-left: 20px;
@@ -43,10 +53,17 @@
   font-weight: bold;
 }
 
+.font-navbar a {
+  text-decoration: none;
+  color: black;
+}
 
 /* Selection */
 .selected-navbar {
-  background-color: green;
+  background-color: #465D43;
+}
+
+.selected-navbar a {
   color: white;
 }
 
@@ -84,10 +101,10 @@
 /* Pictures */
 
 .profilepic {
-  width: 150px;
-  height: 150px;
+  width: 116px;
+  height: 116px;
   border-radius: 50%;
-  border: 4px solid black;
+  border: 6px solid black;
 }
 
 .editpic {
diff --git a/src/css/styles.css b/src/css/styles.css
index c2d1b69..bd7358f 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -92,13 +92,13 @@ label {
 }
 .register label {
   font-size: 16px;
-  margin: 5px 0;
-  padding-left: 11px;
+  margin: 5px 0px;
+  padding-left: 12px;
   color: #02702C;
   display: inline-block;
   float: left;
   clear: left;
-  width: 143px;
+  width: 142px;
   text-align: left;
   height: 25px;
 }
diff --git a/src/dbconfig.php b/src/dbconfig.php
index a13e908..77d4373 100644
--- a/src/dbconfig.php
+++ b/src/dbconfig.php
@@ -1,7 +1,7 @@
 <?php
   define('DB_SERVER', 'localhost');
   define('DB_USERNAME', 'root');
-  define('DB_PASSWORD', '');
+  define('DB_PASSWORD', 'root');
   define('DB_NAME', 'tubes1-wbd');
 
  ?>
diff --git a/src/profile.php b/src/profile.php
index f751c71..cac3a34 100644
--- a/src/profile.php
+++ b/src/profile.php
@@ -39,8 +39,7 @@ require_once 'dbconfig.php';
       <div class="rowflex">
         <div class="flexone">
           <div>
-            <span class="font-header" style="color: green;">PR</span>
-            -
+            <span class="font-header" style="color: green;">PR-</span>
             <span class="font-header" style="color: red;">OJEK</span>
           </div>
           <div style="color: green;">
@@ -50,16 +49,16 @@ require_once 'dbconfig.php';
 
         <div class="mtop10 flexone textright">
           <span>Hi, </span>
-          <span id="username"><?php echo $username ?></span>
+          <span><b><?php echo $username ?></b>!</span>
           <br  />
           <a href="#">Logout</a>
         </div>
       </div>
 
       <div class="mtop10 rowflex">
-            <div class="flexone box font-navbar">ORDER</div>
-            <div class="flexone box font-navbar">HISTORY</div>
-            <div class="flexone box font-navbar selected-navbar">MY PROFILE</div>
+        <div class="flexone box font-navbar"><a href="">ORDER</a></div>
+        <div class="flexone box font-navbar"><a href="">HISTORY</a></div>
+        <div class="flexone box font-navbar selected-navbar"><a href="">MY PROFILE</a></div>
       </div>
 
       <div class="mtop10">
@@ -78,7 +77,7 @@ require_once 'dbconfig.php';
           <?php echo $fullname?>
         </div>
         <?php if($isdriver) {
-           echo '<span id="isdriver">Driver</span><span >| '. $avg_vote . '(' . $n_voters .')' . '</span>'; }
+           echo '<span id="isdriver">Driver</span><span >| &#8594; '. $avg_vote . '(' . $n_voters .')' . '</span>'; }
            else {
              echo '<span>Non-Driver</span>';
            }?>
diff --git a/src/register.php b/src/register.php
index 3471ab5..c6add5d 100644
--- a/src/register.php
+++ b/src/register.php
@@ -7,18 +7,12 @@
     <script src="js/register.js" charset="utf-8"></script>
   </head>
   <body>
-    <nav>
-      <ul>
-        <li><a href="#home">Home</a></li>
-        <li><a href="#about">About</a></li>
-      </ul>
-    </nav>
-    <div class="container">
+    <div class="container register">
       <div class="box">
         <h1 class="no-background">
           <span><b>SIGN UP</b></span>
         </h1>
-        <form class="form-group" onsubmit="return submitForm()" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" method="post">
+        <form onsubmit="return submitForm()" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" method="post">
           <label>Your Name</label>
           <input type="text" class="form-control" name="nama" >
           <label>Username</label>
-- 
GitLab