Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7735f99
Update issue templates
lucicto Feb 16, 2023
2148509
Merge pull request #1 from lucicto/lucicto-patch-1
lucicto Feb 16, 2023
0ffd3c9
added ssh keygen issue #2
lucicto Feb 16, 2023
41ea8e1
Merge pull request #19 from rsk6/18-clear-vocabulary closes #18
rsk6 Feb 18, 2023
ff83c8f
Merge branch 'main' into 2-ssh-keygen-and-github
kl63 Feb 18, 2023
a73f66d
Merge pull request #20 from kl63/2-ssh-keygen-and-github
rsk6 Feb 18, 2023
632b657
Merge pull request #21 from kl63/4-i-learned-github-issues
rsk6 Feb 18, 2023
10427b2
Merge branch 'main' into 6-understanding-different-error-messages-in-…
rsk6 Feb 18, 2023
1ceb0bb
Merge pull request #22 from kl63/6-understanding-different-error-mess…
rsk6 Feb 18, 2023
c0abcd9
Merge pull request #23 from kl63/8-having-a-deep-understanding-of-git…
rsk6 Feb 18, 2023
b6fc88f
Merge pull request #24 from kl63/10-learning-how-to-better-solve-merg…
rsk6 Feb 18, 2023
8923784
Merge pull request #25 from kl63/12-the-importance-of-having-docker-o…
rsk6 Feb 18, 2023
a1943ae
Merge branch 'main' into 14-using-different-applications-to-create-on…
kl63 Feb 18, 2023
c3dad1a
Merge pull request #26 from kl63/14-using-different-applications-to-c…
rsk6 Feb 18, 2023
6b3cce0
Merge branch 'main' into 16-becoming-more-comfortable-with-docker
rsk6 Feb 18, 2023
ae28029
Merge pull request #27 from kl63/16-becoming-more-comfortable-with-do…
rsk6 Feb 18, 2023
7892a51
Merge branch 'main' into 18-learning-about-other-applications-needed-…
kl63 Feb 18, 2023
a4dbd5e
Merge pull request #28 from kl63/18-learning-about-other-applications…
rsk6 Feb 18, 2023
c513fd3
Merge branch 'main' into 2-ssh-keygen-and-github
lucicto Feb 18, 2023
992c5ba
Merge branch 'main' into 2-ssh-keygen-and-github
lucicto Feb 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/things-i-don-t-understand.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name: Things I Don't Understand
about: This is for adding issues that you don't understand
title: ''
labels: Complied List, Things I Don't Understand
labels: IDontKnow
labels: Complied List, Things I Don't Understand
assignees: ''
Expand Down
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/things-i-learned.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
name: Things I learned
about: Add one item for each thing you learned keep to max of 255 characters
title: "[Things I Learned]"
2-ssh-keygen-and-github
labels: ''

labels: IKnow


labels: ''
assignees: ''

Expand Down
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/things-i-want-to-know.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
---

