Skip to content

Commit

Permalink
Merge branch 'main' of github.com:DeNepo/welcome-to-js into main
Browse files Browse the repository at this point in the history
  • Loading branch information
colevandersWands committed Nov 20, 2023
2 parents 8580c52 + c2bd7ec commit 12c8d0e
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 18 deletions.
13 changes: 5 additions & 8 deletions 1-what-is-programming/0-javascript/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ alert('hello user (alert)');

You can also write your code in a script tag of an HTML file then open the HTML
file in your browser. The JavaScript will run automatically when the page is
loaded. See this in action with `./inline.html`.
loaded. See this in action with `./1-inline-script-tag.html`.

You will learn about this later in the course for examples and exercises that
introduce how JavaScript interacts with the DOM. It's easier to understand "the
Expand All @@ -74,8 +74,8 @@ big picture" when you can see everything in one document.

You can also write your code in a separate `.js` file, then load the file into
your HTML to execute the code. There are two different ways you can load a `.js`
file into your HTML, you can see them in action with `./separate-script` and
`./separate-modules` (you'll learn more about scripts vs. modules later on).
file into your HTML, you can see them in action with `./2-separate-script-file` and
`./3-separate-module-files` (you'll learn more about scripts vs. modules later on).

You will use this for larger projects and for collaboration. Separating code
into smaller files each with a clear purpose makes your code base easier to
Expand Down Expand Up @@ -113,8 +113,7 @@ in a browser, each one has a specific use case:
[code.org](https://code.org/) (develop and play games with JS),
[editor.p5js.org](https://editor.p5js.org/) (create interactive artwork),
[PencilCode](https://pencilcode.net/edit/myprogram) (write your code as blocks
or text), [Ocelot](https://code.ocelot-ide.org/) (disallows "bad" language
features and has helpful error messages).
or text).

---

Expand All @@ -135,11 +134,9 @@ secure and developer-friendly alternative to Node.js.

- [javascript.info/intro](https://javascript.info/intro)
- [The Net Ninja](https://www.youtube.com/watch?v=VB7y0yxZjro)
- [MDN](https://developer.mozilla.org/en-US/docs/Learn/JavaScript/First_steps/What_is_JavaScript)
- [Andrew Mosh](https://www.youtube.com/watch?v=W6NZfCO5SIk) \(first 5 minutes\)
- [Code School](https://www.youtube.com/watch?v=nItSSTwBvSU)
- [MDN: First Steps](https://developer.mozilla.org/en-US/docs/Learn/JavaScript/First_steps/What_is_JavaScript)
- [javascript.info](https://javascript.info/intro)
- [Danielle Thé](https://www.youtube.com/watch?v=gT0Lh1eYk78)

---
Expand All @@ -148,4 +145,4 @@ secure and developer-friendly alternative to Node.js.

JavaScript is the language used to write the Source Code in this diagram:

[![program diagram](../../assets/a-program.svg)](https://excalidraw.com/#json=_cj6JYwuO38PPGKxXN_cQ,3910Z7e2jGLZu4vjueG-Bg)
[![program diagram](../../assets/a-program.png)](https://excalidraw.com/#json=_cj6JYwuO38PPGKxXN_cQ,3910Z7e2jGLZu4vjueG-Bg)
1 change: 0 additions & 1 deletion 1-what-is-programming/0-javascript/some-history.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ grow, but this is the case for JavaScript.

- [You Don't Know JS](https://github.com/getify/You-Dont-Know-JS/blob/2nd-ed/get-started/ch1.md#backwards--forwards)
- [Why is JavaScript backwards compatible to a fault?](https://stackoverflow.com/questions/4937245/why-is-javascript-backwards-compatible-to-a-fault)
- [edytawrobel](https://www.edytawrobel.com/js-compatibility/)
- [tonsky.me](https://tonsky.me/blog/compatibility/)
- [rohitdhatrak](https://www.rohitdhatrak.com/backwards-forwards-compatibility/)
- [Chrome Breaks the Web](https://www.theregister.com/2021/10/04/chrome_breaks_web/)
Expand Down
2 changes: 1 addition & 1 deletion 1-what-is-programming/1-the-developers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ Users and on the left in this diagram, developers are on the right.
- **Dynamic**: Logs and error messages help developers understand what is
happening inside the computer as it follows the code's instructions.

[![program diagram](../../assets/a-program.svg)](https://excalidraw.com/#json=40qMI89WByj9Yhhh94Ghg,4zpL-AmDgpnbyFJWJfNQhg)
[![program diagram](../../assets/a-program.png)](https://excalidraw.com/#json=40qMI89WByj9Yhhh94Ghg,4zpL-AmDgpnbyFJWJfNQhg)
2 changes: 1 addition & 1 deletion 1-what-is-programming/2-the-computer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ developer.
Tracing code is a very good way to begin understanding how the computer follows
your instructions one step at a time:

[![program diagram](../../assets/a-program.svg)](https://excalidraw.com/#json=_cj6JYwuO38PPGKxXN_cQ,3910Z7e2jGLZu4vjueG-Bg)
[![program diagram](../../assets/a-program.png)](https://excalidraw.com/#json=_cj6JYwuO38PPGKxXN_cQ,3910Z7e2jGLZu4vjueG-Bg)
2 changes: 1 addition & 1 deletion 1-what-is-programming/3-the-users/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ Users and on the left in this diagram, developers are on the right.
- **Outputting Data**: `alert` is a simple way for the computer to display
data to a user.

[![program diagram](../../assets/a-program.svg)](https://excalidraw.com/#json=40qMI89WByj9Yhhh94Ghg,4zpL-AmDgpnbyFJWJfNQhg)
[![program diagram](../../assets/a-program.png)](https://excalidraw.com/#json=40qMI89WByj9Yhhh94Ghg,4zpL-AmDgpnbyFJWJfNQhg)
4 changes: 2 additions & 2 deletions 1-what-is-programming/4-data-in-data-out/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

So what is a program? It's something like this:

![program diagram](../../assets/a-program.svg)
![program diagram](../../assets/a-program.png)

The basic job of a computer program is to process data. Even the most beautiful
and interactive programs are just processing data behind the scenes. One of the
Expand Down Expand Up @@ -90,7 +90,7 @@ Practice explaining what is happening in each program using these terms:
out.

In the `/examples` folder you will find a few programs with a comment describing
the **behavior**, **data in** and **data out**. Your challenge in `/exericses`
the **behavior**, **data in** and **data out**. Your challenge in `/exercises`
is to fill in the same information for new programs.

Be _very careful_ about your formatting! Study the example comments closely and
Expand Down
4 changes: 2 additions & 2 deletions 1-what-is-programming/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ then communicating with everyone involved to deliver quality software within
your project's constraints. This diagram shows the different channels of
communication in a software project:

![rhetorical situation](../assets/the-big-picture.svg)
![rhetorical situation](../assets/the-big-picture.png)

---

Expand All @@ -42,7 +42,7 @@ perfectly structured and do exactly what we want. The computer just _parses_
(interprets) our code and follows the instructions without any understanding or
thinking.

You can think of a programing language as the developer's UI for the computer.
You can think of a programming language as the developer's UI for the computer.
Because this UI isn't very intuitive you will need to spend a lot of time
studying syntax and other details before you can program with ease. This is why
you will be focusing on _understanding_ programs before writing them.
Expand Down
2 changes: 2 additions & 0 deletions 2-just-enough-javascript/02-primitive-values/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ console.log(null);
'use strict';
console.log('--- numbers: numbers that are not wrapped in quotation marks ---');
console.log(12);
console.log(3.14);
console.log(0);
console.log(-12);
console.log(10_000_000_000);
```
2 changes: 1 addition & 1 deletion 2-just-enough-javascript/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ rest go a lot smoother.
#### `// prettier-ignore`

The marking exercises will have an extra block around the code and a comment
written before the block. You can ignore that. It's there Prettier doesn't
written before the block. You can ignore that. It's there so that Prettier doesn't
remove the extra spacing when it formats the code.

---
Expand Down
Binary file added assets/a-program.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/computers-and-developers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/the-big-picture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lesson-plans/computers-and-developers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ will be a mystery!

---

<img src="../../assets/computers-and-developers.svg" alt="rhetorical situation" style="height: 85%; width: 85%;">
<img src="../../assets/computers-and-developers.png" alt="rhetorical situation" style="height: 85%; width: 85%;">

---

Expand Down

0 comments on commit 12c8d0e

Please sign in to comment.