From 0a45a12bf4b46c43d35d83ad576decd2393a0eb0 Mon Sep 17 00:00:00 2001 From: Jennifer Dutton Date: Wed, 30 Nov 2016 18:20:20 -0600 Subject: [PATCH 1/5] added image --- partials/navbar.html | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/partials/navbar.html b/partials/navbar.html index 32cd8b9..0b68f69 100644 --- a/partials/navbar.html +++ b/partials/navbar.html @@ -1,27 +1,8 @@ - \ No newline at end of file +logo \ No newline at end of file From 65f80ff5f76b14bc71bab9b1f2dbe26463665284 Mon Sep 17 00:00:00 2001 From: Helana Nosrat Date: Wed, 30 Nov 2016 19:03:02 -0600 Subject: [PATCH 2/5] added partials for login view --- css/main.css | 41 +++++++++++++++++++++++++++++++++++++ javascripts/AppConstants.js | 2 +- partials/loginview.html | 17 +++++++++++++++ pinSeed.json | 26 +++++++++++------------ 4 files changed, 72 insertions(+), 14 deletions(-) create mode 100644 partials/loginview.html diff --git a/css/main.css b/css/main.css index 04bea34..bf176ad 100644 --- a/css/main.css +++ b/css/main.css @@ -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; } \ No newline at end of file diff --git a/javascripts/AppConstants.js b/javascripts/AppConstants.js index b98070e..9d17b21 100644 --- a/javascripts/AppConstants.js +++ b/javascripts/AppConstants.js @@ -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", diff --git a/partials/loginview.html b/partials/loginview.html new file mode 100644 index 0000000..dee6cfc --- /dev/null +++ b/partials/loginview.html @@ -0,0 +1,17 @@ +
+
\ No newline at end of file diff --git a/pinSeed.json b/pinSeed.json index 7c3bfec..e889e4f 100644 --- a/pinSeed.json +++ b/pinSeed.json @@ -1,61 +1,61 @@ { - "pins":{ - "item0":{ + "boards":{ + "board0":{ "title":"Boot 1", "url": "https://s-media-cache-ak0.pinimg.com/originals/44/da/4a/44da4af92c633f8227c19a6d4bedb735.jpg", "uid": "" }, - "item1":{ + "board1":{ "title":"Boot 2", "url": "https://en.wikipedia.org/wiki/Billy_Connolly#/media/File:Billy_Connolly%27s_banana_boots.jpg", "uid": "" }, - "item2":{ + "board2":{ "title":"Boot 3", "url": "https://cdn1.thehunt.com/app/public/system/zine_images/173223/original/c7b6fef772c4f987ca3085741610dca4.jpg", "uid": "" }, - "item3":{ + "board3":{ "title":"Boot 4", "url": "http://www.sarahlyon.com/wp-content/uploads/2011/05/bronze-boots.jpg", "uid": "" }, - "item4":{ + "board4":{ "title":"Boot 5", "url": "https://images.timberland.com/is/image/TimberlandBrand/bee-line-blue-boot-mens-1?$custom-slider$", "uid": "" }, - "item5":{ + "board5":{ "title":"Boot 6", "url": "https://s-media-cache-ak0.pinimg.com/736x/f3/1b/a4/f31ba4c63bb2b54e9d3ed8d5db9be653.jpg", "uid": "" }, - "item6":{ + "board6":{ "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": "" }, - "item7":{ + "board7":{ "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": "" }, - "item8":{ + "board8":{ "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": "" }, - "item9":{ + "board9":{ "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": "" }, - "item10":{ + "board10":{ "title":"Boot 11", "url": "http://ep.yimg.com/ay/langstons/lane-boots-women-s-dawson-cowboy-boots-turquoise-brown-114859.jpg", "uid": "" }, - "item11":{ + "board11":{ "title":"Boot 12", "url": "http://www.stetson.com/Images/ProductFull/102233-62/cheyenne-mens-cowboy-boots-square-toe.jpg", "uid": "" From 1e73218325bb8bc84091f496c0322b7dd18055fb Mon Sep 17 00:00:00 2001 From: Jennifer Dutton Date: Wed, 30 Nov 2016 19:07:46 -0600 Subject: [PATCH 3/5] added navCtrl.js --- javascripts/controllers/NavCtrl.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/javascripts/controllers/NavCtrl.js b/javascripts/controllers/NavCtrl.js index 3918c74..aaac44b 100644 --- a/javascripts/controllers/NavCtrl.js +++ b/javascripts/controllers/NavCtrl.js @@ -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" + } + ]; +}); From 071fe3d8c5492d145a0c6255bd80a44871f8bc6e Mon Sep 17 00:00:00 2001 From: Helana Nosrat Date: Wed, 30 Nov 2016 20:19:10 -0600 Subject: [PATCH 4/5] added and updated seeder --- pinSeed.json | 124 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 99 insertions(+), 25 deletions(-) diff --git a/pinSeed.json b/pinSeed.json index e889e4f..4f9ec16 100644 --- a/pinSeed.json +++ b/pinSeed.json @@ -1,64 +1,138 @@ { - "boards":{ - "board0":{ - "title":"Boot 1", + "boards": { + "board0": { + "id": 0, + "title": "Boot 1", + "assignedTo": "Helana" + }, + "board1": { + "id": 1, + "title": "Boot 2", + "assignedTo": "Ellen" + }, + "board2": { + "id": 2, + "title": "Boot 3", + "assignedTo": "Jennifer" + }, + "board3": { + "id": 3, + "title": "Boot 4", + "assignedTo": "Ellen" + }, + "board4": { + "id": 4, + "title": "Boot 5", + "assignedTo": "Ellen" + }, + "board5": { + "id": 5, + "title": "Boot 6", + "assignedTo": "Helana" + }, + "board6": { + "id": 6, + "title": "Boot 7", + "assignedTo": "Jennifer" + }, + "board7": { + "id": 7, + "title": "Boot 8", + "assignedTo": "Ellen" + + }, + "board8": { + "id": 8, + "title": "Boot 9", + "assignedTo": "Helana" + + }, + "board9": { + "id": 9, + "title": "Boot 10", + "assignedTo": "Ellen" + }, + "board10": { + "id": 10, + "title": "Boot 11", + "assignedTo": "Jennifer" + }, + "board11": { + "id": 11, + "title": "Boot 12", + "assignedTo": "Helana" + } + }, + "pins": { + "pins0": { + "title": "Boot 1", "url": "https://s-media-cache-ak0.pinimg.com/originals/44/da/4a/44da4af92c633f8227c19a6d4bedb735.jpg", "uid": "" }, - "board1":{ - "title":"Boot 2", + "pins1": { + "title": "Boot 2", "url": "https://en.wikipedia.org/wiki/Billy_Connolly#/media/File:Billy_Connolly%27s_banana_boots.jpg", "uid": "" }, - "board2":{ - "title":"Boot 3", + "pins2": { + "title": "Boot 3", "url": "https://cdn1.thehunt.com/app/public/system/zine_images/173223/original/c7b6fef772c4f987ca3085741610dca4.jpg", "uid": "" }, - "board3":{ - "title":"Boot 4", + "pins3": { + "title": "Boot 4", "url": "http://www.sarahlyon.com/wp-content/uploads/2011/05/bronze-boots.jpg", "uid": "" }, - "board4":{ - "title":"Boot 5", + "pins4": { + "title": "Boot 5", "url": "https://images.timberland.com/is/image/TimberlandBrand/bee-line-blue-boot-mens-1?$custom-slider$", "uid": "" }, - "board5":{ - "title":"Boot 6", + "pins5": { + "title": "Boot 6", "url": "https://s-media-cache-ak0.pinimg.com/736x/f3/1b/a4/f31ba4c63bb2b54e9d3ed8d5db9be653.jpg", "uid": "" }, - "board6":{ - "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": "" }, - "board7":{ - "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": "" }, - "board8":{ - "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": "" }, - "board9":{ - "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": "" }, - "board10":{ - "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": "" }, - "board11":{ - "title":"Boot 12", + "pins11": { + "title": "Boot 12", "url": "http://www.stetson.com/Images/ProductFull/102233-62/cheyenne-mens-cowboy-boots-square-toe.jpg", "uid": "" } + }, + "users": { + "user0": { + "uid": "HNyxaY54vhMKR5KiwAh3RtRTx812", + "username": "a" + }, + "user1": { + "uid": "GfwHOLHVMtShlgID43MirvPexFv1", + "username": "b" + } } } \ No newline at end of file From f483d6cf312f0047ba73a6a7e390562b38a03ca1 Mon Sep 17 00:00:00 2001 From: Jennifer Dutton Date: Wed, 30 Nov 2016 20:53:27 -0600 Subject: [PATCH 5/5] updated seed file --- pinSeed.json | 72 ++++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pinSeed.json b/pinSeed.json index 4f9ec16..8982585 100644 --- a/pinSeed.json +++ b/pinSeed.json @@ -1,128 +1,128 @@ { "boards": { "board0": { - "id": 0, "title": "Boot 1", - "assignedTo": "Helana" + "assignedTo": "Helana", + "uid":"" }, "board1": { - "id": 1, "title": "Boot 2", - "assignedTo": "Ellen" + "assignedTo": "Ellen", + "uid":"" }, "board2": { - "id": 2, "title": "Boot 3", - "assignedTo": "Jennifer" + "assignedTo": "Jennifer", + "uid":"" }, "board3": { - "id": 3, "title": "Boot 4", - "assignedTo": "Ellen" + "assignedTo": "Ellen", + "uid":"" }, "board4": { - "id": 4, "title": "Boot 5", - "assignedTo": "Ellen" + "assignedTo": "Ellen", + "uid":"" }, "board5": { - "id": 5, "title": "Boot 6", - "assignedTo": "Helana" + "assignedTo": "Helana", + "uid":"" }, "board6": { - "id": 6, "title": "Boot 7", - "assignedTo": "Jennifer" + "assignedTo": "Jennifer", + "uid":"" }, "board7": { - "id": 7, "title": "Boot 8", - "assignedTo": "Ellen" + "assignedTo": "Ellen", + "uid":"" }, "board8": { - "id": 8, "title": "Boot 9", - "assignedTo": "Helana" + "assignedTo": "Helana", + "uid":"" }, "board9": { - "id": 9, "title": "Boot 10", - "assignedTo": "Ellen" + "assignedTo": "Ellen", + "uid":"" }, "board10": { - "id": 10, "title": "Boot 11", - "assignedTo": "Jennifer" + "assignedTo": "Jennifer", + "uid":"" }, "board11": { - "id": 11, "title": "Boot 12", - "assignedTo": "Helana" + "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" }, "pins1": { "title": "Boot 2", "url": "https://en.wikipedia.org/wiki/Billy_Connolly#/media/File:Billy_Connolly%27s_banana_boots.jpg", - "uid": "" + "boardId": "board2" }, "pins2": { "title": "Boot 3", "url": "https://cdn1.thehunt.com/app/public/system/zine_images/173223/original/c7b6fef772c4f987ca3085741610dca4.jpg", - "uid": "" + "boardId": "board3" }, "pins3": { "title": "Boot 4", "url": "http://www.sarahlyon.com/wp-content/uploads/2011/05/bronze-boots.jpg", - "uid": "" + "boardId": "board4" }, "pins4": { "title": "Boot 5", "url": "https://images.timberland.com/is/image/TimberlandBrand/bee-line-blue-boot-mens-1?$custom-slider$", - "uid": "" + "boardId": "board5" }, "pins5": { "title": "Boot 6", "url": "https://s-media-cache-ak0.pinimg.com/736x/f3/1b/a4/f31ba4c63bb2b54e9d3ed8d5db9be653.jpg", - "uid": "" + "boardId": "board6" }, "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" }, "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" }, "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" }, "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" }, "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" }, "pins11": { "title": "Boot 12", "url": "http://www.stetson.com/Images/ProductFull/102233-62/cheyenne-mens-cowboy-boots-square-toe.jpg", - "uid": "" + "boardId": "board12" } }, "users": {