Skip to content

Commit

Permalink
[automated changes] run prettier on entire repo after simplifying config
Browse files Browse the repository at this point in the history
  • Loading branch information
vegetabill committed Dec 14, 2020
1 parent 6a81b37 commit cab822c
Show file tree
Hide file tree
Showing 58 changed files with 1,552 additions and 1,390 deletions.
11 changes: 0 additions & 11 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
{
"arrowParens": "always",
"bracketSpacing": true,
"jsxBracketSameLine": false,
"jsxSingleQuote": false,
"semi": true,
"singleQuote": true,
"tabWidth": 2,
"useTabs": false,
"quoteProps": "as-needed",
"trailingComma": "none",
"requirePragma": false,
"insertPragma": false,
"proseWrap": "preserve",
"vueIndentScriptAndStyle": false,
"endOfLine": "auto",
"overrides": [
{
"files": "*.md",
Expand Down
6 changes: 3 additions & 3 deletions _templates/lesson-v2.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# Your Topic Name

_Should match the filename, but filename should be `kebab-case`_

**Note: all content should follow the [Style Guide](./README.md#style-guide)**

## Projected Time

1.5 hours

- Lesson: 30min
- Guided Practice: 30min
- Independent Practice: 30min
Expand Down Expand Up @@ -42,7 +44,6 @@ It can contain links to external materials but you should summarize here in your

###


### Common Mistakes & Misconceptions

This section is optional, but if there are common misunderstandings, please enumerate them here. List things that apprentices might not realize, might assume at first, or should avoid.
Expand All @@ -51,12 +52,10 @@ This section is optional, but if there are common misunderstandings, please enum
- `for (let x of obj)` loops and `for (let elem in obj)` loops are different
- `const` variables are not immutable; they just can't be reassigned


### Guided Practice

Have the apprentices work with you as you do something step-by-step. This should be inlined here as original content, not just linked to an external tutorials.


### Independent Practice

Class does this thing themselves with specific additional items. This could be alone, with a partner, or small group; but the idea is that it's less guided, more independent.
Expand All @@ -68,5 +67,6 @@ Building on the independent practice, here are some challenging optional add-ons
### Supplemental Materials

Here you can link in external tutorials, official or unofficial documentation pages, blogs, videos, etc.

- [example website](https://google.com) - short description (approximate duration to watch/read)
- [Other example website](https://google.com) - description
12 changes: 6 additions & 6 deletions algorithms/sorting.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Say we want to sort a deck of cards:
Let's talk about the Complexity of BogoSort. Here's the pseudocode:

```JavaScript
while not Sorted(a)
while not Sorted(a)
Shuffle(a)
```

Expand Down Expand Up @@ -114,8 +114,8 @@ function bubble_sort(a)
}
n--;
} while (swap);
return x;
}
return x;
}
```

We have nested loops: the while-loop and the for-loop! The outer loop passes until there are no more swaps. Thus the runtime is O(n^2).
Expand Down Expand Up @@ -195,16 +195,16 @@ function merge (a, left, right, middle){
for(let j=0;j<n2;j++){
R[j] = a[middle+j+1];
}
i = 0;
j = 0 ;
i = 0;
j = 0 ;
let k = left;
while (i < n1 && j < n2)
{
if (L[i] <= R[j])
a[k] = L[i++];
else
a[k] = R[j++];
k++;
k++;
}
while (i < n1)
{
Expand Down
Loading

0 comments on commit cab822c

Please sign in to comment.