diff --git a/.gitignore b/.gitignore index 9c2cf50..f777683 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,8 @@ /Assignments/MP02_CalebFontenot/nbproject/private/ /Assignments/lab5_CalebFontenot/nbproject/private/ /Assignments/lab5_4_CalebFontenot/nbproject/private/ -<<<<<<< Updated upstream /Assignments/MP03_CalebFontenot/nbproject/private/ -======= /Assignments/lab6_1_CalebFontenot/nbproject/private/ ->>>>>>> Stashed changes /Assignments/lab6.2_CalebFontenot/nbproject/private/ /Assignments/MP04_CalebFontenot/nbproject/private/ /Assignments/lab7_CalebFontenot/nbproject/private/ @@ -18,9 +15,7 @@ /Assignments/MP07_CalebFontenot/nbproject/private/ /Assignments/JavaScript_1/nbproject/private/ /Assignments/JavaScript/chapter2LatBame/nbproject/private/ -<<<<<<< Updated upstream /Assignments/JavaScript/lab13js_CalebFontenot/nbproject/private/ -======= /Assignments/JavaScript/Chapter3Examples/nbproject/private/ /Assignments/JavaScript/lab12js/nbproject/private/ ->>>>>>> Stashed changes +/Assignments/JavaScript/MP09_CalebFontenot/nbproject/private/ diff --git a/Assignments/JavaScript/MP09_CalebFontenot/.bowerrc b/Assignments/JavaScript/MP09_CalebFontenot/.bowerrc new file mode 100644 index 0000000..0ba26f2 --- /dev/null +++ b/Assignments/JavaScript/MP09_CalebFontenot/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "public_html/bower_components" +} diff --git a/Assignments/JavaScript/MP09_CalebFontenot/Gruntfile.js b/Assignments/JavaScript/MP09_CalebFontenot/Gruntfile.js new file mode 100644 index 0000000..496183b --- /dev/null +++ b/Assignments/JavaScript/MP09_CalebFontenot/Gruntfile.js @@ -0,0 +1,9 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/ClientSide/Gruntfile.js to edit this template + */ +module.exports = function (grunt) { + // Project configuration. + grunt.initConfig({ + }); +}; diff --git a/Assignments/JavaScript/MP09_CalebFontenot/bower.json b/Assignments/JavaScript/MP09_CalebFontenot/bower.json new file mode 100644 index 0000000..344e40d --- /dev/null +++ b/Assignments/JavaScript/MP09_CalebFontenot/bower.json @@ -0,0 +1,13 @@ +{ + "name": "MP09_CalebFontenot", + "version": "1.0.0", + "main": "path/to/main.css", + "ignore": [ + ".jshintrc", + "**/*.txt" + ], + "dependencies": { + }, + "devDependencies": { + } +} diff --git a/Assignments/JavaScript/MP09_CalebFontenot/gulpfile.js b/Assignments/JavaScript/MP09_CalebFontenot/gulpfile.js new file mode 100644 index 0000000..eccfb02 --- /dev/null +++ b/Assignments/JavaScript/MP09_CalebFontenot/gulpfile.js @@ -0,0 +1,10 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/ClientSide/gulpfile.js to edit this template + */ + +var gulp = require('gulp'); + +gulp.task('default', function () { + // place code for your default task here +}); diff --git a/Assignments/JavaScript/MP09_CalebFontenot/nbproject/project.properties b/Assignments/JavaScript/MP09_CalebFontenot/nbproject/project.properties new file mode 100644 index 0000000..e35def8 --- /dev/null +++ b/Assignments/JavaScript/MP09_CalebFontenot/nbproject/project.properties @@ -0,0 +1,5 @@ +file.reference.MP09_CalebFontenot-public_html=public_html +file.reference.MP09_CalebFontenot-test=test +files.encoding=UTF-8 +site.root.folder=${file.reference.MP09_CalebFontenot-public_html} +test.folder=${file.reference.MP09_CalebFontenot-test} diff --git a/Assignments/JavaScript/MP09_CalebFontenot/nbproject/project.xml b/Assignments/JavaScript/MP09_CalebFontenot/nbproject/project.xml new file mode 100644 index 0000000..757bfe9 --- /dev/null +++ b/Assignments/JavaScript/MP09_CalebFontenot/nbproject/project.xml @@ -0,0 +1,9 @@ + + + org.netbeans.modules.web.clientproject + + + MP09_CalebFontenot + + + diff --git a/Assignments/JavaScript/MP09_CalebFontenot/package.json b/Assignments/JavaScript/MP09_CalebFontenot/package.json new file mode 100644 index 0000000..b222212 --- /dev/null +++ b/Assignments/JavaScript/MP09_CalebFontenot/package.json @@ -0,0 +1,8 @@ +{ + "name": "MP09_CalebFontenot", + "version": "1.0.0", + "keywords": ["util", "functional", "server", "client", "browser"], + "author": "caleb", + "contributors": [], + "dependencies": {} +} diff --git a/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 2.html b/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 2.html new file mode 100644 index 0000000..cc81621 --- /dev/null +++ b/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 2.html @@ -0,0 +1,55 @@ + + + + + TODO supply a title + + + + + diff --git a/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 3.html b/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 3.html new file mode 100644 index 0000000..2880942 --- /dev/null +++ b/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 3.html @@ -0,0 +1,30 @@ + + + + + TODO supply a title + + + + + diff --git a/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 4.html b/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 4.html new file mode 100644 index 0000000..5163029 --- /dev/null +++ b/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 4.html @@ -0,0 +1,41 @@ + + + + + Net Pay Calculator + + + + + diff --git a/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 5.html b/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 5.html new file mode 100644 index 0000000..95be275 --- /dev/null +++ b/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 5.html @@ -0,0 +1,48 @@ + + + + + TODO supply a title + + + + + diff --git a/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 6.html b/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 6.html new file mode 100644 index 0000000..66fb371 --- /dev/null +++ b/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 6.html @@ -0,0 +1,40 @@ + + + + + TODO supply a title + + + + + +

Purchase items!

+

+

Click on an item to purchase it.

+ + + + + + + + diff --git a/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 7.html b/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 7.html new file mode 100644 index 0000000..9b9a1a4 --- /dev/null +++ b/Assignments/JavaScript/MP09_CalebFontenot/public_html/Problem 7.html @@ -0,0 +1,36 @@ + + + + + + + +

Hi there!

+ + + + + \ No newline at end of file diff --git a/Assignments/JavaScript/chapter2LatBame/public_html/Challenge1.html b/Assignments/JavaScript/chapter2LatBame/public_html/Challenge1.html index 12182c6..f79017c 100644 --- a/Assignments/JavaScript/chapter2LatBame/public_html/Challenge1.html +++ b/Assignments/JavaScript/chapter2LatBame/public_html/Challenge1.html @@ -5,7 +5,7 @@ Click nbfs://nbhost/SystemFileSystem/Templates/ClientSide/html.html to edit this --> - TODO supply a title + Challenge 1 diff --git a/Assignments/JavaScript/chapter2LatBame/public_html/Challenge4.html b/Assignments/JavaScript/chapter2LatBame/public_html/Challenge4.html new file mode 100644 index 0000000..deb7b68 --- /dev/null +++ b/Assignments/JavaScript/chapter2LatBame/public_html/Challenge4.html @@ -0,0 +1,35 @@ + + + + + Challenge 4 + + + + + + diff --git a/ZIPs/MP02_CalebFontenot.zip b/ZIPs/HTML/MP02_CalebFontenot.zip similarity index 100% rename from ZIPs/MP02_CalebFontenot.zip rename to ZIPs/HTML/MP02_CalebFontenot.zip diff --git a/ZIPs/MP03_CalebFontenot.zip b/ZIPs/HTML/MP03_CalebFontenot.zip similarity index 100% rename from ZIPs/MP03_CalebFontenot.zip rename to ZIPs/HTML/MP03_CalebFontenot.zip diff --git a/ZIPs/MP04_CalebFontenot.zip b/ZIPs/HTML/MP04_CalebFontenot.zip similarity index 100% rename from ZIPs/MP04_CalebFontenot.zip rename to ZIPs/HTML/MP04_CalebFontenot.zip diff --git a/ZIPs/MP05_CalebFontenot.zip b/ZIPs/HTML/MP05_CalebFontenot.zip similarity index 100% rename from ZIPs/MP05_CalebFontenot.zip rename to ZIPs/HTML/MP05_CalebFontenot.zip diff --git a/ZIPs/MP06_CalebFontenot.zip b/ZIPs/HTML/MP06_CalebFontenot.zip similarity index 100% rename from ZIPs/MP06_CalebFontenot.zip rename to ZIPs/HTML/MP06_CalebFontenot.zip diff --git a/ZIPs/MP07_CalebFontenot.zip b/ZIPs/HTML/MP07_CalebFontenot.zip similarity index 100% rename from ZIPs/MP07_CalebFontenot.zip rename to ZIPs/HTML/MP07_CalebFontenot.zip diff --git a/ZIPs/MP1_CalebFontenot.zip b/ZIPs/HTML/MP1_CalebFontenot.zip similarity index 100% rename from ZIPs/MP1_CalebFontenot.zip rename to ZIPs/HTML/MP1_CalebFontenot.zip diff --git a/ZIPs/lab08_CalebFontenot.zip b/ZIPs/HTML/lab08_CalebFontenot.zip similarity index 100% rename from ZIPs/lab08_CalebFontenot.zip rename to ZIPs/HTML/lab08_CalebFontenot.zip diff --git a/ZIPs/lab0_CalebFontenot.zip b/ZIPs/HTML/lab0_CalebFontenot.zip similarity index 100% rename from ZIPs/lab0_CalebFontenot.zip rename to ZIPs/HTML/lab0_CalebFontenot.zip diff --git a/ZIPs/lab2_2_CalebFontenot.zip b/ZIPs/HTML/lab2_2_CalebFontenot.zip similarity index 100% rename from ZIPs/lab2_2_CalebFontenot.zip rename to ZIPs/HTML/lab2_2_CalebFontenot.zip diff --git a/ZIPs/lab2_CalebFontenot.zip b/ZIPs/HTML/lab2_CalebFontenot.zip similarity index 100% rename from ZIPs/lab2_CalebFontenot.zip rename to ZIPs/HTML/lab2_CalebFontenot.zip diff --git a/ZIPs/lab4_CalebFontenot.zip b/ZIPs/HTML/lab4_CalebFontenot.zip similarity index 100% rename from ZIPs/lab4_CalebFontenot.zip rename to ZIPs/HTML/lab4_CalebFontenot.zip diff --git a/ZIPs/lab5_4_CalebFontenot.zip b/ZIPs/HTML/lab5_4_CalebFontenot.zip similarity index 100% rename from ZIPs/lab5_4_CalebFontenot.zip rename to ZIPs/HTML/lab5_4_CalebFontenot.zip diff --git a/ZIPs/lab6_1_CalebFontenot.zip b/ZIPs/HTML/lab6_1_CalebFontenot.zip similarity index 100% rename from ZIPs/lab6_1_CalebFontenot.zip rename to ZIPs/HTML/lab6_1_CalebFontenot.zip diff --git a/ZIPs/lab6_2_CalebFontenot.zip b/ZIPs/HTML/lab6_2_CalebFontenot.zip similarity index 100% rename from ZIPs/lab6_2_CalebFontenot.zip rename to ZIPs/HTML/lab6_2_CalebFontenot.zip diff --git a/ZIPs/lab7_CalebFontenot.zip b/ZIPs/HTML/lab7_CalebFontenot.zip similarity index 100% rename from ZIPs/lab7_CalebFontenot.zip rename to ZIPs/HTML/lab7_CalebFontenot.zip diff --git a/ZIPs/JavaScript/chapter2LatBame.zip b/ZIPs/JavaScript/chapter2LatBame.zip new file mode 100644 index 0000000..da682b8 Binary files /dev/null and b/ZIPs/JavaScript/chapter2LatBame.zip differ