Skip to content
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

Jump to bottom

Lab 9 branch - sgvolkov #198

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

Lab 9 branch - sgvolkov #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1107785
"updating my files for hw 2"
sgvolkov Sep 13, 2016
2767359
hw updating 2
sgvolkov Sep 13, 2016
02ebccf
hate
sgvolkov Sep 14, 2016
77b911d
"updating my files for hw 2"
sgvolkov Sep 13, 2016
2024306
hw updating 2
sgvolkov Sep 13, 2016
1909243
hate
sgvolkov Sep 14, 2016
1860a6c
Merge branch 'master' of github.com:sgvolkov/IOLab-1
sgvolkov Sep 15, 2016
e69ebe6
HW3
sgvolkov Sep 22, 2016
0caa424
Merge remote-tracking branch 'upstream/master'
sgvolkov Sep 23, 2016
1553445
Flask Lab
sgvolkov Oct 6, 2016
c88658e
trying again, flask lab
sgvolkov Oct 6, 2016
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 modified Assignment/HW3-JS_ToDo_List/HW3 - JavaScript & jQuery.docx
View file
Open in desktop
Binary file not shown.
20 changes: 20 additions & 0 deletions Assignment/HW3-JS_ToDo_List/_css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,21 @@
/* Add CSS */
#to-do{
color: #39CCCC; /* Playing with fun colors for the two list headers*/
}

#complete{
color: #85144b;
}

#in_progress{
color: #3D9970;
}

/* Adding nice fonts to the headers and instructive text*/
h1, h2{
font-family: Rockwell, "Courier Bold", Courier, Georgia, Times, "Times New Roman", serif;
}
p{
font-family: Didot, "Didot LT STD", "Hoefler Text", Garamond, "Times New Roman", serif;
}

24 changes: 24 additions & 0 deletions Assignment/HW3-JS_ToDo_List/_js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,37 @@
$(document).ready(
$("#new-item").on('click', function() {
// once the document loads, create new item with this function
var user_input = $('#todo-item-input').val();
$('#list_todo').prepend("<li><button> Move me! </button>" + user_input + "</li>");
})
);

//$("#new-list").on('click', function() {
// once the document loads, create new item with this function
//$('.ul_list').append($('<ol>',{
//text: $('#input-new-list').val()
//}));
//});


$("#list_todo").on('click', "button", function() {
// move from list_todo container to list_completed container
($(this).html("Add To Complete List"));
var workingItem = $(this).parent();
$("#working_todo").prepend(workingItem).css("color", "#B10DC9"); //changing the color of a completed item
});


$("#working_todo").on('click', "button", function() {
// move from list_todo container to list_completed container
($(this).html("Add To In Progress List"));
var completedItem = $(this).parent();
$("#list_completed").prepend(completedItem).css("color", "#0074D9"); //changing the color of a completed item
});

$("#list_completed").on('click', "button", function() {
// move back from list_completed container to list_todo container
($(this).html("Add To In Progress List"));
var incompleteItem = $(this).parent();
$("#working_todo").prepend(incompleteItem);
});
20 changes: 16 additions & 4 deletions Assignment/HW3-JS_ToDo_List/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,30 @@

<title> Homework4 Javascript and jQuery </title>
<link rel="stylesheet" href="_css/style.css">
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>

</head>
<body>
<!-- adding a title and instructive text -->
<header>
<h1 id="site-title">Sasha's Super To-Do List!</h1>
<p>To use this site, type a to-do into the box below and hit 'click me' to move it into your to-do list. <br>Once complete, hit "move me!" to move it into the completed list. <br>Moved it too soon? Hit 'Add To To-Do List!' to put it back in the to-do list.</p>
<!-- create input tag for user input -->
<input>

<!-- button takes input and adds a new element with content to 'list_do' -->
<button id="new-item"> </button>

<input id="todo-item-input">
<!-- button takes input and adds a new element with content to 'list_do' -->
<button id="new-item">Add a to-do!</button>
<!--<h4> OR</h4>
<ul class="ul_list"></ul>
<input id="input-new-list">
<button id="new-list">Create a new List!</button>-->

<!-- ability to move items between list_todo and list_completed -->
<h2 id="to-do"> To Do List</h2>
<div id="list_todo"> </div>
<h2 id="in_progress"> In Progress List</h2>
<div id="working_todo"> </div>
<h2 id="complete">Completed List</h2>
<div id="list_completed"> </div>

<script type="text/javascript" src="_js/main.js"> </script>
Expand Down
69 changes: 69 additions & 0 deletions Assignment/Homework_1 - HTML/Sasha-Pokedex.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<!DOCTYPE html>

<html>
<head>
<meta charset="UTF-8">
<link rel="stylesheet" type="text/css" href="main.css">
<link rel="stylesheet" type="text/css" media="(max-width: 500px)" href="small.css">
<link rel="stylesheet" type="text/css" media="(min-width: 501px) and (max-width: 700px)" href="medium.css">
<a id="top"></a>
<title>Pokedex</title>
</head>

<body>
<header>
<button><a href="#footer">FOOTER</a></button>
<h2 id="site-title">Pokedex</h2>
<nav id="navigation">
<a id="pokeball"><a/>
<img src="assets/icons/pokeball_icon.png" alt="Pokeball">
</nav>
</header>

