Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nss-evening-cohort-04/pinterestin…
Browse files Browse the repository at this point in the history 
…g-team-7
  • Loading branch information
@helanan
helanan committed Dec 1, 2016
2 parents 47857be + f483d6c commit 245001d
Show file tree
Hide file tree
Showing 6 changed files with 195 additions and 65 deletions.
41 changes: 41 additions & 0 deletions css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,45 @@ body {
h1 {
font-family: 'Anton', sans-serif;
font-size: 1.5em;
}

/*=========================================*/ /*PARTIALS*/
/*=========================================*/

/*Login Partial*/

.form-signin {
max-width: 330px;
padding: 15px;
margin: 0 auto;
margin-bottom: 10px;
}
.form-signin .form-signin-heading,
.form-signin .checkbox {
margin-bottom: 10px;
}
.form-signin .checkbox {
font-weight: normal;
}
.form-signin .form-control {
position: relative;
height: auto;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding: 10px;
font-size: 16px;
}
.form-signin .form-control:focus {
z-index: 2;
}
.form-signin input[type="email"] {
margin-bottom: -1px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
.form-signin input[type="password"] {
margin-bottom: 10px;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
2 changes: 1 addition & 1 deletion javascripts/AppConstants.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use strict";

app.constant("FIREBASE_CONFIG", {
apiKey: "AIzaSyDLYTCrr8KDez8swSpi0Hgef3ymv4xSPVI",
apiKey: "AIzaSyDLYTCrr8KDez8swSpi0Hgef3ymv4xSPVI",
authDomain: "pinthis-fe275.firebaseapp.com",
databaseURL: "https://pinthis-fe275.firebaseio.com",
storageBucket: "pinthis-fe275.appspot.com",
Expand Down
17 changes: 17 additions & 0 deletions javascripts/controllers/NavCtrl.js
View file
Original file line number Diff line number Diff line change
@@ -1 +1,18 @@
"use strict";

app.controller("NavCtrl", function($scope) {
$scope.navItems = [
{
name: "Logout",
url:"#/logout"
},
{
name:"All Items",
url:"#/items/list"
},
{
name:"New Item",
url:"#/items/new"
}
];
});
17 changes: 17 additions & 0 deletions partials/loginview.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<div class="container">
<form class="form-signin">
<h2 class="form-signin-heading" id="banner">
<img src="http://res.cloudinary.com/emma/image/upload/v1480545088/PinThis_fgaae2.png"</h2>
<label for="inputEmail" class="sr-only">Email address</label>
<input type="email" id="inputEmail" class="form-control" placeholder="Email address" required autofocus>
<label for="inputPassword" class="sr-only">Password</label>
<input type="password" id="inputPassword" class="form-control" placeholder="Password" required>
<div class="checkbox">
<label>
<input type="checkbox" value="remember-me"> Remember me
</label>
</div>
<button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
</form>

</div>
35 changes: 8 additions & 27 deletions partials/navbar.html
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,8 @@
<nav class="navbar navbar-default">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<!-- <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button> -->
<a class="navbar-brand" href="#">Brand</a>
</div>


<form class="navbar-form navbar-left">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>
<ul class="nav navbar-nav navbar-right">
<li><a href="#">Link</a></li>

</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
<img src=# alt="logo"/></img><form class="navbar-form navbar-left" role="search">
<div class="form-group">
<nav>
<input type="text" class="form-control" placeholder="Search">
</nav>
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>
148 changes: 111 additions & 37 deletions pinSeed.json
View file
Original file line number Diff line number Diff line change
@@ -1,64 +1,138 @@
{
"pins":{
"item0":{
"title":"Boot 1",
"boards": {
"board0": {
"title": "Boot 1",
"assignedTo": "Helana",
"uid":""
},
"board1": {
"title": "Boot 2",
"assignedTo": "Ellen",
"uid":""
},
"board2": {
"title": "Boot 3",
"assignedTo": "Jennifer",
"uid":""
},
"board3": {
"title": "Boot 4",
"assignedTo": "Ellen",
"uid":""
},
"board4": {
"title": "Boot 5",
"assignedTo": "Ellen",
"uid":""
},
"board5": {
"title": "Boot 6",
"assignedTo": "Helana",
"uid":""
},
"board6": {
"title": "Boot 7",
"assignedTo": "Jennifer",
"uid":""
},
"board7": {
"title": "Boot 8",
"assignedTo": "Ellen",
"uid":""

},
"board8": {
"title": "Boot 9",
"assignedTo": "Helana",
"uid":""

},
"board9": {
"title": "Boot 10",
"assignedTo": "Ellen",
"uid":""
},
"board10": {
"title": "Boot 11",
"assignedTo": "Jennifer",
"uid":""
},
"board11": {
"title": "Boot 12",
"assignedTo": "Helana",
"uid":""
}
},
"pins": {
"pins0": {
"title": "Boot 1",
"url": "https://s-media-cache-ak0.pinimg.com/originals/44/da/4a/44da4af92c633f8227c19a6d4bedb735.jpg",
"uid": ""
"boardId": "board1"
},
"item1":{
"title":"Boot 2",
"pins1": {
"title": "Boot 2",
"url": "https://en.wikipedia.org/wiki/Billy_Connolly#/media/File:Billy_Connolly%27s_banana_boots.jpg",
"uid": ""
"boardId": "board2"
},
"item2":{
"title":"Boot 3",
"pins2": {
"title": "Boot 3",
"url": "https://cdn1.thehunt.com/app/public/system/zine_images/173223/original/c7b6fef772c4f987ca3085741610dca4.jpg",
"uid": ""
"boardId": "board3"
},
"item3":{
"title":"Boot 4",
"pins3": {
"title": "Boot 4",
"url": "http://www.sarahlyon.com/wp-content/uploads/2011/05/bronze-boots.jpg",
"uid": ""
"boardId": "board4"
},
"item4":{
"title":"Boot 5",
"pins4": {
"title": "Boot 5",
"url": "https://images.timberland.com/is/image/TimberlandBrand/bee-line-blue-boot-mens-1?$custom-slider$",
"uid": ""
"boardId": "board5"
},
"item5":{
"title":"Boot 6",
"pins5": {
"title": "Boot 6",
"url": "https://s-media-cache-ak0.pinimg.com/736x/f3/1b/a4/f31ba4c63bb2b54e9d3ed8d5db9be653.jpg",
"uid": ""
"boardId": "board6"
},
"item6":{
"title":"Boot 7",
"pins6": {
"title": "Boot 7",
"url": "http://demandware.edgesuite.net/aaew_prd/on/demandware.static/-/Sites-masterCatalog_Bootbarn/default/dw635d0de1/large/Harley-Davidson_D83736_15.jpg",
"uid": ""
"boardId": "board7"
},
"item7":{
"title":"Boot 8",
"pins7": {
"title": "Boot 8",
"url": "http://shopjustice.scene7.com/is/image/justiceProdATG/7030016_619?undefined&id=8B_Rv3&fmt=jpg&fit=constrain,1&wid=477&hei=688",
"uid": ""
"boardId": "board8"
},
"item8":{
"title":"Boot 9",
"pins8": {
"title": "Boot 9",
"url": "https://www.countryoutfitter.com/on/demandware.static/-/Sites-co-master-catalog/default/dwb6dfe201/images/productimages/275127_111064-womens-brown-cowhide-square-toe-boot-l5078_large.jpg",
"uid": ""
"boardId": "board9"
},
"item9":{
"title":"Boot 10",
"pins9": {
"title": "Boot 10",
"url": "https://www.countryoutfitter.com/on/demandware.static/-/Sites-co-master-catalog/default/dw341ad420/images/productimages/277702_108662-womens-crystal-pattern-fringe-boot-honey_large.jpg",
"uid": ""
"boardId": "board10"
},
"item10":{
"title":"Boot 11",
"pins10": {
"title": "Boot 11",
"url": "http://ep.yimg.com/ay/langstons/lane-boots-women-s-dawson-cowboy-boots-turquoise-brown-114859.jpg",
"uid": ""
"boardId": "board11"
},
"item11":{
"title":"Boot 12",
"pins11": {
"title": "Boot 12",
"url": "http://www.stetson.com/Images/ProductFull/102233-62/cheyenne-mens-cowboy-boots-square-toe.jpg",
"uid": ""
"boardId": "board12"
}
},
"users": {
"user0": {
"uid": "HNyxaY54vhMKR5KiwAh3RtRTx812",
"username": "a"
},
"user1": {
"uid": "GfwHOLHVMtShlgID43MirvPexFv1",
"username": "b"
}
}
}

0 comments on commit 245001d

Please sign in to comment.