From bfa6c9eddce4ec1b80fb52b8990d756004b6ed49 Mon Sep 17 00:00:00 2001 From: Jovan Kelly Date: Wed, 7 Oct 2015 22:03:31 +0000 Subject: [PATCH 1/3] started --- solutions/01_hello_html/hello.html | 1 - 1 file changed, 1 deletion(-) delete mode 100644 solutions/01_hello_html/hello.html diff --git a/solutions/01_hello_html/hello.html b/solutions/01_hello_html/hello.html deleted file mode 100644 index d975ef8..0000000 --- a/solutions/01_hello_html/hello.html +++ /dev/null @@ -1 +0,0 @@ -This is just an example! Hehe. \ No newline at end of file From a015b810da4596c780bfdc16c9213c8eb36611f2 Mon Sep 17 00:00:00 2001 From: Jovan Kelly Date: Wed, 7 Oct 2015 22:05:14 +0000 Subject: [PATCH 2/3] started --- solutions/Html_Css/01_hello_html/hello.html | 9 +++++++++ .../Html_Css/02_headBody_html/headBody.html | 11 +++++++++++ solutions/Html_Css/03_img_html/img.html | 19 +++++++++++++++++++ solutions/Html_Css/04_div_html/div.html | 16 ++++++++++++++++ .../Html_Css/05_My_First_Website/index.html | 12 ++++++++++++ .../Html_Css/05_My_First_Website/page1.html | 12 ++++++++++++ .../Html_Css/05_My_First_Website/page2.html | 12 ++++++++++++ .../Html_Css/05_My_First_Website/page3.html | 12 ++++++++++++ .../Html_Css/05_My_First_Website/style.css | 3 +++ solutions/Html_Css/06_My_Site/index.html | 17 +++++++++++++++++ solutions/Html_Css/06_My_Site/page1.html | 17 +++++++++++++++++ solutions/Html_Css/06_My_Site/page2.html | 17 +++++++++++++++++ solutions/Html_Css/06_My_Site/page3.html | 17 +++++++++++++++++ .../01_Hello_js/hello.html | 9 +++++++++ .../01_Hello_js/hello.js | 1 + .../02_Hello_Name/helloName.html | 9 +++++++++ .../02_Hello_Name/helloName.js | 2 ++ .../10_Roman/index.html | 9 +++++++++ .../10_Roman/roman.js | 6 ++++++ 19 files changed, 210 insertions(+) create mode 100644 solutions/Html_Css/01_hello_html/hello.html create mode 100644 solutions/Html_Css/02_headBody_html/headBody.html create mode 100644 solutions/Html_Css/03_img_html/img.html create mode 100644 solutions/Html_Css/04_div_html/div.html create mode 100644 solutions/Html_Css/05_My_First_Website/index.html create mode 100644 solutions/Html_Css/05_My_First_Website/page1.html create mode 100644 solutions/Html_Css/05_My_First_Website/page2.html create mode 100644 solutions/Html_Css/05_My_First_Website/page3.html create mode 100644 solutions/Html_Css/05_My_First_Website/style.css create mode 100644 solutions/Html_Css/06_My_Site/index.html create mode 100644 solutions/Html_Css/06_My_Site/page1.html create mode 100644 solutions/Html_Css/06_My_Site/page2.html create mode 100644 solutions/Html_Css/06_My_Site/page3.html create mode 100644 solutions/Javascript_Variables_and_Strings/01_Hello_js/hello.html create mode 100644 solutions/Javascript_Variables_and_Strings/01_Hello_js/hello.js create mode 100644 solutions/Javascript_Variables_and_Strings/02_Hello_Name/helloName.html create mode 100644 solutions/Javascript_Variables_and_Strings/02_Hello_Name/helloName.js create mode 100644 solutions/Javascript_Variables_and_Strings/10_Roman/index.html create mode 100644 solutions/Javascript_Variables_and_Strings/10_Roman/roman.js diff --git a/solutions/Html_Css/01_hello_html/hello.html b/solutions/Html_Css/01_hello_html/hello.html new file mode 100644 index 0000000..ffc7ba1 --- /dev/null +++ b/solutions/Html_Css/01_hello_html/hello.html @@ -0,0 +1,9 @@ + + + + Hello World + + +

