diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..e8be062 Binary files /dev/null and b/.DS_Store differ diff --git a/README.md b/README.md index c333a9b..4148b32 100644 --- a/README.md +++ b/README.md @@ -1,77 +1,12 @@ -Assignment 1 - Hello World: Basic Deployment w/ Git, GitHub, Glitch -=== +Daniel Caffrey +http://a1-dpcaffrey.glitch.me -*DUE: Thursday, August 29th by 11:59 AM (before the start of class!)* - -This assignment is a "warm-up" exercise. -You will simply deploy the starting Web site that you will use this term to [Glitch](http://www.glitch.com/). - -Treat this assignment as a chance to get up to speed on Git, GitHub, and Glitch. -If you already know these, great. -However, if you're new to them, spend several hours practicing, experimenting, and reading documentation. -In other words, don't just get your website up and done. You will need skills with these tools throughout the rest of the course. - -Assignment details ---- - -Do the following to complete this assignment: - -1. Fork the starting project code in GitHub. This repo contains: - * the server code, `server.js` - * A starting `index.html` file that you will edit as described below - * A package.json file that helps configure Glitch - * This README -2. Edit `index.html` to show the following information about you: - * your name and class at WPI (e.g. class of 2020) Note: Do not put any contact or personal information that you do not potentially want other people outside of this class to see. - * your major(s) and minor(s) - * previous computer science courses that you have taken at WPI - * your experience with the following technologies and methods (none, some, a lot) - * HTML - * CSS - * Java - * JavaScript - * Ruby - * Python - * unit testing -3. Test your project to make sure that when someone goes to your main page, it displays correctly. You can do this locally by simply running `node server.js` from within the assignment directory. - -4. Modify the README file according to the specification below. -5. Commit and push all your changes to GitHub. -6. Deploy your project to Glitch. You can do this by [importing the repo from GitHub](https://medium.com/glitch/import-code-from-anywhere-83fb60ea4875) -7. Ensure that your project has the proper naming scheme (guide follows) so we can find it. -8. Create and submit a Pull Request to the original repo. - -Naming and URL Scheme ---- - -You must use a consistent naming scheme for all projects in this course. -If we can't find it, we can't grade it. - -By default Glitch often assigns your application a random name. To change it, click on the project dropdown menu in the upper left corner of Glitch. You will then see an additional text field displaying the project name in the resulting menu; click here to edit the name. - -The name scheme should be `a1-yourGitHubUsername`. -The `a1` will need to be updated to `a2`, `a3`, and so on in future projects. - -Resources ---- - -If you need a JavaScript/HTML/CSS refresher, see [Technology Fundamentals by Scott Murray](http://chimera.labs.oreilly.com/books/1230000000345/ch03.html#_html) and/or [JavaScript Codeacademy](https://www.codecademy.com/en/tracks/javascript). - -If you need a Git/GitHub refreseher, see [GitHub Bootcamp](https://help.github.com/categories/bootcamp/), the [GitHub Guides](https://guides.github.com/) (especially the ones on Hello World, and Understanding the GitHub Flow, and Forking Projects), and [CodeSchool's Try Git Course](https://www.codeschool.com/courses/try-git). - -Sample Readme (delete the above when you're ready to submit, and modify the below so with your links and descriptions) ---- - -Charlie Roberts -http://a1-charlieroberts.glitch.me - -This project shows ... +This project shows my name, a basic description of what I do at WPI, info about by Degree, my CS background, and my work experience. The project employs basic HTML, JavaScript, and CSS. ## Technical Achievements -- **Proved P=NP**: Using a combination of... -- **Solved AI**: ... +- **Utilized HTML**: Using basic HTML, made a website that displays info about me, as well as links to an external website (YouTube). ### Design Achievements -- **Re-vamped Apple's Design Philosophy**: Shown in `style.css`, the code... +- **Re-styled the page with CSS**: Using internal CSS (in a style tag), the Degree info and CS info were styled to include borders of different colors. diff --git a/index.html b/index.html index 37ac8c3..d879045 100755 --- a/index.html +++ b/index.html @@ -3,26 +3,33 @@ CS4241 Assignment 1 + -

Information about [Your name here]

-

- [Self introduction] -

+

Information about Daniel Caffrey

- [Major and other information] -

-

- [Other things] + I sing in the WPI Men's Glee Club, and I am also the Music Director of Simple Harmonic Motion, one of WPI's a cappella singing groups

+ Here is our YouTube Channel! +

Major Info:

+

Electrical and Computer Engineering Major +
Computer Science Minor +
Class of 2020

+

Previous CS Courses:

+

CS 1004: Intro to Programming for Non-Majors +
CS 2301: Systems Programming for Non-Majors +
CS 2102: Object Oriented Programming w/ Java Concepts +
CS 3431: Database Systems

+ -

Experience

-

- Working experience -

+

Work Experience