diff --git a/README.md b/README.md index 4906dc8..6dc1960 100644 --- a/README.md +++ b/README.md @@ -1,102 +1,18 @@ -Assignment 1 - Hello World: Basic Deployment w/ Git, GitHub, Glitch -=== +Patrick Houlihan +https://glitch.com/~a1-excitinglyplain -*DUE: Monday, September 7th 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 ---- - -This assignment requires that your website is both contained in a GitHub repository and hosted in Glitch. There are two ways to do this: - -1. Fork this repo and clone it to your computer, make changes locally on your computer, push the repo onto GitHub, and then import your GitHub repo into Glitch. -2. Fork this repo and then import it directly to Glitch, use the Glitch editor to make changes, and then export your repo from Glitch back to GitHub. -3. Same as #1, but instead of importing from Github to Glitch you just upload the files (or copy/paste) them directly to Glitch. - -## Option 1 - Clone to computer, push to Github, import to Glitch (recommended) - -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 -4. Complete some technical and/or design achievements (see below). -5. 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. - -6. Modify the README file according to the specification below. -7. Commit and push all your changes to GitHub. -8. Deploy your project to Glitch. You can do this by [importing the repo from GitHub](https://medium.com/glitch/import-code-from-anywhere-83fb60ea4875) -9. Ensure that your project has the proper naming scheme (guide follows) so we can find it. -9. Create and submit a Pull Request to the original repo. - -## Option 2 - Fork repo and import to Glitch, edit on Glitch, and then export back to GitHub -Most of these steps are the same as option 1, except that you being by creating a new project Glitch using this repo as a staring point (just choose New Project > Import from GitHub for this and then paste in the link to your repo). At the end, you can export your Glitch project to GitHub by [following these instructions](https://www.youtube.com/watch?time_continue=77&v=aWJFbtrgW4E&feature=emb_logo). *Note that the location of the projecct export feature in Glitch has moved from what they show in this video.* It's now located in Tools > Import and Export (tools is located in the bottom left of the Glitch editor). - -## Option 3 - Clone to computer, edit locally, push to GitHub, upload to Glitch -This is the same as option 1, except that for step 6 (Deploy to Glitch) you simply upload each file to your Glitch repository (using New File > Upload a File). - -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. - -Achievements ---- -Below are some suggested technical and design achievements. You can use these to help boost your grade up to an A and customize the assignment to your personal interests. These are recommended acheivements, but feel free to create/implement your own... just make sure you thoroughly describe what you did in your README and why it was challenging. ALL ACHIEVEMENTS MUST BE DESCRIBED IN YOUR README IN ORDER TO GET CREDIT FOR THEM. - -*Technical* -1. (max 5 points) Style your page using CSS. Each style rule you apply will get you 1 extra point for a maximum of 5 points. Be sure to describe your style rules in your README. -2. (5 points) Add a simple JavaScript animation to the page. -3. (max 5 points) Experiment with other HTML tags (links, images, tables etc.) Each extra tag you use will get you 1 extra point for a maximum of 5 points. Be sure to describe the links you use in your README. - -*Design* -1. (10 points) Create a color palette using [color.adobe.com](https://color.adobe.com). Use all the colors in the palette in your webpage by implementing the appropriate CSS. Add a small screenshot of the color wheel for your color palette to your repo. -2. (5 points) Use a font from [Goolge Fonts](https://fonts.google.com) in your website. - -Resources ---- - -If you need a JavaScript/HTML/CSS refresher, see [HTML & CSS](https://wpi.primo.exlibrisgroup.com/discovery/fulldisplay?docid=alma9936730811904746&context=L&vid=01WPI_INST:Default&lang=en&search_scope=MyInst_and_CI&adaptor=Local%20Search%20Engine&tab=Everything&query=any,contains,Jon%20Duckett&offset=0) 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 text below with your links and descriptions) ---- - -Charlie Roberts -http://a1-charlieroberts.glitch.me - -This project shows ... +This project shows use of a css grid to display and answer the required information needed for the project. It features 2 PNG pictures I made in Microsoft Paint Freshman year. The overall style and appearance of the page is guided by the color scheme of the picture, as I based the Adobe color palette I selected off of the colors featured in the image. ## Technical Achievements -- **Styled page with CSS**: Added rules for the p, li, and a selectors... +- **Styled page with CSS**: +Added Style Rules for buttons, buttons on hover, unordered lists, h1, background, and a grid. These style rules, especially for the button allow a nice effect where on hover, the color of the text and background inverts. +- **JavaScript**: +By clicking the CS4731 button, you can change the background to a smaller tiled variant of the background image. +- **CSS tag usage**: +I used buttons, links, grids, and button hover. Grid was the most difficult of the bunch as I had to read multiple articles and view code from W3Schools and Mozilla before I was able to understand what was happening. The link I used links to the WPI page welcoming my year into WPI. ### Design Achievements -- **Used the Roboto Font from Google Fonts**: I used Roboto as the font for the primary copy text in my site. - - +- **Used the Roboto Font from Google Fonts**: +I used Roboto as the font for the primary copy text in my site. This required going to an external website. +- **Used Adobe Color Palette**: +Image of colors is included and the colors are prominently featured on the site. This was difficult because I had a look in mind that I wanted, making it difficult to find the exact combo. diff --git a/colorwheel.PNG b/colorwheel.PNG new file mode 100644 index 0000000..2bed9d0 Binary files /dev/null and b/colorwheel.PNG differ diff --git a/index.html b/index.html index 37ac8c3..cec02a7 100755 --- a/index.html +++ b/index.html @@ -2,27 +2,62 @@ CS4241 Assignment 1 + + + + + - -

