Skip to content

Commit f745b9c

Browse files
committed
wip
1 parent ce9cd25 commit f745b9c

Some content is hidden

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

47 files changed

+7073
-2615
lines changed

.babelrc

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"presets": [
3-
"es2015",
4-
"stage-2"
3+
"env"
4+
],
5+
"plugins": [
6+
"transform-object-rest-spread"
57
]
6-
}
8+
}

.eslintrc.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
module.exports = {
2-
extends: ['standard', 'prettier'],
2+
extends: ['standard', "standard-react", 'prettier'],
33
plugins: ['prettier'],
44
rules: {
5+
'react/react-in-jsx-scope': 'off',
6+
'react/prop-types': 'off',
57
'prettier/prettier': [
68
'error',
79
{

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.cache
12
.DS_Store
23
*.log
34
node_modules

.stylelintrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": [ "stylelint-config-standard", "stylelint-config-recess-order" ]
3+
}

CHANGELOG.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
## Unreleased
44

55
* Create empty `conf.json` if it doesn't exist
6-
* Update UI to open links in new tabs. Should help with third-party tools.
6+
* Update UI to open links in new tabs (should improve integration with third-party tools)
7+
* Local self-signed certicate are now generated in `~/.hotel` (you'll need to trust the certificate again)
8+
79

810
## 0.7.6
911

README.md

+8-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Development of Hotel is generously supported by contributions from people. If yo
2727
## Features
2828

2929
* __Local domains__ - `http://project.dev`
30-
* __HTTPS via self-signed certificate__ - `https://project.dev`
30+
* __HTTPS via local self-signed certificate__ - `https://project.dev`
3131
* __Wildcard subdomains__ - `http://*.project.dev`
3232
* __Works everywhere__ - OS X, Linux and Windows
3333
* __Works with any server__ - Node, Ruby, PHP, ...
@@ -113,15 +113,15 @@ On __Windows__ use `"%PORT%"` instead of `'$PORT'`
113113
Add your remote servers
114114

115115
```sh
116-
~$ hotel add http://some-domain.com --name local-domain
117116
~$ hotel add http://192.168.1.12:1337 --name aliased-address
117+
~$ hotel add http://google.com --name aliased-domain
118118
```
119119

120120
You can now access them using
121121

122122
```sh
123-
http://local-domain.dev # will proxy requests to http://some-domain.com
124123
http://aliased-address.dev # will proxy requests to http://192.168.1.12:1337
124+
http://aliased-domain.dev # will proxy requests to http://google.com
125125
```
126126

127127
## CLI usage and options
@@ -174,14 +174,16 @@ hotel add "cmd -p %PORT%" # Windows
174174

175175
If you're offline or can't configure your browser to use `.dev` domains, you can __always__ access your local servers by going to [localhost:2000](http://localhost:2000).
176176

177-
## Configurations and logs
177+
## Configurations, logs and certificates
178178

179-
`~/.hotel` contains daemon logs, servers and daemon configurations.
179+
You can find hotel related files in `~/.hotel` :
180180

181181
```sh
182182
~/.hotel/conf.json
183183
~/.hotel/daemon.log
184184
~/.hotel/daemon.pid
185+
~/.hotel/key.pem
186+
~/.hotel/cert.pem
185187
~/.hotel/servers/<app-name>.json
186188
```
187189

@@ -197,7 +199,7 @@ By default, `hotel` uses the following configuration values:
197199
}
198200
```
199201

200-
You can override them in `~/.hotel/conf.json`.
202+
To override a value, simply add it to `~/.hotel/conf.json` and run `hotel stop && hotel start`
201203

202204
## Third-party tools
203205

nodemon.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"exec": "babel-node",
33
"ignore": [
4-
"src/client",
5-
"src/daemon/public"
4+
"src/front/**/*",
5+
"src/daemon/public/**/*"
66
]
77
}

0 commit comments

Comments
 (0)