Merge pull request #3 from awslabs/jp/updates-from-sfloft-feedback

Address SF Loft Feedback
aws-samples · Jan 31, 2017 · d0dddcb · d0dddcb
2 parents 4182cba + b64de3c
commit d0dddcb
Show file tree

Hide file tree

Showing 117 changed files with 146 additions and 115 deletions.
diff --git a/NOTICE b/NOTICE
@@ -1,2 +1,2 @@
 Wild Rydes Serverless Web Application Workshop: Lab Guide
-Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. 
+Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
diff --git a/README.md b/README.md
diff --git a/images/lab2_cognito-create-pool.png → images/lab1_cognito-create-pool.png b/images/lab2_cognito-create-pool.png → images/lab1_cognito-create-pool.png
diff --git a/images/lab2_cognito-pool-details.png → images/lab1_cognito-pool-details.png b/images/lab2_cognito-pool-details.png → images/lab1_cognito-pool-details.png
diff --git a/images/lab1_cognito-unauth-policy.png b/images/lab1_cognito-unauth-policy.png
diff --git a/images/lab2_configure-triggers.png → images/lab1_configure-triggers.png b/images/lab2_configure-triggers.png → images/lab1_configure-triggers.png
diff --git a/images/lab2_confirmation.png → images/lab1_confirmation.png b/images/lab2_confirmation.png → images/lab1_confirmation.png
diff --git a/images/lab2_dynamodb-create-table.png → images/lab1_dynamodb-create-table.png b/images/lab2_dynamodb-create-table.png → images/lab1_dynamodb-create-table.png
diff --git a/images/lab2_dynamodb-table-details.png → images/lab1_dynamodb-table-details.png b/images/lab2_dynamodb-table-details.png → images/lab1_dynamodb-table-details.png
diff --git a/images/lab2_email.png → images/lab1_email.png b/images/lab2_email.png → images/lab1_email.png
diff --git a/images/lab2_env-vars.png → images/lab1_env-vars.png b/images/lab2_env-vars.png → images/lab1_env-vars.png
diff --git a/images/lab2_role-review.png → images/lab1_role-review.png b/images/lab2_role-review.png → images/lab1_role-review.png
diff --git a/images/lab2_role-type.png → images/lab1_role-type.png b/images/lab2_role-type.png → images/lab1_role-type.png
diff --git a/images/lab2_table-items.png → images/lab1_table-items.png b/images/lab2_table-items.png → images/lab1_table-items.png
diff --git a/images/lab2_trigger-tab.png → images/lab1_trigger-tab.png b/images/lab2_trigger-tab.png → images/lab1_trigger-tab.png
diff --git a/images/lab2_verify-email.png → images/lab1_verify-email.png b/images/lab2_verify-email.png → images/lab1_verify-email.png
diff --git a/images/lab3_admin.png → images/lab2_admin.png b/images/lab3_admin.png → images/lab2_admin.png
diff --git a/images/lab3_app-details.png → images/lab2_app-details.png b/images/lab3_app-details.png → images/lab2_app-details.png
diff --git a/images/lab3_authorizer.png → images/lab2_authorizer.png b/images/lab3_authorizer.png → images/lab2_authorizer.png
diff --git a/images/lab3_create-method.png → images/lab2_create-method.png b/images/lab3_create-method.png → images/lab2_create-method.png
diff --git a/images/lab3_create-user.png → images/lab2_create-user.png b/images/lab3_create-user.png → images/lab2_create-user.png
diff --git a/images/lab3_invoke-url.png → images/lab2_invoke-url.png b/images/lab3_invoke-url.png → images/lab2_invoke-url.png
diff --git a/images/lab3_lambda-role.png → images/lab2_lambda-role.png b/images/lab3_lambda-role.png → images/lab2_lambda-role.png
diff --git a/images/lab3_pool-details.png → images/lab2_pool-details.png b/images/lab3_pool-details.png → images/lab2_pool-details.png
diff --git a/images/lab4_authorization-settings.png → images/lab3_authorization-settings.png b/images/lab4_authorization-settings.png → images/lab3_authorization-settings.png
diff --git a/images/lab4_create-post-method.png → images/lab3_create-post-method.png b/images/lab4_create-post-method.png → images/lab3_create-post-method.png
diff --git a/images/lab4_create-resource.png → images/lab3_create-resource.png b/images/lab4_create-resource.png → images/lab3_create-resource.png
diff --git a/images/lab4_create-table.png → images/lab3_create-table.png b/images/lab4_create-table.png → images/lab3_create-table.png
diff --git a/images/lab4_new-post.png → images/lab3_new-post.png b/images/lab4_new-post.png → images/lab3_new-post.png
diff --git a/images/lab4_post.png → images/lab3_post.png b/images/lab4_post.png → images/lab3_post.png
diff --git a/images/lab1_bucket-permissions.png → images/prelab_bucket-permissions.png b/images/lab1_bucket-permissions.png → images/prelab_bucket-permissions.png
diff --git a/images/lab1_bucket-policy.png → images/prelab_bucket-policy.png b/images/lab1_bucket-policy.png → images/prelab_bucket-policy.png
diff --git a/images/lab1_cloudfront-distributions.png → images/prelab_cloudfront-distributions.png b/images/lab1_cloudfront-distributions.png → images/prelab_cloudfront-distributions.png
diff --git a/images/lab1_create-bucket.png → images/prelab_create-bucket.png b/images/lab1_create-bucket.png → images/prelab_create-bucket.png
diff --git a/images/lab1_customize-cache-settings.png → images/prelab_customize-cache-settings.png b/images/lab1_customize-cache-settings.png → images/prelab_customize-cache-settings.png
diff --git a/images/lab1_origin-domain-name.png → images/prelab_origin-domain-name.png b/images/lab1_origin-domain-name.png → images/prelab_origin-domain-name.png
diff --git a/images/lab1_website-hosting.png → images/prelab_website-hosting.png b/images/lab1_website-hosting.png → images/prelab_website-hosting.png
diff --git a/images/lab1_website-via-cloudfront.png → images/prelab_website-via-cloudfront.png b/images/lab1_website-via-cloudfront.png → images/prelab_website-via-cloudfront.png
diff --git a/images/lab1_website.png → images/prelab_website.png b/images/lab1_website.png → images/prelab_website.png
diff --git a/lab1/index.html b/lab1/index.html
@@ -6,14 +6,16 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Wild Rydes</title>
 