Information about [Your name here]

-

- [Self introduction] -

-

- [Major and other information] -

-

- [Other things] -

-

Experience

-

- Working experience -

- + + +

Information about Patrick Houlihan

+
+
+

+ Class of 2022 +

+
+
+

+ Computer Science Major +

+
+
+

+ I have taken the following courses. +

+

+
+
+

+ Work experience +

+ +
+ +
diff --git a/package.json b/package.json index 1699a50..c33f624 100755 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cr-4241-simple-glitch", "version": "0.1.0", "description": "WPI CS 4241 first assignment", - "author": "Charlie Roberts", + "author": "Patrick Houlihan", "scripts": { "start": "node server.js" } diff --git a/script.js b/script.js new file mode 100644 index 0000000..ff41556 --- /dev/null +++ b/script.js @@ -0,0 +1,3 @@ +function main () { + document.body.style.background = "url('https://cdn.glitch.com/30612050-05be-4b3f-bae1-68a7ba65878b%2FPhoneBackground.png?v=1599447504656')"; +} \ No newline at end of file diff --git a/server.js b/server.js index 9490f71..ee17c6e 100644 --- a/server.js +++ b/server.js @@ -1,25 +1,59 @@ -const http = require('http'), - fs = require('fs'), - port = 3000 - -const server = http.createServer( function( request,response ) { - switch( request.url ) { - case '/': - sendFile( response, 'index.html' ) - break - case '/index.html': - sendFile( response, 'index.html' ) - break - default: - response.end( '404 Error: File Not Found' ) - } -}) -server.listen( process.env.PORT || port ) -const sendFile = function( response, filename ) { - fs.readFile( filename, function( err, content ) { - file = content - response.end( content, 'utf-8' ) - }) -} +// const http = require('http'), +// fs = require('fs'), +// port = 3000; + +// const server = http.createServer( function( request,response ) { +// console.log(request); +// switch( request.url ) { +// case '/style.css': +// sendfile( response, 'style.css' ); +// case '/script.js': +// sendfile( response, 'script.js' ); +// case '/index.html': +// sendFile( response, 'index.html' ) +// break +// default: +// response.end( '404 Error: File Not Found' ) +// } +// }) + +// server.listen( process.env.PORT || port ) + +// const sendFile = function( response, filename ) { +// fs.readFile( filename, function( err, content ) { +// file = content +// response.end( content, 'utf-8' ) +// }) +// } + +const http = require('http'); +const fs = require('fs'); + +let index; +fs.readFile('index.html' , function (err, content) { + index = content; +}); + +http.createServer( function(request, response) { + + switch (request.url) { + case '/style.css': + let css; + fs.readFile('style.css' , function (err, content) { + css = content; + response.write(css, 'utf-8'); + }); + case '/script.js': + let js; + fs.readFile('script.js' , function (err, content) { + js = content; + response.end(js, 'utf-8'); + }); + break; + default: + response.write(index, 'utf-8'); + break; + } +}).listen(3000); \ No newline at end of file diff --git a/style.css b/style.css new file mode 100644 index 0000000..34846fb --- /dev/null +++ b/style.css @@ -0,0 +1,87 @@ + +body { + font-family: 'Roboto', sans-serif; + margin: 2em; + background: url("https://cdn.glitch.com/a0932599-8cec-49e9-8b52-8f59ed766e23%2Fmini.png?v=1599345336237") + no-repeat center center fixed; +} + +h1 { + font-style: italic; + text-align: center; + padding: 2%; + background-color: rgba(62, 112, 230, .90); +} + +li { + list-style-type: none; +} + +.grid { + display: grid; + grid-gap: 50px; + grid-auto-rows: auto; +} + +.grid > div { + text-align: center; + padding: 2%; + width: auto; +} + +.gridItem1a { + grid-row: 1; + grid-column: 1; + text-align: center; + background-color: rgba(191, 157, 245, 0.96) !important; + +} + +.gridItem2a { + grid-row: 2; + grid-column: 1; + text-align: center; + background-color: rgba(250, 236, 162, 0.98); + +} + +.gridItem1b { + grid-row: 1; + grid-column: 2; + text-align: center; + background-color: rgba(252, 168, 56, .99); + +} + +.gridItem2b { + grid-row: 2; + grid-column: 2; + text-align: center; + background-color: rgba(53, 238, 242, .95); + } + +.button1 { + background-color: rgba(250, 236, 162, 0.97); + padding: 15px 100px; + text-align: center; + transition-duration: 0.4s; + border: none; +} + +.button1:hover { + color: rgba(250, 236, 162, 0.75); + background-color: black; +} + +.button2 { + background-color: rgba(53, 238, 242, .95); + padding: 15px 100px; + text-align: center; + transition-duration: 0.4s; + border: none; +} + +.button2:hover { + color: rgba(53, 238, 242, .95); + background-color: black; +} \ No newline at end of file