diff --git a/unit_03/w08d02/homework/README.md b/unit_03/w08d02/homework/README.md index 937c9fe..5d2d3c6 100644 --- a/unit_03/w08d02/homework/README.md +++ b/unit_03/w08d02/homework/README.md @@ -103,7 +103,12 @@ var caesarShift = function(str, amount) { "Commit 3: Connected the cipher to encode messages."
+Add a little bit of styling to your cipher. Take a screenshot of it and upload it to your folder. +**Commit 4**
+
+"Commit 4: Uploaded the screenshot of the cipher." +
## Part 2 @@ -175,9 +180,9 @@ this.songs = [ Server and database will be introduced tomorrow Overall, you will need data and functions in your controller. -**Commit 4**
+**Commit 5**

-"Commit 4: Set up my initial files." +"Commit 5: Set up my initial files."
@@ -190,18 +195,18 @@ Overall, you will need data and functions in your controller. - `ng-if` or alternatively, `ng-hide` and/or `ng-show` - curlies `{{ }}` -**Commit 5**
+**Commit 6**

-"Commit 5: Setup and now displaying the songs." +"Commit 6: Setup and now displaying the songs."
#####Add a song - a form with an `ng-submit` - inputs that rout to `ng-model`s which could be inside a formdata object in the controller maybe. -**Commit 6**
+**Commit 7**

-"Commit 6: Setup and now able to add a song." +"Commit 7: Setup and now able to add a song."
#####Shuffle function @@ -220,7 +225,14 @@ Pass in an array and the shuffle function will randomize the order of the elemen } ``` -**Commit 7**
+**Commit 8**
+
+"Commit 8: Can shuffle the order of the songs." +
+ +Add a little bit of styling to your shuffler. Take a screenshot of it and add it to your folder. + +**Commit 9**

-"Commit 7: Can shuffle the order of the songs." +"Commit 9: Added a screenshot of my shuffler."
diff --git a/unit_03/w08d04/morning_exercise/README.md b/unit_03/w08d04/morning_exercise/README.md new file mode 100644 index 0000000..51accdd --- /dev/null +++ b/unit_03/w08d04/morning_exercise/README.md @@ -0,0 +1,85 @@ +![ga](http://mobbook.generalassemb.ly/ga_cog.png) + +# WDI-PANTHALASSA + +--- +Title: Github Collaboration & Branching
+Type: Morning Exercise
+Duration: "0:45"
+Creator:
+ Original creator: Kristyn Bryan
+ Course: WDIr Panthalassa
+Competencies: Github
+Prerequisites: none
+ +--- + +# Morning Exercise + +## Github Collaboration + +Let's randomly assign the team member letter. The person who has the smaller number in their street address will be Team Member A (Ex: I live at 123 Maple Dr., and my partner lives at 5 Blueberry Ln. -- so my partner is Team Member A). + +#### Team Member A +- You will be the Github master for this task. +- Share your screen with your partner +- Create a Github repo called `team-github-practice` +- Add team member B as a "Contributor". + - `Settings` tab + - `Collaborators` on the left + - Confirm your password + - Add your team mate's Github username +- Check the box for "Initialize this repository with a README" +- Click "Create Repository" + +#### Team Member B +- Watch (and help guide if necessary) as your team mate creates the Github repo +- Give your team member your Github username so that they can make you a Contributor + +#### Both Team Members +- Go to this new repository on your Github account. +- Click "Clone or Download" and copy the link in the "Clone with HTTPS". +- On your local drive, go to your Desktop or Documents or wherever you keep your development files (outside of any other repos) and, in your terminal, clone the repo `git clone` paste the https link from Github. +- Note, if you type `git remote`, you will see that only `origin` is created as a remote. You will be pushing to and pulling from origin (and the branch name). + +## Github Branches + +#### Team Member A +- From the master branch, create a branch called `main-page` +- From the branch `main-page`, create an index.html page. +- In this file, create a page that will display a welcome message when you open in. +- Add, commit, and push your work **to your branch** + +#### Team Member B +- From the master branch, create a branch called `main-page-styling` +- From the branch `main-page-styling`, create a style.css file. +- In this file, add some general styling on the background, `

` tags, and the font. +- Add, commit, and push your work **to your branch** + +#### Both Team Members +- Create a pull request by going to into your Github account. +- Click on "Compare & pull request" +- Your `base` branch should be `master` and your `compare` branch should be the branch that you created. +- Write a comment. +- On the right side, click on "Assignee" and tag your partner. +- Click "Create pull request". +- DO NOT click "merge". + +#### Team Member A +- Look at your team member's pull request. If it looks okay, click "merge". + +#### Team Member B +- Look at your team member's pull request. If it looks okay, click "merge". + +#### You have now merged your files into master! + +#### Both Team Members +- In your terminal, checkout your `master` branch. +- Pull down the most current data by doing `git pull origin master` +- Take a look at your files. Everything should be there. + +#### Communicate +- You need to link up that style sheet that you created to the index.html file. How will you do it? Discuss and decide who will do it, which branch you will be on, etc. +- Go through the pull request process. +- After the merge, pull the master data to your local file. +- Open the `index.html` to make sure that everyting is connected properly. diff --git a/unit_03/w08d04/morning_exercise/daily_tracker.md b/unit_03/w08d04/morning_exercise/daily_tracker.md new file mode 100644 index 0000000..7938add --- /dev/null +++ b/unit_03/w08d04/morning_exercise/daily_tracker.md @@ -0,0 +1,75 @@ +![ga](http://mobbook.generalassemb.ly/ga_cog.png) + +# WDI-PANTHALASSA + +--- +Title: Daily Project Tracker
+Type: Afternoon Exercise
+Duration: "0:45"
+Creator:
+ Original creator: Kristyn Bryan
+ Course: WDIr Panthalassa
+Competencies: Trello & Github
+Prerequisites: none
+ +--- +# Dialy Tracker for Project Work + +Beginning with Project 3, you will be asked to create a daily tracker for your work. Some of you have already started using a tracker for Project 1 and/or Project 2. There are many ways to go about doing this, but we will cover two today. + +Choose a tool that you will want to use and look at each day. One that can help you be agile with your development - adjust want you need to adjust, move what needs to be moved, etc. If you're collaborating on a project, make sure that it's a tool that can easily be shared and your collaborators can be tagged on actions as well. + +## My approach +- When I create a project tracker, I always include my user stories. By doing this, I can look back on them each to to confirm that I'm focused on what needs to be accomplished in the big picture. +- Break it down, day by day. Make one column for each day in Trello or mark the date in your Github issue - whatever you're going to do, break it down to bitesize pieces for each day. Remember to include the final day - presentation day - in your tracker! +- Divide and conquer. Your user stories give you the big picture of what needs to be done in your app, now break each user story down into actions that you need to take in order to accomplish that user story. + +## Trello + +![](trello_daily_tracker.png) + +## Github issues + +https://guides.github.com/features/issues/ + +## Activity + +### Your pretend project: + +You are given a project to work starting on Monday, January 1 and your presentation is due on Monday, January 8. You are working on this project alone, and have the following information: + +#### User stories: +1. The user should be able to go to app URL and immediately see a game board. +2. The users should be able to set their name. +3. The users should be able to play the game with at least one other player. +4. The user should see if they won or lost. + +### Your MVP +1. An interactive board which renders on page load +2. A way for players to set their name +3. A way for players to mark an empty space on their turn +4. The game should end when there is a winner, or if the game is a tie +5. The game should report the end state + +#### Your Stretch Goals +1. A button on `game over` to reset the game back to initial state
+2. A way to keep track of Player 1 vs. Player 2 wins
+- An option to play vs. a computer with AI + - Level 1: Random empty space is good enough + - Level 2: Computer chooses a space which immediately blocks a player win
+3. Add in the ability to store a game to play later. This might use Firebase or local storage to do so.
+4. Add in the ability to play live with somebody remotely. This will definitely need to use [Firebase](https://www.firebase.com/). + +### Make your tracker + +1. Trello + - Create a new Trello board called `tracker-practice` + - Create a daily plan of action in Trello (each column should be a separate date) + - Use labels + - Stretch: Add stickers + +2. Github + - Create a new repo on Github called `tracker-practice`. + - Create a daily plan of action in Github issues + - Use labels + - Stretch: Use Milestones diff --git a/unit_03/w08d04/morning_exercise/trello_daily_tracker.png b/unit_03/w08d04/morning_exercise/trello_daily_tracker.png new file mode 100644 index 0000000..bd36060 Binary files /dev/null and b/unit_03/w08d04/morning_exercise/trello_daily_tracker.png differ