diff --git a/README.md b/README.md index 5a426c0..54b9e96 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ ## Table of Content + - [Introduction](#introduction) - [Prerequisites](#prerequisites) - [Installation](#installation) @@ -29,12 +30,14 @@ - [Maintainers](#maintainers) ## Introduction +
GDSC DEU logo
GDSC DEU members can write blog post and introduce their project at this repository. And you can read GDSC DEU information at https://gdsc-deu.github.io. ## Prerequisites + - Ruby version **2.5.0** or higher - RubyGems - GCC and Make @@ -42,37 +45,51 @@ GDSC DEU members can write blog post and introduce their project at this reposit See [prerequrisites](https://jekyllrb.com/docs/installation/#requirements) for guides and details. ## Installation -> **πŸ’‘** This installation is for project for run locally. + +### Install Locally Below is an example of how you can instruct your audience on installing and setting up your app. + 1. Install all [prerequisites](#prerequisites). 2. Install the jekyll and bundler gems. - ```terminal - gem install jekyll bundler - ``` + ```terminal + gem install jekyll bundler + ``` 3. Clone the repo and change into the repo's directory. - ```terminal - git clone https://github.com/GDSC-DEU/gdsc-deu.github.io.git - cd ./gdsc-deu.github.io - ``` -3. Install all dependency. - ``` - bundle install - ``` + ```terminal + git clone https://github.com/GDSC-DEU/gdsc-deu.github.io.git + cd ./gdsc-deu.github.io + ``` +4. Install all dependency. + ``` + bundle install + ``` + +### Using Dokcer + +You can also use Docker to run the site locally. + +```bash +docker run --volume="$PWD:/srv/jekyll" -p 4000:4000 -it jekyll/jekyll jekyll serve +``` ## Development + ### Run development instance (with hot-reload) + ``` bundle exec jekyll serve ``` -* You can check the demo site by accessing [https://localhost:4000](https://localhost:4000). + +- You can check the demo site by accessing [https://localhost:4000](https://localhost:4000). ### Directory Structure + ```bash GDSC-DEU.GITHUB.IO/ β”œβ”€β”€ _data # Well-formatted site data. β”œβ”€β”€ _includes # The partials of layouts and posts. -β”œβ”€β”€ _layouts # The templates that wrap posts. +β”œβ”€β”€ _layouts # The templates that wrap posts. β”œβ”€β”€ _members # GDSC Member Information. β”œβ”€β”€ _pages # Website pages (that are not posts) β”œβ”€β”€ _posts # Where all blog posts will go. @@ -91,9 +108,11 @@ GDSC-DEU.GITHUB.IO/ ``` ## Style Guide -* Use the **[Google HTML/CSS Guideline](https://google.github.io/styleguide/htmlcssguide.html)**. + +- Use the **[Google HTML/CSS Guideline](https://google.github.io/styleguide/htmlcssguide.html)**. ## Contributing + 1. Create issues about the work. 2. Create a branch on the issue. 3. Commit, push to the created branch. @@ -101,13 +120,17 @@ GDSC-DEU.GITHUB.IO/ 5. Review the code and merge it. ### Branching + Use author name and issue number into the branch names according to the format below: + ``` ___ ``` + E.g., **jiyoon_43_feature_new-experimental-changes** ### Commit Message + Referred to [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/). ``` @@ -117,7 +140,7 @@ Referred to [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0 ``` ## Maintainers -Current Maintainers: -* Jiyoon Bak (jiy00nn) - https://github.com/jiy00nn +Current Maintainers: +- Jiyoon Bak (jiy00nn) - https://github.com/jiy00nn diff --git a/_data/navigation.yml b/_data/navigation.yml index 28bd95f..e79b533 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -1,12 +1,12 @@ - name: Home link: / -- name: Blog - link: /blog/ -- name: Project - link: /project/ +- name: About Us + link: /about-us/ - name: Member link: /member/ +- name: Blog + link: /blog/ - name: Study link: /study/ -- name: About Us - link: /about-us/ +- name: Project + link: /project/ diff --git a/_data/studies.yaml b/_data/studies.yaml new file mode 100644 index 0000000..c4c9351 --- /dev/null +++ b/_data/studies.yaml @@ -0,0 +1,75 @@ +- title: Spring Study + tags: + - Spring + - Java + description: "μŠ€ν”„λ§ ν”„λ ˆμž„μ›Œν¬λ₯Ό κ³΅λΆ€ν•˜λ©° μŠ€ν”„λ§μ˜ 기본적인 κ°œλ…κ³Ό μ‚¬μš©λ²•μ„ μ΅νžˆλŠ” μŠ€ν„°λ””μž…λ‹ˆλ‹€." + start: 2021-03-02 + end: 2021-05-25 + image: /assets/img/logos/Spring-Boot-Logo.png + members: + - id: cmsong111 + - id: jhkim + +- title: λ¦¬μ•‘ν‹°λΈŒ μŠ€ν”„λ§ Study + tags: + - Spring + - Java + description: "μŠ€ν”„λ§ ν”„λ ˆμž„μ›Œν¬λ₯Ό κ³΅λΆ€ν•˜λ©° μŠ€ν”„λ§μ˜ 기본적인 κ°œλ…κ³Ό μ‚¬μš©λ²•μ„ μ΅νžˆλŠ” μŠ€ν„°λ””μž…λ‹ˆλ‹€." + start: 2021-03-02 + end: 2023-05-25 + image: /assets/img/logos/Spring-Boot-Logo.png + members: + - id: cmsong111 + - id: jhkim + +- title: Web Basic μŠ€ν„°λ”” + tags: + - Web + - HTML + - CSS + - JavaScript + description: "μ›Ή ν”„λ‘ νŠΈμ—”λ“œ κ°œλ°œμ„ μœ„ν•œ 기초 지식을 μŠ΅λ“ν•˜λŠ” μŠ€ν„°λ””μž…λ‹ˆλ‹€." + start: 2021-02-15 + end: 2022-04-30 + image: /assets/img/logos/web-logo.png + members: + - id: jhkim + - id: cmsong111 + +- title: Spring Study + tags: + - Spring + - Java + description: "μŠ€ν”„λ§ ν”„λ ˆμž„μ›Œν¬λ₯Ό κ³΅λΆ€ν•˜λ©° μŠ€ν”„λ§μ˜ 기본적인 κ°œλ…κ³Ό μ‚¬μš©λ²•μ„ μ΅νžˆλŠ” μŠ€ν„°λ””μž…λ‹ˆλ‹€." + start: 2021-03-02 + end: 2021-05-25 + image: /assets/img/logos/Spring-Boot-Logo.png + members: + - id: cmsong111 + - id: jhkim + +- title: λ¦¬μ•‘ν‹°λΈŒ μŠ€ν”„λ§ Study + tags: + - Spring + - Java + description: "μŠ€ν”„λ§ ν”„λ ˆμž„μ›Œν¬λ₯Ό κ³΅λΆ€ν•˜λ©° μŠ€ν”„λ§μ˜ 기본적인 κ°œλ…κ³Ό μ‚¬μš©λ²•μ„ μ΅νžˆλŠ” μŠ€ν„°λ””μž…λ‹ˆλ‹€." + start: 2021-03-02 + end: 2023-05-25 + image: /assets/img/logos/Spring-Boot-Logo.png + members: + - id: cmsong111 + - id: jhkim + +- title: Web Basic μŠ€ν„°λ”” + tags: + - Web + - HTML + - CSS + - JavaScript + description: "μ›Ή ν”„λ‘ νŠΈμ—”λ“œ κ°œλ°œμ„ μœ„ν•œ 기초 지식을 μŠ΅λ“ν•˜λŠ” μŠ€ν„°λ””μž…λ‹ˆλ‹€." + start: 2021-02-15 + end: 2022-04-30 + image: /assets/img/logos/web-logo.png + members: + - id: jhkim + - id: cmsong111 \ No newline at end of file diff --git a/_pages/study.html b/_pages/study.html new file mode 100644 index 0000000..d9744c6 --- /dev/null +++ b/_pages/study.html @@ -0,0 +1,47 @@ +--- +layout: default +title: Study +permalink: /study/ +--- + + + +Study + +πŸ“– μŠ€ν„°λ”” 진행 +
+
+ {% assign sorted = site.data.studies | sort: 'end' | reverse %} + {% for study in sorted %} +
+ Card image cap +
+

+ {{ study.title }} +

+

+ {{ study.description }} +

+ μ°Έκ°€μž +
    + {% for member in study.members %} +
  • {{ member.id }}
  • + {% endfor %} +
+ +
+ +
+ {% endfor %} +
+
\ No newline at end of file diff --git a/_pages/study.md b/_pages/study.md deleted file mode 100644 index edf8120..0000000 --- a/_pages/study.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -layout: default -title: Study -permalink: /study/ ---- - -# Study - -## πŸ“– μŠ€ν„°λ”” 진행 - -- Spring Boot -- JPA -- Spring Security -- Spring Cloud \ No newline at end of file diff --git a/assets/img/logos/Spring-Boot-Logo.png b/assets/img/logos/Spring-Boot-Logo.png new file mode 100644 index 0000000..c2cc7f0 Binary files /dev/null and b/assets/img/logos/Spring-Boot-Logo.png differ diff --git a/assets/img/logos/web-logo.png b/assets/img/logos/web-logo.png new file mode 100644 index 0000000..780a166 Binary files /dev/null and b/assets/img/logos/web-logo.png differ