Skip to content

Commit

Permalink
Clean up form styling
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterEckIII committed Jun 6, 2018
1 parent 2735581 commit 8675730
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 117 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# YelpCamp
# Camp Bug
A campground social media site for sharing reviews, experiences, and advice about campgrounds from around the world

This project is being completed as part of the Colt Steele Web Development Bootcamp. The general idea for the site is to house a social community of camp-goers where they can share reviews, insights, recommendations, and experiences.
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "yelpcamp",
"name": "campbug",
"version": "1.0.0",
"description": "Capstone Project",
"main": "app.js",
Expand Down
3 changes: 3 additions & 0 deletions public/stylesheets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@
margin-top: 20px;
}

form {
margin: 0 auto;
}
2 changes: 1 addition & 1 deletion routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ router.post("/register", function (req, res) {
return res.redirect("back");
}
passport.authenticate("local")(req, res, function () {
req.flash("success", "Welcome to YelpCamp, " + user.username);
req.flash("success", "Welcome to Camp Bug, " + user.username);
res.redirect("/campgrounds");
});
});
Expand Down
2 changes: 1 addition & 1 deletion views/campgrounds/edit.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="container">
<h1 style="text-align:center;">Edit Comment - <%= campground.name %></h1>
<div class="row">
<div style="width:30%; margin:37px auto;">
<div class="col-sm-12 col-md-6">
<form action="/campgrounds/<%= campground._id %>?_method=PUT" method="POST">
<div class="form-group">
<label for="campground[name]">Campground Name</label>
Expand Down
2 changes: 1 addition & 1 deletion views/campgrounds/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="container">
<header class="jumbotron">
<div class="container">
<h1>Welcome to YelpCamp</h1>
<h1>Welcome to Camp Bug</h1>
<p>View some of the best campgrounds from around the world</p>
<p>
<a class="btn btn-primary btn-lg" href="/campgrounds/new">Add New Campground</a>
Expand Down
2 changes: 1 addition & 1 deletion views/campgrounds/new.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="container">
<h1 style="text-align:center;">New Campground</h1>
<div class="row">
<div style="width:30%; margin:37px auto;">
<div class="col-sm-12 col-md-6">
<form action="/campgrounds" method="POST">
<div class="form-group">
<label for="name">Campground Name</label>
Expand Down
2 changes: 1 addition & 1 deletion views/campgrounds/show.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="container">
<div class="row">
<div class="col-md-3">
<p class="lead">YelpCamp</p>
<p class="lead">Camp Bug</p>
<div class="list-group">
<li class="list-group-item active">Info 1</li>
<li class="list-group-item">Info 2</li>
Expand Down
4 changes: 2 additions & 2 deletions views/landing.ejs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>YelpCamp</title>
<title>Camp Bug</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link rel="stylesheet" href="/stylesheets/landing.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js" type="tex/javascript" async></script>
Expand All @@ -21,7 +21,7 @@
</div>

<div id="landing-header">
<h1>Welcome to YelpCamp!</h1>
<h1>Welcome to CampBug!</h1>
<a href="/campgrounds" class="btn btn-success">View All Campgrounds</a>
</div>

Expand Down
2 changes: 1 addition & 1 deletion views/partials/footer.ejs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


<footer>
<p class="text-center text-muted">Trademark YelpCamp 2018</p>
<p class="text-center text-muted">Trademark Camp Bug 2018</p>
</footer>
</body>
</html>
2 changes: 1 addition & 1 deletion views/partials/header.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</head>
<body>
<nav class="navbar navbar-expand-lg navbar-light bg-light" role="navigation">
<a class="navbar-brand" href="/">YelpCamp</a>
<a class="navbar-brand" href="/">Camp Bug</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand Down
4 changes: 2 additions & 2 deletions views/users/login.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<form action="/login" method="POST" style="width:50%; margin:0 auto;">
<div class="container" style="margin: 0 auto;">
<div class="form-row">
<div class="form-group col-md-6" style="width:60%;">
<div class="form-group col-sm-12 col-md-6">
<label for="username">Username</label>
<input name="username" type="text" class="form-control" id="loginUsername" placeholder="Username">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6" style="width:60%;">
<div class="form-group col-sm-12 col-md-6" style="width:60%;">
<label for="password">Password</label>
<input name="password" type="password" class="form-control" id="loginPassword" placeholder="Password">
</div>
Expand Down
119 changes: 16 additions & 103 deletions views/users/register.ejs
Original file line number Diff line number Diff line change
@@ -1,109 +1,22 @@
<% include ../partials/header %>

