Skip to content

Commit

Permalink
Merge pull request #53 from WolfSlayer2/main
Browse files Browse the repository at this point in the history 
Fix the Button UI
  • Loading branch information
@Kritika30032002
Kritika30032002 authored Oct 10, 2023
2 parents db5b2db + abb94ba commit e41acaf
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 79 deletions.
32 changes: 16 additions & 16 deletions views/home.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<%- include('partials/header') %>

<div class="jumbotron centered">
<div class="container">
<i class="fas fa-key fa-6x"></i>
<h1 class="display-3">Secrets</h1>
<p class="lead">Don't keep your secrets, share them anonymously!</p>
<hr />
<a class="btn btn-light btn-lg" href="/register" role="button">Register</a>
<a class="btn btn-dark btn-lg" href="/login" role="button">Login</a>
<div class="jumbotron centered">
<div class="container">
<i class="fas fa-key fa-6x"></i>
<h1 class="display-3">Secrets</h1>
<p class="lead">Don't keep your secrets, share them anonymously!</p>
<hr />
<div class="d-flex justify-content-center">
<a class="btn btn-light btn-lg col-2 mx-2" href="/register" role="button">Register</a>
<a class="btn btn-dark btn-lg col-2 mx-2" href="/login" role="button">Login</a>
</div>
</div>
</div>
</div>
<a href="#navbar" id="myBtn" title="Go to top">
<img
src="https://img.icons8.com/ios-filled/50/000000/long-arrow-up.png"
style="width: 70%; height: 70%; color: white; position: relative; left: 7px"
/>
</a>
<a href="#navbar" id="myBtn" title="Go to top">
<img src="https://img.icons8.com/ios-filled/50/000000/long-arrow-up.png"
style="width: 70%; height: 70%; color: white; position: relative; left: 7px" />
</a>

<%- include('partials/footer') %>
<%- include('partials/footer') %>
88 changes: 39 additions & 49 deletions views/login.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,51 @@
<%- include('partials/header') %>

<div class="container mt-5" style="margin-bottom: 197px">
<h1>Login</h1>
<div class="container mt-5" style="margin-bottom: 197px">
<h1>Login</h1>

<div class="row">
<div class="col-sm-8">
<div class="card">
<div class="card-body">
<!-- Makes POST request to /login route -->
<form action="/login" method="POST">
<div class="form-group">
<label for="email">Email</label>
<input type="email" class="form-control" name="username" />
</div>
<div class="form-group">
<label for="password">Password</label>
<input type="password" class="form-control" name="password" />
</div>
<button type="submit" class="btn btn-dark">Login</button>
</form>
<div class="row">
<div class="col-sm-8">
<div class="card">
<div class="card-body">
<!-- Makes POST request to /login route -->
<form action="/login" method="POST">
<div class="form-group">
<label for="email">Email</label>
<input type="email" class="form-control" name="username" />
</div>
<div class="form-group">
<label for="password">Password</label>
<input type="password" class="form-control" name="password" />
</div>
<button type="submit" class="btn btn-dark col-2">Login</button>
</form>
</div>
</div>
</div>
</div>

<div class="col-sm-4">
<div class="card">
<div class="card-body">
<a
class="btn btn-block btn-social btn-google"
href="/auth/google"
role="button"
>
<i class="fab fa-google"></i>
Sign In with Google
</a>
<div class="col-sm-4">
<div class="card">
<div class="card-body">
<a class="btn btn-block btn-social btn-google" href="/auth/google" role="button">
<i class="fab fa-google"></i>
Sign In with Google
</a>
</div>
</div>
</div>

<div class="card">
<div class="card-body">
<a
class="btn btn-block btn-social btn-facebook"
href="/auth/facebook"
role="button"
>
<i class="fab fa-facebook"></i>
Sign In with Facebook
</a>
<div class="card">
<div class="card-body">
<a class="btn btn-block btn-social btn-facebook" href="/auth/facebook" role="button">
<i class="fab fa-facebook"></i>
Sign In with Facebook
</a>
</div>
</div>
</div>
</div>
</div>
</div>
<a href="#navbar" id="myBtn" title="Go to top">
<img
src="https://img.icons8.com/ios-filled/50/000000/long-arrow-up.png"
style="width: 70%; height: 70%; color: white; position: relative; left: 7px"
/>
</a>
<%- include('partials/footer') %>
<a href="#navbar" id="myBtn" title="Go to top">
<img src="https://img.icons8.com/ios-filled/50/000000/long-arrow-up.png"
style="width: 70%; height: 70%; color: white; position: relative; left: 7px" />
</a>
<%- include('partials/footer') %>
2 changes: 1 addition & 1 deletion views/register.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
</div>
<button
type="submit"
class="btn btn-dark"
class="btn btn-dark col-2"
id="user-register"
>
Register
Expand Down
29 changes: 16 additions & 13 deletions views/secrets.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<%- include('partials/header') %>

<div class="jumbotron text-center">
<div class="container">
<i class="fas fa-key fa-6x"></i>
<h1 class="display-3">You've Discovered My Secret!</h1>
<div class="jumbotron text-center">
<div class="container">
<i class="fas fa-key fa-6x"></i>
<h1 class="display-3">You've Discovered My Secret!</h1>

<% usersWithSecrets.forEach(function(user){ %>
<p class="secret-text"><%=user.secret%></p>
<% }) %>
<% usersWithSecrets.forEach(function(user){ %>
<p class="secret-text">
<%=user.secret%>
</p>
<% }) %>


<hr>

<a class="btn btn-light btn-lg" href="/logout" role="button">Log Out</a>
<a class="btn btn-dark btn-lg" href="/submit" role="button">Submit a Secret</a>
<hr>
<div class="d-flex justify-content-center">
<a class="btn btn-light btn-lg col-2 mx-1" href="/logout" role="button">Log Out</a>
<a class="btn btn-dark btn-lg col-2 mx-1" href="/submit" role="button">Submit a Secret</a>
</div>
</div>
</div>
</div>

<%- include('partials/footer') %>
<%- include('partials/footer') %>

0 comments on commit e41acaf

Please sign in to comment.