sosnowski · Krzysiek92 · Feb 10, 2016 · Feb 15, 2016 · Feb 16, 2016 · Feb 16, 2016
diff --git a/Lesson 1/code/exercises/exercise1.html b/Lesson 1/code/exercises/exercise1.html
@@ -4,11 +4,19 @@
   <title>Exercise 1</title>    
 </head>  
 
-<body>  
-
-    <p>Check Variables: x = ?, y = ?, z = ?</p>
-    <p>Test: x = ?, y = ?, z = ?</p>
-    <p>Check Variables: x = ?, y = ?, z = ?</p>
+<body>
+    <!-- 
+        1. Open this document side-by-side on browser (with js console opened) and code editor.
+        2. Analyse JavaScript code below, keep in mind function scope :)
+        3. Try to guess values variable values in each part of exercise (points 1,2,3)
+        4. Test it and put values in the comments. 
+    -->
+    <h1>Guess and click game</h1>
+    <ol>
+        <li>Click "Check Variables": x = ?, y = ?, z = ?</li>
+        <li>Click "Test": x = ?, y = ?, z = ?</li>
+        <li>Click "Check Variables": x = ?, y = ?, z = ?</li>
+    </ol>
 
     <button id="testButton">Test</button>
     <button id="checkVariablesButton">Check Variables</button>
@@ -17,10 +25,11 @@
         var x = 4;
         y = 10;
 
-        function checkVariables() {
+        function checkVariables() {       
             alert('x: ' + x); //x = ??
             alert('y: ' + y); //y = ??
             alert('z: ' + z); //z = ??
+
         }
 
         function test() {
@@ -33,6 +42,7 @@
             alert('z: ' + z); //z = ??
         }
 
+
     </script>
 
     <script type="text/javascript">

diff --git a/Lesson 1/code/exercises/exercise2.html b/Lesson 1/code/exercises/exercise2.html
@@ -5,7 +5,24 @@
 </head>  
 
 <body>
-
+     <!-- 
+        1. Open this document side-by-side on browser (with js console opened) and code editor.
+        2. Analyse JavaScript code below.
+        3. Write your own implementation of methods:
+            a. countBoolean,
+            b. countNumber,
+            c. countString,
+            d. countFalsy
+        All methods should return right count of Boolean, Number, String or Falsy value.
+        Don't be decived by empty Objects :)
+        4. Test it out :)
+
+        Bibliography
+        https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/typeof
+        https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array
+        https://developer.mozilla.org/en-US/docs/Glossary/Falsy 
+    -->
+    <h1>Value counter</h1>
     <p>Boolean: <label id="boolLabel"></label></p>
     <p>Number: <label id="numberLabel"></label></p>
     <p>String: <label id="stringLabel"></label></p>
@@ -24,18 +41,22 @@
         var arr = [];
 
         function countBoolean() {
+            //!!!!!!!!!
             return 0;
         }
 
         function countNumber() {
+            //!!!!!!!!!
             return 0;
         }
 
         function countString() {
+            //!!!!!!!!!
             return 0;
         }
 
         function countFalsy() {
+            //!!!!!!!!!
             return 0;
         }
 

diff --git a/Lesson 1/code/exercises/exercise3.html b/Lesson 1/code/exercises/exercise3.html
@@ -5,7 +5,26 @@
 </head>  
 
 <body>
-
+    <!-- 
+        1. Open this document side-by-side on browser (with js console opened) and code editor.
+        2. Analyse JavaScript code below.
+        3. Write your own implementation of methods:
+            a. addStandardBook,
+            b. addVipBook,
+            c. borrowStandardBook,
+            d. borrowVipBook
+        Based on standard Array operations (push, pop, ...)
+        4. Fill in implementation of methods:
+            a. printStandards
+            b. printVip 
+        Based on some advanced methods like filter or your own implementation.
+        5. Test it out :)
+
+        Bibliography        
+        https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array
+        https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter 
+    -->
+    <h1>Stellar library</h1>
     <p>
         Standard Books: <br />
         Free: <label id="standardFreeLabel"></label> <br />