<h1 class="page-title" style="text-align:center;">Sign Up</h1>

<form action="/register" method="POST">
<input type="text" name="username" placeholder="username">
<input type="password" name="password" placeholder="password">
<button class="btn btn-primary">Sign Up</button>
</form>
<!--
<form action="/register" method="POST">
<div class="container">
<div class="form-row">
<div class="form-group col-md-4">
<label for="inputEmail">Email</label>
<input name="inputEmail" type="email" class="form-control" id="inputEmail" placeholder="[email protected]">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label for="inputPassword">Password</label>
<input name="inputPassword" type="password" class="form-control" id="inputPassword" placeholder="ThatsAmore1">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label for="inputName">Name</label>
<input name="inputName" type="text" class="form-control" id="inputName" placeholder="Frank Sinatra">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label for="inputUsername">Username</label>
<input name="inputUsername" type="text" class="form-control" id="inputUsername" placeholder="@frank_sinatra">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label for="inputCity">City</label>
<input name="inputCity" type="text" class="form-control" id="inputCity">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label for="inputState">State</label>
<select name="inputState" id="inputState" class="form-control">
<option selected>Choose...</option>
<option value="AL">Alabama</option>
<option value="AK">Alaska</option>
<option value="AZ">Arizona</option>
<option value="AR">Arkansas</option>
<option value="CA">California</option>
<option value="CO">Colorado</option>
<option value="CT">Connecticut</option>
<option value="DE">Delaware</option>
<option value="DC">District Of Columbia</option>
<option value="FL">Florida</option>
<option value="GA">Georgia</option>
<option value="HI">Hawaii</option>
<option value="ID">Idaho</option>
<option value="IL">Illinois</option>
<option value="IN">Indiana</option>
<option value="IA">Iowa</option>
<option value="KS">Kansas</option>
<option value="KY">Kentucky</option>
<option value="LA">Louisiana</option>
<option value="ME">Maine</option>
<option value="MD">Maryland</option>
<option value="MA">Massachusetts</option>
<option value="MI">Michigan</option>
<option value="MN">Minnesota</option>
<option value="MS">Mississippi</option>
<option value="MO">Missouri</option>
<option value="MT">Montana</option>
<option value="NE">Nebraska</option>
<option value="NV">Nevada</option>
<option value="NH">New Hampshire</option>
<option value="NJ">New Jersey</option>
<option value="NM">New Mexico</option>
<option value="NY">New York</option>
<option value="NC">North Carolina</option>
<option value="ND">North Dakota</option>
<option value="OH">Ohio</option>
<option value="OK">Oklahoma</option>
<option value="OR">Oregon</option>
<option value="PA">Pennsylvania</option>
<option value="RI">Rhode Island</option>
<option value="SC">South Carolina</option>
<option value="SD">South Dakota</option>
<option value="TN">Tennessee</option>
<option value="TX">Texas</option>
<option value="UT">Utah</option>
<option value="VT">Vermont</option>
<option value="VA">Virginia</option>
<option value="WA">Washington</option>
<option value="WV">West Virginia</option>
<option value="WI">Wisconsin</option>
<option value="WY">Wyoming</option>
</select>
</div>
</div>
<div class="form-row">
<button type="submit" class="btn btn-primary">Register</button>
<h1 class="page-title" style="text-align:center;">Register</h1>
<div class="container">
<div class="row">
<div class="col-sm-12 col-md-6">
<form action="/register" method="POST">
<div class="form-group">
<label for="username">Username</label>
<input type="text" name="username" class="form-control" placeholder="username">
</div>
<div class="form-group">
<label for="password">Password</label>
<input type="password" name="password" class="form-control" placeholder="password">
</div>
<button class="btn btn-primary">Sign Up</button>
</form>
</div>
</div>
</form>
-->
</div>

<% include ../partials/footer %>

0 comments on commit 8675730

Please sign in to comment.