Skip to content

Commit

Permalink
Basic Landing Page
Browse files Browse the repository at this point in the history
  • Loading branch information
Skyfly2 committed Oct 19, 2019
1 parent 4389c83 commit b65c243
Show file tree
Hide file tree
Showing 8 changed files with 88 additions and 43 deletions.
11 changes: 5 additions & 6 deletions css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ h1,h2,h3,h4,h5,h6{
}

a{
font-size: 25px; font-family: 'Manjari', sans-serif;
font-size: 10px; font-family: 'Manjari', sans-serif;
}
footer{
position: relative;
}

body{
background-color: #CCC;
.btn-mylife{
background-color: #3c6948;
}

.scroll{

.btn-mylife:hover{
background-color: #272e2a;
}
Binary file added images/landingtexture.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/myLifelogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/myLifelogocropped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/mylifetransparent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
56 changes: 21 additions & 35 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,50 +6,36 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>myLife - Login</title>
<title>myLife</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.css"/>
<link href="https://fonts.googleapis.com/css?family=Manjari&display=swap" rel="stylesheet">


</head>
<body style="background-image: ">
<div class ="container">
<div class = "row">
<div class = "col-lg-6 m-auto">
<div class = "card bg-light mt-5">
<div class="card-title bg-success text-white mt-5">
<h3 class="text-center py-3" style="font-family: 'Manjari', sans-serif;">Login to myLife</h3>
<body style="background-image: url(images/landingtexture.jpg); background-size: 100%;">
<nav class="navbar navbar-expand-lg navbar-light" style="height: 85px; background-color:#3c6948;">
<a class="navbar-brand" href="#" style="font-family: 'Manjari', sans-serif; font-size: 42px; color: white;">myLife</a>
</nav>
<div class="container" style="font-family: 'Manjari', sans-serif; font-size: 42px; color: black; margin-top: 50px;">
<center>
<h1>Personal schedule management</h1>
<h1>Intelligent social collaboration</h1>
<h1>Seamless multi-platform use</h1>
</center>
<div class="row">
<div class="col-sm-6">
<img style="float: right;" src="images/mylifetransparent.png">
</div>

<?php
if(@$_GET['Invalid'] == true)
{
?>
<div class="alert-light text-danger text-center py-3"><?php echo $_GET['Invalid']?></div>
<?php
}

if(@$_GET['Success'] == true){
?>
<div class="alert-light text-success text-center py-3"><?php echo $_GET['Success']?></div>
<?php
}
?>


<div class="card-body">
<form action="php/login.php" method="post">
<input type="text" name="UName" placeholder="Username" class="form-control mb-4">
<input type="password" name="Password" placeholder="Password" class="form-control mb-4">
<button class="btn btn-success" name="Login">Login</button>
<br/>
<a href="pages/registration.php">Don't have an account? Sign up here</a>
</form>
<div class="col-sm-6">
<br/>
<a class="btn btn-success" style="height: 50px; width: 275px; font-size: 30px;" href="pages/loginpage.php">Login</a>
<br/>
<a class="btn btn-primary" style="height: 50px; width: 275px; font-size: 30px;" href="pages/registration.php">Register</a>
</div>
</div>
</div>
</div>

</div>


<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
Expand Down
60 changes: 60 additions & 0 deletions pages/loginpage.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?php
session_start();
?>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>myLife - Login</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.css"/>
<link href="https://fonts.googleapis.com/css?family=Manjari&display=swap" rel="stylesheet">


</head>
<body style="background-image: ">
<div class ="container">
<div class = "row">
<div class = "col-lg-6 m-auto">
<div class = "card bg-light mt-5">
<div class="card-title text-white mt-5" style="background-color:#3c6948;">
<h3 class="text-center py-3" style="font-family: 'Manjari', sans-serif;">Login to myLife</h3>
</div>

<?php
if(@$_GET['Invalid'] == true)
{
?>
<div class="alert-light text-danger text-center py-3"><?php echo $_GET['Invalid']?></div>
<?php
}

if(@$_GET['Success'] == true){
?>
<div class="alert-light text-success text-center py-3"><?php echo $_GET['Success']?></div>
<?php
}
?>


<div class="card-body">
<form action="../php/login.php" method="post">
<input type="text" name="UName" placeholder="Username" class="form-control mb-4">
<input type="password" name="Password" placeholder="Password" class="form-control mb-4">
<button class="btn btn-success" name="Login">Login</button>
<br/>
<a href="registration.php">Don't have an account? Sign up here</a>
</form>
</div>
</div>
</div>
</div>
</div>

<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="js/jquery-3.3.1.slim.min.js"></script>
<script src="js/popper.min.js"></script>
<script src="bootstrap-4.1.0/js/bootstrap.min.js"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions pages/registration.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class = "row">
<div class = "col-lg-6 m-auto">
<div class = "card bg-light mt-5">
<div class="card-title bg-success text-white mt-5">
<div class="card-title text-white mt-5" style="background-color:#3c6948;">
<h3 class="text-center py-3" style="font-family: 'Manjari', sans-serif;">Register a myLife Account</h3>
</div>

Expand All @@ -38,7 +38,7 @@
<input type="password" name="ConfirmPassword" placeholder="Confirm Password" class="form-control mb-4">
<button class="btn btn-success" name="Register">Register</button>
<br/>
<a href="../index.php">Already have an account? Sign in here</a>
<a href="loginpage.php">Already have an account? Sign in here</a>
</form>
</div>
</div>
Expand Down

0 comments on commit b65c243

Please sign in to comment.