Merge branch 'master' of https://github.com/jborak/charityspotter

jborak · Nov 8, 2015 · 0a4fd37 · 0a4fd37
2 parents a78ff77 + 5cc5709
commit 0a4fd37
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 14 deletions.
diff --git a/appengine/frontend/collector.html b/appengine/frontend/collector.html
@@ -29,15 +29,11 @@
   } else {
     console.log("Authenticated successfully with payload:", authData);
 $("#user").html('<img src="' + authData.facebook.profileImageURL + '">');
-  }
+$( ".logging" ).replaceWith( "<a>Logout</a>" );}
 });
 }
 
     </script>
-
-
-
-
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -71,7 +67,7 @@
 </head>
 
 <body id="page-top">
-<div id="user"></div>
+
     <nav id="mainNav" class="navbar navbar-primary navbar-fixed-top">
         <div class="container-fluid">
             <!-- Brand and toggle get grouped for better mobile display -->
@@ -110,14 +106,19 @@
             <h1>Collector</h1>
         </div>
 
-                        <ul>                                    
+               <ul>     <div class= "logging">                               
                     <a href="#" id="fblogin" class="btn btn-collector btn-lg" style="margin: 50px"><i class="#"></i> <span class="network-name">Login</span></a>
-
+                    </div>
                 </ul>
+                <div class="row">
+                    <div class="col-lg-4 col-lg-offset-4 text-center">
+
+           </div>
+           </div>
     </div>
 
   <!--  <div class="container" style="margin: 100px"><a href="#" id="fblogin">FB Login</a></div>-->
-
+<center><div id="user" style="padding: 20px"></div></center>
     <div class="container">
         <div class="row">
             <div class="col-lg-8 col-lg-offset-2 text-center">

diff --git a/appengine/frontend/css/new-collection.css b/appengine/frontend/css/new-collection.css
@@ -31,6 +31,12 @@ h6 {
     font-weight: 400;
 }
 
+#explore-header {
+    color: #eb3812;
+    font-size: 2.4em;
+    text-align: left;
+}
+
 .new-col-header {
     padding-top: 50px; /* If you're making other pages, make sure there is 50px of padding to make sure the navbar doesn't overlap content! */
     padding-bottom: 10px;
@@ -45,7 +51,7 @@ h6 {
     margin-top: 5px;
     margin-left: auto;
     margin-right: auto;
-    height: 60px;
+    height: 225px;
     text-align: center;
     border-radius: 2px;
 }
@@ -62,4 +68,11 @@ form a {
     font-size: 1.1em;
 }
 
+#name-bar {
+    width: 500px;
+    margin-left: 2em;
+    margin-right: 1em;
+}
+
+
 
diff --git a/appengine/frontend/demo/unknown.jpg b/appengine/frontend/demo/unknown.jpg
diff --git a/appengine/frontend/demo/unknown.png b/appengine/frontend/demo/unknown.png
diff --git a/appengine/frontend/new-collection.html b/appengine/frontend/new-collection.html
@@ -81,7 +81,9 @@ <h1>Collections</h1>
         <div class="row">
             <div class="col-lg-8 col-lg-offset-2 text-center">
                 <hr class="light">
-                <br/><br/>
+                <br/>
+                <p id='explore-header'>Create a new collection event</p>
+                <br/>
             </div>
         </div>
     </div>
@@ -91,17 +93,38 @@ <h1>Collections</h1>
         <div class='search-container'>
             <form class="navbar-form navbar-left" role="search">
                 <div class="form-group">
-                    <a>Search for tags, objects or even specific IDs:</a>
-                    <input type="text" class="form-control" id="search-bar" placeholder="Search">
+                    <a>Collection Event ID:</a>
+                    <input type="text" class="form-control" id="name-bar" placeholder="My-collection">
+                </br>
                 </div>
-                <button type="submit" class="btn btn-default" onclick="javascript:searchItems(event);"><span class="glyphicon glyphicon-search"></span></button>
+                <div class="form-group">
+                </br>
+                    <a>Collection location:</a>
+                    <input type="text" class="form-control" placeholder="Tatooine">
+                    <a>  Storage units:</a>
+                    <input type="text" class="form-control" placeholder="Alderaan">
+                </br>
+                </div>
+            </br>
+                <div class="form-group">
+                </br>
+                    <a>Invite other collectors:</a>
+                    <input type="text" class="form-control" placeholder="Mace Windu">
+                </br>
+                </div>
+                </br>
+                </br>
+
+                <button type="submit" class="btn btn-default" onclick="javascript:searchItems(event);">Create form   <span class="glyphicon glyphicon-plus"></span></button>
             </form>
         </div>
     </div>
 
 
 
     <div class="container">
+    </br>
+    </br>
         <div class="row">
             <div class="col-lg-4"></div>
             <div class="col-lg-4">