From a94b63943f0d67022996f8674fb717999529ebb1 Mon Sep 17 00:00:00 2001 From: Monica Date: Thu, 30 Oct 2014 13:04:37 -0700 Subject: [PATCH 01/13] Update readme.md first commit --- readme.md | 75 +------------------------------------------------------ 1 file changed, 1 insertion(+), 74 deletions(-) diff --git a/readme.md b/readme.md index f1e9101..0ea0b54 100755 --- a/readme.md +++ b/readme.md @@ -1,74 +1 @@ -# UXE - AppCache, Storage and Meta Data - -For this assignment, students will be required to produce a single static HTML page view that: - -- Uses static HTML and simple assets (css, images, etc ... ) -- Build simple functionality that exposes one of the following - - AppCache - - Local Storage - - indexDB - - File API -- HTML should use examples of - - Microdata, Microformats or RDF - - ARIA - - -## Submitting assignments - -Submitting assignments for this course will require leveraging some of the more advanced features of Github. These features will not only improve your knowledge of Git and Github, but also provide practice exercises for working on a distributed project with a large team. - -## How to submit an assignment - -In order to submit assignments, please use the following steps - -1. [Fork this repo][1] so that you have a working version -1. [Clone the forked repo][2] to your local computer -1. Create a folder named with your name, example `dale-sande` -1. Once completed with your assignment, commit code to the master branch and push to Github `git push origin master` -1. From __your fork__ of the project, initiate a pull request to the parent repo - -## Assignment review - -When a pull request is initiated, I will be notified of the update and comment on the submitted assignment via Github tools. - -## Keeping your local repo up to date -Your local repo will be an independent version of the original repo from the moment you fork the repo. In order to keep your local repo up to date with the original repo, you need to do what is called an [upstream pull][3]. - -To manage an upstream pull, I suggest updating your `.bash_profile` and your `.gitconfig` file with easy to remember aliases. - -### .bash_profile - -In your `.bash_profile` add the following alias - -``` -alias upstream="git remote add upstream \$@" -``` - -From the command line you simply need to refer to the alias and add the path to the upstream repo as shown in the following example. - -``` -$ upstream https://github.com/blackfalcon/unicorn-class-css-section.git -``` - -Once the upstream repo is configured for your local repo, this never needs to be reset again, unless you delete your local repo. - -### .gitconfig -In your `.gitconfig` add the following alias - -``` -[alias] - pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master" -``` - -From the command line, within the project repo, enter the following command to pull latest code from the upstream master. - -``` -git pu -``` - - - - -[1]:https://help.github.com/articles/fork-a-repo -[2]:https://help.github.com/articles/fork-a-repo#step-2-clone-your-fork -[3]:https://help.github.com/articles/syncing-a-fork +There are two folders in this repo, one containing a folder with a file reader and another containing an html mockup of gmail.com with local storage. From 60236e41dff3e8f8e15cfb0aee5ca93b65707cc0 Mon Sep 17 00:00:00 2001 From: Monica Date: Thu, 30 Oct 2014 13:38:42 -0700 Subject: [PATCH 02/13] Create file-reader.js first commit --- FileReader/file-reader.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 FileReader/file-reader.js diff --git a/FileReader/file-reader.js b/FileReader/file-reader.js new file mode 100644 index 0000000..8231ccb --- /dev/null +++ b/FileReader/file-reader.js @@ -0,0 +1,16 @@ +var fileInput = document.getElementById('fileInput'); +var fileDisplayArea = document.getElementById('fileDisplayArea'); + +fileInput.addEventListener('change', function() { + var file = fileInput.files[0]; + var textType = /text.*/; + if (file.type.match(textType)) { + var reader = new FileReader(); + reader.onload = function(e) { + fileDisplayArea.innerText = reader.result; + } + reader.readAsText(file); + } else { + fileDisplayArea.innerText = "File not supported!"; + } +}) From b9c9f95fbd3cec45cde5f2817d4d4953ca957e1c Mon Sep 17 00:00:00 2001 From: Monica Date: Thu, 30 Oct 2014 13:39:12 -0700 Subject: [PATCH 03/13] Create style.css first commit --- FileReader/style.css | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 FileReader/style.css diff --git a/FileReader/style.css b/FileReader/style.css new file mode 100644 index 0000000..89fabc1 --- /dev/null +++ b/FileReader/style.css @@ -0,0 +1,20 @@ +body { + background-color: #dddddd; +} +#fileInput { + border-radius: 0px; + margin-left: 43%; + margin-top: 5%; +} +#fileDisplayArea { + width: 80%; + margin: 0 auto; +} +h1 { + width: 15%; + margin: 0 auto; +} +#header { + background-color: black; + height: 50px; +} From e8b2acb8016261a9603dfbf6fbbcb3692644d6d0 Mon Sep 17 00:00:00 2001 From: Monica Date: Thu, 30 Oct 2014 13:39:38 -0700 Subject: [PATCH 04/13] Create zz.html first commit --- FileReader/zz.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 FileReader/zz.html diff --git a/FileReader/zz.html b/FileReader/zz.html new file mode 100644 index 0000000..7702e39 --- /dev/null +++ b/FileReader/zz.html @@ -0,0 +1,17 @@ + + + + + + + + + +
+

