Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed boardcontroller error of undefined, commented out css #14

Merged
merged 1 commit into from
Dec 3, 2016
+21 −17
Merged

fixed boardcontroller error of undefined, commented out css #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ h1 {

/*Login Partial*/

.form-signin {
/*.form-signin {
max-width: 330px;
padding: 15px;
margin: 0 auto;
Expand Down Expand Up @@ -48,4 +48,4 @@ h1 {
margin-bottom: 10px;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
}*/
28 changes: 17 additions & 11 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,41 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Pin This!</title>
<link href="https://fonts.googleapis.com/css?family=Anton|Yanone+Kaffeesatz" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="css/main.css">
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="/lib/bower_components/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="css/main.css">
</head>

<body>
<body ng-app="PinThisApp">
<div ng-include='./partials/navbar.html'></div>
<!-- <div ng-include='./partials/navbar.html'></div> -->

<div class="row">
<h1>Pin This!</h1>
<div class="col-xs-offset-2 col-xs-8" ng-view></div>
<h1>Pin This!</h1>
<div class="col-xs-offset-2 col-xs-8" ng-view></div>
</div>
</body>

<script src="https://www.gstatic.com/firebasejs/3.6.2/firebase.js"></script>
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<!-- <script type="text/javascript" src="js/materialize.min.js"></script> -->
<script type="text/javascript" src="/lib/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/lib/bower_components/angular/angular.min.js"></script>
<script src="/lib/bower_components/angular-route/angular-route.min.js"></script>



<script src="/javascripts/app.js"></script>
<script src="/javascripts/AppConstants.js"></script>
<script src="/javascripts/AppConfig.js"></script>
<script src="/javascripts/factories/AuthFactory.js"></script>
<!-- <script src="/javascripts/factories/BoardFactory.js"></script> -->
<script src="/javascripts/factories/BoardFactory.js">
<script src="/javascripts/factories/UserFactory.js"></script>
<script src="/javascripts/controllers/AuthCtrl.js"></script>
<!-- <script src="/javascripts/controllers/NavCtrl.js"></script> -->
<!-- <script src="/javascripts/controllers/GeneralViewCtrl.js"></script>
<script src="/javascripts/controllers/CreateBoardCtrl.js"></script>
<script src="/javascripts/controllers/CreateBoardCtrl.js"></script> -->
<script src="/javascripts/controllers/BoardViewCtrl.js"></script>
<script src="/javascripts/controllers/BoardEditCtrl.js"></script> -->
<script src="/javascripts/controllers/BoardEditCtrl.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion javascripts/controllers/BoardEditCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
});
};
Expand Down
4 changes: 1 addition & 3 deletions javascripts/controllers/BoardViewCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
});
});