name: Things i want to know
about: Describe this issue template's purpose here.
title: ''
labels: Things i Want to Know
name: Things I want to Know
about: Describe this issue template's purpose here.
title: Thing I want to Know <file in title> [Thing I want to Know
labels: Things I want to Know

name: Things I want to know
about: Describe this issue template's purpose here.
title: 'Thing I want to know: <file in title> [Thing I want to Knows]'
labels: IWantToKnow


name: Things I want to Know
about: Describe this issue template's purpose here.
title: Thing I want to Know <file in title> [Thing I want to Know
Expand All @@ -11,5 +23,11 @@ assignees: ''

---



Please describe what you want to know in less than 255 characters

Please describe what you want to know in less than 255 characters.


Please describe what you want to know in less than 255 characters
43 changes: 43 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,47 @@ To submit this assignment you need to submit the result of step #5 to canvas. W
Collaborating on GitHub:

1. Fork the repository: Each person should fork the repository to their own GitHub account. To do this, click the "Fork" button in the top-right corner of the repository page.

2. Enable issues: If you don't see the "Issues" tab in the main menu, you should enable it in the repository settings. Go to the "Issues" tab, and click "Milestones" to add a 0.1.0 milestone and describe it as a consolidated list of issues from your team. On the issues tab you should also create labels for "I Know", "Want to Know", and "Don't Understand". Once you create these labels then go to settings and look for the "Issues Template" and create 3 issue templates that will provide the starting text for each issue filed of that type. At the bottom of each issue you will see that you can automaticly assign a label to that issue type, so connect the respective labels you created with the 3 issue types.
3. Create one issue per item in your list and assign it to the correct issue template.
4. Create a new project tab and create a new project (you have to click the down arrow next to "link project" to change it to new project). When you create a project you need to select "board" and name it "Documentation Tasks".
5. Go back to your issues, click on each issue, and assign the issue to the following: assignee i.e. you, miletone i.e. the one you created 0.1.0, project documentation (set the status to todo) and create the branch for the issue.
4. Go to the "Project" board, and if you see any tasks without a status move them to the todo column.
5. Pick one task and move it to the in progress column to indicate you are going to work on it.
6. If you have not done so already clone the repository to your local and type "git fetch" to see the branch(s) for the issues you created.
7. Do a "git checkout <name of branch>" i.e. "git checkout 1-some-issue".
8. Complete the issue by adding one item to one of the 3 categories. Do a git status and make sure that only the readme is changed. If the readme just has the change then you can do a git commit -a -m "PUT A DESCRIPTIVE MESSAGE HERE". git commit with the -a flag adds all the new and modified files to the commit.
9. Push the branch back by doing a git push origin head or use the push command from the drop down in Pycharm.
10. Make a pull request (MAKE SURE YOU DO IT FOR YOUR OWN IT WILL DEFAULT TO MAKING A PULL REQUEST TO THE UPSTREAM REPOSITORY" for the branch and when you come to the part where you have to need the commit message you have to add "closes #?" the ? is whatever issue number that the pull request resolves.
11. Check the documentation board and you should see that the task has moved from in progress to done.
12. Once you have resolved an issue you should go to your partners' fork and make a pull request that to merge your issue branch.
13. Your partner will then need to create an issue to merge the pull request. You first need to save an issue and after you save it will make the right side controls active and you can select the repository / pull request you want to link and fill out the other fields like assigning the task to the milestone, assigning a developer, assiginging it to the right project with the todo status.
14. Once your partner creates the issue they need to merge the pull request and close it with the "closes #?" in the merge message.
15. On your own fork, you will want to make a pull request to yourself to merge their updated master into yours.


# Complete the Assignment By adding your issues to these 3 lists.

## Put your items here
### Things you understand so far
1. I know how to make an SSH key and add it to github so I don't need to login with a password
1. I know how to make an SSH Key and add it to Github so I dont need to login with a password
2. I learned Github issues
3. The importance of having Docker running.
### Things you don't understand about what we are doing / web development.
1. I wish I knew how to read different errors on command line.
2. The purpose of Github Actions.
3. Resolving merge conflicts.
### Things you want to know next

1. Using different applications to create one final webpage.
2. Becoming more comfortable with Docker.

3. Learning how to use other applications that are needed in the field.


1. How to connect viewjs to elastic search

2. Enable issues: If you don't see the "Issues" tab in the main menu, you should enable it in the repository settings.
3. Go to the "Issues" tab, and click "Milestones" to add a 0.1.0 milestone and describe it as a consolidated list of issues from your team.
4. Go to the issues tab you should also create labels for "I Know", "Want to Know", "Don't Understand", and "Master List".
Expand Down Expand Up @@ -128,3 +169,5 @@ Collaborating on GitHub:
2. Becoming more comfortable with Docker.
3. Learning how to use other applications that are needed in the field.