Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
d2b57a9
Initial commit
jgwentworth92 Feb 18, 2023
9848bc4
issue 3
jgwentworth92 Feb 20, 2023
1220c34
issue 1
jgwentworth92 Feb 20, 2023
990df70
issue 3
jgwentworth92 Feb 20, 2023
c97fed3
issue 2
jgwentworth92 Feb 20, 2023
4755c69
issue 4
jgwentworth92 Feb 21, 2023
657fd0f
issue 5
jgwentworth92 Feb 21, 2023
506a367
issue 6
jgwentworth92 Feb 21, 2023
451b02c
issue 7
jgwentworth92 Feb 21, 2023
647b2e5
issue 8
jgwentworth92 Feb 21, 2023
c432765
issue 9
jgwentworth92 Feb 21, 2023
c33d1a7
Update issue templates
EDS435 Feb 22, 2023
9ab752f
Merge pull request #1 from EDS435/EDS435-patch-1
EDS435 Feb 22, 2023
ec83353
Merge pull request #128 from jidone7061/main
kaw393939 Feb 22, 2023
c57e4eb
Revert "Merge pull request #128 from jidone7061/main"
kaw393939 Feb 22, 2023
3de8655
Added Ssh Issue.
ESinson Feb 22, 2023
e3b5f58
Merge pull request #3 from EDS435/2-i-am-having-trouble-with-ssh clos…
EDS435 Feb 22, 2023
4f1c572
Added Traefik Issue.
ESinson Feb 22, 2023
d46288f
Merge pull request #5 from EDS435/4-treafik closes #5
EDS435 Feb 22, 2023
7bd797a
Added Webclass Issue.
ESinson Feb 22, 2023
4476d1a
Merge pull request #7 from EDS435/6-webclass-integration closes Issue #7
EDS435 Feb 22, 2023
dadba0d
Added Docker Hub.
ESinson Feb 22, 2023
78bb532
Merge pull request #9 from EDS435/8-dockerhub closes 8-dockerhub
EDS435 Feb 22, 2023
b50e92e
Added Css.
ESinson Feb 22, 2023
a853de1
Merge pull request #11 from EDS435/10-css closes 10-css
EDS435 Feb 22, 2023
01ae646
Added Basics of Putty.
ESinson Feb 23, 2023
7b1c5eb
Merge pull request #13 from EDS435/12-basics-of-putty closes 12-basic…
EDS435 Feb 23, 2023
8458a78
Added Daemons.
ESinson Feb 23, 2023
af7eaf1
Merge pull request #15 from EDS435/14-daemons closes 14-daemons
EDS435 Feb 23, 2023
4e3ccab
Added Kubernetes.
ESinson Feb 23, 2023
4026135
Merge pull request #17 from EDS435/16-kubernetes closes 16-kubernetes
EDS435 Feb 23, 2023
72726ae
Added Node.js.
ESinson Feb 23, 2023
655fdf4
Merge pull request #19 from EDS435/18-nodejs closes 18-nodejs
EDS435 Feb 23, 2023
ca2acdc
Merge pull request #3 from EDS435/main
EDS435 Feb 23, 2023
fb2da4e
Added Node.js.
ESinson Feb 23, 2023
c553735
Added Docker Hub.
ESinson Feb 23, 2023
ea77474
Added Basics of Putty.
ESinson Feb 23, 2023
473acf3
Added SSH.
ESinson Feb 23, 2023
8be30bd
Added Traefik
ESinson Feb 23, 2023
95d011d
Added Webclass.
ESinson Feb 23, 2023
8d51edf
Added Daemons.
ESinson Feb 23, 2023
f03bf95
Added Kubernetes
ESinson Feb 23, 2023
5f54c08
Added Node.js.
ESinson Feb 23, 2023
1bb993d
Merge pull request #10 from jgwentworth92/issue5_IknowAgile
jgwentworth92 Feb 23, 2023
868a0eb
Merge branch 'main' into Issue9_IknowFlask
jgwentworth92 Feb 23, 2023
d28b0f8
Merge pull request #11 from jgwentworth92/Issue9_IknowFlask
jgwentworth92 Feb 23, 2023
207d386
Merge pull request #12 from jgwentworth92/Issue6_DontKno_PostgreSQL
jgwentworth92 Feb 23, 2023
9b28453
Merge pull request #13 from jgwentworth92/Issue4-I2learnNodeJS
jgwentworth92 Feb 23, 2023
3a50c15
Merge branch 'main' into Issue8_DontKno_AdvancedDocker
jgwentworth92 Feb 23, 2023
68e4f15
Merge pull request #14 from jgwentworth92/Issue8_DontKno_AdvancedDocker
jgwentworth92 Feb 23, 2023
b99e856
Merge branch 'main' into Issue7_WantToLearnVue
jgwentworth92 Feb 23, 2023
cc21593
Merge pull request #15 from jgwentworth92/Issue7_WantToLearnVue
jgwentworth92 Feb 23, 2023
08f4545
Merge branch 'main' into issue1_I_dont_understand_how_to_code_with_mu…
jgwentworth92 Feb 23, 2023
5bdf983
Merge pull request #16 from jgwentworth92/issue1_I_dont_understand_ho…
jgwentworth92 Feb 23, 2023
49b8f4e
Merge branch 'main' into Issue3-I-want-to-know-React-JS
jgwentworth92 Feb 23, 2023
7e1a7bf
Merge pull request #18 from jgwentworth92/Issue3-I-want-to-know-React-JS
jgwentworth92 Feb 23, 2023
87ff190
Merge branch 'main' into Issue2_IKnowPHP
jgwentworth92 Feb 23, 2023
b02271c
Merge pull request #17 from jgwentworth92/Issue2_IKnowPHP
jgwentworth92 Feb 23, 2023
18b3554
Merge branch 'main' into Iknow-css
jgwentworth92 Feb 23, 2023
6af4ef9
Merge pull request #19 from jgwentworth92/Iknow-css
jgwentworth92 Feb 23, 2023
0ca95d6
Merge branch 'main' into WantKno-node
jgwentworth92 Feb 23, 2023
1669873
Merge pull request #27 from jgwentworth92/WantKno-node
jgwentworth92 Feb 23, 2023
3bb05aa
Update README.md
jgwentworth92 Feb 24, 2023
78c170f
merge conflicts
jgwentworth92 Feb 24, 2023
28597cb
Merge pull request #6 from jgwentworth92/mergemasterlist
EmmanuelChiobi Feb 24, 2023
8322e78
Added issue templates
EmmanuelChiobi Feb 24, 2023
28cd908
Merge pull request #7 from EmmanuelChiobi/Issue-Templates-Addition
EmmanuelChiobi Feb 24, 2023
02b4334
Update issue templates
EmmanuelChiobi Feb 24, 2023
ad3d0b7
Merge pull request #8 from EmmanuelChiobi/Issue-Templates-Addition-2
EmmanuelChiobi Feb 24, 2023
439de35
Added Docker / Kubernetes
EmmanuelChiobi Feb 24, 2023
48be62b
Added Docker / Kubernetes (2)
EmmanuelChiobi Feb 24, 2023
9c81c34
Merge pull request #10 from EmmanuelChiobi/9-docker-kubernetes closes #9
EmmanuelChiobi Feb 24, 2023
a82d875
Added UNIX Commands
EmmanuelChiobi Feb 24, 2023
0589a4d
Merge pull request #12 from EmmanuelChiobi/11-unix-commands closes #11
EmmanuelChiobi Feb 24, 2023
459d470
Update README.md
EDS435 Feb 24, 2023
746afb4
Update Read Me 3
EDS435 Feb 24, 2023
9f620d7
Merge pull request #31 from EDS435/EDS435-patch-3
EDS435 Feb 24, 2023
94c2b06
Update issue templates
EDS435 Feb 24, 2023
c050c3d
Merge pull request #32 from EDS435/EDS435-patch-4
EDS435 Feb 24, 2023
a8efb06
Added Bootstrap
EmmanuelChiobi Feb 24, 2023
78ab1c6
Merge pull request #15 from EmmanuelChiobi/14-bootstrap closes #14
EmmanuelChiobi Feb 24, 2023
d9feded
Fixing conflicts on repos
EmmanuelChiobi Feb 24, 2023
ba22b22
Merge pull request #16 from EmmanuelChiobi/fixing-conflicts
EmmanuelChiobi Feb 24, 2023
a5ab172
Added Python
EmmanuelChiobi Feb 24, 2023
a135613
Merge pull request #18 from EmmanuelChiobi/17-python closes #17
EmmanuelChiobi Feb 24, 2023
6398615
Added MongoDB
EmmanuelChiobi Feb 24, 2023
d2eb668
Merge pull request #20 from EmmanuelChiobi/19-mongodb closes #19
EmmanuelChiobi Feb 24, 2023
27ef6fd
Added NodeJS
EmmanuelChiobi Feb 24, 2023
debc5aa
Merge pull request #22 from EmmanuelChiobi/21-nodejs closes #21
EmmanuelChiobi Feb 24, 2023
7633131
Added ReactJS
EmmanuelChiobi Feb 24, 2023
623b5e2
Merge pull request #24 from EmmanuelChiobi/23-reactjs closes #23
EmmanuelChiobi Feb 24, 2023
4744699
Added Flask
EmmanuelChiobi Feb 24, 2023
4e79b9b
Merge pull request #26 from EmmanuelChiobi/25-flask closes #25
EmmanuelChiobi Feb 24, 2023
ee96dcd
Added AWS
EmmanuelChiobi Feb 24, 2023
7398485
Merge pull request #28 from EmmanuelChiobi/27-aws closes #27
EmmanuelChiobi Feb 24, 2023
35ca91b
Added UNIX Commands
EmmanuelChiobi Feb 24, 2023
40edb26
Merge pull request #34 from EDS435/unix-commands-ec
EmmanuelChiobi Feb 24, 2023
88e93ea
Added Bootstrap
EmmanuelChiobi Feb 24, 2023
eac17d0
Merge pull request #35 from EDS435/bootstrap-ec
EmmanuelChiobi Feb 24, 2023
5f3d08b
Added Python
EmmanuelChiobi Feb 24, 2023
a8e5c49
Merge pull request #36 from EDS435/python-ec
EmmanuelChiobi Feb 24, 2023
b5b71a0
Added Docker / Kubernetes
EmmanuelChiobi Feb 24, 2023
5e9159f
Merge pull request #37 from EDS435/docker-kubernetes-ec
EmmanuelChiobi Feb 24, 2023
2ec5031
Edited Docker / Kubernetes
EmmanuelChiobi Feb 24, 2023
57e444d
Added MongoDB
EmmanuelChiobi Feb 24, 2023
e13dead
Merge pull request #38 from EDS435/mongodb-ec
EmmanuelChiobi Feb 24, 2023
d2678b1
Added NodeJS
EmmanuelChiobi Feb 24, 2023
c8de97f
Merge pull request #39 from EDS435/nodejs-ec
EmmanuelChiobi Feb 24, 2023
01ee27e
Added ReactJS
EmmanuelChiobi Feb 24, 2023
9a6e48e
Merge pull request #40 from EDS435/reactjs-ec
EmmanuelChiobi Feb 24, 2023
f532484
Added Flask
EmmanuelChiobi Feb 24, 2023
5e1473b
Merge pull request #41 from EDS435/flask-ec
EmmanuelChiobi Feb 24, 2023
c23438d
Added AWS
EmmanuelChiobi Feb 24, 2023
a4b84c3
Merge pull request #42 from EDS435/aws-ec
EmmanuelChiobi Feb 24, 2023
5366ba8
Merge branch 'main' into main
EmmanuelChiobi Feb 24, 2023
0a6cea7
Merge pull request #13 from EDS435/main
EmmanuelChiobi Feb 24, 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
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/assign-master-list.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Assign Master List
about: 'Create an issue using the template "Assignment Master List" '
title: ''
labels: ''
assignees: ''

