From 41f289b7e907f2d148e962edcacad01cba802ccf Mon Sep 17 00:00:00 2001 From: Zoom543 Date: Tue, 12 Apr 2016 14:40:09 +0000 Subject: [PATCH 1/5] Completed To-Do --- index.html~ | 43 +++++++++++++++++++++++++++++++++++++++++++ main.css~ | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ main.js~ | 1 + 3 files changed, 95 insertions(+) create mode 100644 index.html~ create mode 100644 main.css~ create mode 100644 main.js~ diff --git a/index.html~ b/index.html~ new file mode 100644 index 0000000..2c2267c --- /dev/null +++ b/index.html~ @@ -0,0 +1,43 @@ +s + + + TO-DO LIST + + + + + + + + + + + +
+ +

TO-DO!!

+ +
+
+
+ +
+
+ +
+
+
+ +
+

To Be Done:

+
+ +
+

Completed:

+
+ +
+ + + + diff --git a/main.css~ b/main.css~ new file mode 100644 index 0000000..3fe5850 --- /dev/null +++ b/main.css~ @@ -0,0 +1,51 @@ +h2 { + color : white; + font-family: nexa; +} + +h3{ + font-family: avenier; +} + +body{ + background-color: #3E3E3E; + font-family: ebrima; +} + +.text-field{ + margin-top: 50px; + margin-bottom: 50px; +} + +.heading{ + background-color: #F4722B; +} + +.well{ + background-color: #B3A78C; +} + +.l_property{ + background-color: #CCCCCC; + padding: 1px; +} + +.col-xs-1{ + text-align: center; + margin-top: 10px; +} + +#Add{ + background-color: #3F72AF; + color: white; +} + +#removeBtn{ + margin-top: 3px; + +} + +#done > div > div > h4 { + text-decoration: line-through; +} + diff --git a/main.js~ b/main.js~ new file mode 100644 index 0000000..c80ec08 --- /dev/null +++ b/main.js~ @@ -0,0 +1 @@ +console.log('test'); \ No newline at end of file From bac97305aab30dd5f8b13687624439b1eb27f3f6 Mon Sep 17 00:00:00 2001 From: Zoom543 Date: Tue, 12 Apr 2016 15:07:53 +0000 Subject: [PATCH 2/5] Completed To-Do --- index.html | 46 ++++++++++++++++++++++++++++++++++++++++++--- index.html~ | 46 +++------------------------------------------ main.css | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++--- main.css~ | 54 +++-------------------------------------------------- main.js | 41 +++++++++++++++++++++++++++++++++++++++- 5 files changed, 140 insertions(+), 101 deletions(-) diff --git a/index.html b/index.html index 47f39d4..9ffc409 100644 --- a/index.html +++ b/index.html @@ -1,3 +1,43 @@ - -

todo!

- \ No newline at end of file + + + + TO-DO LIST + + + + + + + + + + + +
+ +

TO-DO!!

+ +
+
+
+ +
+
+ +
+
+
+ +
+

To Be Done:

+
+ +
+

Completed:

+
+ +
+ + + + diff --git a/index.html~ b/index.html~ index 2c2267c..47f39d4 100644 --- a/index.html~ +++ b/index.html~ @@ -1,43 +1,3 @@ -s - - - TO-DO LIST - - - - - - - - - - - -
- -

TO-DO!!

- -
-
-
- -
-
- -
-
-
- -
-

To Be Done:

-
- -
-

Completed:

-
- -
- - - - + +

todo!

+ \ No newline at end of file diff --git a/main.css b/main.css index cdda92f..3fe5850 100644 --- a/main.css +++ b/main.css @@ -1,3 +1,51 @@ -body { - padding: 20px; -} \ No newline at end of file +h2 { + color : white; + font-family: nexa; +} + +h3{ + font-family: avenier; +} + +body{ + background-color: #3E3E3E; + font-family: ebrima; +} + +.text-field{ + margin-top: 50px; + margin-bottom: 50px; +} + +.heading{ + background-color: #F4722B; +} + +.well{ + background-color: #B3A78C; +} + +.l_property{ + background-color: #CCCCCC; + padding: 1px; +} + +.col-xs-1{ + text-align: center; + margin-top: 10px; +} + +#Add{ + background-color: #3F72AF; + color: white; +} + +#removeBtn{ + margin-top: 3px; + +} + +#done > div > div > h4 { + text-decoration: line-through; +} + diff --git a/main.css~ b/main.css~ index 3fe5850..cdda92f 100644 --- a/main.css~ +++ b/main.css~ @@ -1,51 +1,3 @@ -h2 { - color : white; - font-family: nexa; -} - -h3{ - font-family: avenier; -} - -body{ - background-color: #3E3E3E; - font-family: ebrima; -} - -.text-field{ - margin-top: 50px; - margin-bottom: 50px; -} - -.heading{ - background-color: #F4722B; -} - -.well{ - background-color: #B3A78C; -} - -.l_property{ - background-color: #CCCCCC; - padding: 1px; -} - -.col-xs-1{ - text-align: center; - margin-top: 10px; -} - -#Add{ - background-color: #3F72AF; - color: white; -} - -#removeBtn{ - margin-top: 3px; - -} - -#done > div > div > h4 { - text-decoration: line-through; -} - +body { + padding: 20px; +} \ No newline at end of file diff --git a/main.js b/main.js index c80ec08..49be986 100644 --- a/main.js +++ b/main.js @@ -1 +1,40 @@ -console.log('test'); \ No newline at end of file +$(document).ready(function(){ + + //to add elements in to be done list + $("#Add").click(function(e){ + if($("#taskEntered").val() === ""){//checking empty or not + alert("Error : No Task Entered"); + return false; + } + else{ + var taskAdded = $("#taskEntered").val();//taking input task from textbox + $("#to-be-done").append("
" + "
" + "" + "
" + "
" + "

" + taskAdded + "

" + "
" + "
" + "" + "
"); + $("#addForm")[0].reset();//to reset textbox + e.preventDefault();//to prevent form reset + } + }); + + //Remove element from list + $(document).on('click', '#removeBtn',function(){ + var taskDel = $(this).parent().parent(); + $(taskDel).remove(); + }); + + //moving checked task to 'done' list + $("#to-be-done").on('click', '.check_todo' ,function(){ + if($(this).is(':checked')){ + var parentEle =$(this).parent().parent(); + $(parentEle).appendTo("#done"); + } + } ); + + //moving uncheck task to 'to-be-done' list + $("#done").on('click', '.check_todo' ,function(){ + if(!($(this).is(':checked'))){ + var parentEle =$(this).parent().parent(); + $(parentEle).appendTo("#to-be-done"); + } + } ); + + +}); From dc904512a93662733befa8c82e9fa5242c705629 Mon Sep 17 00:00:00 2001 From: Zoom543 Date: Tue, 12 Apr 2016 15:28:18 +0000 Subject: [PATCH 3/5] Delete index.html~ --- index.html~ | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 index.html~ diff --git a/index.html~ b/index.html~ deleted file mode 100644 index 47f39d4..0000000 --- a/index.html~ +++ /dev/null @@ -1,3 +0,0 @@ - -

todo!

- \ No newline at end of file From c91319be16c925b1819f9c20bca1c789a4e0a18e Mon Sep 17 00:00:00 2001 From: Zoom543 Date: Tue, 12 Apr 2016 15:28:27 +0000 Subject: [PATCH 4/5] Delete main.css~ --- main.css~ | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 main.css~ diff --git a/main.css~ b/main.css~ deleted file mode 100644 index cdda92f..0000000 --- a/main.css~ +++ /dev/null @@ -1,3 +0,0 @@ -body { - padding: 20px; -} \ No newline at end of file From 12478e64a132187e590020daa37cccd06c7d4531 Mon Sep 17 00:00:00 2001 From: Zoom543 Date: Tue, 12 Apr 2016 15:28:37 +0000 Subject: [PATCH 5/5] Delete main.js~ --- main.js~ | 1 - 1 file changed, 1 deletion(-) delete mode 100644 main.js~ diff --git a/main.js~ b/main.js~ deleted file mode 100644 index c80ec08..0000000 --- a/main.js~ +++ /dev/null @@ -1 +0,0 @@ -console.log('test'); \ No newline at end of file