Hello, World!

+ + \ No newline at end of file diff --git a/solutions/Html_Css/02_headBody_html/headBody.html b/solutions/Html_Css/02_headBody_html/headBody.html new file mode 100644 index 0000000..a94b41c --- /dev/null +++ b/solutions/Html_Css/02_headBody_html/headBody.html @@ -0,0 +1,11 @@ + + + + + Hello! + + + + World! + + \ No newline at end of file diff --git a/solutions/Html_Css/03_img_html/img.html b/solutions/Html_Css/03_img_html/img.html new file mode 100644 index 0000000..54bc6dc --- /dev/null +++ b/solutions/Html_Css/03_img_html/img.html @@ -0,0 +1,19 @@ + + + + + Images + + + + + +

This is a map!

+ +

Yea! I found the treasure!

+ + \ No newline at end of file diff --git a/solutions/Html_Css/04_div_html/div.html b/solutions/Html_Css/04_div_html/div.html new file mode 100644 index 0000000..1cbed97 --- /dev/null +++ b/solutions/Html_Css/04_div_html/div.html @@ -0,0 +1,16 @@ + + + + + Im a div! + + + +
+ +
+
+

This is a treasure map!

+
+ + \ No newline at end of file diff --git a/solutions/Html_Css/05_My_First_Website/index.html b/solutions/Html_Css/05_My_First_Website/index.html new file mode 100644 index 0000000..630f227 --- /dev/null +++ b/solutions/Html_Css/05_My_First_Website/index.html @@ -0,0 +1,12 @@ + + + + + Jovan's First Website - Home + + + + +

This is the index!

+ + \ No newline at end of file diff --git a/solutions/Html_Css/05_My_First_Website/page1.html b/solutions/Html_Css/05_My_First_Website/page1.html new file mode 100644 index 0000000..72a51d8 --- /dev/null +++ b/solutions/Html_Css/05_My_First_Website/page1.html @@ -0,0 +1,12 @@ + + + + + Jovan's First Website - Page 1 + + + + +

This is the first page!

+ + \ No newline at end of file diff --git a/solutions/Html_Css/05_My_First_Website/page2.html b/solutions/Html_Css/05_My_First_Website/page2.html new file mode 100644 index 0000000..327d71a --- /dev/null +++ b/solutions/Html_Css/05_My_First_Website/page2.html @@ -0,0 +1,12 @@ + + + + + Jovan's First Website - Page 2 + + + + +

This is the second page!

+ + \ No newline at end of file diff --git a/solutions/Html_Css/05_My_First_Website/page3.html b/solutions/Html_Css/05_My_First_Website/page3.html new file mode 100644 index 0000000..26bc203 --- /dev/null +++ b/solutions/Html_Css/05_My_First_Website/page3.html @@ -0,0 +1,12 @@ + + + + + Jovan's First Website - Page 3 + + + + + This is the third page! + + \ No newline at end of file diff --git a/solutions/Html_Css/05_My_First_Website/style.css b/solutions/Html_Css/05_My_First_Website/style.css new file mode 100644 index 0000000..c06e8d2 --- /dev/null +++ b/solutions/Html_Css/05_My_First_Website/style.css @@ -0,0 +1,3 @@ +p{ + text-align: center; +} \ No newline at end of file diff --git a/solutions/Html_Css/06_My_Site/index.html b/solutions/Html_Css/06_My_Site/index.html new file mode 100644 index 0000000..df24738 --- /dev/null +++ b/solutions/Html_Css/06_My_Site/index.html @@ -0,0 +1,17 @@ + + + + + Jovan's Site + + + + +

Hello, World!

+ + + \ No newline at end of file diff --git a/solutions/Html_Css/06_My_Site/page1.html b/solutions/Html_Css/06_My_Site/page1.html new file mode 100644 index 0000000..cf3e428 --- /dev/null +++ b/solutions/Html_Css/06_My_Site/page1.html @@ -0,0 +1,17 @@ + + + + + Jovan's Site + + + + +

Page 1

