Skip to content

Commit e090ab0

Browse files
dima716dima716
committed
Add Angular rules
1 parent 67106d8 commit e090ab0

Some content is hidden

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

52 files changed

+301
-349
lines changed

‎Readme.md

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
# Стиль кода Академии HTML
2-
3-
[![dependency status][dependency-image]][dependency-url]
4-
[![devDependency status][devdependency-image]][devdependency-url]
5-
6-
_TBD_
1+
# Стиль кода Aitarget
72

83
## Сервер для разработки
94

@@ -33,22 +28,3 @@ $ npm test
3328

3429
Для проверки скриптов используется [ESLint](http://eslint.org).
3530

36-
## Нашли ошибку?
37-
38-
Пожалуйста, [создайте тикет](https://github.com/htmlacademy/codeguide/issues).
39-
40-
## Благодарности
41-
42-
* [Code Guide](http://codeguide.co) by @mdo
43-
* [CSS Guidelines](http://cssguidelin.es) by Harry Roberts
44-
* [Idiomatic CSS](https://github.com/necolas/idiomatic-css) by Nicolas Gallagher
45-
* [Primer Guidelines](http://primercss.io/guidelines/) by GitHub
46-
47-
## Лицензия
48-
49-
Лицензия MIT, смотрите файл `License.md`.
50-
51-
[dependency-image]: https://david-dm.org/htmlacademy/codeguide.svg?style=flat-square
52-
[dependency-url]: https://david-dm.org/htmlacademy/codeguide
53-
[devdependency-image]: https://david-dm.org/htmlacademy/codeguide/dev-status.svg?style=flat-square
54-
[devdependency-url]: https://david-dm.org/htmlacademy/codeguide#info=devDependencies

‎app/css/chapter.css

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,17 @@
1818

1919
border-bottom: 1px solid var(--subtle-color);
2020

21+
&_vertical {
22+
flex-direction: column !important;
23+
& .chapter-part-col {
24+
width: 100%;
25+
26+
& p {
27+
max-width: 100% !important;
28+
}
29+
}
30+
}
31+
2132
@media (--viewport-large) {
2233
flex-direction: row;
2334
flex-wrap: wrap;
@@ -51,6 +62,10 @@
5162
p {
5263
max-width: 32rem;
5364
}
65+
66+
img {
67+
width: 100%;
68+
}
5469
}
5570

5671
.gray-bgcolor {

‎app/img/angular-helpers.jpg

70.4 KB
Loading

‎app/img/files-naming.jpg

230 KB
Loading

‎app/img/structure-example.jpg

54 KB
Loading

‎app/templates/helpers/resolve.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@ module.exports = function(url) {
2222
url = file.replace(root, '');
2323
}
2424

25+
url = url.replace(/^[/]{1}/, '');
2526
return url;
2627
};

‎app/templates/index.hbs

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,28 @@
22
<html lang="ru">
33
<head>
44
<meta charset="utf-8">
5-
<title>Стиль кода Aitarget</title>
5+
<title>Aitarget Codestyle</title>
66
<link rel="stylesheet" href="{{resolve 'style.css'}}">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
</head>
99
<body>
1010

1111
<main>
1212
{{~> header ~}}
13-
1413
<section class="chapter">
1514
<h2>Оглавление</h2>
1615
<article class="chapter-part">
1716
<div class="chapter-part-col">
1817
<h4>Jade</h4>
1918
<ul>
20-
<li><a href="#jade-classes-ids">Классы и идентификаторы пишутся в начале</a></li>
19+
<li><a href="#jade-classes-ids">Классы и идентификаторы</a></li>
2120
<li><a href="#jade-comments">Комментарии</a></li>
2221
<li><a href="#jade-inline-elements">Строчные элементы</a></li>
2322
<li><a href="#jade-linewrapping">Перенос строки для однотипных блоков</a></li>
2423
<li><a href="#jade-long-lines">Длинные строки</a></li>
25-
<li><a href="#jade-mixins">Пиши меньше, делай больше</a></li>
26-
<li><a href="#jade-number-values">Числовые значения в аттрибутах</a></li>
2724
<li><a href="#jade-several-attributes">Несколько аттрибутов</a></li>
2825
<li><a href="#jade-single-attributes">Одиночные аттрибуты</a></li>
29-
<li><a href="#jade-single-quotes">Одиночные кавычки</a></li>
26+
<li><a href="#jade-quotes">Кавычки</a></li>
3027
<li><a href="#jade-unnecessary-attributes">Необязательные аттрибуты</a></li>
3128
<li><a href="#jade-include-partials">Подключение шаблонов</a></li>
3229
<li><a href="#jade-useful-links">Полезные ссылки</a></li>
@@ -38,12 +35,9 @@
3835
<li><a href="#stylus-syntax">Синтаксис</a></li>
3936
<li><a href="#stylus-indentation">Отступы</a></li>
4037
<li><a href="#stylus-space-classes">Отступы между классами</a></li>
41-
<li><a href="#stylus-unnecessary-symbols">Использование ненужных символов</a></li>
42-
43-
<li><a href="#stylus-one-block">Один файл - один блок</a></li>
38+
<li><a href="#stylus-one-block">Один файл - один компонент</a></li>
4439
<li><a href="#stylus-mixins-blocks">Свойства в примесях</a></li>
4540
<li><a href="#stylus-total">Итого</a></li>
46-
4741
<li><a href="#stylus-variables">Переменные</a></li>
4842
<li><a href="#stylus-problems">Возможные проблемы и пути их решения</a></li>
4943
<li><a href="#stylus-general-recomendations">Общие рекомедации</a></li>
@@ -75,13 +69,17 @@
7569
<div class="chapter-part-col">
7670
<h4>Angular</h4>
7771
<ul>
78-
<li><a href="#css-syntax">Структура папок</a></li>
72+
<li><a href="#angular-files-structure">Структура файлов</a></li>
73+
<li><a href="#angular-files-naming">Наименование файлов, папок и сущностей Angular</a></li>
74+
<li><a href="#angular-helpers">Встроенные хэлперы Angular</a></li>
75+
<li><a href="#angular-general-recomendations">Общие рекомендации</a></li>
7976
</ul>
8077
</div>
8178
<div class="chapter-part-col">
8279
<h4>Git</h4>
8380
<ul>
8481
<li><a href="#git-branch-naming">Наименование веток</a></li>
82+
<li><a href="#git-commit-writing">Написание коммитов</a></li>
8583
</ul>
8684
</div>
8785
</article>
@@ -109,6 +107,12 @@
109107
{{~> jquery/jquery-rules ~}}
110108
</section>
111109

110+
<section class="chapter">
111+
<h2>Angular</h2>
112+
{{~> angular/angular-rules ~}}
113+
{{~> angular/angular-recomendations ~}}
114+
</section>
115+
112116
<section class="chapter">
113117
<h2>Git</h2>
114118
{{~> git/git-rules ~}}

‎app/templates/partials/angular/angular-recomendations.hbs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<article class="chapter-part">
2+
<div class="chapter-part-col">
3+
{{~> angular/recomendations/angular-general-recomendations ~}}
4+
</div>
5+
</article>
6+
7+
8+

‎app/templates/partials/angular/angular-rules.hbs

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<article class="chapter-part chapter-part_vertical">
2+
<div class="chapter-part-col">
3+
{{~> angular/rules/angular-files-naming ~}}
4+
</div>
5+
<div class="chapter-part-col gray-bgcolor">
6+
<figure>
7+
<pre><code class="language-js">
8+
{{~> angular/examples/angular-files-naming-example ~}}
9+
</code></pre>
10+
</figure>
11+
</div>
12+
</article>
13+
14+
<article class="chapter-part">
15+
<div class="chapter-part-col">
16+
{{~> angular/rules/angular-files-structure ~}}
17+
</div>
18+
<div class="chapter-part-col gray-bgcolor">
19+
{{~> angular/examples/angular-files-structure-example ~}}
20+
</div>
21+
</article>
22+
23+
<article class="chapter-part">
24+
<div class="chapter-part-col">
25+
{{~> angular/rules/angular-helpers ~}}
26+
</div>
27+
<div class="chapter-part-col gray-bgcolor"
28+
{{~> angular/examples/angular-helpers-example ~}}
29+
</div>
30+
</article>

‎app/templates/partials/angular/examples/angular-files-naming-example.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<img src="img/files-naming.jpg" alt="Наименование сущностей">

‎app/templates/partials/angular/examples/angular-files-structure-example.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<img src="img/structure-example.jpg" alt="Стурктура компонента">

‎app/templates/partials/angular/rules/jquery-variables.hbs renamed to ‎app/templates/partials/angular/examples/angular-general-recommendations-example.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<h4 id="jquery-variables">Наименование переменных</h4>
1+
<h4 id="angular-files-naming">Наименование файлов</h4>
22
<p>Для jQuery-переменных используйте префикс $.</p>

‎app/templates/partials/angular/examples/angular-helpers-example.hbs

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<ul>
2+
<li>
3+
<a href="https://docs.angularjs.org/api/ng/function/angular.bind">angular.bind</a>
4+
</li>
5+
<li>
6+
<a href="https://docs.angularjs.org/api/ng/function/angular.bootstrap">angular.bootstrap</a>
7+
</li>
8+
<li>
9+
<a href="https://docs.angularjs.org/api/ng/function/angular.copy">angular.copy</a>
10+
</li>
11+
<li>
12+
<a href="https://docs.angularjs.org/api/ng/function/angular.element">angular.element</a>
13+
</li>
14+
<li>
15+
<a href="https://docs.angularjs.org/api/ng/function/angular.equals">angular.equals</a>
16+
</li>
17+
<li>
18+
<a href="https://docs.angularjs.org/api/ng/function/angular.extend">angular.extend</a>
19+
</li>
20+
<li>
21+
<a href="https://docs.angularjs.org/api/ng/function/angular.forEach">angular.forEach</a>
22+
</li>
23+
<li>
24+
<a href="https://docs.angularjs.org/api/ng/function/angular.fromJson">angular.fromJson</a>
25+
</li>
26+
<li>
27+
<a href="https://docs.angularjs.org/api/ng/function/angular.identity">angular.identity</a>
28+
</li>
29+
<li>
30+
<a href="https://docs.angularjs.org/api/ng/function/angular.injector">angular.injector</a>
31+
</li>
32+
<li>
33+
<a href="https://docs.angularjs.org/api/ng/function/angular.isArray">angular.isArray</a>
34+
</li>
35+
<li>
36+
<a href="https://docs.angularjs.org/api/ng/function/angular.isDate">angular.isDate</a>
37+
</li>
38+
<li>
39+
<a href="https://docs.angularjs.org/api/ng/function/angular.isDefined">angular.isDefined</a>
40+
</li>
41+
<li>
42+
<a href="https://docs.angularjs.org/api/ng/function/angular.isElement">angular.isElement</a>
43+
</li>
44+
<li>
45+
<a href="https://docs.angularjs.org/api/ng/function/angular.isFunction">angular.isFunction</a>
46+
</li>
47+
<li>
48+
<a href="https://docs.angularjs.org/api/ng/function/angular.isNumber">angular.isNumber</a>
49+
</li>
50+
<li>
51+
<a href="https://docs.angularjs.org/api/ng/function/angular.isObject">angular.isObject</a>
52+
</li>
53+
<li>
54+
<a href="https://docs.angularjs.org/api/ng/function/angular.isString">angular.isString</a>
55+
</li>
56+
<li>
57+
<a href="https://docs.angularjs.org/api/ng/function/angular.isUndefined">angular.isUndefined</a>
58+
</li>
59+
<li>
60+
<a href="https://docs.angularjs.org/api/ng/function/angular.lowercase">angular.lowercase</a>
61+
</li>
62+
<li>
63+
<a href="https://docs.angularjs.org/api/ng/function/angular.merge">angular.merge</a>
64+
</li>
65+
<li>
66+
<a href="https://docs.angularjs.org/api/ng/function/angular.module">angular.module</a>
67+
</li>
68+
<li>
69+
<a href="https://docs.angularjs.org/api/ng/function/angular.noop">angular.noop</a>
70+
</li>
71+
<li>
72+
<a href="https://docs.angularjs.org/api/ng/function/angular.reloadWithDebugInfo">angular.reloadWithDebugInfo</a>
73+
</li>
74+
<li>
75+
<a href="https://docs.angularjs.org/api/ng/function/angular.toJson">angular.toJson</a>
76+
</li>
77+
<li>
78+
<a href="https://docs.angularjs.org/api/ng/function/angular.uppercase">angular.uppercase</a>
79+
</li>
80+
</ul>

‎app/templates/partials/angular/examples/jquery-cache-example.hbs

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎app/templates/partials/angular/examples/jquery-events-example.hbs

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎app/templates/partials/angular/examples/jquery-search-elements-example.hbs

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎app/templates/partials/angular/examples/jquery-variables-example.hbs

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)