Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
2b9d633
Update issue templates
kl63 Feb 16, 2023
37ef67c
Merge pull request #1 from kl63/kl63-patch-1
kl63 Feb 16, 2023
7735f99
Update issue templates
lucicto Feb 16, 2023
2148509
Merge pull request #1 from lucicto/lucicto-patch-1
lucicto Feb 16, 2023
6f7bf83
added SSH Keygen issue #1
Feb 16, 2023
0ffd3c9
added ssh keygen issue #2
lucicto Feb 16, 2023
7e99667
Merge pull request #3 from kl63/2-ssh-keygen-and-github closes #1
kl63 Feb 16, 2023
1de4462
Merge pull request #3 from lucicto/2-ssh-keygen-and-github closes #2
lucicto Feb 16, 2023
8ae7cea
did this up
lucicto Feb 16, 2023
d5f7079
did this up
Feb 16, 2023
3a5ac9f
added issue 2
Feb 16, 2023
bb65c9a
Merge pull request #5 from kl63/4-i-learned-github-issues
kl63 Feb 16, 2023
f814658
Update issue templates
kl63 Feb 17, 2023
5a2d719
added something I don't understand
Feb 17, 2023
2737fc5
Merge pull request #7 from kl63/6-understanding-different-error-messa…
kl63 Feb 17, 2023
a4ccd34
did something
lucicto Feb 17, 2023
8c415c3
Merge branch 'main' into 4-i-learned-github-issues
lucicto Feb 17, 2023
49bdc1c
Merge pull request #5 from lucicto/4-i-learned-github-issues closes #4
lucicto Feb 17, 2023
0a4f3fd
added an issue
lucicto Feb 17, 2023
20d1bf4
Merge pull request #7 from lucicto/6-need-help-on-the-assignments clo…
lucicto Feb 17, 2023
e0407d3
Update issue templates
lucicto Feb 17, 2023
425bd76
added an issue in don't understand
lucicto Feb 17, 2023
a317a66
adding something I don't understand
Feb 17, 2023
157e615
Merge pull request #9 from lucicto/8-need-help-with-the-commands-on-p…
lucicto Feb 17, 2023
f288bd0
Merge pull request #9 from kl63/8-having-a-deep-understanding-of-gith…
kl63 Feb 17, 2023
bc72861
added an issue in don't understand
lucicto Feb 17, 2023
d1d0bcb
adding something I don't understand 2
Feb 17, 2023
11bc14c
Merge pull request #11 from lucicto/10-some-of-the-terminology-used-i…
lucicto Feb 17, 2023
73397d3
Merge pull request #11 from kl63/10-learning-how-to-better-solve-merg…
kl63 Feb 17, 2023
e39cce5
adding something I learned 1
Feb 17, 2023
6b38f6c
added an something in the i learned part
lucicto Feb 17, 2023
47a123d
Merge pull request #13 from lucicto/12-how-to-do-a-commit-and-push-on…
lucicto Feb 17, 2023
2b7f2b1
Merge pull request #13 from kl63/12-the-importance-of-having-docker-o…
kl63 Feb 17, 2023
438cae5
added an something in the i learned part
lucicto Feb 17, 2023
e2c4b27
added an issue in i want to learn
lucicto Feb 17, 2023
1aff95f
adding something I want to learn 1
Feb 17, 2023
d73e9d6
Merge pull request #15 from lucicto/14-how-to-merge-and-resolve-merge…
lucicto Feb 17, 2023
1e9df42
Merge pull request #15 from kl63/14-using-different-applications-to-c…
kl63 Feb 17, 2023
bf5007c
added another issue in i want to learn
lucicto Feb 17, 2023
b1ed64e
adding something I want to learn 2
Feb 17, 2023
d0878f4
Merge pull request #17 from lucicto/16-understanding-how-pycharm-gith…
lucicto Feb 17, 2023
f059736
Merge pull request #17 from kl63/16-becoming-more-comfortable-with-do…
kl63 Feb 17, 2023
e36937f
added last issue in i want to learn
lucicto Feb 17, 2023
e66280f
adding something I want to learn 3
Feb 17, 2023
e5ec8fa
Merge pull request #19 from lucicto/18-learn-more-about-dockerhub clo…
lucicto Feb 17, 2023
a04c943
Merge pull request #19 from kl63/18-learning-about-other-applications…
kl63 Feb 17, 2023
4205204
Update issue templates
rsk6 Feb 18, 2023
fd8c9f4
Update issue templates
rsk6 Feb 18, 2023
df0ba34
added something to list
rsk6 Feb 18, 2023
8070381
Merge pull request #2 from rsk6/1-simple-and-well-explained-definitio…
rsk6 Feb 18, 2023
8da775e
added something
rsk6 Feb 18, 2023
da66c2e
Merge pull request #4 from rsk6/3-simple-explanation-of-what-everythi…
rsk6 Feb 18, 2023
b44de25
added something
rsk6 Feb 18, 2023
5b06fb5
Merge pull request #6 from rsk6/5-explain-pycharm-terminal-and-comman…
rsk6 Feb 18, 2023
41083f1
added something
rsk6 Feb 18, 2023
49d99c3
added something
rsk6 Feb 18, 2023
4dd6f4c
added something
rsk6 Feb 18, 2023
f72c552
added something
rsk6 Feb 18, 2023
9c76609
Merge pull request #9 from rsk6/8-github-repositories closes #8
rsk6 Feb 18, 2023
7dbd38c
added something
rsk6 Feb 18, 2023
53e7775
Merge pull request #11 from rsk6/10-github-classroom-assignments clos…
rsk6 Feb 18, 2023
5864245
added something
rsk6 Feb 18, 2023
9ef2b80
Merge pull request #13 from rsk6/12-autograder closes #12
rsk6 Feb 18, 2023
3a0a5a5
added something
rsk6 Feb 18, 2023
2ebe42b
added something
rsk6 Feb 18, 2023
c42c8d8
Merge pull request #15 from rsk6/14-understand-and-comprehend-process…
rsk6 Feb 18, 2023
c6addc3
added something
rsk6 Feb 18, 2023
eb039bc
Merge pull request #17 from rsk6/16-what-and-how-do-they-do-and-work …
rsk6 Feb 18, 2023
05dc336
added something
rsk6 Feb 18, 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
ee0765f
Merge branch 'main' into 1-simple-and-well-explained-definitions-need…
rsk6 Feb 18, 2023
ac2b231
Merge pull request #20 from rsk6/1-simple-and-well-explained-definiti…
kl63 Feb 18, 2023
eb574b7
Merge pull request #21 from rsk6/3-simple-explanation-of-what-everyth…
kl63 Feb 18, 2023
01d5501
Merge pull request #22 from rsk6/5-explain-pycharm-terminal-and-commands
kl63 Feb 18, 2023
537f8ca
Merge pull request #23 from rsk6/7-github-repositories
kl63 Feb 18, 2023
c356d24
Merge branch 'main' into 8-github-repositories
rsk6 Feb 18, 2023
0e5d3b8
Merge pull request #24 from rsk6/8-github-repositories
kl63 Feb 18, 2023
b4eb003
Merge branch 'main' into 10-github-classroom-assignments
rsk6 Feb 18, 2023
2dbfc47
Merge pull request #25 from rsk6/10-github-classroom-assignments
kl63 Feb 18, 2023
7d87230
Merge branch 'main' into 12-autograder
rsk6 Feb 18, 2023
465ab57
Merge branch 'main' into 1-simple-and-well-explained-definitions-need…
rsk6 Feb 18, 2023
20ad63e
Merge pull request #20 from rsk6/1-simple-and-well-explained-definiti…
lucicto Feb 18, 2023
65be394
Merge pull request #21 from rsk6/3-simple-explanation-of-what-everyth…
lucicto Feb 18, 2023
261bda0
Merge pull request #22 from rsk6/5-explain-pycharm-terminal-and-commands
lucicto Feb 18, 2023
6fbc001
Merge pull request #23 from rsk6/8-github-repositories
lucicto Feb 18, 2023
42d590c
Merge pull request #24 from rsk6/10-github-classroom-assignments
lucicto Feb 18, 2023
1d743a0
Merge pull request #25 from rsk6/12-autograder
lucicto Feb 18, 2023
e043647
Merge pull request #26 from rsk6/14-understand-and-comprehend-process
lucicto Feb 18, 2023
1351f50
Merge pull request #27 from rsk6/16-what-and-how-do-they-do-and-work
lucicto Feb 18, 2023
a7695a6
Merge pull request #28 from rsk6/18-clear-vocabulary
lucicto Feb 18, 2023
33ab62d
Update README.md
kl63 Feb 19, 2023
a867fd8
Merge branch 'main' into 2-ssh-keygen-and-github
kl63 Feb 20, 2023
d025f1f
Merge pull request #29 from kl63/2-ssh-keygen-and-github
lucicto Feb 20, 2023
0fb6b7d
Merge branch 'main' into 6-understanding-different-error-messages-in-…
kl63 Feb 20, 2023
258766a
Merge pull request #30 from kl63/6-understanding-different-error-mess…
lucicto Feb 20, 2023
a9e8bac
Merge branch 'main' into 14-using-different-applications-to-create-on…
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/completed-lists.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Completed Lists
about: This is for your master pull request to merge your master into this repo.
title: Put your UCID as the title (replace this text)
labels: Compiled List
labels: ''
assignees: ''

