diff --git a/src/css/fan.css b/src/css/fan.css index d10154db010e15b67f16c5761f6c22198d8cb0eb..54de30b867f1a1657acd9642f735d709cd82f2b7 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 8b1e41217289c44cdbb45536018432dabb1a4ba4..63ad1fb3b9fb7339e0a46537c7c2a310c5442558 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 c2d1b690c16d74917a4dcda707543c9f393a5328..bd7358f1ea8740ec0bb1224e68a5a98338929fb4 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 a13e908d228a97dc4cdb416ceec6db52e133c999..77d437344bf0adcf1a53e7278f0f058093810015 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 f751c71eeb82d56476a5bf4b43e9b4dfc2db84db..cac3a3496db20a4c00fd37d7624408d68dbdccc4 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 >| → '. $avg_vote . '(' . $n_voters .')' . '</span>'; } else { echo '<span>Non-Driver</span>'; }?> diff --git a/src/register.php b/src/register.php index 3471ab5241de85e7168ed0dda4b4296a714aadc3..c6add5d35b19837af04b18f7f8800096d340cb15 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>