-
-
   <link rel="stylesheet" href="styles/main.css">
 
   <script src="scripts/vendor/modernizr.js"></script>
+  <script src="scripts/vendor/aws-sdk.min.js" defer></script>
 
   <script src="https://use.typekit.net/dmq4txp.js"></script>
   <script>try{Typekit.load({ async: true });}catch(e){}</script>
+
+  <script src="scripts/config.js" defer></script>
+  <script src="scripts/index.js" defer></script>
 </head>
 <body class="page-home">
 
@@ -82,16 +84,26 @@ <h2 class="section-title">Our Story</h2>
 
   <section class="home-sign-up">
     <div class="row column">
-      <img class="icon-w" src="images/wr-home-W.png">
+      <div class="row column">
+        <img class="icon-w" src="images/wr-home-W.png">
 
-      <form onsubmit="javascript:void(0);">
-        <input type="email" placeholder="Enter your email address">
-        <button type="button">Submit</button>
-      </form>
+        <div class="row column" id="form">
+          <form>
+            <input type="email" placeholder="Enter your email address">
+            <button type="submit">Submit</button>
+          </form>
 
-      <h2 class="section-title">Sign Up</h2>
+          <h2 class="section-title">Sign Up</h2>
+
+          <p class="content">Wild Rydes is coming soon! Enter your email to enter the limited private beta</p>
+        </div>
 
