Created
November 27, 2017 13:36
-
-
Save tomatohammado/2bcd60ce219318d167a343bf2f675fa2 to your computer and use it in GitHub Desktop.
Vestibule Week 2, Weekend - updates to memory card game
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Last login: Tue Nov 21 20:38:51 on ttys001 | |
| GAs-MacBook-Air:~ ga$ cd ga-wdi/ | |
| .DS_Store fundamentals/ sandbox/ | |
| GAs-MacBook-Air:~ ga$ cd ga-wdi/fundamentals/wdi-fundamentals-memorygame/ | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Untracked files: | |
| (use "git add <file>..." to include in what will be committed) | |
| images/back-alpha-fix.png | |
| images/king-of-diamonds-alpha-fix.png | |
| images/king-of-hearts-alpha-fix.png | |
| images/queen-of-diamonds-alpha-fix.png | |
| images/queen-of-hearts-alpha-fix.png | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add . | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "created new batch of images with proper transparency, so the corners don't have that white edge around it. Took me like an hour to figure out, but toooootally worth it." | |
| [master daf125b] created new batch of images with proper transparency, so the corners don't have that white edge around it. Took me like an hour to figure out, but toooootally worth it. | |
| 5 files changed, 0 insertions(+), 0 deletions(-) | |
| create mode 100644 images/back-alpha-fix.png | |
| create mode 100644 images/king-of-diamonds-alpha-fix.png | |
| create mode 100644 images/king-of-hearts-alpha-fix.png | |
| create mode 100644 images/queen-of-diamonds-alpha-fix.png | |
| create mode 100644 images/queen-of-hearts-alpha-fix.png | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 8, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (8/8), done. | |
| Writing objects: 100% (8/8), 68.96 KiB | 6.27 MiB/s, done. | |
| Total 8 (delta 1), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (1/1), completed with 1 local object. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 3425bb0..daf125b master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add . | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "changed img src to match the new fixed images, adjusted the css for .flipped cards so it looks better. There's stll some weirdness even, but I'm not a designer so I'm not pressed about it." | |
| [master ebf33c5] changed img src to match the new fixed images, adjusted the css for .flipped cards so it looks better. There's stll some weirdness even, but I'm not a designer so I'm not pressed about it. | |
| 2 files changed, 7 insertions(+), 6 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 6, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (6/6), 617 bytes | 617.00 KiB/s, done. | |
| Total 6 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| daf125b..ebf33c5 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git log | |
| commit ebf33c52f68927327ddf0295d39c4017a2b3b689 (HEAD -> master, origin/master, origin/HEAD) | |
| Author: Hammad Malik <[email protected]> | |
| Date: Wed Nov 22 13:45:05 2017 -0500 | |
| changed img src to match the new fixed images, adjusted the css for .flipped cards so it looks better. There's stll some weirdness even, but I'm not a designer so I'm not pressed about it. | |
| commit daf125bb7e4699b6c3f91c1e66525e6b95d2469b | |
| Author: Hammad Malik <[email protected]> | |
| Date: Wed Nov 22 13:28:46 2017 -0500 | |
| created new batch of images with proper transparency, so the corners don't have that white edge around it. Took me like an hour to figure out, but toooootally worth it. | |
| commit 3425bb054b752e699e480e2fc62a5ea48a155c95 | |
| Author: Hammad Malik <[email protected]> | |
| Date: Wed Nov 22 11:28:17 2017 -0500 | |
| added box-shadow to highlight flipped cards. | |
| commit b92d28411db0343abe65368938685d0b966d3eee | |
| Author: Hammad Malik <[email protected]> | |
| Date: Wed Nov 22 11:08:38 2017 -0500 | |
| added style to .matched, so matched cards turn somewhat transparent. | |
| commit 1611b3a556014db5822057ab93524681878061c5 | |
| Author: Hammad Malik <[email protected]> | |
| Date: Wed Nov 22 11:04:12 2017 -0500 | |
| so I had to change the conditional that checks if a card is selected twice. The nice thing is it keeps the current selection, so you only have to select one other card before it checks for a match. | |
| commit 33510ae5cfc337cad9a23495001307bc2689fa03 | |
| Author: Hammad Malik <[email protected]> | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add . | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "alright, so I changed the .flipped name to .selected because it makes more sense to me, because matched cards are still flipped over. So I had to change some css along with that. Also, got the logic for flipping the card faces back over if they don't match, and checking to see if a card has been matched in addition to if it has already been selected before the flipCard() function continues." | |
| [master 14ecac3] alright, so I changed the .flipped name to .selected because it makes more sense to me, because matched cards are still flipped over. So I had to change some css along with that. Also, got the logic for flipping the card faces back over if they don't match, and checking to see if a card has been matched in addition to if it has already been selected before the flipCard() function continues. | |
| 2 files changed, 19 insertions(+), 17 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 6, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (6/6), 880 bytes | 880.00 KiB/s, done. | |
| Total 6 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| ebf33c5..14ecac3 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add . | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "making score display. Now I need to make it increment." | |
| [master 0601b78] making score display. Now I need to make it increment. | |
| 3 files changed, 39 insertions(+), 7 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 7, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (5/5), done. | |
| Writing objects: 100% (7/7), 1.00 KiB | 514.00 KiB/s, done. | |
| Total 7 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 14ecac3..0601b78 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "wooooohoooo got the score to increment\!" | |
| [master 7a4ad4c] wooooohoooo got the score to increment\! | |
| 1 file changed, 4 insertions(+) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 386 bytes | 386.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 0601b78..7a4ad4c master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git branch | |
| hammad-malik-exercise-mvp | |
| * master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout hammad-malik-exercise-mvp | |
| Switched to branch 'hammad-malik-exercise-mvp' | |
| Your branch is up to date with 'origin/hammad-malik-exercise-mvp'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git merge master | |
| Updating 1a899a1..7a4ad4c | |
| Fast-forward | |
| css/style.css | 31 ++++++++++++++++++++++++++-- | |
| images/back-alpha-fix.png | Bin 0 -> 21113 bytes | |
| images/king-of-diamonds-alpha-fix.png | Bin 0 -> 11325 bytes | |
| images/king-of-hearts-alpha-fix.png | Bin 0 -> 11498 bytes | |
| images/queen-of-diamonds-alpha-fix.png | Bin 0 -> 14327 bytes | |
| images/queen-of-hearts-alpha-fix.png | Bin 0 -> 14405 bytes | |
| index.html | 18 +++++++++++++---- | |
| js/main.js | 80 +++++++++++++++++++++++++++++++++++++++++++++++-------------------------- | |
| 8 files changed, 95 insertions(+), 34 deletions(-) | |
| create mode 100644 images/back-alpha-fix.png | |
| create mode 100644 images/king-of-diamonds-alpha-fix.png | |
| create mode 100644 images/king-of-hearts-alpha-fix.png | |
| create mode 100644 images/queen-of-diamonds-alpha-fix.png | |
| create mode 100644 images/queen-of-hearts-alpha-fix.png | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Total 0 (delta 0), reused 0 (delta 0) | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 1a899a1..7a4ad4c hammad-malik-exercise-mvp -> hammad-malik-exercise-mvp | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is up to date with 'origin/master'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "didn't properly camelCase a function name. So, that" | |
| [master e0137c7] didn't properly camelCase a function name. So, that | |
| 1 file changed, 3 insertions(+), 3 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 383 bytes | 383.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 7a4ad4c..e0137c7 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git branch | |
| hammad-malik-exercise-mvp | |
| * master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout hammad-malik-exercise-mvp | |
| Switched to branch 'hammad-malik-exercise-mvp' | |
| Your branch is up to date with 'origin/hammad-malik-exercise-mvp'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git merge master | |
| Updating 7a4ad4c..e0137c7 | |
| Fast-forward | |
| js/main.js | 6 +++--- | |
| 1 file changed, 3 insertions(+), 3 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Total 0 (delta 0), reused 0 (delta 0) | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 7a4ad4c..e0137c7 hammad-malik-exercise-mvp -> hammad-malik-exercise-mvp | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is up to date with 'origin/master'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add index.html | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "I just realized my nav links don't work because I got rid of the #ids. So I added them back in with better names, and fixed the hrefs. Fun stuff" | |
| [master 4d45306] I just realized my nav links don't work because I got rid of the #ids. So I added them back in with better names, and fixed the hrefs. Fun stuff | |
| 1 file changed, 4 insertions(+), 4 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 3, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (3/3), 434 bytes | 434.00 KiB/s, done. | |
| Total 3 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| e0137c7..4d45306 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout hammad-malik-exercise-mvp | |
| Switched to branch 'hammad-malik-exercise-mvp' | |
| Your branch is up to date with 'origin/hammad-malik-exercise-mvp'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git merge master | |
| Updating e0137c7..4d45306 | |
| Fast-forward | |
| index.html | 8 ++++---- | |
| 1 file changed, 4 insertions(+), 4 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Total 0 (delta 0), reused 0 (delta 0) | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| e0137c7..4d45306 hammad-malik-exercise-mvp -> hammad-malik-exercise-mvp | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is up to date with 'origin/master'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout -b hammad-malik-submission | |
| Switched to a new branch 'hammad-malik-submission' | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push --set-upstream hammad-malik-submission | |
| fatal: 'hammad-malik-submission' does not appear to be a git repository | |
| fatal: Could not read from remote repository. | |
| Please make sure you have the correct access rights | |
| and the repository exists. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| fatal: The current branch hammad-malik-submission has no upstream branch. | |
| To push the current branch and set the remote as upstream, use | |
| git push --set-upstream origin hammad-malik-submission | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push --set-upstream origin hammad-malik-submission | |
| Total 0 (delta 0), reused 0 (delta 0) | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| * [new branch] hammad-malik-submission -> hammad-malik-submission | |
| Branch 'hammad-malik-submission' set up to track remote branch 'hammad-malik-submission' from 'origin'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch hammad-malik-submission | |
| Your branch is up to date with 'origin/hammad-malik-submission'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is up to date with 'origin/master'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| modified: index.html | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "add .card class when creating cards" | |
| [master b6f5111] add .card class when creating cards | |
| 1 file changed, 1 insertion(+) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add . | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "minor changes to markup and styles" | |
| [master 332808a] minor changes to markup and styles | |
| 2 files changed, 8 insertions(+), 7 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 9, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (7/7), done. | |
| Writing objects: 100% (9/9), 971 bytes | 323.00 KiB/s, done. | |
| Total 9 (delta 4), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (4/4), completed with 4 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 4d45306..332808a master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout hammad-malik-submission | |
| Switched to branch 'hammad-malik-submission' | |
| Your branch is up to date with 'origin/hammad-malik-submission'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git merge master | |
| Updating 4d45306..332808a | |
| Fast-forward | |
| css/style.css | 11 ++++++----- | |
| index.html | 4 ++-- | |
| js/main.js | 1 + | |
| 3 files changed, 9 insertions(+), 7 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Total 0 (delta 0), reused 0 (delta 0) | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 4d45306..332808a hammad-malik-submission -> hammad-malik-submission | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is up to date with 'origin/master'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "added code for knuth shuffle, to suffle the contents of an array" | |
| [master 8ad0670] added code for knuth shuffle, to suffle the contents of an array | |
| 1 file changed, 21 insertions(+) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 681 bytes | 227.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 332808a..8ad0670 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| modified: js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "changed reset event listener to target the .card class instead of `.card-container img`. Doesn't change functionality, baby steps" | |
| -bash: .card-container: command not found | |
| [master 7de059d] changed reset event listener to target the .card class instead of . Doesn't change functionality, baby steps | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 398 bytes | 398.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 8ad0670..7de059d master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add . | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "changed logic in reset button event listener to work with any number of cards" | |
| [master b17f408] changed logic in reset button event listener to work with any number of cards | |
| 1 file changed, 2 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 429 bytes | 214.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 7de059d..b17f408 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add . | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "greatly simplified logic to check for if a card has been selected using .selected - it's so obvious lookin back on it. Also, added a comment for adding the data-tier when creating the board." | |
| [master 8127975] greatly simplified logic to check for if a card has been selected using .selected - it's so obvious lookin back on it. Also, added a comment for adding the data-tier when creating the board. | |
| 1 file changed, 2 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 503 bytes | 503.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| b17f408..8127975 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "refactored code so it checks the data-id vs writing to card properties to the .card nodes and getting those attributes. This way, I can keep the [data-id]s the same and shuffle the card array itself." | |
| [master 0dac8e2] refactored code so it checks the data-id vs writing to card properties to the .card nodes and getting those attributes. This way, I can keep the [data-id]s the same and shuffle the card array itself. | |
| 1 file changed, 18 insertions(+), 6 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 638 bytes | 638.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 8127975..0dac8e2 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "wow, with all that planning and refactoring, getting the cards to shuffle is easy. Good enough for a submission, I'd say" | |
| [master 82b9096] wow, with all that planning and refactoring, getting the cards to shuffle is easy. Good enough for a submission, I'd say | |
| 1 file changed, 1 insertion(+) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 430 bytes | 430.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 0dac8e2..82b9096 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git branch | |
| hammad-malik-exercise-mvp | |
| hammad-malik-submission | |
| * master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout hammad-malik-submission | |
| Switched to branch 'hammad-malik-submission' | |
| Your branch is up to date with 'origin/hammad-malik-submission'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git merge master | |
| Updating 332808a..82b9096 | |
| Fast-forward | |
| js/main.js | 54 +++++++++++++++++++++++++++++++++++++++++++++--------- | |
| 1 file changed, 45 insertions(+), 9 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Total 0 (delta 0), reused 0 (delta 0) | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 332808a..82b9096 hammad-malik-submission -> hammad-malik-submission | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is up to date with 'origin/master'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add index.html | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "added markup for difficulty selector" | |
| [master eb9b166] added markup for difficulty selector | |
| 1 file changed, 6 insertions(+) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 3, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (3/3), 393 bytes | 393.00 KiB/s, done. | |
| Total 3 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 82b9096..eb9b166 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| modified: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add . | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "updated markup and added styles to difficulty buttons. Now for the functionality" | |
| [master 9d9d11c] updated markup and added styles to difficulty buttons. Now for the functionality | |
| 2 files changed, 37 insertions(+), 5 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 5, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (5/5), 842 bytes | 842.00 KiB/s, done. | |
| Total 5 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| eb9b166..9d9d11c master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add css/style.css | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "removed some opacity from the header. that's it. I just got back to my computer and was freaking out to see an unstaged modification, I should look into diff tools for VS Code" | |
| [master b4dd7ee] removed some opacity from the header. that's it. I just got back to my computer and was freaking out to see an unstaged modification, I should look into diff tools for VS Code | |
| 1 file changed, 1 deletion(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 448 bytes | 448.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 9d9d11c..b4dd7ee master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| modified: index.html | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add . | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "added effect for .card-back, including adding a .card-back class. No real purpose, just for kicks" | |
| [master fd51735] added effect for .card-back, including adding a .card-back class. No real purpose, just for kicks | |
| 3 files changed, 25 insertions(+), 18 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 7, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (5/5), done. | |
| Writing objects: 100% (7/7), 870 bytes | 435.00 KiB/s, done. | |
| Total 7 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| b4dd7ee..fd51735 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add css/style.css | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "changed the greyscale value on the .card-back" | |
| [master 4027581] changed the greyscale value on the .card-back | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 363 bytes | 363.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| fd51735..4027581 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add css/style.css | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "cleaned up styles" | |
| [master 5ac0d2b] cleaned up styles | |
| 1 file changed, 1 insertion(+), 3 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add index.html | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "reorganized markup so .difficulty-container and .score-container are in the .game-board, and other small changes" | |
| [master d9374f8] reorganized markup so .difficulty-container and .score-container are in the .game-board, and other small changes | |
| 1 file changed, 10 insertions(+), 10 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 7, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (7/7), 870 bytes | 870.00 KiB/s, done. | |
| Total 7 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 4027581..d9374f8 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "cleaned up javascript" | |
| [master e9bc493] cleaned up javascript | |
| 1 file changed, 11 insertions(+), 25 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 725 bytes | 725.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| d9374f8..e9bc493 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "added event listener to difficulty buttons. Right now it just console.logs, but at least it's working" | |
| [master 7e8f26e] added event listener to difficulty buttons. Right now it just console.logs, but at least it's working | |
| 1 file changed, 23 insertions(+), 8 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 686 bytes | 686.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| e9bc493..7e8f26e master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add . | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "added [data-difficult]y attribute to .difficulty-buttons, updated event listeners to change the difficulty level including styles. Still need to add the styles to the reset button" | |
| [master b83436b] added [data-difficult]y attribute to .difficulty-buttons, updated event listeners to change the difficulty level including styles. Still need to add the styles to the reset button | |
| 2 files changed, 11 insertions(+), 4 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 5, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (5/5), 718 bytes | 718.00 KiB/s, done. | |
| Total 5 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 7e8f26e..b83436b master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "calls resetBoard() whenever a new difficulty is selected. Oh, and I made a resetBoard() function and refactored the .reset-button even listener. Looks a lot cleaner, it just resetBoard() and create(Board)" | |
| [master 4b8d006] calls resetBoard() whenever a new difficulty is selected. Oh, and I made a resetBoard() function and refactored the .reset-button even listener. Looks a lot cleaner, it just resetBoard() and create(Board) | |
| 1 file changed, 34 insertions(+), 7 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 824 bytes | 412.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| b83436b..4b8d006 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "reorganized js functions" | |
| [master 5bd06be] reorganized js functions | |
| 1 file changed, 40 insertions(+), 41 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 372 bytes | 372.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 4b8d006..5bd06be master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "created getDifficultyLevel() function, started createCards() function" | |
| [master c4fba40] created getDifficultyLevel() function, started createCards() function | |
| 1 file changed, 10 insertions(+), 2 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 455 bytes | 455.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 5bd06be..c4fba40 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit js/main.js | |
| Aborting commit due to empty commit message. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "createDeck() function appears to be working just fine. Now to implement it" | |
| [master a000431] createDeck() function appears to be working just fine. Now to implement it | |
| 1 file changed, 60 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 851 bytes | 851.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| c4fba40..a000431 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ | |
| [Restored Nov 26, 2017 at 6:49:15 PM] | |
| Last login: Fri Nov 24 20:03:07 on console | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ code . | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git log | |
| commit a000431e622b0f27f98e6e427d026d9d8ad4db3b (HEAD -> master, origin/master, origin/HEAD) | |
| Author: Hammad Malik <[email protected]> | |
| Date: Thu Nov 23 15:31:38 2017 -0500 | |
| commit a000431e622b0f27f98e6e427d026d9d8ad4db3b (HEAD -> master, origin/master, origin/HEAD) | |
| Author: Hammad Malik <[email protected]> | |
| Date: Thu Nov 23 15:31:38 2017 -0500 | |
| createDeck() function appears to be working just fine. Now to implement it | |
| commit c4fba40ef11920018a9f3697575a571fa433e164 | |
| Author: Hammad Malik <[email protected]> | |
| Date: Thu Nov 23 14:35:41 2017 -0500 | |
| created getDifficultyLevel() function, started createCards() function | |
| commit 5bd06bee6720070fe0bf086f33fad0c034895cdc | |
| Author: Hammad Malik <[email protected]> | |
| Date: Thu Nov 23 14:17:54 2017 -0500 | |
| reorganized js functions | |
| commit 4b8d00675bcdcdf48f63c626846bed511eb29d03 | |
| Author: Hammad Malik <[email protected]> | |
| Date: Thu Nov 23 14:09:06 2017 -0500 | |
| calls resetBoard() whenever a new difficulty is selected. Oh, and I made a resetBoard() function and refactored the .reset-button even listener. Looks a lot cleaner, it just resetBoard() and create(Board) | |
| commit b83436bc17167d942d3333c2c5ab1d2068257a5e | |
| Author: Hammad Malik <[email protected]> | |
| Date: Thu Nov 23 13:44:42 2017 -0500 | |
| added [data-difficult]y attribute to .difficulty-buttons, updated event listeners to change the difficulty level including styles. Still need to add the styles to the reset button | |
| commit 7e8f26e941153466d2290463c34463f84554794d | |
| Author: Hammad Malik <[email protected]> | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "it's been a few days since I last worked on this, so I'm trying to make sure I have my bearings on what I'm trying to do. Last commit I had the createCardDeck() function working, but the createBoard() function wasn't using it. So I implemented the createCardDeck() and it appears everything is working correctly, including the score tracking. Now to fix the styles so the different card tiers look distinct from one another. And I think I need to add a .card-tier-# class when a card is flipped so it works, because I currently don't have an HTML attribute tracking the tier." | |
| [master 06ef224] it's been a few days since I last worked on this, so I'm trying to make sure I have my bearings on what I'm trying to do. Last commit I had the createCardDeck() function working, but the createBoard() function wasn't using it. So I implemented the createCardDeck() and it appears everything is working correctly, including the score tracking. Now to fix the styles so the different card tiers look distinct from one another. And I think I need to add a .card-tier-# class when a card is flipped so it works, because I currently don't have an HTML attribute tracking the tier. | |
| 1 file changed, 38 insertions(+), 32 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 943 bytes | 471.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| a000431..06ef224 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: js/main.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add js/main.js | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "adds and removes .card-tier-# class when a card is selected. Now for the styles, and that should be everything\!" | |
| [master 13be6ca] adds and removes .card-tier-# class when a card is selected. Now for the styles, and that should be everything\! | |
| 1 file changed, 2 insertions(+) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (4/4), 466 bytes | 466.00 KiB/s, done. | |
| Total 4 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 06ef224..13be6ca master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| modified: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add index.html | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "changed default difficulty to normal, and fixed typo in the default .reset-button class to correctly display styles" | |
| [master 8f5f4e7] changed default difficulty to normal, and fixed typo in the default .reset-button class to correctly display styles | |
| 1 file changed, 3 insertions(+), 3 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add css/style.css | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "changed hur-rotate properties for difficulty levels. "Normal" is now the default 0deg color" | |
| [master a3cdee2] changed hur-rotate properties for difficulty levels. Normal is now the default 0deg color | |
| 1 file changed, 6 insertions(+), 3 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 7, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (7/7), 902 bytes | 300.00 KiB/s, done. | |
| Total 7 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| 13be6ca..a3cdee2 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add css/style.css | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "card faces now distinct for each .card-tier-#, even when card is matched. Now to fix the highlighting on select, and I'll be good to go" | |
| [master 468f830] card faces now distinct for each .card-tier-#, even when card is matched. Now to fix the highlighting on select, and I'll be good to go | |
| 1 file changed, 27 insertions(+), 2 deletions(-) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git add css/style.css | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git commit -m "on second thought, I actually like the hue-rotate on the .card-selected highlighting. The contrast is consistent, looks better than I thought. So I just added a media query to make the cards either display in rows of 1, 2, or 4 cards. For now, I'm happy. I can still refactor my code, and I would like to do something special when you win the game and the score equals the goal, but I'll think about it later" | |
| [master f9dbbe1] on second thought, I actually like the hue-rotate on the .card-selected highlighting. The contrast is consistent, looks better than I thought. So I just added a media query to make the cards either display in rows of 1, 2, or 4 cards. For now, I'm happy. I can still refactor my code, and I would like to do something special when you win the game and the score equals the goal, but I'll think about it later | |
| 1 file changed, 11 insertions(+) | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push | |
| Counting objects: 8, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (8/8), 1.13 KiB | 1.13 MiB/s, done. | |
| Total 8 (delta 4), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (4/4), completed with 2 local objects. | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| a3cdee2..f9dbbe1 master -> master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git branch | |
| hammad-malik-exercise-mvp | |
| hammad-malik-submission | |
| * master | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout -b hammad-malik-submission-update | |
| Switched to a new branch 'hammad-malik-submission-update' | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git push --set-upstream origin hammad-malik-submission-update | |
| Total 0 (delta 0), reused 0 (delta 0) | |
| To https://github.com/tomatohammado/wdi-fundamentals-memorygame.git | |
| * [new branch] hammad-malik-submission-update -> hammad-malik-submission-update | |
| Branch 'hammad-malik-submission-update' set up to track remote branch 'hammad-malik-submission-update' from 'origin'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git status | |
| On branch hammad-malik-submission-update | |
| Your branch is up to date with 'origin/hammad-malik-submission-update'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is up to date with 'origin/master'. | |
| GAs-MacBook-Air:wdi-fundamentals-memorygame ga$ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment