Skip to content

Commit

Permalink
merged upstream branch into main
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhalasz committed Mar 1, 2024
1 parent 3ec9dd0 commit cacad8e
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 10,380 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- run: npm install
- name: Install dependencies
uses: actions/setup-node@v4
with:
node-version: '16.20.2' # Install the latest LTS (Long-Term Support) version

- run: npm run format:check

Expand Down
5 changes: 3 additions & 2 deletions 1-what-is-programming/0-javascript/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ 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 `./2-separate-script-file` and
`./3-separate-module-files` (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
1 change: 0 additions & 1 deletion 2-just-enough-javascript/07-variables/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@ many rules and the rules aren't very complicated, you just need to learn them:
- [nexTRIE](https://www.youtube.com/watch?v=O5WlRR-lEDE)
- [launchcode](https://education.launchcode.org/intro-to-web-dev-curriculum/data-and-variables/reading/more-on-variables/index.html#naming-variables)


<details>
<summary>🥚 variable names <strong>can</strong> use numbers, letters, $, or _</summary>

Expand Down
9 changes: 4 additions & 5 deletions 2-just-enough-javascript/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ and interact with users. Why just enough, and not a little more? Because reading
and understanding program logic is more important than JavaScript, so why let
the code get in the way?

In this directory is all the JavaScript you will find in this module's
examples and exercises. Don't be mistaken, there's a lot you can do with only
this!
In this directory is all the JavaScript you will find in this module's examples
and exercises. Don't be mistaken, there's a lot you can do with only this!

---

Expand Down Expand Up @@ -59,8 +58,8 @@ 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 so that Prettier doesn't
remove the extra spacing when it formats the code.
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ that have been running for a while, and especially work well when doing a second
code club using the same code snippet.

- [code reading resources](https://codereading.club/resources)

---

> adapted from
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Welcome to JS || [Inside JS >>>](https://github.com/DeNepo/inside-js)
<!-- Welcome to JS || [Inside JS >>>](https://github.com/DeNepo/inside-js) -->

# Welcome to JS

Expand Down Expand Up @@ -253,8 +253,8 @@ collaboratively on a code base.
2. pull the changes from your fork to your computer
3. Navigate to the module repository in terminal
- `$ cd welcome-to-js`
4. Run the `study` command from your CLI
- `$ study`
4. Run the `lenses2` command from your CLI
- `$ lenses2`
5. The material will open in your default browser, you're good to go!
- you can read the `study-lenses` user guide from your browser by navigating
to `localhost:xxxx?--help`
Expand Down
Loading

0 comments on commit cacad8e

Please sign in to comment.