diff --git a/.github/ISSUE_TEMPLATE/assignment-master-list.md b/.github/ISSUE_TEMPLATE/assignment-master-list.md new file mode 100644 index 00000000..47fd2599 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/assignment-master-list.md @@ -0,0 +1,8 @@ +--- +name: Assignment master list +about: merging my master with another person's master +title: '' +labels: '' +assignees: '' + +--- diff --git a/.github/ISSUE_TEMPLATE/complete-list.md b/.github/ISSUE_TEMPLATE/complete-list.md deleted file mode 100644 index 5ccd425b..00000000 --- a/.github/ISSUE_TEMPLATE/complete-list.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Complete List -about: Sending to upstream Repo -title: Use UCID -labels: Complete List -assignees: '' - ---- - - diff --git a/.github/ISSUE_TEMPLATE/completed-lists.md b/.github/ISSUE_TEMPLATE/completed-lists.md deleted file mode 100644 index e7796b43..00000000 --- a/.github/ISSUE_TEMPLATE/completed-lists.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -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: '' - - -You need to make a pull request and add the link to the pull request to this issue when you submit. - -PULL REQUEST LINK: - -UCID: diff --git a/.github/ISSUE_TEMPLATE/master-list.md b/.github/ISSUE_TEMPLATE/master-list.md deleted file mode 100644 index c222948d..00000000 --- a/.github/ISSUE_TEMPLATE/master-list.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Master List -about: Describe this issue template's purpose here. -title: '' -labels: Master List -assignees: '' - ---- - -This is the master list for the ideas diff --git a/.github/ISSUE_TEMPLATE/master-pull-request.md b/.github/ISSUE_TEMPLATE/master-pull-request.md index 475bc47c..5ea8b96b 100644 --- a/.github/ISSUE_TEMPLATE/master-pull-request.md +++ b/.github/ISSUE_TEMPLATE/master-pull-request.md @@ -1,11 +1,10 @@ --- name: Master Pull Request - - about: This is for your master pull request to merge your master into this repo. -title: bcs25 - +title: Put your UCID as the title(replace this text) +labels: '' +assignees: '' +--- -You need to make a pull request snd add the link to the pull request to the issue when you submit. - +You need to make a pull request and add the link to the pull request to this issue when you submit. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/things-we-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md similarity index 55% rename from .github/ISSUE_TEMPLATE/things-we-don-t-understand.md rename to .github/ISSUE_TEMPLATE/things-i-don-t-understand.md index 60a3fea9..130906ce 100644 --- a/.github/ISSUE_TEMPLATE/things-we-don-t-understand.md +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -1,5 +1,5 @@ --- -name: Things we don't understand +name: Things I Don't Understand about: This is for adding issues that you don't understand title: '' labels: '' @@ -7,4 +7,4 @@ assignees: '' --- -I don't understand +I don't understand \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/things-i-know.md b/.github/ISSUE_TEMPLATE/things-i-learned.md similarity index 78% rename from .github/ISSUE_TEMPLATE/things-i-know.md rename to .github/ISSUE_TEMPLATE/things-i-learned.md index 3bcf609a..881e22df 100644 --- a/.github/ISSUE_TEMPLATE/things-i-know.md +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -1,10 +1,10 @@ --- -name: Things I know +name: Things I learned about: Add one item for each thing you learned keep to max of 255 characters -title: "[Things I Learned]" +title: '' 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. +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. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bcs25.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md similarity index 50% rename from .github/ISSUE_TEMPLATE/bcs25.md rename to .github/ISSUE_TEMPLATE/things-i-want-to-know.md index 51785f76..5c30254d 100644 --- a/.github/ISSUE_TEMPLATE/bcs25.md +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -1,5 +1,5 @@ --- -name: bcs25 +name: Things I want to know about: Describe this issue template's purpose here. title: '' labels: '' @@ -7,4 +7,4 @@ assignees: '' --- - +Please describe what you want to know in less than 255 characters. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/things-we-understand.md b/.github/ISSUE_TEMPLATE/things-we-understand.md deleted file mode 100644 index ac9b6d60..00000000 --- a/.github/ISSUE_TEMPLATE/things-we-understand.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Things we understand -about: Add one item for each thing you learned keep to max of 255 characters -title: "[Things we understand]" -labels: Thing we understand -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. diff --git a/.github/ISSUE_TEMPLATE/things-we-want-to-know-next.md b/.github/ISSUE_TEMPLATE/things-we-want-to-know-next.md deleted file mode 100644 index 97638fe3..00000000 --- a/.github/ISSUE_TEMPLATE/things-we-want-to-know-next.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Things we want to know next -about: Describe this issue template's purpose here. -title: 'Thing we want to know: [Thing we want to Knows]' -labels: Thing we want to know next -assignees: '' - ---- - -Please describe what you want to know in less than 255 characters. diff --git a/README.md b/README.md index 23720273..447268a2 100644 --- a/README.md +++ b/README.md @@ -9,55 +9,60 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. You will learn to merge pull requests and resolve merge conflicts 3. You will learn to manage a basic project using GitHub Project. -### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned. The number in the bracket next to each issue is the count, you should set your count at 1 for your issue. We need the count of how many times the issue is mentioned, so that we can prioritize each issue. +### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned. The number in the bracket next to each issue is the count, you should set your count at 1 for your issue. We need the count of how many times the issue is mentioned, so that we can prioritze each issue. ### Your list should look like this: -#### Things we understand** - -1. git status [1] -2. git fetch [1] -3. git checkout [1] -4. Docker Setup[4] -5. Linux command[1] -6. I learned Python Pytest[1] -7. Create new branch and merge within my own repo[1] -8. Cloning Repository[2] -9. Python is integrated into pycharm[1] -10. Pycharm and Github workflow and integration process[1] -11. Create new branch and merge within my own repo[1] +#### Things we understand** +1. I learned Git issues[1] +2. I learned Git status[1] +3. Docker Installation[4] +4. GitHub and PyCharm work[1] +5. Building image on Docker[1] +6. GitHub commands[1] +7. Python Print[1] +8. Linux Directory listing[2] +9. Git push and pull[1] +10. Building Docker Image [1] +11. Using Git on command line[1] +12. Collaborating on GitHub[1] #### Things we don't understand -1. Clarity on who Merges a pull request [1] -2. Difference between Docker build & Docker compose [1] -3. How docker pushes to dockerhub [1] -4. Git rebase Usage[1] -5. Git Stash Usage[1] -6. Git show Usage[1] -7. Undo specific git commit or git push[2] -8. Git Pull[2] -9. Docker Storage space limitation[2] -10. dockerization[1] -11. Git Push[1] -12. Teraform[1] -12. Cloud deployment with Kubernetes[1] +1. I don't understand how to resolve merge conflicts[1] +2. I don't understand Docker container images and their use[1] +3. I don't know how to deal with daemon errors[2] +4. Auto grading[1] +5. gitHub commit and push[1] +6. Terminal Errors[1] +7. Git Stash[2] +8. GIt pull[2] +9. GIT status[1] +10. Git merge[1] +11. port issues on docker[1] +12. pull requests on GHub[1] +13. Watchtower[1] #### Things we want to know next** -1. How to better work as a PM or as a subordinate [1] -2. Use Python program to write Hello World [1] -3. How Dockerhub pushes or uses resources against repos in scalable way [1] -4. How to deploy a web app with a database on the cloud [1] -5. Cloud deployment with Kubernetes[3] -6. Teraform Usage[3] -7. Elastic Search Indexing[3] -8. Security within our Github and Docker workflow[1] -9. Linux Directory Listings[1] +1. I want to know about CI/CD tools[1] +2. I want to know Git remote repositories[1] +3. cloud deployment with kubernetes[4] +4. Resolving Errors[1] +5. Web project using HTML, CSS, JavaScript[2] +6. Elastic Search Indexing [1] +7. Teraform[1] +8. How write Automated Tests [1] +9. Devops[1] +10. How to create a webpage[1] +11. Working with Vi[1] +12. Webpack[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 **open powershell or terminal and run "ssh-keygen -b 4096" and hit enter through the prompts and then open the file **your home directory/.ssh/id_rsa.pub** and copy that text into your github account settings under SSH/GPG keys -> add key. in one of the prompts it will tell you where it is going to save the key. If you already have a key reusue the one you have and cancel out of the process with control c **. I do it on my mac with the command vi ~/.ssh/id_rsa.pub" and then i press shift colon : and q to quit + + ### [Assignment Video](https://youtu.be/UFLKojO3OtM) ## You will accomplish this assignment in 5 phases: