Skip to content

a1-amalik3099 #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amalik3099 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

a1-amalik3099 #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d37b69
Made changes to index.html and readme.md to develop webpage
amalik3099 Sep 7, 2020
d0c86b8
made changes to readme.md to fix html tags not showing up
amalik3099 Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added A1_custom_colorwheel.JPG
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
129 changes: 32 additions & 97 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,102 +1,37 @@
Assignment 1 - Hello World: Basic Deployment w/ Git, GitHub, Glitch
===
Aditya Malik
http://a1-amalik3099.glitch.me

*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 is an introduction to HTML, CSS, JavaScript, Git, Github, and Glitch. It involves setting up a website and deploying it to Glitch.

## Technical Achievements
- **Styled page with CSS**: Added rules for the p, li, and a selectors...
- **Styled page with CSS**: Added style rules for the p, li, h1, h2, h3, li, div, table, and hr selectors. The style rules utilized are as follows:
- font-family
- color
- background-color
- font-weight
- letter-spacing
- font-size
- margin
- text-decoration
- width
- height
- border
- background-clip
- padding
- align-content
- border-collapse
- **Added a JavaScript Animation to the Website**: Added a JavaScript Animation to create an automatic image slideshow that shows different pictures of the WPI campus and Gompei. To look at how an example slideshow was created, I looked at a demo from w3schools.com. The link is as follows: https://www.w3schools.com/howto/howto_js_slideshow.asp
Once I looked at the slideshow on w3schools that used buttons that needed to be clicked to move to the next picture, I implemented an automatic slideshow so that the user does not have to click any buttons. There is also an image fading that is implemented so that the images transition smoothly.
- **Added different HTML Tags to the Website**:
- (div) I had to use two different instances of (div) in my webpage. Once to create a box around text, and once for the images in my slideshow. To differentiate between styling for two instances of (div) I used classes. These were class="personal-info" and class="slideshow-container". I created a box around text with with transparent borders. I used the link from Geeksforgeeks to learn how to create a box around text. I then created a transparent border around the text, followed by anoher colored border. These were customized to match the color theme of the page. I also had to adjust the width, margins, borders, and padding to fit the spacing of the page. Source : https://www.geeksforgeeks.org/create-a-transparent-border-with-css/#:~:text=Step%201%3A%20Create%20a%20div,the%20padding%20of%20the%20element.
- (img) added pictures of WPI along with figcaption
- (a) added link to LinkedIn profile
- (table) made table for technical background, with checkmarks to showcase selected option. Customized the table for my website by making the row and colomn headers to a specific font-style and color theme that matches the website. The checkmarks were are also a custom style and color. Source: link at: http://cssmenumaker.com/blog/stylish-css-tables-tutorial/
- (hr) Created a horizontal line between sections of the website to distinguish them.
- (marquee) Implemented scrolling text at the bottom of the webpage that covers the purpose of the website as a project for CS 4241. Source: https://www.html.am/html-codes/marquees/scrolling-text.cfm

### 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 elements in the body that did not have a specific font-style
- **Used the Source Sans pro Font from Google Fonts**: I used Source Sans pro for h1, h2, and the unordered lists li
- **Used the Montserrat Font from Google Fonts**: I used Montserrat for the primary text in the body (the <p> tags)
- **Created a color palette using color.adobe.com**: I created a custome color palette from color.abode.com that suited my color theme for the website- vibrant yet professional. I included a screenshot of the palette in the images folder in the directory. All the colors from the palette were implemented into the website to style the h1, h2, h3, p, div, hr, table, marquee.
227 changes: 219 additions & 8 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,237 @@
<head>
<title>CS4241 Assignment 1</title>
<meta charset="utf-8">
<style>
body {
font-family: 'Roboto', sans-serif;
color: #DFDCE3;
font-weight: 400;
letter-spacing: -.003em;
font-size: 14px;
margin: 2em;
background: #4ABDAC;
}

h1 {
font-family: 'Montserrat', sans-serif;
font-weight: 6000;
letter-spacing: -.003em;
font-size: 40px;
color: #FC4A1A
}

h2 {
font-family: 'Source Sans Pro', sans-serif;
font-weight: 1000;
letter-spacing: -.003em;
font-size: 26px;
color: #F7B733
}

h3 {
font-family: 'Source Sans Pro', sans-serif;
font-weight: 800;
letter-spacing: -.003em;
font-size: 18px;
text-decoration: underline;
color: rgba(0, 0, 0, .4);
}

p {
font-family: 'Montserrat', sans-serif;
font-weight: 100;
letter-spacing: -.003em;
font-size: 14px;
color: #DFDCE3;
}

li {
font-family: 'Source Sans Pro', sans-serif;
font-weight: 100;
letter-spacing: -.003em;
font-size: 14px;
color: #DFDCE3;
}

