diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..be6eeba
Binary files /dev/null and b/.DS_Store differ
diff --git a/Assignment/.DS_Store b/Assignment/.DS_Store
new file mode 100644
index 0000000..bb583d8
Binary files /dev/null and b/Assignment/.DS_Store differ
diff --git a/Assignment/HW3-JS_ToDo_List/.DS_Store b/Assignment/HW3-JS_ToDo_List/.DS_Store
new file mode 100644
index 0000000..4efe5d5
Binary files /dev/null and b/Assignment/HW3-JS_ToDo_List/.DS_Store differ
diff --git a/Assignment/HW3-JS_ToDo_List/index.html b/Assignment/HW3-JS_ToDo_List/index.html
new file mode 100644
index 0000000..6a5a06d
--- /dev/null
+++ b/Assignment/HW3-JS_ToDo_List/index.html
@@ -0,0 +1,74 @@
+
+
+
+
+
+ Homework4 Javascript and jQuery
+
+
+
+
+
+
+
+
+
+
+
Your To-Do List
+
+
Are you taking a ton of ischool awesome classes ? Do you find yourself surrounded by projects which makes you forget some of your other important tasks ? Fret no more! You have your own personal task list.
+
+
Mention what task you need to do in the textbox below.
+
click "Add Item to list" button and your task will be automatically saved to to-do list.
+
If you have completed your task, you can hit the 'mark as complete' button and it will move automatically to 'completed task list'
+
You can move your task from completed task list to to-do list by clicking the 'mark as incomplete' button
+
simple ! right? Lets get started!
+
+
+
+
+
Enter task to be done below
+
+
+
+
+
+
+
+
Here is your To-Do List
+
+
+
+
+
+
+
Here is your Completed Task List
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assignment/HW3-JS_ToDo_List/main.js b/Assignment/HW3-JS_ToDo_List/main.js
new file mode 100644
index 0000000..fc3c1b6
--- /dev/null
+++ b/Assignment/HW3-JS_ToDo_List/main.js
@@ -0,0 +1,40 @@
+$(document).ready(function() {
+ $("#new-item").on('click', function() {
+ // once the document loads,
+ // create new item with this function
+ $("#header1").animate({marginLeft: "+=400px"});//animation for moving the header left to right
+ $("#header1").animate({marginLeft: "-=400px"});//animation for moving the header right to left
+ var todo_input = $("input").val();
+ $("#to-do").prepend('
'+" " +todo_input+ " " + '
');
+ $("#to-do").animate({fontSize: '2em'}, "slow");
+ $("#to-do").animate({fontSize: '1em'}, "slow");
+ });
+
+
+ $("#to-do").on('click', "button", function() {
+ // move from list_todo container to
+ // list_completed container
+ $("#header2").animate({marginLeft: "+=400px"});//animation for moving the header left to right
+ $("#header2").animate({marginLeft: "-=400px"});//animation for moving the header right to left
+ $(this).html("Unmark as Complete");
+ var completed = $(this).parent();
+ $("#completed").prepend(completed);
+ $("#completed").animate({fontSize: '2em'}, "slow");
+ $("#completed").animate({fontSize: '1em'}, "slow");
+
+ });
+
+ $("#list_completed").on('click', "button", function() {
+ // move back from list_completed container to
+ // list_todo container
+ $("#header2").animate({marginLeft: "+=400px"}); //animation for moving header2 from left to right
+ $("#header2").animate({marginLeft: "-=400px"});//animation for moving header2 from right to left
+ $("#header1").animate({marginLeft: "+=400px"});//animation for moving the header1 left to right
+ $("#header1").animate({marginLeft: "-=400px"});//animation for moving header2 from right to left
+ $(this).html("completed?");
+ var doAgain = $(this).parent();
+ $("#to-do").prepend(doAgain);
+
+ });
+});
+
diff --git a/Assignment/HW3-JS_ToDo_List/style.css b/Assignment/HW3-JS_ToDo_List/style.css
new file mode 100644
index 0000000..13b0202
--- /dev/null
+++ b/Assignment/HW3-JS_ToDo_List/style.css
@@ -0,0 +1,59 @@
+/* Add CSS */
+/*----------------- CSS RESET ------------------*/
+
+body{
+ background-image: url("https://ae01.alicdn.com/kf/HTB1gYMOIXXXXXX1XVXXq6xXFXXXu/12x8FT-font-b-Light-b-font-Brown-Orange-Wooden-Planks-font-b-Wood-b-font-font.jpg");
+ width: 980px;
+ margin: 20px 35px 50px;
+ font-size: 16px;
+ line-height: 1.7;
+}
+#instructions{
+ width : 90%;
+ background-image:url("http://www.dreamtemplate.com/dreamcodes/bg_images/color/c10.jpg");
+ font-style: italic;
+ font-color: pink;
+ color: white;
+ padding: 15px;
+
+}
+
+.todoImage{
+ float: left;
+}
+
+
+.completedImage{
+ float: left;
+}
+#to-do,
+#completed{
+ display: block;
+ margin-left: 50%;
+ margin-top: 15%;
+}
+
+
+h1,h2,h3 {
+ color: white;
+}
+
+#list_todo{
+ background-color: yellow;
+ width: 80%;
+ display: block;
+ margin-left: 50px;
+ font-family: helvetica;
+ font-color: blue;
+ display: inline-block;
+}
+
+#list_completed{
+ background-color: pink;
+ width: 80%;
+ display: block;
+ margin-left: 50px;
+ font-family: sans-serif;
+ color: green;
+ display: inline-block;
+}
\ No newline at end of file
diff --git a/Assignment/HW4_SoundCloud/.DS_Store b/Assignment/HW4_SoundCloud/.DS_Store
new file mode 100644
index 0000000..c396f22
Binary files /dev/null and b/Assignment/HW4_SoundCloud/.DS_Store differ
diff --git a/Assignment/HW4_SoundCloud/_css/.DS_Store b/Assignment/HW4_SoundCloud/_css/.DS_Store
new file mode 100644
index 0000000..93da8ce
Binary files /dev/null and b/Assignment/HW4_SoundCloud/_css/.DS_Store differ
diff --git a/Assignment/HW4_SoundCloud/_css/style.css b/Assignment/HW4_SoundCloud/_css/style.css
new file mode 100644
index 0000000..ae0bd46
--- /dev/null
+++ b/Assignment/HW4_SoundCloud/_css/style.css
@@ -0,0 +1,44 @@
+
+body{
+ background-image: url("http://pre10.deviantart.net/3046/th/pre/f/2010/320/d/1/website_background_by_modsoft-d3302jz.png");
+ color: white;
+ margin-left: 20px;
+}
+
+h2{
+ padding-top: 3%;
+ background-image: url("https://images.sharefaith.com/images/3/1335548756984_58/img_mouseover3.jpg");
+ height: 13%;
+ text-align: center;
+}
+.song {
+ display: flex;
+ margin-bottom: 3%;
+}
+
+article {
+ display: flex;
+ flex-direction: row;
+}
+
+
+li {
+ list-style: none;
+}
+
+
+.song-details {
+ margin-left: 3%;
+}
+
+#search-results, #playlist {
+ margin-top: 3%;
+}
+
+
+
+
+.h3style {
+ padding-left: 200px;
+}
+
diff --git a/Assignment/HW4_SoundCloud/_js/.DS_Store b/Assignment/HW4_SoundCloud/_js/.DS_Store
new file mode 100644
index 0000000..4074f24
Binary files /dev/null and b/Assignment/HW4_SoundCloud/_js/.DS_Store differ
diff --git a/Assignment/HW4_SoundCloud/_js/main.js b/Assignment/HW4_SoundCloud/_js/main.js
new file mode 100644
index 0000000..8f0a466
--- /dev/null
+++ b/Assignment/HW4_SoundCloud/_js/main.js
@@ -0,0 +1,64 @@
+/* jQuery code to run the music playlist*/
+
+$(document).on("click", ".playlist-add", function () {
+ var same = $(this).parent().parent().clone();
+ same.children(".song-details").children(".playlist-add").remove();
+ same.children(".song-details").append("");
+ $('#songsList').prepend(same);
+});
+
+
+$(document).ready(
+ $("#music").on("click", function() {
+ searchSongsAPI($("#find").val());
+ })
+);
+
+/* jQuery code to play music*/
+$(document).on("click", ".play", function () {
+ playSong($(this).attr('id'));
+});
+
+/* jQuery code for down button functionality*/
+$(document).on("click", ".down", function() {
+ searchedSong = $(this).parent().parent();
+ searchedSong.insertAfter(searchedSong.next());
+});
+
+/* jQuery code to search the music*/
+function searchSongsAPI(searchQuery) {
+ $("#results").children("#songResults").children().remove();
+ $.get("https://api.soundcloud.com/tracks?client_id=b3179c0738764e846066975c2571aebb",
+ {'q': searchQuery,
+ 'limit': '150'},
+ function(data) {
+ for (var i = 0; i < 18; i++) {
+ $("#songResults").append("
Browse through millions of songs here and create your own playlist!
+
Type whatever you want to search for in the searchbox below
+
Loved the song ? Add it to your Playlist and play it from there!
+
You can remove a song from playlist by clicking on remove song button or reorder the position of song in the playlist by clicking on the up and down buttons !
+
+
+
+
+
Your Searched Songs
+
+
+
Songs Playlist
+
+
+
+
+
\ No newline at end of file
diff --git a/Assignment/Homework_1 - HTML/.DS_Store b/Assignment/Homework_1 - HTML/.DS_Store
new file mode 100644
index 0000000..0558645
Binary files /dev/null and b/Assignment/Homework_1 - HTML/.DS_Store differ
diff --git a/Assignment/Homework_1 - HTML/.DS_Store.orig b/Assignment/Homework_1 - HTML/.DS_Store.orig
new file mode 100644
index 0000000..1be6b80
Binary files /dev/null and b/Assignment/Homework_1 - HTML/.DS_Store.orig differ
diff --git a/Assignment/Homework_1 - HTML/area.html b/Assignment/Homework_1 - HTML/area.html
new file mode 100644
index 0000000..301d879
--- /dev/null
+++ b/Assignment/Homework_1 - HTML/area.html
@@ -0,0 +1,28 @@
+
+
+
+
+Area
+
+
+
+
+
+
+
Pickachu can be seen napping in a bright sunlight. It has two red dots
+on its cheeks. By practicing html and css Pikachu can learn confusion.
+Pikachu likes to steal computer chargers from sleeping college students.
+
Pickachu can be seen napping in a bright sunlight. It has two red dots
+on its cheeks. By practicing html and css Pikachu can learn confusion.
+Pikachu likes to steal computer chargers from sleeping college students.
+
Pickachu can be seen napping in a bright sunlight. It has two red dots
+on its cheeks. By practicing html and css Pikachu can learn confusion.
+Pikachu likes to steal computer chargers from sleeping college students.
+
Pickachu can be seen napping in a bright sunlight. It has two red dots
+on its cheeks. By practicing html and css Pikachu can learn confusion.
+Pikachu likes to steal computer chargers from sleeping college students.
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/pokedex.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/pokedex.html
new file mode 100755
index 0000000..4429293
--- /dev/null
+++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/pokedex.html
@@ -0,0 +1,83 @@
+
+
+
+ Pokemon
+
+
+
+
+
+
+
+
+
+
+
+
Pokedex
+
+
+
+
+
+
+
+
No. 001 Pikachu
+
+
+
+
No. 001 Pikachu
+
+
+
+
+
- Electric type
- Gentle temperament
- Grasslands
+
+
+
+
+
+ - Electric type - Gentle temperament - Grasslands
+
+
+
+ Pickahu can be seen napping in a bright sunlight. It has two red dots on its cheeks. By practicing html and css Pikachu can learn confusion. Pikachu likes to steal computer chargers from sleeping college students.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Labs/.DS_Store b/Labs/.DS_Store
new file mode 100644
index 0000000..856bd0b
Binary files /dev/null and b/Labs/.DS_Store differ
diff --git a/Labs/Lab 4 - Responsive Design/.DS_Store b/Labs/Lab 4 - Responsive Design/.DS_Store
new file mode 100644
index 0000000..64513da
Binary files /dev/null and b/Labs/Lab 4 - Responsive Design/.DS_Store differ
diff --git a/Labs/Lab11-ORM/.DS_Store b/Labs/Lab11-ORM/.DS_Store
new file mode 100644
index 0000000..4d19572
Binary files /dev/null and b/Labs/Lab11-ORM/.DS_Store differ
diff --git a/Labs/Lab11-ORM/orm_tutorial.zip b/Labs/Lab11-ORM/orm_tutorial.zip
new file mode 100644
index 0000000..47b035c
Binary files /dev/null and b/Labs/Lab11-ORM/orm_tutorial.zip differ
diff --git a/Labs/Lab11-ORM/orm_tutorial/.DS_Store b/Labs/Lab11-ORM/orm_tutorial/.DS_Store
new file mode 100644
index 0000000..1b9fddf
Binary files /dev/null and b/Labs/Lab11-ORM/orm_tutorial/.DS_Store differ
diff --git a/Labs/Lab11-ORM/orm_tutorial/__pycache__/config.cpython-35.pyc b/Labs/Lab11-ORM/orm_tutorial/__pycache__/config.cpython-35.pyc
new file mode 100644
index 0000000..4ffbf4e
Binary files /dev/null and b/Labs/Lab11-ORM/orm_tutorial/__pycache__/config.cpython-35.pyc differ
diff --git a/Labs/Lab11-ORM/orm_tutorial/app.db b/Labs/Lab11-ORM/orm_tutorial/app.db
new file mode 100755
index 0000000..913aa35
Binary files /dev/null and b/Labs/Lab11-ORM/orm_tutorial/app.db differ
diff --git a/Labs/Lab11-ORM/orm_tutorial/app/.DS_Store b/Labs/Lab11-ORM/orm_tutorial/app/.DS_Store
new file mode 100644
index 0000000..934c25e
Binary files /dev/null and b/Labs/Lab11-ORM/orm_tutorial/app/.DS_Store differ
diff --git a/Labs/Lab11-ORM/orm_tutorial/app/__init__.py b/Labs/Lab11-ORM/orm_tutorial/app/__init__.py
new file mode 100755
index 0000000..353d3af
--- /dev/null
+++ b/Labs/Lab11-ORM/orm_tutorial/app/__init__.py
@@ -0,0 +1,8 @@
+from flask import Flask
+from flask.ext.sqlalchemy import SQLAlchemy
+
+app = Flask(__name__)
+app.config.from_object('config')
+db = SQLAlchemy(app)
+
+from app import views, models
diff --git a/Labs/Lab11-ORM/orm_tutorial/app/__init__.pyc b/Labs/Lab11-ORM/orm_tutorial/app/__init__.pyc
new file mode 100644
index 0000000..7773f19
Binary files /dev/null and b/Labs/Lab11-ORM/orm_tutorial/app/__init__.pyc differ
diff --git a/Labs/Lab11-ORM/orm_tutorial/app/__pycache__/__init__.cpython-35.pyc b/Labs/Lab11-ORM/orm_tutorial/app/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..d75b31c
Binary files /dev/null and b/Labs/Lab11-ORM/orm_tutorial/app/__pycache__/__init__.cpython-35.pyc differ
diff --git a/Labs/Lab11-ORM/orm_tutorial/app/forms.py b/Labs/Lab11-ORM/orm_tutorial/app/forms.py
new file mode 100755
index 0000000..5724699
--- /dev/null
+++ b/Labs/Lab11-ORM/orm_tutorial/app/forms.py
@@ -0,0 +1,9 @@
+from flask.ext.wtf import Form
+from wtforms import StringField, IntegerField
+from flask_wtf.html5 import EmailField
+from wtforms.validators import DataRequired
+
+class CustomerForm(Form):
+ company = StringField('company', validators=[DataRequired()])
+ email = EmailField('email', validators=[DataRequired()])
+ # Add additional Address fields here
diff --git a/Labs/Lab11-ORM/orm_tutorial/app/forms.pyc b/Labs/Lab11-ORM/orm_tutorial/app/forms.pyc
new file mode 100644
index 0000000..669b7b7
Binary files /dev/null and b/Labs/Lab11-ORM/orm_tutorial/app/forms.pyc differ
diff --git a/Labs/Lab11-ORM/orm_tutorial/app/models.py b/Labs/Lab11-ORM/orm_tutorial/app/models.py
new file mode 100755
index 0000000..6f412c9
--- /dev/null
+++ b/Labs/Lab11-ORM/orm_tutorial/app/models.py
@@ -0,0 +1,10 @@
+from app import db
+
+# Your Customer Database code should go here
+class Customer(db.Model):
+ id = db.Column(db.Integer, primary_key = TRUE)
+ company = db.Column(db.String (120), unique = False)
+ email = db.Column(db.String(120))
+
+ def_repr_(self):
+ return '' %self.id
diff --git a/Labs/Lab11-ORM/orm_tutorial/app/models.pyc b/Labs/Lab11-ORM/orm_tutorial/app/models.pyc
new file mode 100644
index 0000000..0aae0da
Binary files /dev/null and b/Labs/Lab11-ORM/orm_tutorial/app/models.pyc differ
diff --git a/Labs/Lab11-ORM/orm_tutorial/app/templates/.DS_Store b/Labs/Lab11-ORM/orm_tutorial/app/templates/.DS_Store
new file mode 100644
index 0000000..9039013
Binary files /dev/null and b/Labs/Lab11-ORM/orm_tutorial/app/templates/.DS_Store differ
diff --git a/Labs/Lab11-ORM/orm_tutorial/app/templates/base.html b/Labs/Lab11-ORM/orm_tutorial/app/templates/base.html
new file mode 100755
index 0000000..db51f24
--- /dev/null
+++ b/Labs/Lab11-ORM/orm_tutorial/app/templates/base.html
@@ -0,0 +1,14 @@
+
+
+ {% if title %}
+ {{ title }} - ACME
+ {% else %}
+ Welcome to ACME Aircraft Parts
+ {% endif %}
+
+
+
+
+ {% block content %}{% endblock %}
+
+
diff --git a/Labs/Lab11-ORM/orm_tutorial/app/templates/customer.html b/Labs/Lab11-ORM/orm_tutorial/app/templates/customer.html
new file mode 100755
index 0000000..d7b457a
--- /dev/null
+++ b/Labs/Lab11-ORM/orm_tutorial/app/templates/customer.html
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+{% block content %}
+
+{% endblock %}
diff --git a/Labs/Lab11-ORM/orm_tutorial/app/views.py b/Labs/Lab11-ORM/orm_tutorial/app/views.py
new file mode 100755
index 0000000..a189a0a
--- /dev/null
+++ b/Labs/Lab11-ORM/orm_tutorial/app/views.py
@@ -0,0 +1,27 @@
+from flask import render_template, redirect, request
+from app import app, models, db
+from .forms import CustomerForm
+
+
+@app.route('/')
+def index():
+ return redirect('/create_customer')
+
+@app.route('/create_customer', methods=['GET', 'POST'])
+def create_customer():
+ form = CustomerForm()
+ if form.validate_on_submit():
+ customer = models.Customer (
+ Company = form.company.data,
+ email = form.email.data)
+ db.session.add(customer)
+ db.session.commit()
+ return redirect('/customers')
+ return render_template('customer.html', form=form)
+
+@app.route('/customers')
+def display_customer():
+ #Fetch customer data from database
+ customers = models.Customer.query.all()
+ return render_template('home.html',
+ customers=customers)
diff --git a/Labs/Lab11-ORM/orm_tutorial/app/views.pyc b/Labs/Lab11-ORM/orm_tutorial/app/views.pyc
new file mode 100644
index 0000000..e27a6bd
Binary files /dev/null and b/Labs/Lab11-ORM/orm_tutorial/app/views.pyc differ
diff --git a/Labs/Lab11-ORM/orm_tutorial/config.py b/Labs/Lab11-ORM/orm_tutorial/config.py
new file mode 100755
index 0000000..a995426
--- /dev/null
+++ b/Labs/Lab11-ORM/orm_tutorial/config.py
@@ -0,0 +1,8 @@
+import os
+basedir = os.path.abspath(os.path.dirname(__file__))
+
+SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(basedir, 'app.db')
+SQLALCHEMY_MIGRATE_REPO = os.path.join(basedir, 'db_repository')
+
+WTF_CSRF_ENABLED = True
+SECRET_KEY = 'you-will-never-guess'
diff --git a/Labs/Lab11-ORM/orm_tutorial/config.pyc b/Labs/Lab11-ORM/orm_tutorial/config.pyc
new file mode 100644
index 0000000..59af7fd
Binary files /dev/null and b/Labs/Lab11-ORM/orm_tutorial/config.pyc differ
diff --git a/Labs/Lab11-ORM/orm_tutorial/readme.md b/Labs/Lab11-ORM/orm_tutorial/readme.md
new file mode 100755
index 0000000..f5a8d70
--- /dev/null
+++ b/Labs/Lab11-ORM/orm_tutorial/readme.md
@@ -0,0 +1,21 @@
+# Models Lab/Homework
+The goal for this lab is to get you comfortable translating your database models into actual code. We will be using [ORMs](https://en.wikipedia.org/wiki/Object-relational_mapping) to help us. The particular ORM that we will be using is SQLAlchemy (the flask implementation is called [Flask-SQLAlchemy](http://flask-sqlalchemy.pocoo.org/2.1/)).
+
+We'll walk through the example together in class which will give you an idea of how this all works together. Your goal for this lab and homework is to create the remaining models, forms, and routes to complete v2 of the exercise from last week.
+
+This means that you must:
+* Create the following tables and the appropriate relationships:
+ * customer
+ * address
+ * order
+ * Remember to run update_database.py whenever you make changes to any models.
+ * This will update the database with your changes. However, **it will delete any data in the database**.
+* Create the forms, templates, routes, etc necessary to input this data into the database.
+* Create a view to showcase the data into your database (see the current implementation of "home.html" for example)
+
+The following documentation will help answer any questions you may have.
+
+## Helpful Documentation
+- [Flask-SQLAlchemy](http://flask-sqlalchemy.pocoo.org/2.1/)
+- [Accessing SQLite3 Command Shell](https://www.sqlite.org/cli.html)
+- [Flask-WTF](https://flask-wtf.readthedocs.org/en/latest/) (flask plugin for creating forms easily)
diff --git a/Labs/Lab11-ORM/orm_tutorial/requirements.txt b/Labs/Lab11-ORM/orm_tutorial/requirements.txt
new file mode 100755
index 0000000..bfbaf81
--- /dev/null
+++ b/Labs/Lab11-ORM/orm_tutorial/requirements.txt
@@ -0,0 +1,10 @@
+Flask==0.10.1
+Flask-SQLAlchemy==2.1
+Flask-WTF==0.12
+itsdangerous==0.24
+Jinja2==2.8
+MarkupSafe==0.23
+SQLAlchemy==1.0.12
+Werkzeug==0.11.4
+wheel==0.29.0
+WTForms==2.1
diff --git a/Labs/Lab11-ORM/orm_tutorial/run.py b/Labs/Lab11-ORM/orm_tutorial/run.py
new file mode 100755
index 0000000..5d2f714
--- /dev/null
+++ b/Labs/Lab11-ORM/orm_tutorial/run.py
@@ -0,0 +1,2 @@
+from app import app
+app.run(debug=True, host="0.0.0.0", port=8081)
diff --git a/Labs/Lab11-ORM/orm_tutorial/update_database.py b/Labs/Lab11-ORM/orm_tutorial/update_database.py
new file mode 100755
index 0000000..b15e4da
--- /dev/null
+++ b/Labs/Lab11-ORM/orm_tutorial/update_database.py
@@ -0,0 +1,3 @@
+from app import db
+db.drop_all()
+db.create_all()
diff --git a/Labs/Lab3 - CSS/.DS_Store b/Labs/Lab3 - CSS/.DS_Store
new file mode 100644
index 0000000..31d5498
Binary files /dev/null and b/Labs/Lab3 - CSS/.DS_Store differ
diff --git a/Labs/Lab3 - CSS/CSS-in-class-grid-layout.html b/Labs/Lab3 - CSS/CSS-in-class-grid-layout.html
index 4d70768..9184332 100644
--- a/Labs/Lab3 - CSS/CSS-in-class-grid-layout.html
+++ b/Labs/Lab3 - CSS/CSS-in-class-grid-layout.html
@@ -4,7 +4,7 @@
Felines in a Grid
-
+
diff --git a/Labs/Lab3 - CSS/style-pooja.css b/Labs/Lab3 - CSS/style-pooja.css
new file mode 100644
index 0000000..f8cd7ea
--- /dev/null
+++ b/Labs/Lab3 - CSS/style-pooja.css
@@ -0,0 +1,161 @@
+/*----------------- CSS RESET ------------------*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+ display: block;
+}
+body {
+ line-height: 1;
+}
+ol, ul {
+ list-style: none;
+}
+blockquote, q {
+ quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+ content: '';
+ content: none;
+}
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+
+/*----------------- CSS RESET ------------------*/
+
+body {
+ font-size: 18px;
+ background-color: yellow;
+}
+
+header, footer {
+ width: 100%;
+ background: blue;
+ color: #ffffff;
+ box-sizing: border-box;
+ height: 50px;
+ line-height: 50px;
+ text-align: center;
+}
+
+header {
+ display: inline-block;
+ position: fixed;
+}
+
+footer {
+/* float: left;*/
+ margin-top: 2em;
+ clear: both;
+}
+
+nav {
+ width: 50%;
+ margin-left: 25%;
+}
+
+img {
+ max-width: 100%;
+ max-height: 100%;
+ border: 1px solid #adadad;
+}
+
+h2 {
+ font-size: 1.5em;
+
+}
+
+h3 {
+ font-size: 1.33em;
+ font-weight: bold;
+ padding: 20px;
+}
+
+a {
+ text-decoration: none;
+}
+
+#site-title {
+ float: left;
+ width: 25%;
+ text-align: center;
+}
+
+.nav-button {
+ color: #ffffff;
+ display: inline-block;
+ background: none;
+ height: 100%;
+ width: 150px;
+ border-left: 1px solid #ffffff;
+ border-right: 1px solid #ffffff;
+ margin-left: -5px;
+}
+
+.nav-button:hover {
+ background: #80b3ff;
+}
+
+a.nav-button:visited {
+ color: #ffffff;
+}
+
+
+/*START HERE*/
+
+.other-news-container {
+ float: left;
+ width : 25%;
+ display: inline-block;
+
+}
+
+.main-container {
+ float:left;
+ width: 75%;
+ display: inline-block;
+
+}
+
+.ib-grid-item {
+ display:inline-block;
+ width:33%;
+ margin-bottom: 5%;
+
+}
+
+.ib-grid-item img {
+ max-width: 66.67%;
+ max-height: 66.67%;
+
+}
+
+.other-news-item {
+ box-sizing: border-box;
+ padding: 0 10%;
+ margin:10%;
+
+}
diff --git a/Labs/Lab_5-Javascript_Basics/.DS_Store b/Labs/Lab_5-Javascript_Basics/.DS_Store
new file mode 100644
index 0000000..effcae1
Binary files /dev/null and b/Labs/Lab_5-Javascript_Basics/.DS_Store differ
diff --git a/Labs/lab9-flask/.DS_Store b/Labs/lab9-flask/.DS_Store
new file mode 100644
index 0000000..81a7478
Binary files /dev/null and b/Labs/lab9-flask/.DS_Store differ
diff --git a/Labs/lab9-flask/flaskLab2/.DS_Store b/Labs/lab9-flask/flaskLab2/.DS_Store
new file mode 100644
index 0000000..2542513
Binary files /dev/null and b/Labs/lab9-flask/flaskLab2/.DS_Store differ
diff --git a/Labs/lab9-flask/flaskLab2/.spyderworkspace b/Labs/lab9-flask/flaskLab2/.spyderworkspace
new file mode 100755
index 0000000..be24de3
Binary files /dev/null and b/Labs/lab9-flask/flaskLab2/.spyderworkspace differ
diff --git a/Labs/lab9-flask/flaskLab2/app/.DS_Store b/Labs/lab9-flask/flaskLab2/app/.DS_Store
new file mode 100644
index 0000000..98bf931
Binary files /dev/null and b/Labs/lab9-flask/flaskLab2/app/.DS_Store differ
diff --git a/Labs/lab9-flask/flaskLab2/app/__init__.py b/Labs/lab9-flask/flaskLab2/app/__init__.py
new file mode 100755
index 0000000..9a4e940
--- /dev/null
+++ b/Labs/lab9-flask/flaskLab2/app/__init__.py
@@ -0,0 +1,4 @@
+from flask import Flask
+
+myapp = Flask(__name__)
+from app import views
diff --git a/Labs/lab9-flask/flaskLab2/app/__init__.pyc b/Labs/lab9-flask/flaskLab2/app/__init__.pyc
new file mode 100755
index 0000000..4d4e5ad
Binary files /dev/null and b/Labs/lab9-flask/flaskLab2/app/__init__.pyc differ
diff --git a/Labs/lab9-flask/flaskLab2/app/__pycache__/.DS_Store b/Labs/lab9-flask/flaskLab2/app/__pycache__/.DS_Store
new file mode 100644
index 0000000..43d109d
Binary files /dev/null and b/Labs/lab9-flask/flaskLab2/app/__pycache__/.DS_Store differ
diff --git a/Labs/lab9-flask/flaskLab2/app/__pycache__/__init__.cpython-35.pyc b/Labs/lab9-flask/flaskLab2/app/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..1ea5aaa
Binary files /dev/null and b/Labs/lab9-flask/flaskLab2/app/__pycache__/__init__.cpython-35.pyc differ
diff --git a/Labs/lab9-flask/flaskLab2/app/__pycache__/views.cpython-35.pyc b/Labs/lab9-flask/flaskLab2/app/__pycache__/views.cpython-35.pyc
new file mode 100644
index 0000000..ad94e7d
Binary files /dev/null and b/Labs/lab9-flask/flaskLab2/app/__pycache__/views.cpython-35.pyc differ
diff --git a/Labs/lab9-flask/flaskLab2/app/static/.DS_Store b/Labs/lab9-flask/flaskLab2/app/static/.DS_Store
new file mode 100644
index 0000000..0e9d903
Binary files /dev/null and b/Labs/lab9-flask/flaskLab2/app/static/.DS_Store differ
diff --git a/Labs/lab9-flask/flaskLab2/app/static/interactions.js b/Labs/lab9-flask/flaskLab2/app/static/interactions.js
new file mode 100755
index 0000000..789a45e
--- /dev/null
+++ b/Labs/lab9-flask/flaskLab2/app/static/interactions.js
@@ -0,0 +1,53 @@
+// $('#submit-survey').on('click', function submitSurvey() {
+// var color = $("input[name=color]").val();
+// var food = $("input[name=food]").val();
+// var vacation = $("input[name=vacation]").val();
+// var feBefore = $("input[name=front-end-before]").val();
+// var feAfter = $("input[name=front-end-after]").val();
+
+ //ajax code to send data, but use form as its much
+
+//check if field is empty
+
+
+$('#submit-survey').on('click', function submitSurvey() {
+ var course = $("input[name=course]").val();
+ var movie = $("input[name=movie]").val();
+ var vacation = $("input[name=vacation]").val();
+ var feBefore = $("input[name=front-end-before]").val();
+ var feAfter = $("input[name=front-end-after]").val();
+ $.post("submit-survey",
+ {
+ course: course,
+ movie: movie,
+ vacation: vacation,
+ feBefore: feBefore,
+ feAfter: feAfter},
+ function(data) {
+ $("html").html(data);
+ }
+ )
+});
+
+
+$("#results-email-container").on('click', '#email-results-button', function emailResults() {
+ console.log($(this));
+});
+
+$("#site-title-wrapper").on('click', function goHome() {
+ window.location.href = '/';
+});
+
+$(document).ready(function applySliderLabels() {
+ var currentValue = $("#fe-before").val();
+ $("#fe-before").next().html(currentValue);
+
+ currentValue = $("#fe-after").val();
+ $("#fe-after").next().html(currentValue);
+});
+
+
+$("input[type='range']").on('change', function updateLabel() {
+ var currentValue = $(this).val();
+ $(this).next().html(currentValue);
+});
\ No newline at end of file
diff --git a/Labs/lab9-flask/flaskLab2/app/static/main.css b/Labs/lab9-flask/flaskLab2/app/static/main.css
new file mode 100755
index 0000000..92c4669
--- /dev/null
+++ b/Labs/lab9-flask/flaskLab2/app/static/main.css
@@ -0,0 +1,226 @@
+/*----------------- CSS RESET ------------------*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+ display: block;
+}
+body {
+ line-height: 1;
+}
+ol, ul {
+ list-style: none;
+}
+blockquote, q {
+ quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+ content: '';
+ content: none;
+}
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+
+/*----------------- CSS RESET ------------------*/
+
+html, body {
+ background-color: blue;
+ font-family: 'Open Sans', sans-serif;
+ font-size: 16px;
+
+}
+
+header {
+ background-color: #1abc9c;
+ box-shadow: 0 2px 6px 1px #a7a7a7;
+ color: #ecf0f1;
+ height: 5rem;
+}
+
+footer {
+ background-color: #16a085;
+ bottom: 0;
+ color: #ecf0f1;
+ height: 7rem;
+ margin-top: 2em;
+ text-align: center;
+ width: 100%;
+}
+
+footer p {
+ height: 7rem;
+ line-height: 7rem;
+}
+
+h1, h3 {
+ padding: 4px;
+}
+
+h1 {
+ font-size: 2rem;
+ font-weight: bold;
+}
+
+h3 {
+ font-size: 1.4rem;
+}
+
+a {
+ text-decoration: none;
+}
+
+input[type="text"], input[type="range"] {
+ border: 1px solid #bdc3c7;
+ border-radius: 2px;
+ margin-left: 1rem;
+ vertical-align: middle;
+}
+
+input[type=range]{
+ -webkit-appearance: none;
+}
+
+input[type=range]::-webkit-slider-thumb {
+ -webkit-appearance: none;
+ border: none;
+ height: 1.2rem;
+ width: 1.2rem;
+ border-radius: 50%;
+ background: #1abc9c;
+ margin-top: -.5rem;
+}
+
+input[type=range]::-webkit-slider-runnable-track {
+ background: #ccc;
+ height: .2rem;
+}
+
+.action-button {
+ background-color: #1abc9c;
+ border: none;
+ border-bottom: 3px solid #16a085;
+ border-radius: 2px;
+ color: #ecf0f1;
+ display: inline-block;
+ font-size: 1rem;
+ font-weight: bold;
+ height: 3rem;
+ padding: 4px;
+ width: 6rem;
+}
+
+.action-button:hover {
+ background-color: #16a085;
+}
+
+#site-title-wrapper {
+ display: inline-block;
+ height: 5rem;
+ width: 15%;
+}
+
+#site-icon-wrapper {
+ display: inline-block;
+ margin-left: 1rem;
+ margin-top: -.5rem;
+ vertical-align: middle;
+ width: 2.5rem;
+}
+
+#site-icon-wrapper img {
+ display: inline-block;
+ max-height: 100%;
+ max-width: 100%
+}
+
+#site-title {
+ display: inline-block;
+ font-weight: bold;
+ height: 5rem;
+ line-height: 5rem;
+ margin-left: .1rem;
+}
+
+#username {
+ margin-right: .7rem;
+}
+
+#logout {
+ float: right;
+ height: inherit;
+ line-height: 5rem;
+ margin-right: 1rem;
+}
+
+#logout-button {
+ background-color: #ecf0f1;
+ border-bottom-color: #bdc3c7;
+ color: #222222;
+ height: 2.5rem;
+ width: 5rem;
+}
+
+#logout-button:hover {
+ background-color: #bdc3c7;
+}
+
+#content {
+ margin-top: 2rem;
+ text-align: center;
+ width: 100%;
+}
+
+.main-container {
+ background: #ecf0f1;
+ border-radius: 4px;
+ box-shadow: 0px 2px 10px 2px #95a5a6;
+ display: block;
+ min-height: 50vh;
+ margin: 2rem 0 0 25%;
+ padding: 1rem;
+ text-align: left;
+ width: 50%;
+}
+
+.survey-item, .result-item, #results-email-container {
+ box-sizing: border-box;
+ display: block;
+ margin: 1.5rem 0;
+ padding: 4px;
+}
+
+.survey-item span {
+ font-size: 1rem;
+ margin-left: 1rem;
+}
+
+#email-results-button, #goHome {
+ height: 2rem;
+ line-height: 2rem;
+ margin-left: 1rem;
+ text-align: center;
+}
+
diff --git a/Labs/lab9-flask/flaskLab2/app/templates/.DS_Store b/Labs/lab9-flask/flaskLab2/app/templates/.DS_Store
new file mode 100644
index 0000000..18a6388
Binary files /dev/null and b/Labs/lab9-flask/flaskLab2/app/templates/.DS_Store differ
diff --git a/Labs/lab9-flask/flaskLab2/app/templates/base.html b/Labs/lab9-flask/flaskLab2/app/templates/base.html
new file mode 100755
index 0000000..eb802bc
--- /dev/null
+++ b/Labs/lab9-flask/flaskLab2/app/templates/base.html
@@ -0,0 +1,33 @@
+
+
+
+
+
+ {% block title %}{% endblock %} - Ape Ask
+
+
+
+ {% block styles %}{% endblock %}
+
+
+
+
+
+ {% block header %}
+
+
+
+
+
Ape Ask
+
+ {% endblock %}
+
+
{% block content %}{% endblock %}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Labs/lab9-flask/flaskLab2/app/templates/login.html b/Labs/lab9-flask/flaskLab2/app/templates/login.html
new file mode 100755
index 0000000..cbd8956
--- /dev/null
+++ b/Labs/lab9-flask/flaskLab2/app/templates/login.html
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+{%block title %}
+ Login
+{% endblock %}
+
+{% block content %}
+
+
Hi There! Welcome to Ape Ask, the leading online survey site.
+
+
Let's get you logged in
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/Labs/lab9-flask/flaskLab2/app/templates/not_authorized.html b/Labs/lab9-flask/flaskLab2/app/templates/not_authorized.html
new file mode 100755
index 0000000..99a0c25
--- /dev/null
+++ b/Labs/lab9-flask/flaskLab2/app/templates/not_authorized.html
@@ -0,0 +1,13 @@
+
+
+
+
+ Oops!
+
+
+
Uh Oh! You're not authorized
+
+
+ Take me back home, already!
+
+
\ No newline at end of file
diff --git a/Labs/lab9-flask/flaskLab2/app/templates/page_not_found.html b/Labs/lab9-flask/flaskLab2/app/templates/page_not_found.html
new file mode 100755
index 0000000..dadcc99
--- /dev/null
+++ b/Labs/lab9-flask/flaskLab2/app/templates/page_not_found.html
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+
+{% block title %}
+ Oops!
+{% endblock %}
+
+{% block content %}
+
Oh, Pooh Bear! You're stuck because we don't have that page for you.
+
+
+ Go back!
+{% endblock %}
\ No newline at end of file
diff --git a/Labs/lab9-flask/flaskLab2/app/templates/results.html b/Labs/lab9-flask/flaskLab2/app/templates/results.html
new file mode 100755
index 0000000..76b49d2
--- /dev/null
+++ b/Labs/lab9-flask/flaskLab2/app/templates/results.html
@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+
+{% block title %}
+ Survey
+{% endblock %}
+
+{% block header %}
+ {{ super() }}
+
+{% endblock %}
+
+{% block content %}
+
Great news - your results are in! Check it out...
+
+
Here are some of your favorite things
+
+ Your favorite course is {{ surveyResponse['course']}}
+ Your favorite movie is {{ surveyResponse['movie']}}
+ Your favorite vacation spot is {{ surveyResponse['vacation']}}
+
+
Wow! Your front end skillz are getting sharp!
+ Before IO Lab, your front end skillz were at a {{ surveyResponse['fe-before']}}
+ But in just a few short weeks of IO Lab, your front end skillz are now a {{ surveyResponse['fe-after']}}
+
+
+ Want your survey results emailed to you?
+ Yes!
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/Labs/lab9-flask/flaskLab2/app/templates/survey.html b/Labs/lab9-flask/flaskLab2/app/templates/survey.html
new file mode 100755
index 0000000..ff2a917
--- /dev/null
+++ b/Labs/lab9-flask/flaskLab2/app/templates/survey.html
@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+
+{% block title %}
+ Survey
+{% endblock %}
+
+
+{% block header %}
+{{super()}}
+
+
+{% endblock %}
+
+{% block content %}
+
+
+ 
+ 
+
+
+
+
+
+
+>>>>>>> 52030fe02dc2a727f56f399dfdf279600f90f917
+
+
+
+
+
+ 
+ 
+