---
Expand Down
15 changes: 15 additions & 0 deletions .github/ISSUE_TEMPLATE/master-pull-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
name: Master Pull Request
about: This is for your master pull request to merge your master into this repo
title: Put your UCID as the title (replace this text)
labels: Complied List

about: This is for your master pull request to merge your master into this repo.
title: Put your UCID as the title (replace this text)
labels: compile list

assignees: ''



You need to make a pull request and add the link to the pull request to this issue when you submit.
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/things-i-don-t-understand.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
name: Things I Don't Understand
about: This is for adding issues that you don't understand
title: ''
labels: Things I Don't Understand
labels: Complied List, Things I Don't Understand
labels: IDontKnow
labels: Complied List, Things I Don't Understand
assignees: ''

---
Expand Down
12 changes: 10 additions & 2 deletions .github/ISSUE_TEMPLATE/things-i-learned.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@
name: Things I learned
about: Add one item for each thing you learned keep to max of 255 characters
title: "[Things I Learned]"
labels: Things I learned
2-ssh-keygen-and-github
labels: ''

labels: IKnow



labels: ''

assignees: ''

---


Please add one item that you learned. File new issues for each item that you learned. Please keep the number of characters to no more than 255.
28 changes: 26 additions & 2 deletions .github/ISSUE_TEMPLATE/things-i-want-to-know.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,34 @@
---
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: Things I learned
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
labels: Things I want to Know
name: Things i want to know
about: Describe this issue template's purpose here.
title: ''
labels: Things i Want to Kno

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