Text File Reader

+ + 

+		

+		
+	
+

From 43a9ccffce335ec398c3311451b59c5ed0936ffd Mon Sep 17 00:00:00 2001
From: Monica 
Date: Thu, 30 Oct 2014 13:41:04 -0700
Subject: [PATCH 05/13] Create localstorage.js

first commit
---
 LocalStorage/localstorage.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 LocalStorage/localstorage.js

diff --git a/LocalStorage/localstorage.js b/LocalStorage/localstorage.js
new file mode 100644
index 0000000..57c9d27
--- /dev/null
+++ b/LocalStorage/localstorage.js
@@ -0,0 +1,13 @@
+      var first = document.getElementById('first');
+      var second = document.getElementById('second');
+
+      first.value = localStorage.getItem('first');
+      second.value = localStorage.getItem('second');
+
+      first.addEventListener('input', function () {
+        localStorage.setItem('first', first.value);
+      }, false);
+
+      second.addEventListener('input', function () {
+        localStorage.setItem('second', second.value);
+      }, false);

From 21173413a01d044006973df0f75b3d83b7729028 Mon Sep 17 00:00:00 2001
From: Monica 
Date: Thu, 30 Oct 2014 13:41:22 -0700
Subject: [PATCH 06/13] Create layout.css

first commit
---
 LocalStorage/layout.css | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 LocalStorage/layout.css

diff --git a/LocalStorage/layout.css b/LocalStorage/layout.css
new file mode 100644
index 0000000..9a534fa
--- /dev/null
+++ b/LocalStorage/layout.css
@@ -0,0 +1,24 @@
+body {
+	text-align: center;
+}
+
+#oneaccount {
+	font-size: 36px;
+	color: gray;
+	font-family: 'Open Sans'
+}
+
+#signin {
+	font-size: 14px;
+	color: gray;
+	font-family: 'Open Sans'
+}
+
+button {
+	background-color: #1E90FF;
+	height: 10px;
+	width: 225px;
+	color: white;
+	padding: 10px 10px 25px 10px;
+	border-radius: 10%;
+}

From 889f85861ed871399d806910b077cf1895edb756 Mon Sep 17 00:00:00 2001
From: Monica 
Date: Thu, 30 Oct 2014 13:41:44 -0700
Subject: [PATCH 07/13] Create index.html

first commit
---
 LocalStorage/index.html | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 LocalStorage/index.html

diff --git a/LocalStorage/index.html b/LocalStorage/index.html
new file mode 100644
index 0000000..8916c43
--- /dev/null
+++ b/LocalStorage/index.html
@@ -0,0 +1,22 @@
+
+
+  
+    
+    
+     
+    
+  
+
+   
+     

+    
One Account. All of Google.
 

+    
Sign in to continue to Gmail
 

+    Email: 

+    Password: 

+    
+
+  
+  
+
+
+

