Skip to content

Commit d8f7b2c

Browse files
demundemun
committed
Merge branch 'master' of github.com:demun/FrontEndStudy
2 parents 39ac6bb + 122464e commit d8f7b2c

109 files changed

Lines changed: 174695 additions & 147 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 프론트엔드스터디(FrontEndStudy)
1+
# :mortar_board: 프론트엔드스터디(FrontEndStudy)
22

33
프론트엔드스터디는 그룹형 스터디로써 프론트엔드 전반에 사용되는 기술을 공부하는 스터디 입니다.
44
모든 문서는 스터디멤버가 작성하고, 익히고, 사용하는걸 목표로 만들어집니다.
@@ -15,26 +15,34 @@
1515

1616
## 목차
1717

18-
* [Github](document/Github/README.md) - 진행완료
19-
* [Sublimetext](document/Sublimetext/README.md) - 진행완료
20-
* [Grunt](document/Grunt/README.md) - 진행완료
21-
* [CSS3](document/CSS3/README.md) - 진행완료
22-
* [Sass](document/Sass/README.md) - 진행완료
18+
* [Github](document/Github/README.md)
19+
* [Sublimetext](document/Sublimetext/README.md)
20+
* [Grunt](document/Grunt/README.md)
21+
* [CSS3](document/CSS3/README.md)
22+
* [Sass](document/Sass/README.md)
2323

2424
<br>
2525

26-
* [Javascript](document/Javascript/README.md) - 진행중
27-
* [Jquery](document/Jquery/README.md) - 진행중
28-
* [Angularjs](document/AngularJS/README.md) - 진행중
29-
* [Bootstrap](document/Bootstrap/README.md) - 진행중
26+
* [Javascript](document/Javascript/README.md)
27+
* [Jquery](document/Jquery/README.md)
28+
* [Angularjs](document/AngularJS/README.md)
29+
* [Bootstrap](document/Bootstrap/README.md)
3030

3131

32-
### 배우고자하는 기술들
32+
### 대기중
3333

3434

35-
* [PostCSS](document/PostCSS/README.md) - 진행대기
36-
* [CoffeeScript](document/CoffeeScript/README.md) - 진행대기
37-
* [Atom](document/Atom/README.md) - 진행대기
38-
* [CSS](document/CSS/README.md) - 진행대기
35+
* :raised_hand: [ES6](document/ES6/README.md)
36+
37+
38+
<br>
39+
40+
41+
42+
* [PostCSS](document/PostCSS/README.md)
43+
* [CoffeeScript](document/CoffeeScript/README.md)
44+
* [Atom](document/Atom/README.md)
45+
* [Less](document/Less/README.md)
46+
* [Gulp](document/Gulp/README.md)
3947

4048
<br>

‎document/@Rule/javascript.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
## 2차 진행
6161

62-
- 분량 나누기(12월 5일, 12월 19일, 1월 9일 발표 분량)
62+
- 분량 나누기(12월 5일, 12월 19일, 1월 9일, 1월 30일 발표 분량)
6363

6464
- **[함수지향1](https://github.com/demun/FrontEndStudy/tree/master/document/Javascript/docs/Team/04_%ED%95%A8%EC%88%98%EC%A7%80%ED%96%A51(%EC%A0%84%EC%B2%B4%EC%9A%94%EC%95%BD%26%EC%9C%A0%ED%9A%A8%EB%B2%94%EC%9C%84%26%EC%BD%9C%EB%B0%B1%ED%95%A8%EC%88%98)) (11/23~29_ 전체에 대한 요점파악식)**
6565

@@ -69,10 +69,10 @@
6969
- [클로저](https://github.com/demun/FrontEndStudy/blob/master/document/Javascript/docs/3-3.%20%ED%81%B4%EB%A1%9C%EC%A0%80.md) __(12/14~16/01/03)__
7070
- [arguments&함수의 호출](https://github.com/demun/FrontEndStudy/blob/master/document/Javascript/docs/3-4.Arguments%26%ED%95%A8%EC%88%98%ED%98%B8%EC%B6%9C.md) __(12/14~16/01/03)__
7171

72-
- **객체지향**
72+
- **[객체지향](https://github.com/demun/FrontEndStudy/tree/master/document/Javascript/docs/Team/06_%EA%B0%9D%EC%B2%B4%EC%A7%80%ED%96%A51)**
7373

74-
- 객체지향 프로그래밍
75-
- 생성자와 new
74+
- [객체지향 프로그래밍](https://github.com/demun/FrontEndStudy/blob/master/document/Javascript/docs/Team/06_%EA%B0%9D%EC%B2%B4%EC%A7%80%ED%96%A51/%EC%9E%84%EC%84%B1%EC%9D%80_%EA%B0%9D%EC%B2%B4%EC%A7%80%ED%96%A5%ED%94%84%EB%A1%9C%EA%B7%B8%EB%9E%98%EB%B0%8D.md) __(01/10~01/29)__
75+
- 생성자와 new __(01/10~01/29)__
7676
- 전역객체
7777
- this
7878
- 상속
@@ -114,7 +114,7 @@
114114

115115
----
116116

117-
##바로가기
117+
## 정리문서 바로가기
118118

119119
* [1.동기vs비동기_통신.md](https://github.com/demun/FrontEndStudy/blob/master/document/Javascript/docs/1.%EB%8F%99%EA%B8%B0vs%EB%B9%84%EB%8F%99%EA%B8%B0_%ED%86%B5%EC%8B%A0.md)
120120
* 2. 실무에서 자주쓰이는 함수.

‎document/AngularJS/README.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,19 @@
1919
### Chapter 6
2020

2121
* [Chanter 6 요약](docs/angularJS_Chapter6.md)
22+
23+
### Chapter 11
24+
25+
* [Chanter 11 요약](docs/angularJS_Chapter11.md)
26+
27+
### Chapter 12
28+
29+
* [Chanter 12 요약](docs/angularJS 12장.md)
30+
31+
### Chapter 13
32+
33+
* [Chanter 13 요약](docs/angularJS 13장.md)
34+
35+
### angularJS 요약
36+
37+
* [angularJS 요약](docs/angularJS 요약.md)

0 commit comments

Comments
 (0)