<article>
<section>
<div class="No-25-Pikachu">
<a id="Pikachu"></a>
<h3><span style="color:blue">No. 025 Pikachu</span></h3>
<div class="No-25-Pikachu">
<ol>
<li>Electric type</li>
<li>Gentle temperment</li>
<li>Grasslands</li>
</ol>
</div>
<img src="assets/images/pickahu.png" alt="Pikachu" style="width:304px;height:228px;">
</section>

<div class="Content-Box">
<!--<div class="Content-Box">-->
<a id="Read-about-Pikachu"></a>
<div style="align:center; margin-right: 300px; margin-left: 300px; border: 6px solid firebrick;">
<p><center> Pikachu can be seen napping in a bright sunlight. It has two red dots on its cheeks. By practicing HTML and CSS, Pikachu can lean confusion. Pikachu likes to steal computer chargers from Koala Boy because he's a Labrador.</center></p>
</div>

<div class ="Pokedex-Images">
<img src="assets/images/charmander.png" alt="Charmander">
<img src="assets/images/abra.png" alt="Abra">
<img src="assets/images/charmeleon.png" alt="Charmeleon">
<img src="assets/images/clafary.png" alt="Clefairy">
<img src="assets/images/firething.png" alt="Ponyta">
<img src="assets/images/horsea.png" alt="Horsea">
<img src="assets/images/jigglyppuff.png" alt="Jigglypuff">
<img src="assets/images/nidorino.png" alt="Nidorino">
<img src="assets/images/pidgey.png" alt="Pidgey">
<img src="assets/images/Vulpix.png" alt="Vulpix">
<img src="assets/images/wartortle.png" alt="Wartortle">
<img src="assets/images/whatisthat.png" alt="Unsure">

</section>
</article>
<footer>
<a id="footer"><a/>
<button><a href="#top">TOP</a></button>
<button><a href="#Pikachu">PIKACHU</a>
<button><a href="map.html">MAP</a>
<button><a href="area.html">AREA</a>
</footer>
</body>
</html>
87 changes: 87 additions & 0 deletions Assignment/Homework_2 - CSS_ResponsiveDesign/Sasha-Pokedex .html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<!DOCTYPE html>

<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" media="(min-width: 701px)" href="main.css">
<link rel="stylesheet" type="text/css" media="(max-width: 500px)" href="small.css">
<link rel="stylesheet" type="text/css" media="(min-width: 501px) and (max-width: 700px)" href="medium.css">
<title>Pokedex</title>
</head>

<header>
<div class="navigation" style="width: 100%">
<button><a href="#footer"; style="color: black">Dropdown</a></button>
<h2 id="site-title">Pokedex</h2>
<div class ="pokeball"><img src="assets/icons/pokeball_icon.png" alt="Pokeball"></div>
</div>
</header>

<body>
<br>
<br>
<div id="search">
<p><br>Search Pokemon</p>
</div>
<article>
<div class="No-1-Pikachu">
<div class="pikachu"><img src="assets/images/pickahu.png" alt="Pikachu">
<table>
<tr>
<th>No. 025 Pikachu</th>
</tr>
<tr>
<td> - Electric type </td>
</tr>
<tr>
<td> - Gentle temperment </td>
</tr>
<tr>
<td> - Grasslands </td>
</tr>
</table>
</div>
<br>
<br>
<br>
<div class="Content-Box">
<p><center> Pikachu can be seen napping in a bright sunlight. It has two red dots on its cheeks. By practicing HTML and CSS, Pikachu can lean confusion. Pikachu likes to steal computer chargers from Koala Boy because he's a Labrador.</center></p>
</div>
<br>
<br>
<br>
<br>
<br>
<section>
<div id="pokedex">
<div class="pokedex-images"
<div style="width: 100%; overflow: hidden;">
<img src="assets/images/charmander.png" alt="Charmander">
<img src="assets/images/abra.png" alt="Abra">
<img src="assets/images/charmeleon.png" alt="Charmeleon">
<img src="assets/images/clafary.png" alt="Clefairy">
<img src="assets/images/firething.png" alt="Ponyta">
<img src="assets/images/horsea.png" alt="Horsea">
<img src="assets/images/jigglyppuff.png" alt="Jigglypuff">
<img src="assets/images/nidorino.png" alt="Nidorino">
<img src="assets/images/pidgey.png" alt="Pidgey">
<img src="assets/images/Vulpix.png" alt="Vulpix">
<img src="assets/images/wartortle.png" alt="Wartortle">
<img src="assets/images/whatisthat.png" alt="Unsure" >
</div>
</div>
</section>
</article>
<br>
<br>
<br>
<br>
<div id="footer">
<button><a href="#top"; style="color: black">TOP</a></button>
<button><a href="#Pikachu"; style="color: black">PIKACHU</a>
<button><a href="map.html"; style="color: black">MAP</a>
<button><a href="area.html"; style="color: black">AREA</a>
</div>
</body>
</html>
26 changes: 26 additions & 0 deletions Assignment/Homework_2 - CSS_ResponsiveDesign/area.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!DOCTYPE html>

<html>
<head>
<meta charset="UTF-8">
<a id="top"></a>
<title>THIS IS AN AREA. WHAT'S AN AREA? :/</title>
</head>

<body>
<header>
<h2 id="site-title">THIS IS AN AREA. WHAT'S AN AREA? :/</h2>
<nav id="navigation">
</nav>
</header>

<article>
<section>
<a href="Sasha-Pokedex.html">Homepage!</a>
<a href="map.html">Area</a>
</div>
<img src="assets/images/pickahu.png" alt="Pikachu" style="width:304px;height:228px;">
</section>
</article>
</body>
</html>
Loading