110 changes: 102 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,20 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and

### Your list should look like this:
#### Things we understand**
1. Python Print[1]
2. Linux Directory listing[2]
1. Github repositories[1]
2. Github classroom assignments[1]
3. Autograder[1]
1. GitHub repositories[1]
2. Linux Directory listing[1]
3. Docker Installation[1]
#### Things we don't understand
1. Git Stash[1]
2. GIt pull[2]
3. GIT status[1]
1. Simple and well explained definitions needed[1]
2. Simple explanation of what everything is used for[1]
3. Explain Pycharm terminal and commands[1]
#### Things we want to know next**
1. Elastic Search Indexing [1]
2. Cloud deployment with Kubernetes[2]
3. Teraform[1]
1. Understand and comprehend process[1]
2. What and how do they do and work[1]
3. Clear vocabulary[1]

## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL
Add your ssh public key to github - See video
Expand Down Expand Up @@ -63,6 +66,45 @@ 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
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.

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 @@ -92,3 +134,55 @@ Collaborating on GitHub:
13. update your local main branch with the changes from the merge by doing git pull origin main
14. Repeat again, and again, and again





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 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. I know how to make an SSH key and add it to github so I don't need to login with a password
2. learned github issues
3. how to do a commit and push on pycharm

### Things you don't understand about what we are doing / web development.
1. Need help on the assignments
2. Need help with the commands on pycharm
3. Some of the terminology used in class.
### Things you want to know next
1. How to merge and resolve merge conflicts.
2. Understanding how pycharm, github and docker go hand in hand.
3. Learn more about dockerhub