Skip to content

Commit

Permalink
Altered userlogin and register
Browse files Browse the repository at this point in the history
Lmk if I missed an update
  • Loading branch information
Kartik Mathur authored Apr 14, 2018
1 parent f4e8333 commit 04a3bad
Show file tree
Hide file tree
Showing 2 changed files with 174 additions and 28 deletions.
96 changes: 86 additions & 10 deletions RoommateTest/src/main/webapp/userLogin.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,103 @@
<link href="signup.css" rel="stylesheet">




<title>Login</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Login</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
<!-- Bulma Version 0.6.2-->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.6.2/css/bulma.min.css" integrity="sha256-2k1KVsNPRXxZOsXQ8aqcZ9GOOwmJTMoOB5o5Qp1d6/s=" crossorigin="anonymous" />
<style type="text/css">
html,body {
font-family: 'Open Sans';
}
</style>
</head>
<body>

<div class="container">

<section class="hero is-fullheight is-default is-bold">
<div class="hero-head">
<nav class="navbar">
<div class="container">
<div class="navbar-brand">
<a class="navbar-item" href="../">
<img src="https://pbs.twimg.com/profile_images/1344530309/RLangTip_400x400.png" alt="Logo">
</a>
<span class="navbar-burger burger" data-target="navbarMenu">
<span></span>
<span></span>
<span></span>
</span>
</div>
<div id="navbarMenu" class="navbar-menu">
<div class="navbar-end"><div class="tabs is-right">

</div>
</div>
</div>
</div>
</nav>
</div>
<div class="hero-body">
<div class="container has-text-centered">

<div class="column is-5 is-offset-3">
<figure class="image is-4by3">
<img src="https://picsum.photos/800/600/?random" alt="Description">
</figure>
</div>
<div class="column is-5 is-offset-3">

<form class="form-request-help" method="POST" action="DispatcherServlet">
<h2 class="form-request-help-heading text-center">Roommates</h2>

<label for="username" class="sr-only">type your full name </label>
<input type="text" name="username" class="form-control" placeholder="Enter a username" required autofocus>

<label for="password" class="sr-only">type your full name </label>
<input type="password" name="password" class="form-control" placeholder="Enter your password" required autofocus>
<input type="hidden" name="command" value="login">
<input type="text" name="password" class="form-control" placeholder="Enter your password" required autofocus>
<input type="hidden" name="command" value="userLogin">


<button class="btn btn-lg btn-primary btn-block" type="submit">submit</button>
</form>


</div>
</div>
</div>
</div>

</section>
<script async type="text/javascript" src="../js/bulma.js"></script>
</body>
</html>
</html>





























106 changes: 88 additions & 18 deletions RoommateTest/src/main/webapp/userRegister.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,56 @@
<link href="signup.css" rel="stylesheet">


<title>Sign up</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Hompage</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
<!-- Bulma Version 0.6.2-->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.6.2/css/bulma.min.css" integrity="sha256-2k1KVsNPRXxZOsXQ8aqcZ9GOOwmJTMoOB5o5Qp1d6/s=" crossorigin="anonymous" />
<style type="text/css">
html,body {
font-family: 'Open Sans';
}
</style>
</head>
<body>

<div class="container">

<form class="form-request-help" method="POST" action="DispatcherServlet">
<section class="hero is-fullheight is-default is-bold">
<div class="hero-head">
<nav class="navbar">
<div class="container">
<div class="navbar-brand">
<a class="navbar-item" href="../">
<img src="https://pbs.twimg.com/profile_images/1344530309/RLangTip_400x400.png" alt="Logo">
</a>
<span class="navbar-burger burger" data-target="navbarMenu">
<span></span>
<span></span>
<span></span>
</span>
</div>
<div id="navbarMenu" class="navbar-menu">
<div class="navbar-end"><div class="tabs is-right">

</div>
</div>
</div>
</div>
</nav>
</div>
<div class="hero-body">
<div class="container has-text-centered">

<div class="column is-5 is-offset-3">
<figure class="image is-4by3">
<img src="https://picsum.photos/800/600/?random" alt="Description">
</figure>
</div>
<div class="column is-5 is-offset-3">


<form class="form-request-help" method="POST" action="DispatcherServlet">
<h2 class="form-request-help-heading text-center">Roommate</h2>
<label for="firstname" class="sr-only">type your full name </label>
<input type="text" name="firstName" class="form-control" placeholder="Enter your first name" required autofocus>
Expand All @@ -37,7 +80,7 @@
<input type="text" name="username" class="form-control" placeholder="Enter a username" required autofocus>

<label for="password" class="sr-only">type your full name </label>
<input type="password" name="password" class="form-control" placeholder="Enter your password" required autofocus>
<input type="text" name="password" class="form-control" placeholder="Enter your password" required autofocus>

<label for="cellNum" class="sr-only">type your full name </label>
<input type="text" name="cellNum" class="form-control" placeholder="Enter your phone number" required autofocus>
Expand All @@ -52,18 +95,45 @@

<button class="btn btn-lg btn-primary btn-block" type="submit">submit</button>
</form>


<!--
private String address;

</div>
</div>
</div>
</div>

</section>
<script async type="text/javascript" src="../js/bulma.js"></script>
</body>
</html>






























private String venmoHandle;
private int groupId;
private String checkedInStatus;
-->

</div> <!-- /container -->

</body>
</html>

0 comments on commit 04a3bad

Please sign in to comment.