Skip to content
This repository was archived by the owner on Sep 3, 2025. It is now read-only.

Improve 7 second try #125

Merged
merged 3 commits into from
Nov 1, 2019
Merged

Improve 7 second try #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c38dcb1
Simplify 7
chibicode Nov 1, 2019
c6bcbfa
Simplify 9
chibicode Nov 1, 2019
2378462
Simplify 9
chibicode Nov 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/components/H.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,8 +1008,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => {
<TwitterEmbed id={shareId} />
{question}
<P>
<Bold>If you changed your mind want to keep reading:</Bold> Press
the button below!
<Bold>To keep reading this course:</Bold> Press the button below!
</P>
</>
)
Expand Down Expand Up @@ -1613,13 +1612,13 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => {
if (locale === 'en') {
return (
<Highlight highlightType="pink">
You can also <Bold>skip to the end</Bold>. <Emoji>😉</Emoji>
You can also <Bold>skip to the end</Bold>.
</Highlight>
)
} else {
return (
<Highlight highlightType="pink">
<Bold>最後までスキップ</Bold>することも可能です。<Emoji>😉</Emoji>
<Bold>最後までスキップ</Bold>することも可能です。
</Highlight>
)
}
Expand All @@ -1628,14 +1627,13 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => {
if (locale === 'en') {
return (
<Highlight highlightType="pink">
You can also <Bold>skip to the next stopping point.</Bold>{' '}
<Emoji>😉</Emoji>
You can also <Bold>skip to the next stopping point.</Bold>
</Highlight>
)
} else {
return (
<Highlight highlightType="pink">
<Bold>途中までスキップ</Bold>することも可能です。<Emoji>😉</Emoji>
<Bold>途中までスキップ</Bold>することも可能です。
</Highlight>
)
}
Expand Down
132 changes: 6 additions & 126 deletions src/contents/7.en.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ export default () => (
)
},
{
type: 'challengeProblem',
title: <>The problem</>,
content: (
<>
Expand Down Expand Up @@ -246,8 +247,7 @@ export default () => (
<P>
<Highlight>
Each <CustomEmoji type="questionFoodGrey" /> icon{' '}
<Italic>represents a food item</Italic>, but we’ll
talk about that later.
<Italic>represents a food item</Italic>.
</Highlight>
</P>
</>
Expand Down Expand Up @@ -277,18 +277,6 @@ export default () => (
]}
/>
<R.Stda>After combining the two lunchboxes</R.Stda>
</>
)
},
{
type: 'challengeProblem',
title: (
<>
<EmojiNumber number={0} /> to <EmojiNumber number={1} />
</>
),
content: (
<>
<BubbleQuotes
quotes={[
{
Expand All @@ -298,104 +286,6 @@ export default () => (
<P>
<Bold>Now, here’s the challenge:</Bold>
</P>
<Ul>
<UlLi>
<Highlight>
If you fill each{' '}
<CustomEmoji type="questionFoodGrey" /> icon with
the <Italic>correct</Italic> food item,
</Highlight>
</UlLi>
<UlLi>
<Highlight>
After running it, it becomes a lunchbox that can be
converted to <EmojiNumber number={1} />.
</Highlight>
</UlLi>
</Ul>
</>
)
}
]}
/>
<R.Cawa>
If you fill each <CustomEmoji type="questionFoodGrey" /> icon with
<br />
the <Italic>correct</Italic> food item,
</R.Cawa>
<ExpressionRunnerSeparator />
<R.Jzwg>
After running it, it becomes a lunchbox
<br />
that can be converted to <EmojiNumber number={1} />
</R.Jzwg>
<BubbleQuotes
quotes={[
{
type: 'dog',
children: (
<>
<P>
Because the top lunchbox can be converted to{' '}
<EmojiNumber number={0} />,
</P>
<R.Hkbs>
<H
args={{
name: 'canBeConvertedCaption',
letter: 'd',
number: 0
}}
/>
</R.Hkbs>
<P>
<Bold>It means that:</Bold>
</P>
<Ul>
<UlLi>By running the combined lunchbox,</UlLi>
<UlLi>
<Highlight>
A lunchbox that can be converted to{' '}
<EmojiNumber number={0} />…
</Highlight>
</UlLi>
<UlLi>
<Highlight>
Becomes a lunchbox that can be converted to{' '}
<EmojiNumber number={1} />.
</Highlight>
</UlLi>
</Ul>
</>
)
}
]}
/>
<EmojiSeparator
nodes={[
<EmojiNumber number={0} />,
<CustomEmoji type="singleArrow" />,
<EmojiNumber number={1} />
]}
description={
<>
A lunchbox that can be converted to <EmojiNumber number={0} />
<br />
becomes a lunchbox
<br />
that can be converted to <EmojiNumber number={1} />
</>
}
/>
<BubbleQuotes
quotes={[
{
type: 'dog',
children: (
<>
<P>
<Bold>So, here’s what you need to do:</Bold>
</P>
<Ul>
<UlLi>
<Highlight>
Expand Down Expand Up @@ -769,7 +659,7 @@ export default () => (
type: 'dog',
children: (
<>
<P>Your answer was incorrect!</P>
<P>Your answer was incorrect.</P>
</>
)
}
Expand Down Expand Up @@ -880,23 +770,13 @@ export default () => (
)
},
{
title: <>The answer is on the next page</>,
title: <>Can the villagers solve this problem?</>,
content: (
<>
<P>
The villagers are so close to getting their mathboxes back, but
they’re struggling with the difficult problem.
</P>
<EmojiSeparator
emojis={['❓', '😭', '❓']}
description={<>This problem is too difficult!</>}
/>
<P>
<Bold>But:</Bold>{' '}
<Highlight>
They’ll figure out the answer on the next page.
</Highlight>{' '}
Let’s keep reading!
they’re struggling. Let’s see if they can solve it on the next
page!
</P>
<NextLessonButton />
</>
Expand Down
Loading