---

Create an issue using the template "Assignment Master List" and reference the pull request that you make in the issue. Make sure you make an issue template to accept this issue on your own repository and provide these instructions.
10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/bcs25.md

This file was deleted.

10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/complete-list.md

This file was deleted.

5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/completed-lists.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
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: Master List
assignees: ''

labels: ''

---

You need to make a pull request and add the link to the pull request to this issue when you submit.

Expand Down
10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/master-list.md

This file was deleted.

9 changes: 4 additions & 5 deletions .github/ISSUE_TEMPLATE/master-pull-request.md
Original file line number Diff line number Diff line change
@@ -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: ''
labels: submit-master
assignees: ''

---

You need to make a pull request snd add the link to the pull request to the issue when you submit.

10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/things-i-don-t-understand.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Things I Don't Understand
about: This is for adding issues that you don't understand.
title: ''
labels: don't understand
assignees: ''

---


Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
name: Things I know
about: Add one item for each thing you learned keep to max of 255 characters
name: Things I Learned
about: Add one item for each thing you learned. Keep to max of 255 characters.
title: "[Things I Learned]"
labels: ''
labels: i know
assignees: ''

---
Expand Down
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/things-i-want-to-know.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Things I Want To Know
about: Add one item for each thing you want to know.
title: 'Thing I want to know: <file in title> [Thing I want to Knows]'
labels: want to know
assignees: ''

---

Please describe what you want to know in less than 255 characters.
10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/things-we-don-t-understand.md

This file was deleted.

10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/things-we-understand.md

This file was deleted.

10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/things-we-want-to-know-next.md

This file was deleted.

64 changes: 27 additions & 37 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,50 +9,39 @@ 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]
1. PHP [1]
2. Agile[1]
3. flask[1]
4. Css.
5. Basics of Putty.
6. Docker Hub.
7. UNIX Commands
8. Bootstrap
9. Python

#### 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. Multi-thread programming [1]
2. PostgreSQL[1]
3. Docker full web-application development[1]
4. Ssh Configuration.
5. Traefik Integration
6. Had issues with earlier webclass integration.
7. Docker / Kubernetes[1]
8. MongoDB
9. NodeJS

#### 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. ReactJS [2]
2. Node.js
3. Daemons
4. Kubernetes
5. Vue JS[4]
6. Flask
7. AWS

## 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 @@ -121,3 +110,4 @@ 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