+ + + \ No newline at end of file diff --git a/solutions/Html_Css/06_My_Site/page2.html b/solutions/Html_Css/06_My_Site/page2.html new file mode 100644 index 0000000..e66dc23 --- /dev/null +++ b/solutions/Html_Css/06_My_Site/page2.html @@ -0,0 +1,17 @@ + + + + + Jovan's Site + + + + +

Page 2

+ + + \ No newline at end of file diff --git a/solutions/Html_Css/06_My_Site/page3.html b/solutions/Html_Css/06_My_Site/page3.html new file mode 100644 index 0000000..3bb87f1 --- /dev/null +++ b/solutions/Html_Css/06_My_Site/page3.html @@ -0,0 +1,17 @@ + + + + + Jovan's Site + + + + +

Page 3

+ + + \ No newline at end of file diff --git a/solutions/Javascript_Variables_and_Strings/01_Hello_js/hello.html b/solutions/Javascript_Variables_and_Strings/01_Hello_js/hello.html new file mode 100644 index 0000000..17721dd --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/01_Hello_js/hello.html @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/solutions/Javascript_Variables_and_Strings/01_Hello_js/hello.js b/solutions/Javascript_Variables_and_Strings/01_Hello_js/hello.js new file mode 100644 index 0000000..ae9e3a9 --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/01_Hello_js/hello.js @@ -0,0 +1 @@ +console.log("Hello, World!"); \ No newline at end of file diff --git a/solutions/Javascript_Variables_and_Strings/02_Hello_Name/helloName.html b/solutions/Javascript_Variables_and_Strings/02_Hello_Name/helloName.html new file mode 100644 index 0000000..ed74335 --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/02_Hello_Name/helloName.html @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/solutions/Javascript_Variables_and_Strings/02_Hello_Name/helloName.js b/solutions/Javascript_Variables_and_Strings/02_Hello_Name/helloName.js new file mode 100644 index 0000000..e498bd9 --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/02_Hello_Name/helloName.js @@ -0,0 +1,2 @@ +var name = prompt("Hello. What is your name!"); +console.log("Hello, " + name + "!"); \ No newline at end of file diff --git a/solutions/Javascript_Variables_and_Strings/10_Roman/index.html b/solutions/Javascript_Variables_and_Strings/10_Roman/index.html new file mode 100644 index 0000000..f8d17b0 --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/10_Roman/index.html @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/solutions/Javascript_Variables_and_Strings/10_Roman/roman.js b/solutions/Javascript_Variables_and_Strings/10_Roman/roman.js new file mode 100644 index 0000000..5023384 --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/10_Roman/roman.js @@ -0,0 +1,6 @@ +function convert(num){ + //I = 1, V = 5, X = 10, L = 50, C = 100, D = 500, M = 1,000 + if(num >= 1000 && num%1000 != 0){ + return num; + } +}; \ No newline at end of file From fb9fea70e05ae20ce1225508e19427d9a269074d Mon Sep 17 00:00:00 2001 From: Jovan Kelly Date: Wed, 14 Oct 2015 21:43:27 +0000 Subject: [PATCH 3/3] this is all i did so far --- .../01_ScriptED_Love/scriptEdLove.js | 7 +++ .../02_ice_cream/icecream.js | 9 ++++ .../Javascript_Conditionals/03_class/class.js | 11 +++++ .../Javascript_Conditionals/04_grade/grade.js | 5 +++ .../03_Age/age.js | 3 ++ .../03_Age/index.html | 9 ++++ .../04_Hello_3_Ages/hello3ages.js | 11 +++++ .../04_Hello_3_Ages/index.html | 9 ++++ .../05_avg/avg.js | 4 ++ .../05_avg/index.html | 9 ++++ .../08_ms_potato/msPotato.js | 2 + .../09b_nose/nose.js | 5 +++ .../10_Roman/roman.js | 45 ++++++++++++++++++- 13 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 solutions/Javascript_Conditionals/01_ScriptED_Love/scriptEdLove.js create mode 100644 solutions/Javascript_Conditionals/02_ice_cream/icecream.js create mode 100644 solutions/Javascript_Conditionals/03_class/class.js create mode 100644 solutions/Javascript_Conditionals/04_grade/grade.js create mode 100644 solutions/Javascript_Variables_and_Strings/03_Age/age.js create mode 100644 solutions/Javascript_Variables_and_Strings/03_Age/index.html create mode 100644 solutions/Javascript_Variables_and_Strings/04_Hello_3_Ages/hello3ages.js create mode 100644 solutions/Javascript_Variables_and_Strings/04_Hello_3_Ages/index.html create mode 100644 solutions/Javascript_Variables_and_Strings/05_avg/avg.js create mode 100644 solutions/Javascript_Variables_and_Strings/05_avg/index.html create mode 100644 solutions/Javascript_Variables_and_Strings/08_ms_potato/msPotato.js create mode 100644 solutions/Javascript_Variables_and_Strings/09b_nose/nose.js diff --git a/solutions/Javascript_Conditionals/01_ScriptED_Love/scriptEdLove.js b/solutions/Javascript_Conditionals/01_ScriptED_Love/scriptEdLove.js new file mode 100644 index 0000000..6089dc6 --- /dev/null +++ b/solutions/Javascript_Conditionals/01_ScriptED_Love/scriptEdLove.js @@ -0,0 +1,7 @@ +function scriptEdLove(love){ + if(love){ + console.log("YAY!"); + } else { + console.log("BOO!!"); + } +} \ No newline at end of file diff --git a/solutions/Javascript_Conditionals/02_ice_cream/icecream.js b/solutions/Javascript_Conditionals/02_ice_cream/icecream.js new file mode 100644 index 0000000..6f80f39 --- /dev/null +++ b/solutions/Javascript_Conditionals/02_ice_cream/icecream.js @@ -0,0 +1,9 @@ +function icecream(favorite){ + if(favorite == "chocolate"){ + console.log("Boo! Chocolate") + } else if(favorite == "vanilla"){ + console.log("YAY! Vanilla"); + } else { + console.log("Huh?"); + } +} \ No newline at end of file diff --git a/solutions/Javascript_Conditionals/03_class/class.js b/solutions/Javascript_Conditionals/03_class/class.js new file mode 100644 index 0000000..26bb8d2 --- /dev/null +++ b/solutions/Javascript_Conditionals/03_class/class.js @@ -0,0 +1,11 @@ +function Grade(grade){ + if(grade == 9){ + console.log("You are a Freshman!"); + } else if(grade == 10){ + console.log("You are a Sophomore!"); + } else if(grade == 11){ + console.log("You are a Junior!"); + } else if(grade == 12){ + console.log("You are a Senior"); + } +} \ No newline at end of file diff --git a/solutions/Javascript_Conditionals/04_grade/grade.js b/solutions/Javascript_Conditionals/04_grade/grade.js new file mode 100644 index 0000000..720264b --- /dev/null +++ b/solutions/Javascript_Conditionals/04_grade/grade.js @@ -0,0 +1,5 @@ +function grade(grade){ + if(grade >= 100 && grade >= 90){ + + } +} \ No newline at end of file diff --git a/solutions/Javascript_Variables_and_Strings/03_Age/age.js b/solutions/Javascript_Variables_and_Strings/03_Age/age.js new file mode 100644 index 0000000..95451df --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/03_Age/age.js @@ -0,0 +1,3 @@ +var name = prompt("Hello, what is your name?"); +var age = prompt("Hello " + name +", how old are you?"); +alert(name + ", you are " + age + " years old."); diff --git a/solutions/Javascript_Variables_and_Strings/03_Age/index.html b/solutions/Javascript_Variables_and_Strings/03_Age/index.html new file mode 100644 index 0000000..6015c2d --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/03_Age/index.html @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/solutions/Javascript_Variables_and_Strings/04_Hello_3_Ages/hello3ages.js b/solutions/Javascript_Variables_and_Strings/04_Hello_3_Ages/hello3ages.js new file mode 100644 index 0000000..38055ec --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/04_Hello_3_Ages/hello3ages.js @@ -0,0 +1,11 @@ +var teachName = prompt("Hey Teach, What is your name?"); +var teachAge = prompt(teachName + " how old are you?"); +var teachName2 = prompt("Hey Teach #2, What is your name?"); +var teachAge2 = prompt("Hey " + teachName2 + ", how old are you?"); +var teachName3 = prompt("Hey Teach #3, What's cha name"); +var teachAge3 = prompt("Hey " + teachName + ", how old are you?"); + +alert("Correct me if I got this wrong, but..."); +alert(teachName + " is " + teachAge + " years old!"); +alert(teachName2 + " is " + teachAge2 + " years old!"); +alert(teachName3 + " is " + teachAge3 + " years old!"); diff --git a/solutions/Javascript_Variables_and_Strings/04_Hello_3_Ages/index.html b/solutions/Javascript_Variables_and_Strings/04_Hello_3_Ages/index.html new file mode 100644 index 0000000..5b5b995 --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/04_Hello_3_Ages/index.html @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/solutions/Javascript_Variables_and_Strings/05_avg/avg.js b/solutions/Javascript_Variables_and_Strings/05_avg/avg.js new file mode 100644 index 0000000..43471dc --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/05_avg/avg.js @@ -0,0 +1,4 @@ +function avg(num1, num2){ + console.log((num1 + num2)/2); +} +avg(5,10); \ No newline at end of file diff --git a/solutions/Javascript_Variables_and_Strings/05_avg/index.html b/solutions/Javascript_Variables_and_Strings/05_avg/index.html new file mode 100644 index 0000000..7fa5fd2 --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/05_avg/index.html @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/solutions/Javascript_Variables_and_Strings/08_ms_potato/msPotato.js b/solutions/Javascript_Variables_and_Strings/08_ms_potato/msPotato.js new file mode 100644 index 0000000..59f6a7d --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/08_ms_potato/msPotato.js @@ -0,0 +1,2 @@ +var msPotato = "I'm packing your angry eyes!"; +console.log(msPotato); \ No newline at end of file diff --git a/solutions/Javascript_Variables_and_Strings/09b_nose/nose.js b/solutions/Javascript_Variables_and_Strings/09b_nose/nose.js new file mode 100644 index 0000000..3e1c0ec --- /dev/null +++ b/solutions/Javascript_Variables_and_Strings/09b_nose/nose.js @@ -0,0 +1,5 @@ +function nose(str){ + var newStr = str.replace("shoes", "nose"); + console.log(newStr); +} +nose("Hello everyone, look at my new shoes"); \ No newline at end of file diff --git a/solutions/Javascript_Variables_and_Strings/10_Roman/roman.js b/solutions/Javascript_Variables_and_Strings/10_Roman/roman.js index 5023384..0edf873 100644 --- a/solutions/Javascript_Variables_and_Strings/10_Roman/roman.js +++ b/solutions/Javascript_Variables_and_Strings/10_Roman/roman.js @@ -1,6 +1,47 @@ function convert(num){ //I = 1, V = 5, X = 10, L = 50, C = 100, D = 500, M = 1,000 - if(num >= 1000 && num%1000 != 0){ - return num; + var convertedNum = ""; + while(num > 0){ + if(num >= 1000){ + num -= 1000; + convertedNum += "M"; + } else if(num == 999){ + num -= 999; + convertedNum += "CMXCIX"; + }else if(num >= 500){ + num -= 500; + convertedNum += "D"; + } else if( num == 499){ + num -= 499; + convertedNum += "CDXCIX"; + }else if(num >= 100){ + num -= 100; + convertedNum += "C"; + } else if(num == 99){ + num -= 99; + convertedNum += "XCIX"; + }else if(num >= 50){ + num -= 50; + convertedNum += "L"; + } else if(num == 49){ + num -= 49; + convertedNum += "XLIX"; + }else if(num >= 10){ + num -= 10; + convertedNum += "X"; + } else if(num == 9){ + num -= 9; + convertedNum += "IX"; + } else if(num >= 5){ + num -= 5; + convertedNum += "V"; + } else if(num == 4){ + num -= 4; + convertedNum += "IV"; + }else if(num >= 1){ + num -= 1; + convertedNum += "I"; + } } + console.log(convertedNum); }; \ No newline at end of file