fixed merged conflicts

laurengranada · Mar 11, 2017 · 9904300 · 9904300
2 parents 52e0ffc + 5708c8a
commit 9904300
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 84 deletions.
diff --git a/public/assets/css/style.css b/public/assets/css/style.css
@@ -61,19 +61,22 @@ body {
 }
 
 
+
 .login {
   position: center;
 }
 .footer {
   bottom: 0;
   position: relative;
+
 }
 
 .input-group {
   opacity: 100;
 }
 
 /*media queries*/
+
 @media (min-width: 768px) {
   #jumbotron {
     min-height: 100%;

diff --git a/public/index.html b/public/index.html
@@ -12,6 +12,7 @@
 
 <body>
 
+
 <nav class="navbar navbar-inverse bg-inverse">
     <a class="navbar-brand" href="/">
         <img src="/assets/images/logo.png" width="30" height="30" class="d-inline-block align-top" alt=""> 
@@ -37,6 +38,7 @@ <h2>About:</h2>
     <br>
  </div>  
 </div>
+
 <div class="footer">
    <hr>
    © Copyright 2017, Finder's Fee

diff --git a/views/finder.handlebars b/views/finder.handlebars
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 
-
 <html lang="en-us">
 
+<<<<<<< HEAD
 <head>
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" integrity="sha384-y3tfxAZXuh4HwSYylfB+J125MxIs6mR5FOHamPBG064zB+AFeWH94NdvaCBm8qnd" crossorigin="anonymous">
 
@@ -44,6 +44,10 @@
 
 <html lang="en-us">
 
+=======
+<html lang="en-us">
+
+>>>>>>> 5708c8aee1845b77333c1722cf6cb1bf8baa8352
 <head>
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" integrity="sha384-y3tfxAZXuh4HwSYylfB+J125MxIs6mR5FOHamPBG064zB+AFeWH94NdvaCBm8qnd" crossorigin="anonymous">
 
@@ -65,19 +69,4 @@
 		<div class="col-xs-12 text-center" id="bottom-bar">
 	 		<img alt="avatar" id="avatar"  style="display:none">
    			<span id="nickname"></span></p>
-      		<button id="btn-login" class = "btn btn-primary">Log In<!<a href="http://localhost:8080/userview/callback"> --><!-- </button>
-      		<button id="btn-logout" class = "btn btn-primary">Log Out</button>
-			</div>
-		</div>
-	</div>
-</body>
 
-<div class="card">
-  <div class="card-block">
-    <h4 class="card-title">Card title</h4>
-    <h6 class="card-subtitle mb-2 text-muted">Card subtitle</h6>
-    <p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>
-    <a href="#" class="card-link">Card link</a>
-    <a href="#" class="card-link">Another link</a>
-  </div>
-</div> --> <!-- --> 
diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars
@@ -21,6 +21,7 @@
   	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 
 	<link rel="icon" href="/assets/images/logo.png">
+<<<<<<< HEAD
 </head>
 <body>
 
@@ -46,6 +47,7 @@
 </div>
 
 
+
 </body>
 </html>
 

diff --git a/views/post.handlebars b/views/post.handlebars
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 
 <html lang="en-us">
+<<<<<<< HEAD
 
 <head>
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" integrity="sha384-y3tfxAZXuh4HwSYylfB+J125MxIs6mR5FOHamPBG064zB+AFeWH94NdvaCBm8qnd" crossorigin="anonymous">
@@ -71,5 +72,3 @@
 </ul>
 </div>
 </form> -->
-
-
diff --git a/views/seeker.handlebars b/views/seeker.handlebars
@@ -1,4 +1,5 @@
- <!DOCTYPE html>
+<!DOCTYPE html>
+
 
 <html lang="en-us">
 

diff --git a/views/seekerform.handlebars b/views/seekerform.handlebars
@@ -1,5 +1,5 @@
 
-<!-- <div class="container">
+<div class="container">
 
 		<h2>What are you looking for?</h2>
 		<hr>
@@ -13,7 +13,7 @@
 
 		<!-- <h4>Link to Photo Image (Required)</h4>
 		<input type="text" name="" id="photo" class="form-control" required >
- --><!-- 
+ --> 
             <br>
             <div class="form-group">
                 <label for="Category">Category:</label>
@@ -51,7 +51,7 @@
     </form>
 		<br>
 		<!-- Submit Button -->
-		<!-- <button type="submit" class="btn btn-primary btn-lg btn-block" id="add-btn" {{!-- onclick="location.href='/post'" --}}><i class="fa fa-check-circle" aria-hidden="true"></i>Submit</button>
+		<<button type="submit" class="btn btn-primary btn-lg btn-block" id="add-btn" {{!-- onclick="location.href='/post'" --}}><i class="fa fa-check-circle" aria-hidden="true"></i>Submit</button>
 </div>
 
 <script src="/public/assets/js/add.js" type="text/javascript"></script> --> 

diff --git a/views/userpost.handlebars b/views/userpost.handlebars
@@ -10,6 +10,7 @@
   <script src="assets/js/login.js" type="text/javascript"></script>
 </head>
 <body>
+<<<<<<< HEAD
       <div class="containerform">
         <h2>YOUR POSTS: </h2> 
         <div class="row">
@@ -53,4 +54,3 @@
 </ul>
 </div> -->
 
-
diff --git a/views/userview.handlebars b/views/userview.handlebars
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE html>
 
 <html lang="en-us">
@@ -70,64 +71,3 @@
 
 
 
-<!-- <!--Latest compiled and minified CSS-->
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-  <link rel="stylesheet" href="/assets/css/style.css" type="text/css" />
-
-<div class="container">
-
-        <h2>What are you looking for?</h2>
-        <hr>
-   <form action="/postToDB" method="POST" role="form">
-
-           <label for="item_name">Item: </label>
-           <div class="input-group">
-                 <span class="input-group-addon" id="basic-addon1"></span>
-                 <input type="text" class="form-control" id="item_name" placeholder="type here" aria-describedby="basic-addon1" required="true">
-           </div>
-
-        <!-- <h4>Link to Photo Image (Required)</h4>
-        <input type="text" name="" id="photo" class="form-control" required >
--->
-           <br>
-           <div class="form-group">
-               <label for="category">Category:</label>
-               <select class="form-control" id="category">
-                 <option>Appliances</option>
-                 <option>Arts&Crafts</option>
-                 <option>Auto</option>
-                 <option>Furniture</option>
-                 <option>Tech</option>
-               </select>
-           </div>
-
-
-           <label for="description">Item Description: </label>
-           <div class="input-group">
-                 <span class="input-group-addon" id=""></span>
-                 <input type="text" class="form-control" id="description" placeholder="type here" aria-describedby="basic-addon1" required="true">
-           </div>
-
-
-           <br>
-           <label for="fee">Fee:</label>
-           <div class="input-group">
-                 <span class="input-group-addon">$</span>
-                 <input type="text" class="form-control" id="fee" aria-label="Amount (to the nearest dollar)">
-                  <span class="input-group-addon">.00</span>
-           </div>
-
-           <br>
-           <label for="email">Email to Contact: </label>
-           <div class="input-group">
-                 <input type="text" class="form-control" id="email" placeholder="Seeker's Email" aria-describedby="basic-addon2">
-                 <span class="input-group-addon" id="email">@example.com</span>
-           </div>
-   </form>
-        <br>
-        <!-- Submit Button -->
-        <button type="submit" class="btn btn-primary btn-lg btn-block" id="add-btn" {{!-- onclick="location.href='/post'" --}}><i class="fa fa-check-circle" aria-hidden="true"></i>Submit</button>
-</div>
-
-<script src="/assets/js/submit.js" type="text/javascript"></script>
-<script src="/assets/js/login.js"></script> -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ @@
       	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     	<link rel="icon" href="/assets/images/logo.png">
+    <<<<<<< HEAD
     </head>
     <body>
@@ Expand All / @@ -46,6 +47,7 @@ @@
     </div>
     </body>
     </html>
@@ Expand Down @@