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 + + 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 ์ ์ถํ๋ฌ ๊ฐ๊ธฐ๐