From f2a98dbf45cd330de521f4d0f3c68883d5476c26 Mon Sep 17 00:00:00 2001 From: Helana Nosrat Date: Fri, 2 Dec 2016 19:29:59 -0600 Subject: [PATCH] fixed boardcontroller error of undefined, commented out css --- css/main.css | 4 ++-- index.html | 28 ++++++++++++++---------- javascripts/controllers/BoardEditCtrl.js | 2 +- javascripts/controllers/BoardViewCtrl.js | 4 +--- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/css/main.css b/css/main.css index bf176ad..d7ceb59 100644 --- a/css/main.css +++ b/css/main.css @@ -14,7 +14,7 @@ h1 { /*Login Partial*/ -.form-signin { +/*.form-signin { max-width: 330px; padding: 15px; margin: 0 auto; @@ -48,4 +48,4 @@ h1 { margin-bottom: 10px; border-top-left-radius: 0; border-top-right-radius: 0; -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/index.html b/index.html index 4c836e8..32115bd 100644 --- a/index.html +++ b/index.html @@ -1,35 +1,41 @@ - + Pin This! - - + + + -
+ +
-

Pin This!

-
+

Pin This!

+
- + - + + + + - + - --> + + \ No newline at end of file diff --git a/javascripts/controllers/BoardEditCtrl.js b/javascripts/controllers/BoardEditCtrl.js index 764462a..e46d852 100644 --- a/javascripts/controllers/BoardEditCtrl.js +++ b/javascripts/controllers/BoardEditCtrl.js @@ -11,7 +11,7 @@ app.controller("BoardEditCtrl", function($scope, $location, $routeParams, BoardF $scope.addNewBoard = function(){ BoardFactory.editBoard($scope.newBoard).then(function(response){ - $scope.newBoard = {}; + $scope.newPins = {}; $location.url("/boards/list"); }); }; diff --git a/javascripts/controllers/BoardViewCtrl.js b/javascripts/controllers/BoardViewCtrl.js index 01ccf02..22a8596 100644 --- a/javascripts/controllers/BoardViewCtrl.js +++ b/javascripts/controllers/BoardViewCtrl.js @@ -1,14 +1,12 @@ "use strict"; app.controller("BoardViewCtrl", function($scope, $routeParams, BoardFactory){ - console.log("routeParams", $routeParams); $scope.selectedBoard = {}; - let BoardId = $routeParams.id; + let boardId = $routeParams.id; console.log("$routeParams", BoardId); BoardFactory.getSingleBoard(boardId).then(function(oneBoard){ oneBoard.id=boardId; $scope.selectedBoard = oneBoard; - console.log("oneBoard", oneBoard); }); }); \ No newline at end of file