From e57487f108c44cbb196a2324ca22d8617e387fad Mon Sep 17 00:00:00 2001 From: Jonathan Calver Date: Sun, 17 Sep 2023 12:47:41 -0400 Subject: [PATCH 01/10] Alice's version of the recipe added --- recipe.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/recipe.md b/recipe.md index a8b51a4d..c43eefce 100644 --- a/recipe.md +++ b/recipe.md @@ -4,9 +4,16 @@ - 2 cups all-purpose flour - 1 3/4 cups granulated sugar - 3/4 cup unsweetened cocoa powder +- 1 cup chocolate chips +- 1 tsp vanilla extract - ... ## Instructions: 1. Preheat the oven to 350°F (175°C). -2. In a large bowl, whisk together the flour, sugar, and cocoa powder. -3. ... \ No newline at end of file +2. In a large bowl, whisk together the flour, sugar, cocoa powder, chocolate chips, and vanilla extract. +3. ... + +## Additional Directions by Alice: +4. In a separate bowl, beat the eggs and add them to the mixture. Stir until well combined. +5. Gradually add the milk and vegetable oil to the mixture, continuing to stir. +6. Pour the batter into a greased and floured 9x13-inch baking pan. From dafb6611c1aa15099729be2c26d23a525a4c6388 Mon Sep 17 00:00:00 2001 From: Jonathan Calver Date: Sun, 17 Sep 2023 12:48:41 -0400 Subject: [PATCH 02/10] Bob's version of the cake recipe added. --- recipe.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/recipe.md b/recipe.md index a8b51a4d..ea014023 100644 --- a/recipe.md +++ b/recipe.md @@ -4,9 +4,15 @@ - 2 cups all-purpose flour - 1 3/4 cups granulated sugar - 3/4 cup unsweetened cocoa powder +- 1/2 tsp ground cinnamon - ... ## Instructions: -1. Preheat the oven to 350°F (175°C). -2. In a large bowl, whisk together the flour, sugar, and cocoa powder. -3. ... \ No newline at end of file +1. Preheat the oven to 375°F (190°C). +2. In a large bowl, whisk together the flour, sugar, cocoa powder, and ground cinnamon. +3. ... + +## Additional Directions by Bob: +4. Add a tablespoon of instant coffee to the dry ingredients for a hint of mocha flavor. +5. Mix in a handful of chocolate chunks for extra indulgence. +6. Line the bottom of the baking pan with parchment paper for easy cake removal. From b8fe006946d62fdde74119502f6a11d42c08f321 Mon Sep 17 00:00:00 2001 From: mxiimy Date: Mon, 16 Sep 2024 09:36:20 -0400 Subject: [PATCH 03/10] Bug fixes for iteration --- src/DataTypes.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/DataTypes.java b/src/DataTypes.java index 4f807c1f..31cbc320 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -1,13 +1,12 @@ import java.util.List; public class DataTypes { - // TODO TASK 1: fix this code so that it passes the test in DataTypesTest.java public static long sum(List numbers) { int s = 0; // below is a "foreach" loop which iterates through numbers for (int x : numbers) { - s += x; + s += numbers.get(x); } return s; } From 17319608dd6a4f00bb225866afbef8ed2a26a1e6 Mon Sep 17 00:00:00 2001 From: mxiimy Date: Mon, 16 Sep 2024 09:38:07 -0400 Subject: [PATCH 04/10] Checked off boxes --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ae0a61a0..c3e0096d 100644 --- a/README.md +++ b/README.md @@ -32,32 +32,32 @@ If you miss the lab and work on this after, you should use this URL though. # TASK 1: Your first branch -- [ ] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal: +- [x] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal: - IntelliJ: `Git -> New branch...` - Terminal: `git checkout -b task_1` - After, you can check `git status` or the Log tab of the Git tool window in IntelliJ to see that you are now on the `task_1` branch. -- [ ] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed. -- [ ] Complete the TASK 1 TODO and commit your changes to this file (checking off the +- [x] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed. +- [x] Complete the TASK 1 TODO and commit your changes to this file (checking off the completed items so far) and `DataTypes.java` (remove the word TODO and your bug fix). - talk to those around you or your TA, then see the hints at the bottom of the readme if you get stuck. -- [ ] Now, we'll merge the `task_1` branch back into `main`. When merging, +- [x] Now, we'll merge the `task_1` branch back into `main`. When merging, you need to be currently on the branch you are trying to merge into, so we'll first checkout the main branch: - IntelliJ: `Git -> branches... -> main -> Checkout` - Terminal: `git checkout main` Note: everything we've done has been local to our repository and have not pushed anything yet. -- [ ] We are back on `main`, so we can now do the merge and complete our work! +- [x] We are back on `main`, so we can now do the merge and complete our work! - IntelliJ: `Git -> Merge... -> task_1 -> Merge` - Terminal: `git merge task_1` You should now see the changes you had made are also in the `main` branch. -- [ ] Now, we'll want to clean up since we are done with our `task_1` branch. +- [x] Now, we'll want to clean up since we are done with our `task_1` branch. - IntelliJ: `Git -> branches... -> task_1 -> Delete` - Terminal: `git branch -d task_1` -- [ ] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) +- [x] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) - we suggest you check off this last item, commit that change (just right on the main branch is fine; no need to branch for this little step), then push your code. Check GitHub to ensure you can see your changes. From 30ea89907facd104cc2a5f9c084837b2d6d23ca7 Mon Sep 17 00:00:00 2001 From: mxiimy Date: Mon, 16 Sep 2024 09:46:23 -0400 Subject: [PATCH 05/10] checked off boxes --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 8207214b..80158096 100644 --- a/README.md +++ b/README.md @@ -30,16 +30,16 @@ If you miss the lab and work on this after, you should use this URL though. # TASK 1: Your first branch -- [ ] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal: +- [x] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal: - IntelliJ: `Git -> New branch...` - Terminal: `git checkout -b task_1` - After, you can check `git status` or the Log tab of the Git tool window in IntelliJ to see that you are now on the `task_1` branch. -- [ ] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed. -- [ ] Complete the TASK 1 TODO and commit your changes to this file (checking off the +- [x] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed. +- [x] Complete the TASK 1 TODO and commit your changes to this file (checking off the completed items so far) and `DataTypes.java` (remove the word TODO and your bug fix). - talk to those around you or your TA, then see the hints at the bottom of the readme if you get stuck. -- [ ] Now, we'll merge the `task_1` branch back into `main`. When merging, +- [x] Now, we'll merge the `task_1` branch back into `main`. When merging, you need to be currently on the branch you are trying to merge into, so we'll first checkout the main branch: - IntelliJ: `Git -> branches... -> main -> Checkout` @@ -51,11 +51,11 @@ Note: everything we've done has been local to our repository and have not pushed You should now see the changes you had made are also in the `main` branch. -- [ ] Now, we'll want to clean up since we are done with our `task_1` branch. +- [x] Now, we'll want to clean up since we are done with our `task_1` branch. - IntelliJ: `Git -> branches... -> task_1 -> Delete` - Terminal: `git branch -d task_1` -- [ ] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) +- [x] Last step, we'll push our changes to the remote repository to share our work! (As we did in Lab 1.) - we suggest you check off this last item, commit that change (just right on the main branch is fine; no need to branch for this little step), then push your code. Check GitHub to ensure you can see your changes. @@ -76,8 +76,8 @@ started working on the recipe in `recipe.md` together, and then each filled in t what they felt would make the most delicious cake! You'll notice that your repository already has two branches called `alice` and `bob`. -- [ ] Checkout the `alice` branch. -- [ ] Attempt to merge the `bob` branch into the `alice` branch using either IntelliJ or the Terminal. +- [x] Checkout the `alice` branch. +- [x] Attempt to merge the `bob` branch into the `alice` branch using either IntelliJ or the Terminal. - You will be prompted to resolve a merge conflict. To do this, you will need to pick and choose which parts of each recipe to keep. - Read what either `git` or `IntelliJ` tells you in order to complete the merge process. From 0e53e525a54a5b8f9123b14f7aaa8b632648f72d Mon Sep 17 00:00:00 2001 From: mxiimy Date: Mon, 16 Sep 2024 09:46:43 -0400 Subject: [PATCH 06/10] bugs --- src/DataTypes.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/DataTypes.java b/src/DataTypes.java index 4f807c1f..31cbc320 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -1,13 +1,12 @@ import java.util.List; public class DataTypes { - // TODO TASK 1: fix this code so that it passes the test in DataTypesTest.java public static long sum(List numbers) { int s = 0; // below is a "foreach" loop which iterates through numbers for (int x : numbers) { - s += x; + s += numbers.get(x); } return s; } From d68c6e2c46803a07be3e38756a181c0d9c58475e Mon Sep 17 00:00:00 2001 From: mxiimy Date: Mon, 16 Sep 2024 10:02:06 -0400 Subject: [PATCH 07/10] bug fixes --- src/DataTypes.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DataTypes.java b/src/DataTypes.java index 31cbc320..7601f4dd 100644 --- a/src/DataTypes.java +++ b/src/DataTypes.java @@ -3,10 +3,10 @@ public class DataTypes { public static long sum(List numbers) { - int s = 0; + long s = 0; // below is a "foreach" loop which iterates through numbers for (int x : numbers) { - s += numbers.get(x); + s += x; } return s; } From 77ea3cb0b87702cc46674f752030db92d6a7bda9 Mon Sep 17 00:00:00 2001 From: mxiimy Date: Mon, 16 Sep 2024 10:04:02 -0400 Subject: [PATCH 08/10] Checked off boxes --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 80158096..0c0a466c 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ can make pull requests to that repo during the Task 3 activity during the lab. During lab, you should not fork directly from https://github.com/CSC207-2024F-UofT/Lab2. If you miss the lab and work on this after, you should use this URL though. -- [ ] Make a fork of this repo and clone a local copy (as you did in Lab 1). +- [x] Make a fork of this repo and clone a local copy (as you did in Lab 1). - **Important**: make sure to uncheck the option to only fork the main branch, as the repo contains two branches you will use later in this lab. @@ -45,7 +45,7 @@ branch: - IntelliJ: `Git -> branches... -> main -> Checkout` - Terminal: `git checkout main` Note: everything we've done has been local to our repository and have not pushed anything yet. -- [ ] We are back on `main`, so we can now do the merge and complete our work! +- [x] We are back on `main`, so we can now do the merge and complete our work! - IntelliJ: `Git -> Merge... -> task_1 -> Merge` - Terminal: `git merge task_1` @@ -84,16 +84,16 @@ You'll notice that your repository already has two branches called `alice` and ` - If you do the merge through the Terminal, you will need to edit `recipe.md` to remove all of the merge conflict symbols which `git` has added to your file. Once done, you will need to `git add` the `recipe.md` file and `git commit` to finish the merge. -- [ ] Once the merge is complete, delete the `bob` branch. +- [x] Once the merge is complete, delete the `bob` branch. -- [ ] Finally, checkout the `main` branch and merge the `alice` branch in (as we did previously). +- [x] Finally, checkout the `main` branch and merge the `alice` branch in (as we did previously). Now, you are almost ready to share your recipe with the remote! # TASK 3 -- [ ] Checkout a new branch called `task_3`. -- [ ] Commit any changes that you want to `recipe.md` to further improve the recipe. +- [x] Checkout a new branch called `task_3`. +- [x] Commit any changes that you want to `recipe.md` to further improve the recipe. - [ ] While still on the `task_3` branch, push your code to your remote repository on GitHub. - [ ] Go to GitHub and you will see an option to make a pull request to the original repo. Make a pull request and see that it shows up in the original repository that you forked. From 0be0d770e690d995520dd57c4de2d35e3a37e9e2 Mon Sep 17 00:00:00 2001 From: mxiimy Date: Mon, 16 Sep 2024 10:04:12 -0400 Subject: [PATCH 09/10] Checked off boxes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c0a466c..67befc93 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ Now, you are almost ready to share your recipe with the remote! - [x] Checkout a new branch called `task_3`. - [x] Commit any changes that you want to `recipe.md` to further improve the recipe. - [ ] While still on the `task_3` branch, push your code to your remote repository on GitHub. -- [ ] Go to GitHub and you will see an option to make a pull request to the original repo. Make +- [x] Go to GitHub and you will see an option to make a pull request to the original repo. Make a pull request and see that it shows up in the original repository that you forked. Since others will also be making pull requests, we won't *actually* accept any of them for now, but From a0846ab97d4ef56f9107049e9f40a5bef0ce5826 Mon Sep 17 00:00:00 2001 From: mxiimy Date: Mon, 16 Sep 2024 10:05:27 -0400 Subject: [PATCH 10/10] Checked off boxes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 31844f5e..c5a0d371 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ Now, you are almost ready to share your recipe with the remote! - [x] Checkout a new branch called `task_3`. - [x] Commit any changes that you want to `recipe.md` to further improve the recipe. -- [ ] While still on the `task_3` branch, push your code to your remote repository on GitHub. +- [x] While still on the `task_3` branch, push your code to your remote repository on GitHub. - [x] Go to GitHub and you will see an option to make a pull request to the original repo. Make a pull request and see that it shows up in the original repository that you forked.