Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
c2bd382
changed readme
zmurta Sep 7, 2017
1053fcb
test
Sep 7, 2017
d7cfd3e
Merge pull request #1 from Group7A/Zach
jmcacioppo Sep 7, 2017
d99511f
added hi
zmurta Sep 7, 2017
d6f0a70
Joseph commit
jmcacioppo Sep 7, 2017
1a9f7b1
cristotest
cristosilva Sep 7, 2017
e938993
another test
Sep 7, 2017
e9ce1e2
Merge branch 'master' into cristotest
jmcacioppo Sep 7, 2017
53f75cd
Merge pull request #2 from Group7A/cristotest
jmcacioppo Sep 7, 2017
9f43e27
Merge branch 'master' into joseph_branch
jmcacioppo Sep 7, 2017
b8ccfe7
Merge pull request #3 from Group7A/joseph_branch
jmcacioppo Sep 7, 2017
43c478c
Ming's first pull request
min-gy Sep 7, 2017
c1398b8
Merge branch 'master' into ming
jmcacioppo Sep 7, 2017
1e5b16a
Merge pull request #4 from Group7A/ming
jmcacioppo Sep 7, 2017
a5b0877
corgis
cristosilva Sep 7, 2017
9670fd2
Merge pull request #5 from Group7A/lili
jmcacioppo Sep 7, 2017
f6a3ab6
Merge branch 'lili' of https://github.com/Group7A/workflow into lili
Sep 7, 2017
3ffc59d
test
Sep 7, 2017
f0d6b8b
Merge pull request #6 from Group7A/lili
jmcacioppo Sep 7, 2017
b8deff4
Himal's new pull request
Himal1993 Sep 7, 2017
b04d456
Merge pull request #7 from Group7A/Himal
jmcacioppo Sep 7, 2017
b7c1512
Readme
Sep 7, 2017
7a9c0ac
Merge branch 'master' into lil
jmcacioppo Sep 7, 2017
bebec7c
Merge pull request #8 from Group7A/lil
jmcacioppo Sep 7, 2017
6ca0ac6
changed background color
Sep 15, 2017
5e763b3
added done button
zmurta Sep 15, 2017
102f969
Merge pull request #9 from Group7A/master
jmcacioppo Sep 15, 2017
5ed822e
Merge pull request #10 from Group7A/lil
jmcacioppo Sep 15, 2017
32e530e
Editting is functional
jmcacioppo Sep 15, 2017
4572f0e
Merge pull request #11 from Group7A/joseph_branch
jmcacioppo Sep 15, 2017
6499899
changed name
Sep 15, 2017
c848b9c
completed functions for script.js
zmurta Sep 16, 2017
a8b4d3b
nonsense
zmurta Sep 16, 2017
102f364
index.html updates
zmurta Sep 16, 2017
c6b79f8
completed part
zmurta Sep 16, 2017
ec9861d
Merge pull request #12 from Group7A/lily
jmcacioppo Sep 16, 2017
49c6b1b
Merge branch 'master' into Zach
jmcacioppo Sep 16, 2017
b2d47e8
Merge pull request #13 from Group7A/Zach
jmcacioppo Sep 16, 2017
2dcaef3
Fixed minor issue for editting a completed item
jmcacioppo Sep 16, 2017
8efc0b5
Add files via upload
cristosilva Sep 17, 2017
7443ba7
Delete index.html
cristosilva Sep 17, 2017
b6572d0
Delete script.js
cristosilva Sep 17, 2017
cea4d43
Update index.html
cristosilva Sep 17, 2017
7d25d84
Update script.js
cristosilva Sep 17, 2017
ed6448a
Merge branch 'master' into cristotest
jmcacioppo Sep 17, 2017
34aeef9
Merge pull request #14 from Group7A/cristotest
jmcacioppo Sep 17, 2017
05d3891
Styled priority button
jmcacioppo Sep 17, 2017
2dde1ba
added updated number of items in to-do list
min-gy Sep 18, 2017
22274c4
Merge pull request #15 from Group7A/ming
jmcacioppo Sep 18, 2017
1396b36
Himal's pull request for to-do app
Himal1993 Sep 19, 2017
bbe303b
removing completed items
Himal1993 Sep 19, 2017
ab96e97
Merge branch 'master' into Himal
jmcacioppo Sep 19, 2017
7c6d8c6
Merge pull request #16 from Group7A/Himal
jmcacioppo Sep 19, 2017
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
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,10 @@ You will be demonstrating your knowledge of GitHub workflow and Scrum fundamenta
- Your repo's master branch should have the updated code (in the todo-src directory) to reflect each task/ticket.