-      <p class="content">Wild Rydes is coming soon! Enter your email to enter the limited private beta</p>
+        <div style="margin-top: 110px; display: none;" id="thank-you" class="row column">
+          <h2 class="section-title">Thank You</h2>
+
+          <p class="content">Wild Rydes is coming soon! Stay tuned for more info about unicorns near you!</p>
+        </div>
+      </div>
 
       <div class="apps">
         <a class="app-icon" href=""><img src="images/wr-home-apple.png"></a>

diff --git a/lab2/scripts/config.js → lab1/scripts/config.js b/lab2/scripts/config.js → lab1/scripts/config.js
diff --git a/lab2/scripts/index.js → lab1/scripts/index.js b/lab2/scripts/index.js → lab1/scripts/index.js
@@ -22,11 +22,12 @@ emailForm.addEventListener('submit', function (event) {
   };
 
   dynamoDB.putItem(params, function (err, data) {
-    if (err) {
-      console.log(err);
-    } else {
+    if (!err) {
       formDiv.style.display = 'none';
       confirmationDiv.style.display = 'block';
+    } else {
+      alert(err);
+      console.log(err);
     }
   });
 });
diff --git a/lab3/scripts/vendor/aws-sdk.min.js → lab1/scripts/vendor/aws-sdk.min.js b/lab3/scripts/vendor/aws-sdk.min.js → lab1/scripts/vendor/aws-sdk.min.js
diff --git a/lab1/styles/main.css b/lab1/styles/main.css
diff --git a/lab3/admin/emails.html → lab2/admin/emails.html b/lab3/admin/emails.html → lab2/admin/emails.html
diff --git a/lab4/admin/index.html → lab2/admin/index.html b/lab4/admin/index.html → lab2/admin/index.html
@@ -25,7 +25,6 @@ <h2>Wild Rydes Admin</h2>
       <h5>Navigation</h5>
       <ul>
         <li><a href="emails.html">View Emails</a></li>
-        <li><a href="post.html">New Blog Post</a></li>
         <li><a id="logout" href="#">Log Out</a></li>
       </ul>
     </div>

diff --git a/lab3/admin/login.html → lab2/admin/login.html b/lab3/admin/login.html → lab2/admin/login.html
diff --git a/lab3/scripts/admin-emails.js → lab2/scripts/admin-emails.js b/lab3/scripts/admin-emails.js → lab2/scripts/admin-emails.js
diff --git a/lab3/scripts/admin-login.js → lab2/scripts/admin-login.js b/lab3/scripts/admin-login.js → lab2/scripts/admin-login.js
diff --git a/lab3/scripts/admin.js → lab2/scripts/admin.js b/lab3/scripts/admin.js → lab2/scripts/admin.js
diff --git a/lab3/scripts/utils.js → lab2/scripts/utils.js b/lab3/scripts/utils.js → lab2/scripts/utils.js
diff --git a/...pts/vendor/amazon-cognito-identity.min.js → ...pts/vendor/amazon-cognito-identity.min.js b/...pts/vendor/amazon-cognito-identity.min.js → ...pts/vendor/amazon-cognito-identity.min.js
diff --git a/lab3/scripts/vendor/aws-cognito-sdk.min.js → lab2/scripts/vendor/aws-cognito-sdk.min.js b/lab3/scripts/vendor/aws-cognito-sdk.min.js → lab2/scripts/vendor/aws-cognito-sdk.min.js
diff --git a/lab3/scripts/vendor/jsbn.js → lab2/scripts/vendor/jsbn.js b/lab3/scripts/vendor/jsbn.js → lab2/scripts/vendor/jsbn.js
diff --git a/lab3/scripts/vendor/jsbn2.js → lab2/scripts/vendor/jsbn2.js b/lab3/scripts/vendor/jsbn2.js → lab2/scripts/vendor/jsbn2.js
diff --git a/lab1/scripts/vendor/modernizr.js → lab2/scripts/vendor/modernizr.js b/lab1/scripts/vendor/modernizr.js → lab2/scripts/vendor/modernizr.js
diff --git a/lab3/scripts/vendor/sjcl.js → lab2/scripts/vendor/sjcl.js b/lab3/scripts/vendor/sjcl.js → lab2/scripts/vendor/sjcl.js
diff --git a/lab3/styles/vendor/normalize.css → lab2/styles/vendor/normalize.css b/lab3/styles/vendor/normalize.css → lab2/styles/vendor/normalize.css
diff --git a/lab3/styles/vendor/skeleton.css → lab2/styles/vendor/skeleton.css b/lab3/styles/vendor/skeleton.css → lab2/styles/vendor/skeleton.css
diff --git a/lab3/admin/index.html b/lab3/admin/index.html
@@ -25,6 +25,7 @@ <h2>Wild Rydes Admin</h2>
       <h5>Navigation</h5>
       <ul>
         <li><a href="emails.html">View Emails</a></li>
