From c38dcb170799237de00a8deff2eb46023473faaa Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Fri, 1 Nov 2019 08:10:13 -0700 Subject: [PATCH 1/3] Simplify 7 --- src/components/H.tsx | 3 +- src/contents/7.en.tsx | 132 ++---------------------------------------- 2 files changed, 7 insertions(+), 128 deletions(-) diff --git a/src/components/H.tsx b/src/components/H.tsx index d3e8c7506..1fb9f1105 100644 --- a/src/components/H.tsx +++ b/src/components/H.tsx @@ -1008,8 +1008,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { {question}

- If you changed your mind want to keep reading: Press - the button below! + To keep reading this course: Press the button below!

) diff --git a/src/contents/7.en.tsx b/src/contents/7.en.tsx index fe6b8c70b..c86c4d39c 100644 --- a/src/contents/7.en.tsx +++ b/src/contents/7.en.tsx @@ -177,6 +177,7 @@ export default () => ( ) }, { + type: 'challengeProblem', title: <>The problem, content: ( <> @@ -246,8 +247,7 @@ export default () => (

Each icon{' '} - represents a food item, but we’ll - talk about that later. + represents a food item.

@@ -277,18 +277,6 @@ export default () => ( ]} /> After combining the two lunchboxes - - ) - }, - { - type: 'challengeProblem', - title: ( - <> - to - - ), - content: ( - <> (

Now, here’s the challenge:

-
    - - - If you fill each{' '} - icon with - the correct food item, - - - - - After running it, it becomes a lunchbox that can be - converted to . - - -
- - ) - } - ]} - /> - - If you fill each icon with -
- the correct food item, - - - - After running it, it becomes a lunchbox -
- that can be converted to - - -

- Because the top lunchbox can be converted to{' '} - , -

- - - -

- It means that: -

-
    - By running the combined lunchbox, - - - A lunchbox that can be converted to{' '} - … - - - - - Becomes a lunchbox that can be converted to{' '} - . - - -
- - ) - } - ]} - /> - , - , - - ]} - description={ - <> - A lunchbox that can be converted to -
- becomes a lunchbox -
- that can be converted to - - } - /> - -

