Skip to content

Commit fb55856

Browse files
authored
Merge pull request bloominstituteoftechnology#10 from LambdaSchool/karthik
Improve README instructions and change from hard tabs to two spaces.
2 parents b1285db + 2996bd9 commit fb55856

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

README.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
# Basic JavaScript Mini
1+
# Basic JavaScript Mini
22

33
Topics:
4-
* GitHub/Git
5-
* Flow: fork -> clone -> (add/commit/push) -> pull request
6-
* arrow functions `=>`
7-
* `const`
8-
* `let`
9-
* String templates
4+
* GitHub/Git
5+
* Flow: fork -> clone -> (add/commit/push) -> pull request
6+
* arrow functions `=>`
7+
* `const`
8+
* `let`
9+
* String templates
1010

1111
## Project Description
1212

1313
### Initialize Project
14-
* Change the JavaScript in the script file to use the new ES6 syntax.
14+
* Change the JavaScript in the script file to use the new ES6 syntax.
1515
* Change the functions to be arrow functions.
1616
* Change the variables to `const` and `let`.
1717

18-
### Steps for submitting a pull request
18+
### Steps for submitting a pull request
19+
* Change your current working directory to your project: `cd /path/to/project`,
20+
where `/path/to/project` is the filesystem path to your project directory.
1921
* Step 1: Add all of your changes: `git add --all`
2022
* Step 2: Commit your changes: `git commit -m "Changed code to ES6"`
21-
* Step 3: Push your changes: `git push origin master`
23+
* Step 3: Push your changes: `git push origin master`
2224
* Step 4: On GitHub submit a pull request back to the main repo.
2325

2426
We do code reviews based off of this pull request process.
25-

script.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
var logger = function() {
2-
var message = 'hi';
3-
console.log(message);
2+
var message = 'hi';
3+
console.log(message);
44
};
55

66
var looper = function() {
7-
var message = 'I love JS!';
8-
for (var i = 0; i < 10; i++) {
9-
console.log(message);
10-
}
7+
var message = 'I love JS!';
8+
for (var i = 0; i < 10; i++) {
9+
console.log(message);
10+
}
1111
};
1212

1313
var greet = function(name) {
14-
var greeting = 'Hello ' + name + '!';
15-
console.log(greeting);
14+
var greeting = 'Hello ' + name + '!';
15+
console.log(greeting);
1616
};
1717

1818
var yourName = 'put your name in here';

0 commit comments

Comments
 (0)