From 1d7222a39a172226d10dfb195b699e9ecc7e5eff Mon Sep 17 00:00:00 2001 From: Beth Adele Long Date: Tue, 1 Nov 2016 18:12:33 -0700 Subject: [PATCH 01/23] Add dummy file for demo --- newfile.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newfile.md diff --git a/newfile.md b/newfile.md new file mode 100644 index 0000000..e69de29 From 3cfaa0da4d60f4bf48da09c2bd27fd358f6d3ecb Mon Sep 17 00:00:00 2001 From: Beth Adele Long Date: Tue, 1 Nov 2016 20:24:51 -0700 Subject: [PATCH 02/23] Add notes --- code/nojs.html | 9 +++++++++ code/tuesday.js | 27 +++++++++++++++------------ notes/tuesday.md | 19 +++++++++++++++++++ 3 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 code/nojs.html create mode 100644 notes/tuesday.md diff --git a/code/nojs.html b/code/nojs.html new file mode 100644 index 0000000..2473cee --- /dev/null +++ b/code/nojs.html @@ -0,0 +1,9 @@ + + + No JavaScript + + +

No JavaScript here!

+ + + diff --git a/code/tuesday.js b/code/tuesday.js index 8056863..37ffedd 100644 --- a/code/tuesday.js +++ b/code/tuesday.js @@ -1,14 +1,17 @@ var day = 'Monday'; -console.log('the day is: ' + day); +// console.log('the day is: ' + day); -day = 'Tuesday'; -console.log('the day is: ' + day); +day == 'Monday' +day === 'Monday' -day = 'Thursday'; -console.log('the day is: ' + day); - -day = 1; -console.log('the day is: ' + day); +// day = 'Tuesday'; +// console.log('the day is: ' + day); +// +// day = 'Thursday'; +// console.log('the day is: ' + day); +// +// day = 1; +// console.log('the day is: ' + day); var monday = 'monday'; var tuesday = 'tuesday'; @@ -25,13 +28,13 @@ tuesday = wednesday; var number = 1; var numberString = '1'; -// console.log('the variable number contains: ' + number); -// console.log('the variable numberString contains: ' + numberString); +console.log('the variable number contains: ' + number); +console.log('the variable numberString contains: ' + numberString); // TODO: What if we look at these in the console? // In the console, type: // number // numberString -// console.log('the type of variable number is: ' + typeof number); -// console.log('the type of variable numberString is: ' + typeof numberString); +console.log('the type of variable number is: ' + typeof number); +console.log('the type of variable numberString is: ' + typeof numberString); diff --git a/notes/tuesday.md b/notes/tuesday.md new file mode 100644 index 0000000..2be9716 --- /dev/null +++ b/notes/tuesday.md @@ -0,0 +1,19 @@ +. period / dot +, comma +! not / exclamation point / bang +* star / asterisk / splat +[] brackets / square brackets +{} braces / curly braces / curly brackets +| pipe +<> gt & lt (greater than & less than) / pointy brackets +/ forward slash +\ backslash +# pound / hash / octothorpe +^ caret +~ tilde +` backtick / backquote +% modulo +& ampersand +() parentheses / parens +- hyphen +_ underscore From 92c67755b8396631e0f26640d0483475ab13f780 Mon Sep 17 00:00:00 2001 From: nicky evers Date: Mon, 23 Jan 2017 19:02:17 -0800 Subject: [PATCH 03/23] Add new file with Monday notes --- notes/monday.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 notes/monday.md diff --git a/notes/monday.md b/notes/monday.md new file mode 100644 index 0000000..e69de29 From f5a6f10a363ead7e0c7800f578d936855b7c20f6 Mon Sep 17 00:00:00 2001 From: nicky evers Date: Mon, 23 Jan 2017 19:13:37 -0800 Subject: [PATCH 04/23] add new monday notes --- notes/monday.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/notes/monday.md b/notes/monday.md index e69de29..a90da4e 100644 --- a/notes/monday.md +++ b/notes/monday.md @@ -0,0 +1,11 @@ +.md- markdown, formatted html + +-Forking- top right of repository page- + +atom . =open +control ` to open terminal in atom + +after changes- git add +stage/rough draft- git add "file name" +actually commit/snapshot - git commit -m "git message, start with present tense verb" +push- git push origin master From 4a712c183cf7effab252a6fb4182d4ceedebb8cd Mon Sep 17 00:00:00 2001 From: nicky evers Date: Mon, 23 Jan 2017 20:20:33 -0800 Subject: [PATCH 05/23] update monday notes --- notes/monday.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/notes/monday.md b/notes/monday.md index a90da4e..a5682a5 100644 --- a/notes/monday.md +++ b/notes/monday.md @@ -9,3 +9,14 @@ after changes- git add stage/rough draft- git add "file name" actually commit/snapshot - git commit -m "git message, start with present tense verb" push- git push origin master + +Command Line: +pwd- present working directory +ls- list +cd= back to home +ls .. -list previous directory +cd ..- back to parent directory +control L- clear +cd - = go back to last directory +!!- do command again +history- history of commands during this session From 37d8ad3ccb8efaa2f74bb2b6be2568cc8ee86c32 Mon Sep 17 00:00:00 2001 From: nicky evers Date: Mon, 23 Jan 2017 20:24:23 -0800 Subject: [PATCH 06/23] update monday notes --- notes/monday.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/notes/monday.md b/notes/monday.md index a5682a5..0258b71 100644 --- a/notes/monday.md +++ b/notes/monday.md @@ -20,3 +20,6 @@ control L- clear cd - = go back to last directory !!- do command again history- history of commands during this session + + +change From c98598e31e1a0e87899e7e3b21c6e9159b792ae7 Mon Sep 17 00:00:00 2001 From: nicky evers Date: Mon, 23 Jan 2017 20:53:28 -0800 Subject: [PATCH 07/23] updated monday notes --- notes/monday.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/notes/monday.md b/notes/monday.md index 0258b71..4a3d50b 100644 --- a/notes/monday.md +++ b/notes/monday.md @@ -21,5 +21,9 @@ cd - = go back to last directory !!- do command again history- history of commands during this session - change + +so many changes + + +chagneeesssss From 69ff45ae858d525cc31fd49119079eea064d17fc Mon Sep 17 00:00:00 2001 From: nicky evers Date: Mon, 23 Jan 2017 20:54:48 -0800 Subject: [PATCH 08/23] updated monday notes --- notes/monday.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/notes/monday.md b/notes/monday.md index 4a3d50b..a5682a5 100644 --- a/notes/monday.md +++ b/notes/monday.md @@ -20,10 +20,3 @@ control L- clear cd - = go back to last directory !!- do command again history- history of commands during this session - -change - -so many changes - - -chagneeesssss From 36fd14ebc5a03f4a2587ecc669ca7ff39d16368b Mon Sep 17 00:00:00 2001 From: nicky evers Date: Tue, 24 Jan 2017 19:03:40 -0800 Subject: [PATCH 09/23] update notes --- notes/monday.md | 1 + 1 file changed, 1 insertion(+) diff --git a/notes/monday.md b/notes/monday.md index a5682a5..ed02c7b 100644 --- a/notes/monday.md +++ b/notes/monday.md @@ -20,3 +20,4 @@ control L- clear cd - = go back to last directory !!- do command again history- history of commands during this session + From f1e291ea986c4048919bc15f1218ca57ac91b225 Mon Sep 17 00:00:00 2001 From: nicky evers Date: Tue, 24 Jan 2017 19:12:40 -0800 Subject: [PATCH 10/23] add tuesday notes --- notes/Tuesday.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 notes/Tuesday.md diff --git a/notes/Tuesday.md b/notes/Tuesday.md new file mode 100644 index 0000000..e69de29 From 47ffa5faada9d3c7529363fdb7b64b5b43e646ed Mon Sep 17 00:00:00 2001 From: nicky evers Date: Tue, 24 Jan 2017 19:45:33 -0800 Subject: [PATCH 11/23] update tuesday --- notes/Tuesday.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/notes/Tuesday.md b/notes/Tuesday.md index e69de29..ef0fe37 100644 --- a/notes/Tuesday.md +++ b/notes/Tuesday.md @@ -0,0 +1,17 @@ +branch- git checkout -b feature/"something" +can branch repository, work in a separate track and merge later. + +ssh key lets you (stable shell) not have to put in password all the time + +REPL: read evaluate print loop + +single or double quotes are interchangable + +console in dev tools chrome +step by step in sources tab dev tools + +cancatonating- a number added with a string will tranform the number ot a string and jam them together. + +double equal sign is checking for truthyness- comparison but not strict, triple equals is exact match, singe equals is assignment/definition + +use browser console for now, but you can add a console directly into atom. From 329e318fa835508fc6f790962b35719700ef4868 Mon Sep 17 00:00:00 2001 From: nicky evers Date: Tue, 24 Jan 2017 19:53:58 -0800 Subject: [PATCH 12/23] add tuesday --- notes/Tuesday.md | 8 ++++---- notes/script.js | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 notes/script.js diff --git a/notes/Tuesday.md b/notes/Tuesday.md index ef0fe37..9d351a9 100644 --- a/notes/Tuesday.md +++ b/notes/Tuesday.md @@ -5,13 +5,13 @@ ssh key lets you (stable shell) not have to put in password all the time REPL: read evaluate print loop -single or double quotes are interchangable +single or double quotes are interchangeable console in dev tools chrome step by step in sources tab dev tools -cancatonating- a number added with a string will tranform the number ot a string and jam them together. +cancatonating- a number added with a string will transform the number to a string and jam them together. -double equal sign is checking for truthyness- comparison but not strict, triple equals is exact match, singe equals is assignment/definition +double equal sign is checking for truthiness- comparison but not strict, triple equals is exact match, singe equals is assignment/definition -use browser console for now, but you can add a console directly into atom. +use browser console for now, but you can add a console directly into atom. diff --git a/notes/script.js b/notes/script.js new file mode 100644 index 0000000..880d86f --- /dev/null +++ b/notes/script.js @@ -0,0 +1 @@ +var myString = 'my string'; From f361cf49628957ab716131554506f99b2d15ff0a Mon Sep 17 00:00:00 2001 From: nicky evers Date: Tue, 24 Jan 2017 20:00:22 -0800 Subject: [PATCH 13/23] update monday --- notes/monday.md | 1 - 1 file changed, 1 deletion(-) diff --git a/notes/monday.md b/notes/monday.md index ed02c7b..a5682a5 100644 --- a/notes/monday.md +++ b/notes/monday.md @@ -20,4 +20,3 @@ control L- clear cd - = go back to last directory !!- do command again history- history of commands during this session - From e5eed844ee090563279b7a0c6e77067a325b88e7 Mon Sep 17 00:00:00 2001 From: nicky evers Date: Tue, 24 Jan 2017 20:43:23 -0800 Subject: [PATCH 14/23] Add Tuesday notes --- notes/tuesday.md | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/notes/tuesday.md b/notes/tuesday.md index 2be9716..9d351a9 100644 --- a/notes/tuesday.md +++ b/notes/tuesday.md @@ -1,19 +1,17 @@ -. period / dot -, comma -! not / exclamation point / bang -* star / asterisk / splat -[] brackets / square brackets -{} braces / curly braces / curly brackets -| pipe -<> gt & lt (greater than & less than) / pointy brackets -/ forward slash -\ backslash -# pound / hash / octothorpe -^ caret -~ tilde -` backtick / backquote -% modulo -& ampersand -() parentheses / parens -- hyphen -_ underscore +branch- git checkout -b feature/"something" +can branch repository, work in a separate track and merge later. + +ssh key lets you (stable shell) not have to put in password all the time + +REPL: read evaluate print loop + +single or double quotes are interchangeable + +console in dev tools chrome +step by step in sources tab dev tools + +cancatonating- a number added with a string will transform the number to a string and jam them together. + +double equal sign is checking for truthiness- comparison but not strict, triple equals is exact match, singe equals is assignment/definition + +use browser console for now, but you can add a console directly into atom. From 3dbf6008d1a08a9962a2ca6c7b3d737d653228fc Mon Sep 17 00:00:00 2001 From: nicky evers Date: Tue, 24 Jan 2017 20:44:25 -0800 Subject: [PATCH 15/23] Rename Tuesday.md to tuesday.md --- notes/Tuesday.md | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 notes/Tuesday.md diff --git a/notes/Tuesday.md b/notes/Tuesday.md deleted file mode 100644 index 9d351a9..0000000 --- a/notes/Tuesday.md +++ /dev/null @@ -1,17 +0,0 @@ -branch- git checkout -b feature/"something" -can branch repository, work in a separate track and merge later. - -ssh key lets you (stable shell) not have to put in password all the time - -REPL: read evaluate print loop - -single or double quotes are interchangeable - -console in dev tools chrome -step by step in sources tab dev tools - -cancatonating- a number added with a string will transform the number to a string and jam them together. - -double equal sign is checking for truthiness- comparison but not strict, triple equals is exact match, singe equals is assignment/definition - -use browser console for now, but you can add a console directly into atom. From c3b0ea6381df72edace142ea4b2488abaa5c0168 Mon Sep 17 00:00:00 2001 From: nicky evers Date: Tue, 24 Jan 2017 20:59:30 -0800 Subject: [PATCH 16/23] update tuesday --- notes/tuesday.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/notes/tuesday.md b/notes/tuesday.md index 9d351a9..29e70ce 100644 --- a/notes/tuesday.md +++ b/notes/tuesday.md @@ -15,3 +15,10 @@ cancatonating- a number added with a string will transform the number to a strin double equal sign is checking for truthiness- comparison but not strict, triple equals is exact match, singe equals is assignment/definition use browser console for now, but you can add a console directly into atom. + +git log- most recent changes + +git checkout "branch name" + + +ash From 2694dd11ded76cf14c93bbc5ce443e111a64fe90 Mon Sep 17 00:00:00 2001 From: nicky evers Date: Wed, 25 Jan 2017 18:11:21 -0800 Subject: [PATCH 17/23] add wed notes --- notes/wednesday.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 notes/wednesday.md diff --git a/notes/wednesday.md b/notes/wednesday.md new file mode 100644 index 0000000..e69de29 From 61a9dcc84243117fa7d781e4808fd1cff0d1ed0f Mon Sep 17 00:00:00 2001 From: nicky evers Date: Wed, 25 Jan 2017 18:11:55 -0800 Subject: [PATCH 18/23] update tuesday --- notes/tuesday.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/notes/tuesday.md b/notes/tuesday.md index 29e70ce..05aa7ec 100644 --- a/notes/tuesday.md +++ b/notes/tuesday.md @@ -19,6 +19,3 @@ use browser console for now, but you can add a console directly into atom. git log- most recent changes git checkout "branch name" - - -ash From 465291d732935f09654bf17f252f577537b99528 Mon Sep 17 00:00:00 2001 From: nicky evers Date: Wed, 25 Jan 2017 18:58:59 -0800 Subject: [PATCH 19/23] update wed --- notes/wednesday.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/notes/wednesday.md b/notes/wednesday.md index 4ac1d90..43adbfb 100644 --- a/notes/wednesday.md +++ b/notes/wednesday.md @@ -4,3 +4,7 @@ fetch- fetch updates from remote- not merging pull- fetch updates from remote, and merging + +In atom, hit control shift m to see markdown preview in atom + +vi- editor you use that is more powerful and interfaced with through terminal. can add vi plug in within atom, good to know basics. From 4ebbcaa20296bfc1da9c2b459772d86928188c52 Mon Sep 17 00:00:00 2001 From: nicky evers Date: Wed, 25 Jan 2017 20:48:53 -0800 Subject: [PATCH 20/23] update wed notes --- notes/wednesday.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/notes/wednesday.md b/notes/wednesday.md index 43adbfb..b86cf75 100644 --- a/notes/wednesday.md +++ b/notes/wednesday.md @@ -8,3 +8,5 @@ pull- fetch updates from remote, and merging In atom, hit control shift m to see markdown preview in atom vi- editor you use that is more powerful and interfaced with through terminal. can add vi plug in within atom, good to know basics. + +"touch" with "file name" creates an empty file in terminal From 23ba736378355224b59d3b57491d2bef92f5cbc2 Mon Sep 17 00:00:00 2001 From: nicky evers Date: Wed, 25 Jan 2017 20:56:02 -0800 Subject: [PATCH 21/23] wed notes --- notes/wednesday.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/notes/wednesday.md b/notes/wednesday.md index 4ac1d90..ab304e5 100644 --- a/notes/wednesday.md +++ b/notes/wednesday.md @@ -4,3 +4,5 @@ fetch- fetch updates from remote- not merging pull- fetch updates from remote, and merging + +a new things From 79c3752ead84e3ff077c2261ef645143958ecee4 Mon Sep 17 00:00:00 2001 From: nicky evers Date: Wed, 25 Jan 2017 20:59:50 -0800 Subject: [PATCH 22/23] wed update --- notes/wednesday.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/notes/wednesday.md b/notes/wednesday.md index 1f37347..4f22007 100644 --- a/notes/wednesday.md +++ b/notes/wednesday.md @@ -1,16 +1,11 @@ -#upstream- -add a remote "git remote add upstream (copied ssh repository url)" -a way to connect my current working directory/local to the original repository and to merge with it. fetch- fetch updates from remote- not merging pull- fetch updates from remote, and merging -<<<<<<< HEAD In atom, hit control shift m to see markdown preview in atom vi- editor you use that is more powerful and interfaced with through terminal. can add vi plug in within atom, good to know basics. "touch" with "file name" creates an empty file in terminal -======= -a new things ->>>>>>> feature/wednesday From 58da24ebc329c7675f425ee6549faa49ecc8053f Mon Sep 17 00:00:00 2001 From: nicky evers Date: Thu, 26 Jan 2017 20:42:35 -0800 Subject: [PATCH 23/23] add thursday notes --- notes/thursday.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 notes/thursday.md diff --git a/notes/thursday.md b/notes/thursday.md new file mode 100644 index 0000000..3e75765 --- /dev/null +++ b/notes/thursday.md @@ -0,0 +1 @@ +new