diff --git a/Lesson 1/presentation/index.html b/Lesson 1/presentation/index.html
@@ -4,7 +4,7 @@
 	<head>
 		<meta charset="utf-8">
 
-		<title>Web Applications [UAM]- by Damian Sosnowski</title>
+		<title>Modern Web Applications [UŁ] - by Damian Sosnowski</title>
 
 		<meta name="author" content="Damian Sosnowski">
 
@@ -42,10 +42,12 @@
 			<!-- Any section element inside of this container is displayed as a slide -->
 			<div class="slides">
 				<section>
-					<h1>Web Appliations</h1>
-					<p><b>Damian Sosnowski</b><br />[email protected]</p>
-                    <p><b>Andrzej Matłosz</b><br />[email protected]</p>
-					<p>Materials: <a href="https://github.com/sosnowski/Kurs_UAM">https://github.com/sosnowski/Kurs_UAM</a></p>
+					<h1>Modern Web Applications</h1>
+					<p><b>Piotr Leszczyński</b><br />[email protected]</p>
+                    <p><b>Rafał Warzycha</b><br />[email protected]/p>
+                    <p>Ubuntu vBox image: <a href="http://just4fun.io/nai-lab.ova">http://just4fun.io/nai-lab.ova</a></p>
+                    <p>Materials: <a href="https://github.com/leszczynski-it/Kurs_UL">https://github.com/leszczynski-it/Kurs_UL</a></p>
+					<p>Based on: <a href="https://github.com/sosnowski/Kurs_UAM">https://github.com/sosnowski/Kurs_UAM</a></p>
 				</section>
 
 				<section>
@@ -60,32 +62,41 @@ <h2>Content of the course:</h2>
 						<li>AngularJS - Currently, the most popular MVC framework</li>
 					</ol>
 				</section>
-
-				<section>
-					<div class="columns">
-						<div class="column">
-							<h2>Tools and Software</h2>
-
-							<ul>
-								<li>Nodejs - <a href="http://nodejs.org">http://nodejs.org/</a></li>
-								<li>Good Browser - Google Chrome / Firefox / IE 10+</li>
-								<li>Brackets.io - or any other decent editor</li>
-								<li>Git and github account</li>
-							</ul>
-						</div>
-
-						<div class="column">
-							<h2>Requirements</h2>
-							<ul>
-								<li>Participation (max 3 absences)</li>
-                                <li>Weekly tasks</li>
-								<li>2 practice tasks</li>
-								<li>Final, group project. 3 phases.</li>
-							</ul>
-						</div>
-					</div>
-				</section>
-
+
+                <section>
+                    <section>
+                        <div class="columns">
+                            <div class="column">
+                                <h2>Tools and Software</h2>
+
+                                <ul>
+                                    <li>Nodejs - <a href="http://nodejs.org">http://nodejs.org/</a></li>
+                                    <li>Good Browser - Google Chrome / Firefox / IE 10+</li>
+                                    <li>Brackets.io - or any other decent editor</li>
+                                    <li>Git and github account</li>
+                                </ul>
+                            </div>
+
+                            <div class="column">
+                                <h2>Requirements</h2>
+                                <ul>
+                                    <li>Participation (max 3 absences)</li>
+                                    <li>Weekly tasks</li>
+                                    <li>2 practice tasks</li>
+                                    <li>Final, group project. 3 phases.</li>
+                                </ul>
+                            </div>
+                        </div>
+                    </section>
+                    <section>
+                        <h1>Git and Github resources</h1>
+                        <ul>
+                            <li>Atlassian git tutorials <a href="https://www.atlassian.com/git/tutorials/setting-up-a-repository">https://www.atlassian.com/git/tutorials/setting-up-a-repository</a>                            </li>
+                            <li>Github tutorials <a href="https://help.github.com">https://help.github.com</a></li>
+                        </ul>
+                    </section>
+                </section>
+
 				<section>
 					<h2>Web applications</h2>
 					<p class="fragment">What is a web application?</p>