- So, here’s what you need to do: -

    @@ -769,7 +659,7 @@ export default () => ( type: 'dog', children: ( <> -

    Your answer was incorrect!

    +

    Your answer was incorrect.

    ) } @@ -880,23 +770,13 @@ export default () => ( ) }, { - title: <>The answer is on the next page, + title: <>Can the villagers solve this problem?, content: ( <>

    The villagers are so close to getting their mathboxes back, but - they’re struggling with the difficult problem. -

    - This problem is too difficult!} - /> -

    - But:{' '} - - They’ll figure out the answer on the next page. - {' '} - Let’s keep reading! + they’re struggling. Let’s see if they can solve it on the next + page!

    From c6bcbfa150216a45a5904db94db9c75e6a0ba3b5 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Fri, 1 Nov 2019 08:16:26 -0700 Subject: [PATCH 2/3] Simplify 9 --- src/components/H.tsx | 9 ++++----- src/contents/9.en.tsx | 15 +++++++++++---- src/contents/9.jp.tsx | 17 ++++++++++++++--- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/components/H.tsx b/src/components/H.tsx index 1fb9f1105..608f19bd1 100644 --- a/src/components/H.tsx +++ b/src/components/H.tsx @@ -1612,13 +1612,13 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { if (locale === 'en') { return ( - You can also skip to the end. 😉 + You can also skip to the end. ) } else { return ( - 最後までスキップすることも可能です。😉 + 最後までスキップすることも可能です。 ) } @@ -1627,14 +1627,13 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { if (locale === 'en') { return ( - You can also skip to the next stopping point.{' '} - 😉 + You can also skip to the next stopping point. ) } else { return ( - 途中までスキップすることも可能です。😉 + 途中までスキップすることも可能です。 ) } diff --git a/src/contents/9.en.tsx b/src/contents/9.en.tsx index d727ae45a..a0863e95c 100644 --- a/src/contents/9.en.tsx +++ b/src/contents/9.en.tsx @@ -641,7 +641,7 @@ export default () => ( type: 'dog', children: ( <> -

    We’re not done yet, but did you notice anything

    +

    We’re not done yet, but did you notice something?

    ) }, @@ -810,12 +810,19 @@ export default () => ( If the same item exists in both{' '} and{' '} - , -
    - then the results change + … } /> + + , + 🆚, + + ]} + description={<>The results change} + /> ) }, diff --git a/src/contents/9.jp.tsx b/src/contents/9.jp.tsx index 0a2b499fd..22d07d4b3 100644 --- a/src/contents/9.jp.tsx +++ b/src/contents/9.jp.tsx @@ -773,13 +773,24 @@ export default () => ( inline bottomRightBadgeType="funcUnbound" />{' '} - に同じ料理があると、 -
    - 実行結果が狂う + に同じ料理があると… } /> + + , + 🆚, + + ]} + description={ + <> + 実行結果が狂う + + } + /> ) }, From 237846253627bbb57c645e9c87ec07a0b39f9c85 Mon Sep 17 00:00:00 2001 From: Shu Uesugi Date: Fri, 1 Nov 2019 08:23:11 -0700 Subject: [PATCH 3/3] Simplify 9 --- src/contents/9.en.tsx | 117 +++--------------------------------------- src/contents/9.jp.tsx | 101 +----------------------------------- 2 files changed, 9 insertions(+), 209 deletions(-) diff --git a/src/contents/9.en.tsx b/src/contents/9.en.tsx index a0863e95c..45b2e5ea9 100644 --- a/src/contents/9.en.tsx +++ b/src/contents/9.en.tsx @@ -259,78 +259,6 @@ export default () => ( ) }, - { - title: <>Let’s compare it with the last time, - content: ( - <> - -

    - Let’s compare it with the last time. Previously, we used - the following lunchbox: -

    -

    - The only difference: It has{' '} - - ’s on the top instead of - ’s. Everything else is the same. -

    - - ) - } - ]} - /> -

    - -

    - - What we used last time: -
    - It has - ’s on top instead of - ’s. -
    - Everything else is the same. -     - -

    - This one did become a lunchbox that can be converted to{' '} - . -

    - - ) - } - ]} - /> - - - - -

    Hmm, why is there a difference?

    - - ) - } - ]} - /> - - ) - }, { title: ( <> @@ -350,36 +278,7 @@ export default () => ( <>

    Let me tell you what’s going on.

    - Let’s take a look at the previous example that{' '} - - ❌ failed{' '} - ❌ - {' '} - to calculate {' '} - ➕ . -

    - - ) - } - ]} - /> - - The example that{' '} - - ❌ failed ❌ - -
    - to calculate ➕{' '} - -     - -

    - Let’s label each item with{' '} + First, let’s label each item with{' '} ( inline bottomRightBadgeType="funcUnbound" /> - , then the results change. + , then the result changes.

    @@ -501,7 +400,7 @@ export default () => ( ,
    - then the results change + then the result changes } /> @@ -519,7 +418,7 @@ export default () => ( type: 'dog', children: ( <> -

    Let me use an example to explain!

    +

    Let me use a simple example to explain!

    ) } @@ -538,7 +437,7 @@ export default () => ( type: 'dog', children: ( <> -

    Here’s a simple example:

    +

    Here’s a simple example that illustrates my point:

      The left lunchbox has{' '} @@ -791,7 +690,7 @@ export default () => ( inline bottomRightBadgeType="funcUnbound" /> - , then the results change. + , then the result changes.

      @@ -821,7 +720,7 @@ export default () => ( 🆚, ]} - description={<>The results change} + description={<>The result changes} /> ) @@ -842,7 +741,7 @@ export default () => ( .

      - ❌ This failed because{' '} + This failed because{' '} was in both{' '} ( ) }, - { - title: <>前回と比較してみよう, - content: ( - <> - -

      - では、前回と比較してみましょう。前回実行したのは、こちらの弁当箱でした。 -

      -

      - - 先ほどと唯一違うのは、上の部分に{' '} - のかわりに{' '} - が入っている - - ところです。(黄色で示しています) -

      - - ) - } - ]} - /> -

      - -

      - - 前回実行した弁当箱: -
      - 上の部分は に変換できる。 -
      - - 先ほどと違うのは、上の の部分。 - -
      - それ以外はすべて先ほどと同じ。 -       - -

      - こちらは、最終的に {' '} - に変換できる弁当箱になりますね。 -

      - - ) - } - ]} - /> - - - - -

      うーん、どうして結果に違いが出るんだろう？

      - - ) - } - ]} - /> - - ) - }, { title: ( <> @@ -349,31 +274,7 @@ export default () => ( <>

      では、ここでネタばらしをしましょう。

      - こちらに、先ほど - 失敗した - 例をもう一度表示しています。 -

      - - ) - } - ]} - /> - - 先ほど{' '} - - ➕{' '} - を計算できなかった - - 例 - - -

      - 次に、 + まず、先ほどの失敗した弁当箱に{' '}