.personal-info {
width: 580px;
height: 140px;
border: 20px double rgba(0, 0, 0, .4);
background: rgba(0, 0, 0, .4);
background-clip: padding-box;
border-radius: 5px;
padding: 5px;
}

hr {
margin: 0em;
align-content: left;
width: auto;
background-color: #333;
}

table {
width: 630px;
border-collapse: collapse;
border-spacing: 0;
text-align: center;
color: #333
}

th, td {
border: 2.5px solid #CCC;
height: 25px;
}

th{
background: rgba(0, 0, 0, .4);
font-weight: bold;
color: #DFDCE3
}

td{
background: #DFDCE3;
}

.fading-slides {
display: none;
}

.slideshow-container {
max-width:800px;
position:relative;
margin:0px;
}

</style>

<link href="https://fonts.googleapis.com/css2?family=Roboto&family=Source+Sans+Pro:wght@500&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@600&display=swap" rel="stylesheet">
</head>
<body>
<h1>Information about [Your name here]</h1>
<h1>Information about Aditya Malik</h1>
<div class="personal-info">
<p>
[Self introduction]
Self introduction: I am a senior at WPI and am a member of the class of 2021
</p>
<p>
[Major and other information]
Major: Robotics Engineering
</p>
<p>
[Other things]
Minor: Computer Science
</p>
<p>
Previous Computer Science classes:
<a href="https://web.wpi.edu/academics/catalogs/ugrad/cscourses.html">CS 1101,</a>
<a href="https://web.wpi.edu/academics/catalogs/ugrad/cscourses.html">CS 2102,</a>
<a href="https://web.wpi.edu/academics/catalogs/ugrad/cscourses.html">CS 2303</a>
</p>
</div>
<br>

<div class="slideshow-container">
<!--images-->
<div class="slides">
<img src="https://www.wpi.edu/sites/default/files/2018/01/10/new%20gompei.jpg" width="630px" height="350px">
</div>
<div class="slides">
<img src="https://www.wpi.edu/sites/default/files/inline-image/News/Daily-Herd/DSC9378.jpg" width="630px" height="350px">
</div>
<div class="slides">
<img src="https://www.wpi.edu/sites/default/files/2018/08/28/MJB_6790_DIGITAL.jpg" width="630px" height="350px">
</div>
</div>
<br>
<hr>

<h2>Experience</h2>
<p>
<h3>
Experience with technology
</h3>

<table>
<tr>
<th></th>
<th scope="col">A lot</th>
<th scope="col">Some</th>
<th scope="col">None</th>
</tr>
<tr>
<th scope="row">HTML</th>
<td></td>
<td>&#10004</td>
<td></td>
</tr>
<tr>
<th scope="row">CSS</th>
<td></td>
<td>&#10004</td>
<td></td>
</tr>
<tr>
<th scope="row">Java</th>
<td></td>
<td>&#10004</td>
<td></td>
</tr>
<tr>
<th scope="row">JavaScript</th>
<td></td>
<td></td>
<td>&#10004</td>
</tr>
<tr>
<th scope="row">Ruby</th>
<td></td>
<td></td>
<td>&#10004</td>
</tr>
<tr>
<th scope="row">Python</th>
<td>&#10004</td>
<td></td>
<td></td>
</tr>
<tr>
<th scope="row">Unit Testing</th>
<td></td>
<td>&#10004</td>
<td></td>
</tr>
</table>

<h3>
Working experience
</p>
</h3>
<ul>
<li>IBM/Rational</li>
<li>WPI</li>
<li>Robotics Engineering Intern at DGWorld</li>
<li>Summer Research Intern at Smart Dubai</li>
<li>To find out more about my work experience, you can find my LinkedIn profile by clicking
<a href="https://www.linkedin.com/in/adityamalik3/">HERE</a>
</li>
</ul>
<br>
<marquee behavior='scroll' direction=right>
This website was created as a project for CS 4241 as an introduction to HTML, CSS, and JavaScript
</marquee>
</body>

<script>
var picIndex = 0;
rotateSlides();

function rotateSlides() {
var i;
var pics = document.getElementsByClassName("slides");
for (i = 0; i < pics.length; i++) {
pics[i].style.display = "none";
}
picIndex++;
if (picIndex > pics.length) {
picIndex = 1
}
pics[picIndex-1].style.display = "block";
setTimeout(rotateSlides, 2500); // Change image every 2.5 seconds
}
</script>
</html>
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "cr-4241-simple-glitch",
"version": "0.1.0",
"description": "WPI CS 4241 first assignment",
"author": "Charlie Roberts",
"author": "Aditya Malik",
"scripts": {
"start": "node server.js"
}
Expand Down