From 04526328fe2319d6b97f150dc74c3698b04c4a6d Mon Sep 17 00:00:00 2001 From: elrimando Date: Tue, 26 Feb 2019 22:32:40 +0800 Subject: [PATCH 1/8] Add title to index page --- index.html | 323 ++++++++++++++++++++++++++++------------------------- 1 file changed, 171 insertions(+), 152 deletions(-) diff --git a/index.html b/index.html index 0986473..8a37e0d 100644 --- a/index.html +++ b/index.html @@ -1,169 +1,188 @@ - - - - - - -
-

Frontend Bootcamp View on GitHub

-
-
- +
+
+ +
+ + + + \ No newline at end of file From 244ed37702b309f73c206793cf8cccce19f0552d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ragnar=20K=C3=A1rason=20Colon?= Date: Tue, 26 Feb 2019 16:18:27 +0000 Subject: [PATCH 2/8] Fixing typos, the one with the title select is a suggestion as it might be unclear. --- step1-02/demo/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/step1-02/demo/README.md b/step1-02/demo/README.md index e3f5123..5bbc685 100644 --- a/step1-02/demo/README.md +++ b/step1-02/demo/README.md @@ -4,7 +4,7 @@ Every website, application, form or component starts with markup. The HTML will ## Demo -In this exercise we will scaffold out some HTML for out Todo app, and add some basic styling to it. +In this exercise we will scaffold out some HTML for our Todo app, then add some basic styling to it. ### Page scaffold @@ -41,7 +41,7 @@ As we saw in the previous demo, HTML elements can be used to describe different ### Updating the header -The header of our page is where most of the action is going to happen. First, lets give our page a title, adding 'TODO' to our `h1`. Then we can add an input and button to our `addTodo` div. +The header of our page is where most of the action is going to happen. First, lets give our page a title (Not the HTML tag), adding 'TODO' to our `h1`. Then we can add an input and button to our `addTodo` div. ```html @@ -61,7 +61,7 @@ The navigation for this application is quite simple. We want users to be able to ### Adding styles -Now that we've got the top of our application scaffolded, we can add some our styles in the head. +Now that we've got the top of our application scaffolded, we can add some of our styles in the head. ```html From 9c5f658168eab6de2af96868da3a5b9ec748ef36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ragnar=20K=C3=A1rason=20Colon?= Date: Tue, 26 Feb 2019 17:01:49 +0000 Subject: [PATCH 3/8] More typos. --- step1-03/exercise/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/step1-03/exercise/README.md b/step1-03/exercise/README.md index b3736b4..708208e 100644 --- a/step1-03/exercise/README.md +++ b/step1-03/exercise/README.md @@ -3,13 +3,13 @@ ### Write updateRemaining function 1. Get a reference to the span with the `remaining` class, and store it in a variable -2. Use [querySelectAll](https://developer.mozilla.org/en-US/docs/Web/API/Document/querySelectorAll) to get all of the todos. +2. Use [querySelectorAll](https://developer.mozilla.org/en-US/docs/Web/API/Document/querySelectorAll) to get all of the todos. 3. Set the `innerText` of the remaining span to the length of those todos. 4. Add updateRemaining() to addTodo ### Write a clearCompleted function -1. Get a reference to all of the todos with [querySelectAll](https://developer.mozilla.org/en-US/docs/Web/API/Document/querySelectorAll) +1. Get a reference to all of the todos with [querySelectorAll](https://developer.mozilla.org/en-US/docs/Web/API/Document/querySelectorAll) 2. Use a `for (let todo of todos)` loop to iterate over each todo 3. Inside the for loop write an `if` statement to test if the `input` inside of the todo has a checked value of true > Hint: you can use querySelector on any HTML node to find child elements within From 9bb0fe0c514b1784c74940647a32350f23c63f81 Mon Sep 17 00:00:00 2001 From: Micah Godbolt Date: Tue, 26 Feb 2019 09:15:17 -0800 Subject: [PATCH 4/8] Update index.html --- index.html | 324 +++++++++++++++++++++++++---------------------------- 1 file changed, 153 insertions(+), 171 deletions(-) diff --git a/index.html b/index.html index 8a37e0d..c9dc707 100644 --- a/index.html +++ b/index.html @@ -1,188 +1,170 @@ - - - - - - Microsoft Days in the Web - Welcome - - - -
-

