From e233b87ca92233c00956183631867a40fa74aaeb Mon Sep 17 00:00:00 2001 From: MelonMonkey2017 <703837@pdsb.net> Date: Sat, 24 Dec 2016 21:04:40 -0500 Subject: [PATCH 1/8] centering entering the h1 tag --- src/assets/main.js | 34 +++++++++++++++++++++++++++++++++- src/index.html | 2 +- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/assets/main.js b/src/assets/main.js index 25601766..f6a0dc1f 100644 --- a/src/assets/main.js +++ b/src/assets/main.js @@ -1,5 +1,37 @@ $(function() { + $.ajax({ + url: 'https://www.codeschool.com/users/HelloWorld333.json', + dataType: 'jsonp', + success: function(response) { + console.log(); + addCourses(response.courses.completed); + } + }); + function addCourses(courses) { - // your code will go here + var $badges = $('#badges'); + courses.forEach(function(course) { + var $course = $('
', { + 'class': 'course' + }).appendTo($badges); + + $('

', { + text: course.title + }).appendTo($course); + + $('', { + src: course.badge + }).appendTo($course); + + $('', { + 'class': 'btn btn-primary', + target: '_blank', + href: course.url, + text: 'See Course' + }).appendTo($course); + + }); + + } }); diff --git a/src/index.html b/src/index.html index a1951a6a..00107d30 100644 --- a/src/index.html +++ b/src/index.html @@ -10,7 +10,7 @@
-

jQuery Badges

+

jQuery Badges

From d974bb7e41bfe59680d4b082b53580d3fd0898f8 Mon Sep 17 00:00:00 2001 From: MelonMonkey2017 <703837@pdsb.net> Date: Sat, 24 Dec 2016 23:27:57 -0500 Subject: [PATCH 2/8] playing with colours colours --- src/assets/main.css | 6 ++++-- src/assets/main.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/assets/main.css b/src/assets/main.css index 53f47958..a6b8d275 100644 --- a/src/assets/main.css +++ b/src/assets/main.css @@ -2,6 +2,8 @@ body { font-family: 'Helvetica Neue', serif; font-size: 18px; + background: #FFFFFF; + text-shadow: 2px 2px #666666; } #badges { @@ -9,7 +11,7 @@ body { } .course { - background: #F5F5F5; + background: #BFBFBF; border-radius: 5px; border: 1px solid #ccc; box-shadow: 1px 1px 5px #EAEAEA; @@ -21,7 +23,7 @@ body { } .course h3 { - color: #999; + color: #FFFFFF; font-size: 1.9rem; font-weight: 200; min-height: 80px;; diff --git a/src/assets/main.js b/src/assets/main.js index f6a0dc1f..c6387e1c 100644 --- a/src/assets/main.js +++ b/src/assets/main.js @@ -25,7 +25,7 @@ $(function() { }).appendTo($course); $('', { - 'class': 'btn btn-primary', + 'class': 'btn btn-large btn-primary', target: '_blank', href: course.url, text: 'See Course' From c8974bdd613caa9e19e3b32befe130c1ad8d4e87 Mon Sep 17 00:00:00 2001 From: MelonMonkey2017 <703837@pdsb.net> Date: Sat, 24 Dec 2016 23:37:07 -0500 Subject: [PATCH 3/8] ITS CHRISTMAS!!!!! wreck the halls with nuclear bombs, trollolololol, lolololol --- src/assets/main.css | 9 ++++++--- src/assets/main.js | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/assets/main.css b/src/assets/main.css index a6b8d275..f0eb1eb3 100644 --- a/src/assets/main.css +++ b/src/assets/main.css @@ -2,16 +2,19 @@ body { font-family: 'Helvetica Neue', serif; font-size: 18px; - background: #FFFFFF; - text-shadow: 2px 2px #666666; + background: #FF1616; } #badges { text-align: center; } +h1 { + color: #FFFFFF +} + .course { - background: #BFBFBF; + background: #2FBF3B; border-radius: 5px; border: 1px solid #ccc; box-shadow: 1px 1px 5px #EAEAEA; diff --git a/src/assets/main.js b/src/assets/main.js index c6387e1c..38c23206 100644 --- a/src/assets/main.js +++ b/src/assets/main.js @@ -25,7 +25,7 @@ $(function() { }).appendTo($course); $('', { - 'class': 'btn btn-large btn-primary', + 'class': 'btn btn-lg btn-default', target: '_blank', href: course.url, text: 'See Course' From 9a872a6a34ea4985aefecdf081c1f8c56ed15a2b Mon Sep 17 00:00:00 2001 From: MelonMonkey2017 <703837@pdsb.net> Date: Sat, 24 Dec 2016 23:47:28 -0500 Subject: [PATCH 4/8] stuff --- src/assets/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/main.js b/src/assets/main.js index 38c23206..66ee7747 100644 --- a/src/assets/main.js +++ b/src/assets/main.js @@ -16,7 +16,7 @@ $(function() { 'class': 'course' }).appendTo($badges); - $('

', { + var $subtitle = $('

', { text: course.title }).appendTo($course); From aafcd0a95673615e448336f2ab5dc06059abf471 Mon Sep 17 00:00:00 2001 From: MelonMonkey2017 <703837@pdsb.net> Date: Sun, 25 Dec 2016 17:11:08 -0500 Subject: [PATCH 5/8] some stuff ya --- src/assets/main.js | 4 ++-- src/index.html | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/assets/main.js b/src/assets/main.js index 66ee7747..e3ada49a 100644 --- a/src/assets/main.js +++ b/src/assets/main.js @@ -3,7 +3,7 @@ $(function() { url: 'https://www.codeschool.com/users/HelloWorld333.json', dataType: 'jsonp', success: function(response) { - console.log(); + console.log("response", response); addCourses(response.courses.completed); } }); @@ -16,7 +16,7 @@ $(function() { 'class': 'course' }).appendTo($badges); - var $subtitle = $('

', { + $('

', { text: course.title }).appendTo($course); diff --git a/src/index.html b/src/index.html index 00107d30..55633ddc 100644 --- a/src/index.html +++ b/src/index.html @@ -14,6 +14,11 @@

+
+

Santa is here!!!

+
Santa
+
+
From ffa39b2f08cb45f6f8af5b2c5189731172eeb186 Mon Sep 17 00:00:00 2001 From: MelonMonkey2017 <703837@pdsb.net> Date: Sun, 25 Dec 2016 21:56:18 -0500 Subject: [PATCH 6/8] deleting some stuff delete --- src/index.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/index.html b/src/index.html index 55633ddc..7c2d2574 100644 --- a/src/index.html +++ b/src/index.html @@ -14,12 +14,6 @@
-
-

Santa is here!!!

-
Santa
-
-
- From 18e66784b91f2105c7a16e84ff6c10c385717e9d Mon Sep 17 00:00:00 2001 From: MelonMonkey2017 <703837@pdsb.net> Date: Sun, 25 Dec 2016 22:17:18 -0500 Subject: [PATCH 7/8] Revert "deleting some stuff" This reverts commit ffa39b2f08cb45f6f8af5b2c5189731172eeb186. --- src/index.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/index.html b/src/index.html index 7c2d2574..55633ddc 100644 --- a/src/index.html +++ b/src/index.html @@ -14,6 +14,12 @@
+
+

Santa is here!!!

+
Santa
+
+
+ From e4783f34b49ea7d12f5bb0d474b46a0fc47299c7 Mon Sep 17 00:00:00 2001 From: MelonMonkey2017 <703837@pdsb.net> Date: Sun, 25 Dec 2016 22:17:58 -0500 Subject: [PATCH 8/8] moving stuff into container --- src/index.html | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/index.html b/src/index.html index 55633ddc..17d650e6 100644 --- a/src/index.html +++ b/src/index.html @@ -12,12 +12,11 @@

jQuery Badges

-
- -
-

Santa is here!!!

-
Santa
-
+
+

Santa is here!!!

+
Santa
+
+