From 8643f040c2b43f9ab6472f776172e61022aabdf1 Mon Sep 17 00:00:00 2001
From: Monica 
Date: Thu, 30 Oct 2014 13:44:34 -0700
Subject: [PATCH 08/13] Update index.html

second commit
---
 LocalStorage/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/LocalStorage/index.html b/LocalStorage/index.html
index 8916c43..cb9f0ec 100644
--- a/LocalStorage/index.html
+++ b/LocalStorage/index.html
@@ -8,7 +8,6 @@
   
 
    
-     

     
One Account. All of Google.
 

     
Sign in to continue to Gmail
 

     Email: 


From d860c6cfff62d36107d3b5d5a9c44b6efb0af129 Mon Sep 17 00:00:00 2001
From: Monica 
Date: Sun, 21 Dec 2014 03:51:36 -0800
Subject: [PATCH 09/13] Update zz.html

indentation corrected
---
 FileReader/zz.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FileReader/zz.html b/FileReader/zz.html
index 7702e39..118b21d 100644
--- a/FileReader/zz.html
+++ b/FileReader/zz.html
@@ -6,7 +6,7 @@
 	  
 	
 	
-		
+		
 		

 			
Text File Reader

 			

From 20f2f14f8038f8e6582e6965e04e094afb1e969e Mon Sep 17 00:00:00 2001
From: Monica 
Date: Sun, 21 Dec 2014 03:52:59 -0800
Subject: [PATCH 10/13] Update index.html

indentation corrected
---
 LocalStorage/index.html | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/LocalStorage/index.html b/LocalStorage/index.html
index cb9f0ec..9dc55a1 100644
--- a/LocalStorage/index.html
+++ b/LocalStorage/index.html
@@ -1,21 +1,17 @@
 
 
-  
-    
-    
-     
-    
-  
-
-   
-    
One Account. All of Google.
 

-    
Sign in to continue to Gmail
 

-    Email: 

-    Password: 

-    
-
+
+  
+  Google
+   
+  
+
+ 
+  
One Account. All of Google.
 

+  
Sign in to continue to Gmail
 

+  Email: 

+  Password: 

+  
   
-  
-
+
 
-

From 8021edffced325298d2cd283a065a951b36d6f9a Mon Sep 17 00:00:00 2001
From: Monica 
Date: Sun, 21 Dec 2014 03:53:59 -0800
Subject: [PATCH 11/13] Update layout.css

indentation corrected
---
 LocalStorage/layout.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LocalStorage/layout.css b/LocalStorage/layout.css
index 9a534fa..51c0857 100644
--- a/LocalStorage/layout.css
+++ b/LocalStorage/layout.css
@@ -1,5 +1,5 @@
 body {
-	text-align: center;
+  text-align: center;
 }
 
 #oneaccount {

From b6f39e9d079ce82096228e891980c28be5a6bdb4 Mon Sep 17 00:00:00 2001
From: Monica 
Date: Sun, 21 Dec 2014 03:55:18 -0800
Subject: [PATCH 12/13] Update layout.css

indentation changed for betting formatting
---
 LocalStorage/layout.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LocalStorage/layout.css b/LocalStorage/layout.css
index 51c0857..75ccabc 100644
--- a/LocalStorage/layout.css
+++ b/LocalStorage/layout.css
@@ -5,13 +5,13 @@ body {
 #oneaccount {
 	font-size: 36px;
 	color: gray;
-	font-family: 'Open Sans'
+	font-family: 'Open Sans';
 }
 
 #signin {
 	font-size: 14px;
 	color: gray;
-	font-family: 'Open Sans'
+	font-family: 'Open Sans';
 }
 
 button {

From 64b2f7acfe5c4d9e0ebd8f1564551f3c04610e88 Mon Sep 17 00:00:00 2001
From: Monica 
Date: Sun, 21 Dec 2014 03:56:47 -0800
Subject: [PATCH 13/13] Update zz.html

---
 FileReader/zz.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FileReader/zz.html b/FileReader/zz.html
index 118b21d..49c21f7 100644
--- a/FileReader/zz.html
+++ b/FileReader/zz.html
@@ -2,7 +2,7 @@
 
 	
 	  
-	  
+	  GOOGLE