Frontend Bootcamp View on GitHub

-
-
-
- -
  • -
    - React Intro -
    - demo | final +
    • +
  • +
    + React Intro +
    + demo | final +
    - -
    • -
  • -
    - React Components -
    - demo | exercise | - final +
    • +
  • +
    + React Components +
    + demo | exercise | + final +
    - -
    • -
  • -
    - State-Driven UI -
    - demo | exercise | - final +
    • +
  • +
    + State-Driven UI +
    + demo | exercise | + final +
    - -
    • -
  • -
    - UI-Driven State -
    - demo | exercise | - final +
    • +
  • +
    + UI-Driven State +
    + demo | exercise | + final +
    - -
    • - - -
    -
      -
    • -

      Day 2

      - Take your todo app to the next level with TypeScript, Fabric React, and Redux. -
      • -
    • -
      - TypeScript Basics -
      - demo | exercise +
      • +
    +
    +
    +
      +
    • +

      Day 2

      + Take your todo app to the next level with TypeScript, Fabric React, and Redux. +
      • +
    • +
      + TypeScript Basics +
      + demo | exercise +
      -
    - -
  • -
    - UI Fabric -
    - demo | exercise +
    • +
  • +
    + UI Fabric +
    + demo | exercise +
    - -
    • -
  • -
    - Theming and Styling -
    - demo | exercise +
    • +
  • +
    + Theming and Styling +
    + demo | exercise +
    - -
    • -
  • -
    - Testing with jest -
    - demo | exercise +
    • +
  • +
    + Testing with jest +
    + demo | exercise +
    - -
    • -
  • -
    - Redux: Reducers -
    - demo | exercise +
    • +
  • +
    + Redux: Reducers +
    + demo | exercise +
    - -
    • -
  • -
    - Redux: Dispatch Actions -
    - demo | exercise +
    • +
  • +
    + Redux: Dispatch Actions +
    + demo | exercise +
    - -
    • -
  • -
    - Redux: Connect to UI -
    - demo | exercise +
    • +
  • +
    + Redux: Connect to UI +
    + demo | exercise +
    - -
    • -
  • -
    - Redux: Combine Reducers -
    - demo | exercise +
    • +
  • +
    + Redux: Combine Reducers +
    + demo | exercise +
    - -
    • -
  • -
    - Redux: Service Calls -
    - demo | exercise +
    • +
  • +
    + Redux: Service Calls +
    + demo | exercise +
    - -
    • - - -
    -
      -
    • -

      Playground

      - Build your app here! -
      • -
    • Playground
      • -
    -
    - - - - \ No newline at end of file + + + +
    +
      +
    • +

      Playground

      + Build your app here! +
      • +
    • Playground
      • +
    +
    + + + From 0cd4c168113a3331317d5574a26d4a567c7e54b2 Mon Sep 17 00:00:00 2001 From: Micah Godbolt Date: Tue, 26 Feb 2019 09:17:33 -0800 Subject: [PATCH 5/8] Update README.md --- step1-02/demo/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/step1-02/demo/README.md b/step1-02/demo/README.md index 5bbc685..b3b8b52 100644 --- a/step1-02/demo/README.md +++ b/step1-02/demo/README.md @@ -41,7 +41,7 @@ As we saw in the previous demo, HTML elements can be used to describe different ### Updating the header -The header of our page is where most of the action is going to happen. First, lets give our page a title (Not the HTML tag), adding 'TODO' to our `h1`. Then we can add an input and button to our `addTodo` div. +The header of our page is where most of the action is going to happen. First, lets give our app a name, adding 'TODO' to our `h1`. Then we can add an input and button to our `addTodo` div. ```html From 212806fe9c73a6fb6d6f1b58ba617cd97a82c5b2 Mon Sep 17 00:00:00 2001 From: Micah Godbolt Date: Tue, 26 Feb 2019 09:18:45 -0800 Subject: [PATCH 6/8] Update README.md --- step1-02/demo/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/step1-02/demo/README.md b/step1-02/demo/README.md index b3b8b52..8b419ba 100644 --- a/step1-02/demo/README.md +++ b/step1-02/demo/README.md @@ -61,7 +61,7 @@ The navigation for this application is quite simple. We want users to be able to ### Adding styles -Now that we've got the top of our application scaffolded, we can add some of our styles in the head. +Now that we've got the top of our application scaffolded, we can add some styles in the head. ```html From 6953257aadb2290de59196431ece29507c1b70a1 Mon Sep 17 00:00:00 2001 From: Ken Date: Tue, 26 Feb 2019 09:35:56 -0800 Subject: [PATCH 7/8] Fixing tracking and fixing the playground link --- assets/track.js | 2 +- index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/track.js b/assets/track.js index f94f793..26f76d4 100644 --- a/assets/track.js +++ b/assets/track.js @@ -5,4 +5,4 @@ var appInsights=window.appInsights||function(a){ instrumentationKey: "6ad37ae0-c4ab-4739-925c-1e2773c31f17" }); // prettier-ignore -window.appInsights=appInsights,appInsights.queue&&0===appInsights.queue.length&&appInsights.trackPageView(); +window.appInsights=appInsights,appInsights.queue&&0===appInsights.queue.length&&appInsights.trackPageView(null, null, {urlReferrer: document.referrer}); diff --git a/index.html b/index.html index 0986473..35ca90b 100644 --- a/index.html +++ b/index.html @@ -161,7 +161,7 @@

    Playground

    Build your app here! -
  • Playground
    • +
  • Playground
    • From 9cef35ef706d730d0f35da1218850bfe902c2e24 Mon Sep 17 00:00:00 2001 From: Ken Date: Tue, 26 Feb 2019 09:45:41 -0800 Subject: [PATCH 8/8] fix links in readme and filter out localhost traffic --- README.md | 4 ++-- assets/track.js | 5 ++++- step2-09/README.md | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fe3e06d..6236408 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,8 @@ Demo and Exercises are combined If you are interested in JavaScript, TypeScript, React, Redux, Design Systems, follow us on Twitter: -@kenneth_chau -@micahgodbolt +- [@kenneth_chau](https://twitter.com/kenneth_chau) +- [@micahgodbolt](https://twitter.com/micahgodbolt) # Contributing diff --git a/assets/track.js b/assets/track.js index 26f76d4..1c3cfda 100644 --- a/assets/track.js +++ b/assets/track.js @@ -4,5 +4,8 @@ var appInsights=window.appInsights||function(a){ }({ instrumentationKey: "6ad37ae0-c4ab-4739-925c-1e2773c31f17" }); + // prettier-ignore -window.appInsights=appInsights,appInsights.queue&&0===appInsights.queue.length&&appInsights.trackPageView(null, null, {urlReferrer: document.referrer}); +if (window.location.hostname !== 'localhost') { + window.appInsights=appInsights,appInsights.queue&&0===appInsights.queue.length&&appInsights.trackPageView(null, null, {urlReferrer: document.referrer}); +} diff --git a/step2-09/README.md b/step2-09/README.md index cda114a..71a1073 100644 --- a/step2-09/README.md +++ b/step2-09/README.md @@ -2,6 +2,8 @@ [Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/) +(First off, this doesn't work with the live site on github.io. Clone this repo to try this step out) + Redux Thunk middleware for actions with service calls. The documentation is here: https://github.com/reduxjs/redux-thunk