Skip to content

Commit 80e49d3

Browse files
chelprocchelproc
committed
講座の順番を少し変更
1 parent cda7700 commit 80e49d3

File tree

24 files changed

+238
-119
lines changed

24 files changed

+238
-119
lines changed

docs/1-trial-session/05-javascript/hello-world-by-javascript.mp4 renamed to docs/1-trial-session/03-javascript/hello-world-by-javascript.mp4

File renamed without changes.

docs/1-trial-session/05-javascript/index.md renamed to docs/1-trial-session/03-javascript/index.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import helloWorldByJavascriptVideo from "./hello-world-by-javascript.mp4"
77

88
## <Term type="javascript">JavaScript</Term>
99

10-
<p><Term type="html">HTML</Term> がウェブサイトの構造を、<Term type="css">CSS</Term> がデザインを司る言語であるとすれば、<Term strong type="javascript">JavaScript</Term> はウェブサイトに振る舞いを与える言語といえます。ブラウザさえあれば環境に関係なく同じように実行可能な、強力なプログラミング言語です。</p>
10+
<p><Term type="html">HTML</Term> がウェブサイトの構造を表す言語だとすれば、<Term strong type="javascript">JavaScript</Term> はウェブサイトに振る舞いを与える言語といえます。ブラウザさえあれば環境に関係なく同じように実行可能な、強力なプログラミング言語です。</p>
11+
12+
![Web開発で用いられる言語](../02-html/web-development-languages.drawio.svg)
1113

1214
## <Term type="javascript">JavaScript</Term> で Hello World!
1315

@@ -34,7 +36,7 @@ import helloWorldByJavascriptVideo from "./hello-world-by-javascript.mp4"
3436
document.write("Hello World!");
3537
```
3638

37-
ブラウザじ実行してみましょう。`Hello World!` と表示されましたか？
39+
ブラウザで実行してみましょう。`Hello World!` と表示されましたか？
3840

3941
<video src={helloWorldByJavascriptVideo} controls />
4042

docs/1-trial-session/06-expressions/index.md renamed to docs/1-trial-session/04-expressions/index.md

File renamed without changes.

docs/1-trial-session/06-expressions/value-types.drawio.svg renamed to docs/1-trial-session/04-expressions/value-types.drawio.svg

File renamed without changes.

docs/1-trial-session/07-variables/index.md renamed to docs/1-trial-session/05-variables/index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: 変数
33
---
44

55
import Term from "@site/src/components/Term";
6+
import OpenInCodeSandbox from "@site/src/components/OpenInCodeSandbox";
67

78
## <Term type="javascriptVariable">変数</Term>とは
89

@@ -61,6 +62,9 @@ price = price / 2;
6162
document.write(price);
6263
```
6364

65+
<OpenInCodeSandbox path="/docs/1-trial-session/05-variables/samples/compound-assignment" />
66+
67+
6468
<p><Term type="javascriptAssignment">代入</Term><Term type="javascriptOperator">演算子</Term>は、まず右辺の<Term type="javascriptExpression">式</Term>を<Term type="javascriptEvaluation">評価</Term>します。これにより、右辺は <code>100 / 2</code> となります。よって、最終的に<Term type="javascriptVariable">変数</Term> <code>price</code> の<Term type="javascriptValue">値</Term>は <code>50</code> となり、これは <code>price</code> を半分にする操作に対応します。</p>
6569

6670
![変数の再代入](./reassignment-evaluation.png)

docs/1-trial-session/07-variables/reassignment-evaluation.png renamed to docs/1-trial-session/05-variables/reassignment-evaluation.png

File renamed without changes.

‎docs/1-trial-session/05-variables/samples/compound-assignment/index.html‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<!DOCTYPE html>
2+
<html lang="ja">
3+
<head>
4+
<meta charset="utf-8" />
5+
<title>Title</title>
6+
</head>
7+
<body>
8+
<script src="./script.js"></script>
9+
</body>
10+
</html>

‎docs/1-trial-session/05-variables/samples/compound-assignment/script.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
document.write("Hello World!");

docs/1-trial-session/08-boolean/index.md renamed to docs/1-trial-session/06-boolean/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import Term from "@site/src/components/Term";
1616

1717
<p><Term type="javascriptBoolean">論理値</Term>に対して適用できる<Term type="javascriptOperator">演算子</Term>が存在します。</p>
1818

19-
```jsx
19+
```javascript
2020
let isMonsterBig = true;
2121
let isMonsterSmall = !true; // false
2222
let isHunterStrong = false;
@@ -36,7 +36,7 @@ let shouldFight = isHunterStrong || isMonsterSmall; // false
3636

3737
比較<Term type="javascriptOperator">演算子</Term>は、複数の<Term type="javascriptValue">値</Term>を比較して、単一の<Term type="javascriptBoolean">論理値</Term>を得ます。
3838

39-
```jsx
39+
```javascript
4040
let age = 15;
4141
let height = 155;
4242
let isFourteen = age === 14; // false

docs/1-trial-session/08-boolean/value-types-with-boolean.drawio.svg renamed to docs/1-trial-session/06-boolean/value-types-with-boolean.drawio.svg

File renamed without changes.

0 commit comments

Comments
 (0)