+        <li><a href="post.html">New Blog Post</a></li>
         <li><a id="logout" href="#">Log Out</a></li>
       </ul>
     </div>

diff --git a/lab4/admin/post.html → lab3/admin/post.html b/lab4/admin/post.html → lab3/admin/post.html
diff --git a/lab4/apply.html → lab3/apply.html b/lab4/apply.html → lab3/apply.html
diff --git a/lab4/blog.html → lab3/blog.html b/lab4/blog.html → lab3/blog.html
diff --git a/lab4/faq.html → lab3/faq.html b/lab4/faq.html → lab3/faq.html
diff --git a/lab4/index.html → lab3/index.html b/lab4/index.html → lab3/index.html
diff --git a/lab4/investors.html → lab3/investors.html b/lab4/investors.html → lab3/investors.html
diff --git a/lab4/scripts/admin-post.js → lab3/scripts/admin-post.js b/lab4/scripts/admin-post.js → lab3/scripts/admin-post.js
diff --git a/lab4/scripts/blog.js → lab3/scripts/blog.js b/lab4/scripts/blog.js → lab3/scripts/blog.js
diff --git a/lab4/unicorns.html → lab3/unicorns.html b/lab4/unicorns.html → lab3/unicorns.html
diff --git a/lab1/apply.html → prelab/apply.html b/lab1/apply.html → prelab/apply.html
diff --git a/lab1/faq.html → prelab/faq.html b/lab1/faq.html → prelab/faq.html
diff --git a/lab1/favicon.ico → prelab/favicon.ico b/lab1/favicon.ico → prelab/favicon.ico
diff --git a/lab1/images/star-pattern.png → prelab/images/star-pattern.png b/lab1/images/star-pattern.png → prelab/images/star-pattern.png
diff --git a/lab1/images/wr-apply-header.png → prelab/images/wr-apply-header.png b/lab1/images/wr-apply-header.png → prelab/images/wr-apply-header.png
diff --git a/lab1/images/wr-faq-header.jpg → prelab/images/wr-faq-header.jpg b/lab1/images/wr-faq-header.jpg → prelab/images/wr-faq-header.jpg
diff --git a/lab1/images/wr-home-W.png → prelab/images/wr-home-W.png b/lab1/images/wr-home-W.png → prelab/images/wr-home-W.png
diff --git a/lab1/images/wr-home-Xiaomi.png → prelab/images/wr-home-Xiaomi.png b/lab1/images/wr-home-Xiaomi.png → prelab/images/wr-home-Xiaomi.png
diff --git a/lab1/images/wr-home-about.jpg → prelab/images/wr-home-about.jpg b/lab1/images/wr-home-about.jpg → prelab/images/wr-home-about.jpg
diff --git a/lab1/images/wr-home-apple.png → prelab/images/wr-home-apple.png b/lab1/images/wr-home-apple.png → prelab/images/wr-home-apple.png
diff --git a/lab1/images/wr-home-blackberry.png → prelab/images/wr-home-blackberry.png b/lab1/images/wr-home-blackberry.png → prelab/images/wr-home-blackberry.png
diff --git a/lab1/images/wr-home-block-1.png → prelab/images/wr-home-block-1.png b/lab1/images/wr-home-block-1.png → prelab/images/wr-home-block-1.png
diff --git a/lab1/images/wr-home-block-2.png → prelab/images/wr-home-block-2.png b/lab1/images/wr-home-block-2.png → prelab/images/wr-home-block-2.png
diff --git a/lab1/images/wr-home-block-3.png → prelab/images/wr-home-block-3.png b/lab1/images/wr-home-block-3.png → prelab/images/wr-home-block-3.png
diff --git a/lab1/images/wr-home-block-4.png → prelab/images/wr-home-block-4.png b/lab1/images/wr-home-block-4.png → prelab/images/wr-home-block-4.png
diff --git a/lab1/images/wr-home-facebook.png → prelab/images/wr-home-facebook.png b/lab1/images/wr-home-facebook.png → prelab/images/wr-home-facebook.png
diff --git a/lab1/images/wr-home-google.png → prelab/images/wr-home-google.png b/lab1/images/wr-home-google.png → prelab/images/wr-home-google.png
diff --git a/lab1/images/wr-home-instagram.png → prelab/images/wr-home-instagram.png b/lab1/images/wr-home-instagram.png → prelab/images/wr-home-instagram.png
diff --git a/lab1/images/wr-home-kraken.png → prelab/images/wr-home-kraken.png b/lab1/images/wr-home-kraken.png → prelab/images/wr-home-kraken.png
diff --git a/lab1/images/wr-home-quote.jpg → prelab/images/wr-home-quote.jpg b/lab1/images/wr-home-quote.jpg → prelab/images/wr-home-quote.jpg
diff --git a/lab1/images/wr-home-quote.png → prelab/images/wr-home-quote.png b/lab1/images/wr-home-quote.png → prelab/images/wr-home-quote.png
diff --git a/lab1/images/wr-home-top.jpg → prelab/images/wr-home-top.jpg b/lab1/images/wr-home-top.jpg → prelab/images/wr-home-top.jpg
diff --git a/lab1/images/wr-home-twitter.png → prelab/images/wr-home-twitter.png b/lab1/images/wr-home-twitter.png → prelab/images/wr-home-twitter.png
diff --git a/lab1/images/wr-home-wechat.png → prelab/images/wr-home-wechat.png b/lab1/images/wr-home-wechat.png → prelab/images/wr-home-wechat.png
diff --git a/lab1/images/wr-home-weibo.png → prelab/images/wr-home-weibo.png b/lab1/images/wr-home-weibo.png → prelab/images/wr-home-weibo.png
diff --git a/lab1/images/wr-investors-1.png → prelab/images/wr-investors-1.png b/lab1/images/wr-investors-1.png → prelab/images/wr-investors-1.png
diff --git a/lab1/images/wr-investors-2.png → prelab/images/wr-investors-2.png b/lab1/images/wr-investors-2.png → prelab/images/wr-investors-2.png
diff --git a/lab1/images/wr-investors-3.png → prelab/images/wr-investors-3.png b/lab1/images/wr-investors-3.png → prelab/images/wr-investors-3.png
diff --git a/lab1/images/wr-investors-4.png → prelab/images/wr-investors-4.png b/lab1/images/wr-investors-4.png → prelab/images/wr-investors-4.png
diff --git a/lab1/images/wr-investors-5.png → prelab/images/wr-investors-5.png b/lab1/images/wr-investors-5.png → prelab/images/wr-investors-5.png
diff --git a/lab1/images/wr-investors-awesome.png → prelab/images/wr-investors-awesome.png b/lab1/images/wr-investors-awesome.png → prelab/images/wr-investors-awesome.png
diff --git a/lab1/images/wr-investors-header.png → prelab/images/wr-investors-header.png b/lab1/images/wr-investors-header.png → prelab/images/wr-investors-header.png
diff --git a/lab1/images/wr-investors-pcp.png → prelab/images/wr-investors-pcp.png b/lab1/images/wr-investors-pcp.png → prelab/images/wr-investors-pcp.png
diff --git a/lab1/images/wr-investors-thebarn.png → prelab/images/wr-investors-thebarn.png b/lab1/images/wr-investors-thebarn.png → prelab/images/wr-investors-thebarn.png
diff --git a/lab1/images/wr-logo-black.png → prelab/images/wr-logo-black.png b/lab1/images/wr-logo-black.png → prelab/images/wr-logo-black.png
diff --git a/lab1/images/wr-logo-white.png → prelab/images/wr-logo-white.png b/lab1/images/wr-logo-white.png → prelab/images/wr-logo-white.png
diff --git a/lab1/images/wr-unicorn-header.png → prelab/images/wr-unicorn-header.png b/lab1/images/wr-unicorn-header.png → prelab/images/wr-unicorn-header.png
diff --git a/lab1/images/wr-unicorn-one.png → prelab/images/wr-unicorn-one.png b/lab1/images/wr-unicorn-one.png → prelab/images/wr-unicorn-one.png
diff --git a/lab1/images/wr-unicorn-three.png → prelab/images/wr-unicorn-three.png b/lab1/images/wr-unicorn-three.png → prelab/images/wr-unicorn-three.png
diff --git a/lab1/images/wr-unicorn-two.png → prelab/images/wr-unicorn-two.png b/lab1/images/wr-unicorn-two.png → prelab/images/wr-unicorn-two.png
diff --git a/lab2/index.html → prelab/index.html b/lab2/index.html → prelab/index.html
@@ -9,13 +9,9 @@
   <link rel="stylesheet" href="styles/main.css">
 
   <script src="scripts/vendor/modernizr.js"></script>
