Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 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
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
28f448f
Merge branch 'master' of https://github.com/Group7A/workflow into jos…
jmcacioppo Sep 15, 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
Lili
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.
6 changes: 5 additions & 1 deletion todo-src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,14 @@ <h2>stuff i gotta do asap</h2>
<!-- http://www.w3schools.com/css/css_float.asp -->
<li class="list-group-item clearfix" ng-repeat="do in todos">

<span>{{do}}</span>
<span ng-hide="do.editting">{{do.name}}</span>
<input ng-show="do.editting" type="text" ng-model="do.name"></input>
<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>
Expand Down
8 changes: 6 additions & 2 deletions todo-src/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
var myApp = angular.module('app', []);

myApp.controller('MainCtrl', function ($scope){
$scope.todos = ["Learn Angular", "Learn node"];
$scope.todos = [
{name: "Learn Angular", editting: false},
{name: "Learn node", editting: false}];
$scope.newItem = "";

$scope.addItem = function(){
Expand All @@ -20,7 +22,9 @@ myApp.controller('MainCtrl', function ($scope){
$scope.todos.splice(index, 1);
}


$scope.editItem = function(item) {
item.editting = !item.editting;
}
});

/*************************
Expand Down
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;

}