diff --git a/.gitignore b/.gitignore index badbc02f6..8e0eafdd1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ _site .sass-cache +.idea/* diff --git a/README.md b/README.md index 9c73a404d..29c778956 100755 --- a/README.md +++ b/README.md @@ -1,63 +1,105 @@ -# Workshop Guestbook ๐Ÿ““ +# DevFest Seoul 2019 ๋ฐฉ๋ช…๋ก ๐Ÿฅณ -Hey welcome to this workshops guestbook! By signing this guestbook we will explore many of the core concepts of GitHub. -By the end of this workshop you will have forked a repo, created a commit, made a pull request and signed your name on the guestbook. +์•ˆ๋…•ํ•˜์„ธ์š”! Commit and Candy ์•กํ‹ฐ๋น„ํ‹ฐ์— ์˜ค์‹ ๊ฒƒ์„ ํ™˜์˜ํ•ฉ๋‹ˆ๋‹ค!
๊ฐœ๋ฐœ์ž๋“ค์˜ ์ถ•์ œ์ธ๋งŒํผ ์žฌ๋ฐŒ๋Š” Commit์„ ๋‚ ๋ ค๋ณด์ง€ ์•Š๊ฒ ์–ด์š”? -# Signing the guestbook +์•„๋ž˜ ์„ค๋ช…์„ ์ฐจ๊ทผ์ฐจ๊ทผ ๋”ฐ๋ผ์˜ค์‹œ๋‹ค๋ณด๋ฉด PR(Pull Request)๋„ ์–ด๋ ต์ง€ ์•Š์•„์š”!
์—ฌ๋Ÿฌ๋ถ„์ด ์ž‘์„ฑํ•œ PR์ด `merge` ๋˜๋ฉด, GDG Seoul Github pages์— ์ธ์‚ฌ๋ง์ด ๋“ฑ๋ก๋ฉ๋‹ˆ๋‹ค. -## Using GitHub.com -### Forks -GitHub let's you adapt any piblic repository using forks. Forks copy the entire repository to your profile so that you have ownership and -controll. This let's you add features to a project without needing to request direct access to a repository. +### ๋ฐฉ๋ช…๋ก ์–‘์‹ (๋ฏธ๋ฆฌ ๋ณต์‚ฌํ•ด์ฃผ์„ธ์š”!) -Let's fork this repository to get started: +- ํ”„๋กœํ•„ url์ด ์—†์„ ๊ฒฝ์šฐ https://avatar.tobi.sh/tobiaslins.svg?text=GDG ์ขŒ์ธก parameter์— ๋ณธ์ธ์˜ ์ด๋‹ˆ์…œ๋กœ ๋ณ€๊ฒฝํ•ด์ฃผ์„ธ์š”. + - ์˜ˆ์‹œ)`https://avatar.tobi.sh/tobiaslins.svg?text=DY` +- emoji ํ•„๋“œ๋Š” ์—ฌ๊ธฐ์—์„œ ์ฐพ์•„ ๋ณต์‚ฌ ๋ถ™์—ฌ๋„ฃ๊ธฐ ํ•ด์ฃผ์„ธ์š” (ํ‚ค๋ณด๋“œ์˜ ๊ธฐ๋ณธ ์ด๋ชจ์ง€๋ฅผ ์‚ฌ์šฉํ•˜์…”๋„ ๋ฉ๋‹ˆ๋‹ค.) ๐Ÿ‘‰ [emojipedia.org](https://emojipedia.org/) +- SNS ๊ณ„์ •์€ ์•„์ด๋””(@์ดํ•˜ ๋ฉ”์ผ ์ œ์™ธ)๋งŒ ์ ์–ด์ฃผ์‹œ๋ฉด ๋ฉ๋‹ˆ๋‹ค. ์˜ˆ์‹œ) cdy0510 + +``` +--- +name: {{์ด๋ฆ„}} +image: {{ํ”„๋กœํ•„ ์‚ฌ์ง„ url}} +emoji: ๐Ÿฅณ +message: {{์ธ์‚ฌ๋ง}} +facebook: {{๊ณ„์ • ์•„์ด๋”” / ์—†์œผ๋ฉด ํ•ด๋‹น ๋ผ์ธ ์‚ญ์ œํ•˜์…”๋„ ๋ฉ๋‹ˆ๋‹ค.}} +twitter: {{๊ณ„์ • ์•„์ด๋”” / ์—†์œผ๋ฉด ํ•ด๋‹น ๋ผ์ธ ์‚ญ์ œํ•˜์…”๋„ ๋ฉ๋‹ˆ๋‹ค.}} +github: {{๊ณ„์ • ์•„์ด๋”” / ์—†์œผ๋ฉด ํ•ด๋‹น ๋ผ์ธ ์‚ญ์ œํ•˜์…”๋„ ๋ฉ๋‹ˆ๋‹ค.}} +--- +``` + + + +# ๐Ÿ“ ๋ฐฉ๋ช…๋ก ๋“ฑ๋กํ•˜๊ธฐ + +## GitHub.com์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค. + +### 1. Fork ํ•˜๊ธฐ + +์šฐ์„  PR์„ ํ•˜๊ธฐ ์œ„ํ•ด ํ˜„์žฌ repository(์ดํ•˜ ์ €์žฅ์†Œ)๋ฅผ ์ž์‹ ์˜ ๊ณ„์ •์œผ๋กœ ํฌํฌ ํ•ด์ฃผ์„ธ์š”. Fork๋Š” ํ˜„์žฌ ์ €์žฅ์†Œ๋ฅผ ์ž์‹ ์˜ ์ €์žฅ์†Œ๋กœ ์ „์ฒด ๋ณต์‚ฌํ•˜๋Š” ๊ฒƒ์„ ์˜๋ฏธํ•ฉ๋‹ˆ๋‹ค. Forkํ•œ ์ €์žฅ์†Œ๋Š” ๋ณธ์ธ ๊ณ„์ •์˜ ์ €์žฅ์†Œ๊ฐ€ ๋˜์–ด ์ง์ ‘ ์†Œ์Šค๋ฅผ ๊ด€๋ฆฌํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ์ด๋ฅผ ํ†ตํ•ด ์›๋ž˜ ์ €์žฅ์†Œ์— ์ง์ ‘ ์•ก์„ธ์Šค ํ•  ํ•„์š” ์—†์ด ํ”„๋กœ์ ํŠธ์— ๊ธฐ๋Šฅ์„ ์ถ”๊ฐ€ ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. + +๊ทธ๋Ÿผ, ์ด ์ €์žฅ์†Œ๋ฅผ Forkํ•˜๋Š” ๊ฒƒ์œผ๋กœ ์‹œ์ž‘ํ•ด๋ณผ๊นŒ์š”? ![fork](.github/images/fork.gif) -### Making a change +[![Inline docs](https://githubbadges.com/fork.svg?user=GDG-Seoul&repo=DevFest-Seoul-2019-guestbook)](https://github.com/GDG-Seoul/DevFest-Seoul-2019-guestbook/fork) -The repository will now exist as a seperate repository under your GitHub profile. From your fork go to the `/_guestbook` folder and click on **Create new file**. -Name this file **yourname.yaml**. Then paste the bellow template into your file and replace it with your details. You can delete any fields you dont want to fill except *name* and *image* +์œ„ ๋ฒ„ํŠผ์„ ๋ˆŒ๋Ÿฌ ํฌํฌํ•˜๊ธฐ + + + +### 2. ๋ณ€๊ฒฝ ์‚ฌํ•ญ ๋งŒ๋“ค๊ธฐ(๋ฐฉ๋ช…๋ก ์ถ”๊ฐ€ํ•˜๊ธฐ) + +์ €์žฅ์†Œ๋Š” ์ด์ œ GitHub ํ”„๋กœํ•„ ์•„๋ž˜์— ๋ณ„๋„์˜ ์ €์žฅ์†Œ๋กœ ์กด์žฌํ•ฉ๋‹ˆ๋‹ค. + +ํฌํฌ์—์„œ `/ _guestbook` ํด๋”๋กœ ๊ฐ€์„œ **Create new file**์„ ํด๋ฆญํ•ด ์ƒˆ ํŒŒ์ผ์„ ๋งŒ๋“ค์–ด์ฃผ์„ธ์š”. +์ด ํŒŒ์ผ ์ด๋ฆ„์„ **{yourname}.yaml**๋กœ ํ•ด์ฃผ์„ธ์š”. ๊ทธ๋Ÿฐ ๋‹ค์Œ ์•„๋ž˜ ์–‘์‹์„ ํŒŒ์ผ์— ๋ถ™์—ฌ ๋„ฃ๊ณ  ์ž์‹ ์˜ ์ •๋ณด๋กœ ๋ฐ”๊ฟ‰๋‹ˆ๋‹ค. *name* ๋ฐ *image*๋ฅผ ์ œ์™ธํ•˜๊ณ  ํ•„์š”ํ•˜์ง€ ์•Š์€ ํ•„๋“œ๋Š” ์‚ญ์ œํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ``` --- -name: Pandelis -image: https://avatar.tobi.sh/tobiaslins.svg?text=PZ -emoji: ๐Ÿผ -message: Hey! I hope you're enjoying the workshop. -twitter: PandelisZ -github: PandelisZ +name: ์กฐ๋‹ค์˜ +image: https://avatar.tobi.sh/tobiaslins.svg?text=DY +emoji: ๐Ÿฅณ +message: ์•ˆ๋…•ํ•˜์„ธ์š”! GDG Seoul ์ตœ๊ณ ! +facebook: cdy0510 +twitter: +github: cdy0510 --- ``` ![fork](.github/images/createfile.gif) -> If you don't wish to use a photo of yourself leve the placeholder image and add your initials as `?text=PZ` for example. +> ์ž์‹ ์˜ ์‚ฌ์ง„์„ ์‚ฌ์šฉํ•˜์ง€ ์•Š์œผ๋ ค๋ฉด https://avatar.tobi.sh/tobiaslins.svg ์— parameter๋กœ ์ด๋‹ˆ์…œ์„ ์ถ”๊ฐ€ํ•ด์ฃผ์„ธ์š”. `?text=DY` + +> emoji ํ•„๋“œ๋Š” ์—ฌ๊ธฐ์—์„œ ์ฐพ์•„ ๋ณต์‚ฌ ๋ถ™์—ฌ๋„ฃ๊ธฐ ํ•ด์ฃผ์„ธ์š”(ํ‚ค๋ณด๋“œ์˜ ๊ธฐ๋ณธ ์ด๋ชจ์ง€๋ฅผ ์‚ฌ์šฉํ•˜์…”๋„ ๋ฉ๋‹ˆ๋‹ค.) ๐Ÿ‘‰ [emojipedia.org](https://emojipedia.org/) -> You can find your favorite emoji at [emojipedia.org](https://emojipedia.org/) and paste it into the emoji field -### Commiting -At the bottom of the new file page you'll be able to submit this change as a **commit**. Scroll to the bottom of the page and enter the commit details. -Commit messages should be short and descriptive so that others can tell what you're changing or adding. +### 3. Commitํ•˜๊ธฐ + +์ƒˆ ํŒŒ์ผ ๋งŒ๋“ค๊ธฐ ํŽ˜์ด์ง€์—์„œ ์ด์ œ ์ˆ˜์ •๋œ ๋‚ด์šฉ์„ `commit`ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ํŽ˜์ด์ง€ ํ•˜๋‹จ์—์„œ ์ปค๋ฐ‹ ์„ธ๋ถ€ ๋‚ด์šฉ์„ ์ฑ„์›Œ์ฃผ์‹œ๊ณ , **Commit new file** ๋ฒ„ํŠผ์„ ํด๋ฆญํ•ด์ฃผ์„ธ์š”. +์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋Š” ์งง๊ณ  ๊ตฌ์ฒด์ ์ด์–ด์•ผ ๋‹ค๋ฅธ ์‚ฌ๋žŒ๋“ค์ด ๋ณ€๊ฒฝํ•˜๊ฑฐ๋‚˜ ์ถ”๊ฐ€ ํ•œ ๋‚ด์šฉ์„ ์•Œ ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ![commit](.github/images/commit.gif) -### Submitting a pull requst -Now that you have made your desired changes to the repo you can submit them **upstream** (the original repository). The way we do this within the [GitHub flow](https://guides.github.com/introduction/flow/) is by creating a pull request on the upstream repository. In this case the upstream repository is the original repository you -forked. This is shown on your repo as **forked from:** at the top of the repository page. +### 4. PR(Pull request) ์ œ์ถœํ•˜๊ธฐ + +์›ํ•˜๋Š” ๋‚ด์šฉ์„ ๋ณ€๊ฒฝ ํ–ˆ์œผ๋ฏ€๋กœ **upstream** (์›๋ž˜ ์ €์žฅ์†Œ)์— PR์„ ์ œ์ถœํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. [GitHub Flow](https://guides.github.com/introduction/flow/) +upstream์— PR์„ ์ œ์ถœํ•˜๋ฉด ๋‚ด ์ฝ”๋“œ๋ฅผ ๋ฐ˜์˜ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. + +upstream์ด๋ž€, ๋‚ด๊ฐ€ forkํ–ˆ๋˜ ์›๋ž˜ ์ €์žฅ์†Œ๋ฅผ ์˜๋ฏธํ•ฉ๋‹ˆ๋‹ค. -To submit a pull request navigate to the original upstream repository and go to the **Pull requests** tab and click **New pull request**. If GitHub does not automatically detect -your fork you can click on *compare across forks*. Then create the pull reqeust +๋‚ด ์ €์žฅ์†Œ ํŽ˜์ด์ง€์—์„œ ์ €์žฅ์†Œ ์ด๋ฆ„ ์•„๋ž˜๋ฅผ ๋ณด๋ฉด **forked from :** ์œผ๋กœ ํ‘œ์‹œ๋ฉ๋‹ˆ๋‹ค.
PR์„ ์ œ์ถœํ•˜๋ ค๋ฉด **Pull request** ํƒญ์„ ๋ˆ„๋ฅด๊ณ , **New pull request** ๋ฒ„ํŠผ์„ ๋ˆ„๋ฅด์„ธ์š”. + +GitHub๊ฐ€ ์ž๋™์œผ๋กœ ๊ฐ์ง€ํ•˜์ง€ ๋ชปํ•˜๋Š” ๊ฒฝ์šฐ *compare across forks*๋ฅผ ํด๋ฆญํ•ด์ฃผ์„ธ์š”. ๊ทธ ๋‹ค์Œ PR์„ ์ƒ์„ฑํ•˜์„ธ์š”. + +base repository๋Š” GDG Seoul์˜ ์ €์žฅ์†Œ๊ฐ€ ๋  ๊ฒƒ์ด๊ณ , head repository๋Š” ์ž์‹ ์ด ์ˆ˜์ •ํ•œ ์ €์žฅ์†Œ์˜ ๋ธŒ๋žœ์น˜๊ฐ€ ๋  ๊ฒƒ์ž…๋‹ˆ๋‹ค. +PR์€ `master` ์ชฝ์œผ๋กœ ์ œ์ถœํ•ด์ฃผ์‹œ๋ฉด ๋ฉ๋‹ˆ๋‹ค. ![pull request](.github/images/pullrequest.gif) -### Congrats :tada: -You've sucessfully creted a pull request! You're changes will now have to be reviewed. If you're filled out your details correctly your pull request will be approved and you will show up on the -guestbook. +### ์ถ•ํ•˜ํ•ฉ๋‹ˆ๋‹ค!! :tada: + +์—ฌ๋Ÿฌ๋ถ„์€ ์„ฑ๊ณต์ ์œผ๋กœ PR์„ ์ œ์ถœํ•˜์…จ์Šต๋‹ˆ๋‹ค!! +๋ฐฉ๋ช…๋ก์„ ์˜ฌ๋ฐ”๋ฅด๊ฒŒ ์ž…๋ ฅํ•˜์…จ๋‹ค๋ฉด, ๋‹ด๋‹น์ž๊ฐ€ PR์„ ์Šน์ธํ•˜๊ณ  ๊ณง ํŽ˜์ด์ง€์— ํ‘œ์‹œ๋  ๊ฒƒ์ž…๋‹ˆ๋‹ค. diff --git a/_config.yml b/_config.yml index d86697dc2..55d34d485 100755 --- a/_config.yml +++ b/_config.yml @@ -6,5 +6,5 @@ collections: - guestbook workshop: - name: - github: https://github.com/PandelisZ/workshop-guestbook + name: DevFest Seoul 2019 + github: https://github.com/GDG-Seoul/DevFest-Seoul-2019-guestbook diff --git a/_guestbook/dayoung.yaml b/_guestbook/dayoung.yaml new file mode 100644 index 000000000..be8473b95 --- /dev/null +++ b/_guestbook/dayoung.yaml @@ -0,0 +1,8 @@ +--- +name: Dayoung Cho +image: https://avatars1.githubusercontent.com/u/15723999?s=460&v=4 +emoji: ๐Ÿฅณ +message: DevFest Seoul์— ์˜ค์‹ ๊ฒƒ์„ ํ™˜์˜ํ•ฉ๋‹ˆ๋‹ค! GDG Seoul ๋งŽ์ด ์‚ฌ๋ž‘ํ•ด์ฃผ์„ธ์š”!! +facebook: cdy0510 +github: cdy0510 +--- diff --git a/_guestbook/haesunpark.yaml b/_guestbook/haesunpark.yaml new file mode 100644 index 000000000..37bb5db33 --- /dev/null +++ b/_guestbook/haesunpark.yaml @@ -0,0 +1,10 @@ + +--- +name: ๋ฐ•ํ•ด์„  +image: https://avatar.tobi.sh/tobiaslins.svg?text=HS +emoji: ๐Ÿ”ฅ +message: ์•ˆ๋…•ํ•˜์„ธ์š”! GDG Seoul ์ตœ๊ณ ! +facebook: haesunrpark +twitter: +github: rickiepark +--- diff --git a/_guestbook/pandelis.yaml b/_guestbook/pandelis.yaml deleted file mode 100644 index 858c5203a..000000000 --- a/_guestbook/pandelis.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: Pandelis -image: https://avatars2.githubusercontent.com/u/8436717?s=460&v=4 -emoji: ๐Ÿผ -message: Hey! I hope you're enjoying the workshop. -twitter: PandelisZ -github: PandelisZ ---- diff --git a/_guestbook/shinye.yaml b/_guestbook/shinye.yaml new file mode 100644 index 000000000..a94346546 --- /dev/null +++ b/_guestbook/shinye.yaml @@ -0,0 +1,8 @@ +--- +name: Shinye Song +image: https://avatars0.githubusercontent.com/u/10671079?s=460&v=4 +emoji: โšพ๏ธ +message: ์ฆ๊ฑฐ์šด DevFest! ๋ชจ๋‘ ์ฆ๊ฑฐ์šด ์‹œ๊ฐ„ ๋˜์‹œ๋ฉด ์ข‹๊ฒ ์–ด์š” <3 (ํ‚ค์›€ํžˆ์–ด๋กœ์ฆˆ ํ•œ๊ตญ์‹œ๋ฆฌ์ฆˆ ํ™”์ดํŒ…!ใ…Žใ…Žใ…‹) +facebook: iamsysong +github: Shinye +--- diff --git a/_guestbook/soyoungjeong.yaml b/_guestbook/soyoungjeong.yaml new file mode 100644 index 000000000..d87428694 --- /dev/null +++ b/_guestbook/soyoungjeong.yaml @@ -0,0 +1,7 @@ +--- +name: ์ •์†Œ์˜ +image: https://avatar.tobi.sh/tobiaslins.svg?text=JSY +emoji: ๐Ÿ˜‡ +message: GDG Seoul ๋„ˆ๋ฌด ์ข‹์•„์š”!! +github: soyoungjeong +--- diff --git a/_guestbook/yeonheehan.yaml b/_guestbook/yeonheehan.yaml new file mode 100644 index 000000000..709aea326 --- /dev/null +++ b/_guestbook/yeonheehan.yaml @@ -0,0 +1,8 @@ +--- +name: ํ•œ์—ฐํฌ +image: https://avatars3.githubusercontent.com/u/33242880?s=460&v=4 +emoji: โญ๏ธ +message: ์•ˆ๋…•ํ•˜์„ธ์š”! GDG Seoul ์ตœ๊ณ !! +facebook: jess0884 +github: hanyeonhee +--- diff --git a/_guestbook/ywkim.yaml b/_guestbook/ywkim.yaml new file mode 100644 index 000000000..0b15a74f5 --- /dev/null +++ b/_guestbook/ywkim.yaml @@ -0,0 +1,9 @@ +--- +name: ๊น€์˜์šฐ +image: https://avatar.tobi.sh/tobiaslins.svg?text=YW +emoji: ๐Ÿฅณ +message: GDG ์ตœ๊ณ  DevFest ์ตœ๊ณ  +facebook: +twitter: +github: hjkkhj123 +--- diff --git a/images/devfest-logo.png b/images/devfest-logo.png new file mode 100644 index 000000000..1c9c47665 Binary files /dev/null and b/images/devfest-logo.png differ diff --git a/index.html b/index.html index c12e6b92d..e1edc46df 100755 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ --- -title: GitHub Workshop Guestbook +title: DevFest Seoul 2019 Guestbook --- @@ -16,8 +16,9 @@
-

{{site.workshop.name}} Workshop Guestbook

-

Sign the guestbook

+ devfest๋กœ๊ณ  +

Seoul 2019 ๋ฐฉ๋ช…๋ก๐Ÿฅณ

+

PR ์ œ์ถœํ•˜๋Ÿฌ ๊ฐ€๊ธฐ๐Ÿ•Š

@@ -32,6 +33,10 @@

{{guest.message}}


+ {% if guest.facebook %} + + {% endif %} + {% if guest.twitter %} {% endif %} @@ -55,11 +60,11 @@

{{guest.message}}

-

Sign the workshop guestbook!

+

PR(pull request)์ œ์ถœํ•˜๊ณ  ์‚ฌํƒ•๋ฐ›์•„๊ฐ€์„ธ์š”!

- +
- Sign the guestbook! + PR ์ œ์ถœํ•˜๋Ÿฌ ๊ฐ€๊ธฐ๐Ÿ•Š