-  <script src="scripts/vendor/aws-sdk.min.js" defer></script>
 
   <script src="https://use.typekit.net/dmq4txp.js"></script>
   <script>try{Typekit.load({ async: true });}catch(e){}</script>
-
-  <script src="scripts/config.js" defer></script>
-  <script src="scripts/index.js" defer></script>
 </head>
 <body class="page-home">
 
@@ -84,26 +80,16 @@ <h2 class="section-title">Our Story</h2>
 
   <section class="home-sign-up">
     <div class="row column">
-      <div class="row column">
-        <img class="icon-w" src="images/wr-home-W.png">
-
-        <div class="row column" id="form">
-          <form>
-            <input type="email" placeholder="Enter your email address">
-            <button type="submit">Submit</button>
-          </form>
-
-          <h2 class="section-title">Sign Up</h2>
+      <img class="icon-w" src="images/wr-home-W.png">
 
-          <p class="content">Wild Rydes is coming soon! Enter your email to enter the limited private beta</p>
-        </div>
+      <form onsubmit="javascript:void(0);">
+        <input type="email" placeholder="Enter your email address">
+        <button type="button">Submit</button>
+      </form>
 
-        <div style="margin-top: 110px; display: none;" id="thank-you" class="row column">
-          <h2 class="section-title">Thank You</h2>
+      <h2 class="section-title">Sign Up</h2>
 
-          <p class="content">Wild Rydes is coming soon! Stay tuned for more info about unicorns near you!</p>
-        </div>
-      </div>
+      <p class="content">Wild Rydes is coming soon! Enter your email to enter the limited private beta</p>
 
       <div class="apps">
         <a class="app-icon" href=""><img src="images/wr-home-apple.png"></a>

diff --git a/lab1/investors.html → prelab/investors.html b/lab1/investors.html → prelab/investors.html
diff --git a/lab1/robots.txt → prelab/robots.txt b/lab1/robots.txt → prelab/robots.txt
diff --git a/lab1/scripts/main.js → prelab/scripts/main.js b/lab1/scripts/main.js → prelab/scripts/main.js
diff --git a/lab1/scripts/vendor.js → prelab/scripts/vendor.js b/lab1/scripts/vendor.js → prelab/scripts/vendor.js
diff --git a/lab3/scripts/vendor/modernizr.js → prelab/scripts/vendor/modernizr.js b/lab3/scripts/vendor/modernizr.js → prelab/scripts/vendor/modernizr.js
diff --git a/prelab/styles/main.css b/prelab/styles/main.css
diff --git a/lab1/unicorns.html → prelab/unicorns.html b/lab1/unicorns.html → prelab/unicorns.html