diff --git a/Lesson 10 - WebSockets/code/complexChat/package.json b/Lesson 10 - WebSockets/code/complexChat/package.json
@@ -3,11 +3,13 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "start": "node app.js"
+    "start": "node app.js",
+    "postinstall": "jspm install"
   },
   "dependencies": {
     "body-parser": "^1.12.2",
     "express": "3.4.4",
+    "jspm": "^0.16.34",
     "method-override": "^2.3.2",
     "morgan": "^1.5.2",
     "multer": "^0.1.8",

diff --git a/Lesson 2 - Functions/presentation/index.html b/Lesson 2 - Functions/presentation/index.html
@@ -44,7 +44,7 @@
 				<section>
 					<h1>Web Appliations</h1>
 					<h3>JavaScript - Functions</h3>
-					<p>Materials: <a href="https://github.com/sosnowski/Kurs_UAM">https://github.com/sosnowski/Kurs_UAM (winter2016)</a></p>
+					<p>Materials: <a href="https://github.com/leszczynski-it/Kurs_UL">https://github.com/leszczynski-it/Kurs_UL</a></p>
 				</section>
 
 				<section>

diff --git a/Lesson 3 - Objects/presentation/index.html b/Lesson 3 - Objects/presentation/index.html
@@ -44,7 +44,7 @@
 				<section>
 					<h1>Web Appliations</h1>
 					<h3>JavaScript - Objects</h3>
-					<p>Materials: <a href="https://github.com/sosnowski/Kurs_UAM">https://github.com/sosnowski/Kurs_UAM (summer2015)</a></p>
+					<p>Materials: <a href="https://github.com/leszczynski-it/Kurs_UL">https://github.com/leszczynski-it/Kurs_UL</a></p>
 				</section>
 
 				<section>

diff --git a/Lesson 4 - DOM/code/app.css b/Lesson 4 - DOM/code/app.css
diff --git a/Lesson 4 - DOM/code/app.js b/Lesson 4 - DOM/code/app.js
diff --git a/Lesson 4 - DOM/code/.jshintrc → Lesson 4 - DOM/code/exercise1/.jshintrc b/Lesson 4 - DOM/code/.jshintrc → Lesson 4 - DOM/code/exercise1/.jshintrc
diff --git a/Lesson 4 - DOM/code/exercise1/app.css b/Lesson 4 - DOM/code/exercise1/app.css
@@ -0,0 +1,7 @@
+.valid {
+	color: green;
+}
+
+.invalid {
+	color: red;
+}
diff --git a/Lesson 4 - DOM/code/exercise1/app.js b/Lesson 4 - DOM/code/exercise1/app.js
@@ -0,0 +1,4 @@
+window.addEventListener('DOMContentLoaded', function () {
+    //When the page structure is loaded...
+
+});
diff --git a/Lesson 4 - DOM/code/exercise1/index.html b/Lesson 4 - DOM/code/exercise1/index.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<html lang="en">
+
+	<head>
+		<meta charset="utf-8">
+
+		<title>Validation</title>
+
+		<meta name="author" content="Damian Sosnowski">
+
+		<link rel="stylesheet" href="app.css">
+		<script type="text/javascript" src="app.js"></script>
+	</head>
+	<body>
+
+	<div>
+		<h1>Odd number validation</h1>
+		<input type="text" name="oddnumber" />
+	</div>
+
+	<div>
+		<h1>Even number validation</h1>
+		<input type="text" name="evennumber" />
+	</div>
+
+	<div>
+        <input type="submit" value="Submit" />
+    </div>
+
+	</body>
+	</script>
diff --git a/Lesson 4 - DOM/code/readme.txt → Lesson 4 - DOM/code/exercise1/readme.txt b/Lesson 4 - DOM/code/readme.txt → Lesson 4 - DOM/code/exercise1/readme.txt