Have fun! :sunglasses: :+1:

Joseph Cacioppo
Zach was here!
Ming
Cristo BOIIII
Lily
Himal
Binary file added corgi.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 25 additions & 5 deletions todo-src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<script src="https://code.angularjs.org/1.4.3/angular.js"></script>
<link rel="stylesheet" href="style.css" />
<script src="script.js"></script>
</head>
</head>

<body ng-app="app">
<h1 class="text-center">My little to do app!</h1>
Expand All @@ -25,18 +25,38 @@ <h1 class="text-center">My little to do app!</h1>
</div><!-- /input-group -->

<h2>stuff i gotta do asap</h2>

<p>Incomplete Items: {{todos.length}}</p>
<ul class="list-group">
<!-- http://www.w3schools.com/css/css_float.asp -->

<li class="list-group-item clearfix" ng-repeat="do in todos">
<button class="btn btn-primary" type="button" ng-click="done(do)">
<span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span>
</button>

<span>{{do}}</span>
<span ng-hide="do.editting || do.done">{{do.name}}</span>
<input ng-show="do.editting" type="text" ng-model="do.name"></input>
<span ng-show="do.done"><strike>{{do.name}}</strike></span>

<!-- This button calls changePriority (which adds 1 to its priority level) when clicked on -->
<div class="pull-right">
<button class="btn btn-primary glyphicon glyphicon-plus" ng-click="changePriority(do)"></button>
Priority: {{do.priority}}
</div>

<button class="btn btn-danger pull-right" type="button" ng-click="deleteItem(do)">
<span class="glyphicon glyphicon-trash " aria-hidden="true"></span>
</button>

<button class="btn btn-info pull-right" type="button" ng-click="editItem(do)">
<span class="glyphicon glyphicon-edit " aria-hidden="true"></span>
</button>
</li>
</ul>
</ul>
<div class="pull-right">
<br></br>
<br><input class="btn btn-md btn-danger" type="submit" value="Remove items" ng-click="removeCompletedItem()">
</div>

</div>

</body>
Expand Down
42 changes: 38 additions & 4 deletions todo-src/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,58 @@
var myApp = angular.module('app', []);

myApp.controller('MainCtrl', function ($scope){
$scope.todos = ["Learn Angular", "Learn node"];
$scope.todos = [
{name: "Learn Angular", done: false, editting: false, priority: 3},
{name: "Learn node", done: false, editting: false, priority: 2},
//added this "test" to test
{name: "Test", done: false, editting: false, priority: 1}
];

$scope.newItem = "";

$scope.addItem = function(){
console.log("in add");
if ($scope.newItem !== ""){
$scope.todos.push($scope.newItem);
$scope.newItem = "";
/* tried this to set priority level automatically to 3:
* $scope.newItem.priority = 3;
* but i failed :(
*/
}
}

$scope.deleteItem = function(item){
console.log("in delete");
var index = $scope.todos.indexOf(item);
$scope.todos.splice(index, 1);
}


$scope.done = function(item){
console.log("completed");
if(!item.editting) item.done = !item.done;
}

//if item is not scrached out, you can edit it
$scope.editItem = function(item) {
if(!item.done) item.editting = !item.editting;
}

// changePriority function. simply adds 1 to the priority
// unless it is at max priority level, then it goes back to 1
$scope.changePriority = function(item) {
if(item.priority < 3) item.priority = item.priority + 1;
else item.priority = 1;
}

$scope.removeCompletedItem = function(){
for (var i = $scope.todos.length - 1; i >= 0; i--) {
if ($scope.todos[i].done) {
$scope.todos.splice(i,1);
}
}
}

});

/*************************
Expand All @@ -33,4 +67,4 @@ myApp.controller('MainCtrl', function ($scope){
* - add a due date
* - add reminder (setInterval)
*
* *********************/
* *********************/
2 changes: 1 addition & 1 deletion todo-src/style.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Styles go here */
body {

background: grey;
background: #558C89;

}