Skip to content

Commit c138d37

Browse files
committed
Merge branch 'develop', prepare v2.1.0
2 parents 685d494 + b77e677 commit c138d37

Some content is hidden

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

49 files changed

+3311
-356
lines changed

.eslintrc

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
2-
"extends": [
3-
"airbnb",
4-
"prettier"
5-
],
2+
"extends": ["airbnb", "prettier"],
63
"parserOptions": {
74
"ecmaVersion": 2017,
85
"sourceType": "module",
@@ -20,20 +17,28 @@
2017
"object-curly-spacing": ["warn", "never"],
2118
"max-len": ["error", 120, 4],
2219
"no-confusing-arrow": "warn",
23-
"comma-dangle": ["error", {
24-
"arrays": "always-multiline",
25-
"objects": "always-multiline",
26-
"imports": "always-multiline",
27-
"exports": "always-multiline",
28-
"functions": "ignore"
29-
}],
20+
"no-underscore-dangle": "off",
21+
"comma-dangle": [
22+
"error",
23+
{
24+
"arrays": "always-multiline",
25+
"objects": "always-multiline",
26+
"imports": "always-multiline",
27+
"exports": "always-multiline",
28+
"functions": "ignore"
29+
}
30+
],
3031
"react/jsx-filename-extension": "off",
31-
"prettier/prettier": ["error", {
32-
"trailingComma": "es5",
33-
"singleQuote": true,
34-
"bracketSpacing": false,
35-
"printWidth": 120
36-
}],
32+
"prettier/prettier": [
33+
"error",
34+
{
35+
"trailingComma": "es5",
36+
"singleQuote": true,
37+
"bracketSpacing": false,
38+
"printWidth": 120
39+
}
40+
],
41+
"global-require": "off",
3742
"no-console": "off",
3843
"no-unused-expressions": "off",
3944
"no-param-reassign": "off",

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
node_modules
2-
test_project
3-
coverage
1+
node_modules/
2+
test_project/
3+
coverage/
44
.nyc_output/
55
exoframe-linux
66
exoframe-macos
77
exoframe-win.exe
8+
.idea/

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Exoframe
1+
<img alt="Exoframe" src="./logo/svg/exo_blue.svg" width="300">
22

33
> Simple Docker deployment tool
44
@@ -64,11 +64,18 @@ You can find a list of all commands and options in the [docs](./docs/README.md).
6464

6565
* [Basics](docs/Basics.md)
6666
* [FAQ](docs/FAQ.md)
67+
* [Contrubiton Guideline](docs/Contributing.md)
6768
* [Templates guide](docs/TemplatesGuide.md)
6869
* [Using nightly versions](docs/Nightly.md)
6970
* [Articles, video and related links](docs/Links.md)
7071
* [Change Log](CHANGELOG.md)
7172

73+
## Special thanks
74+
75+
Thanks to:
76+
77+
* [Ivan Semenov](https://www.behance.net/ivan_semenov) for making [an awesome logo](./logo/README.md)
78+
7279
## License
7380

7481
Licensed under MIT.

docs/Basics.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,18 @@ Config file has the following structure:
9494
}
9595
```
9696

97+
## Project ignore file
98+
99+
In some cases you might want to ignore particular files during project deployment (e.g. tests, fixtures, node_modules, etc.).
100+
You can specify ignored files using `.exoframeignore` file in the root of the project.
101+
Each line is then used by the [ignore](https://github.com/kaelzhang/node-ignore) module during deployment process.
102+
When not provided ignore file contains the following entries:
103+
104+
```
105+
.git
106+
node_modules
107+
```
108+
97109
## CLI Configuration
98110

99111
Exoframe stores its config in `~/.exoframe/cli.config.yml`.

logo/.DS_Store

8 KB
Binary file not shown.

logo/README.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Logo
2+
3+
This folder contains Exoframe logo and its variations
4+
5+
## Logo variations
6+
7+
Black:
8+
9+
<img alt="Exoframe" src="./svg/exo_black.svg" width="300">
10+
11+
Blue:
12+
13+
<img alt="Exoframe" src="./svg/exo_blue.svg" width="300">
14+
15+
White:
16+
17+
<img alt="Exoframe" src="./svg/exo_white.svg" width="300">
18+
19+
Black (logo only):
20+
21+
<img alt="Exoframe" src="./svg/logo_black.svg" width="300">
22+
23+
Blue (logo only):
24+
25+
<img alt="Exoframe" src="./svg/logo_blue.svg" width="300">
26+
27+
White (logo only):
28+
29+
<img alt="Exoframe" src="./svg/logo_white.svg" width="300">
30+
31+
## Made by
32+
33+
Logo was made by [Ivan Semenov](https://www.behance.net/ivan_semenov).

logo/ai/exoframe_logo.ai

Lines changed: 2073 additions & 0 deletions
Large diffs are not rendered by default.

logo/jpeg/exo_black.jpg

98.9 KB
Loading

logo/jpeg/exo_blue.jpg

107 KB
Loading

logo/jpeg/exo_white.jpg

101 KB
Loading

logo/jpeg/logo_black.jpg

44.5 KB
Loading

logo/jpeg/logo_blue.jpg

52.8 KB
Loading

logo/jpeg/logo_white.jpg

47.6 KB
Loading

logo/png/exo_black.png

66 KB
Loading

logo/png/exo_blue.png

65.9 KB
Loading

logo/png/exo_white.png

63.1 KB
Loading

logo/png/logo_black.png

21.6 KB
Loading

logo/png/logo_blue.png

21.7 KB
Loading

logo/png/logo_white.png

21.6 KB
Loading

logo/svg/exo_black.svg

Lines changed: 46 additions & 0 deletions
Loading

logo/svg/exo_blue.svg

Lines changed: 46 additions & 0 deletions
Loading

logo/svg/exo_white.svg

Lines changed: 46 additions & 0 deletions
Loading

logo/svg/logo_black.svg

Lines changed: 28 additions & 0 deletions
Loading

logo/svg/logo_blue.svg

Lines changed: 28 additions & 0 deletions
Loading

logo/svg/logo_white.svg

Lines changed: 28 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)