Skip to content

Commit 52f1708

Browse files
committed
Use Pug instead of Jade
1 parent 11c8980 commit 52f1708

File tree

13 files changed

+142
-10
lines changed

13 files changed

+142
-10
lines changed

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Changelog
22

3+
### 0.6.1 (10-10-2016)
4+
5+
Changed Jade dependency to Pug
6+
7+
### 0.6.0 (10-10-2016)
8+
9+
Thanks to @ITsvetkoFF:
10+
11+
Added image rendering option
12+
13+
Option to add requests made by webpage to result
14+
315
### 0.5.0 (04-03-2016)
416

517
Thanks to @andersju:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![PhearJS](http://d3jtdrwnfjguwh.cloudfront.net/logo-red.svg) (0.5.0)
1+
![PhearJS](http://d3jtdrwnfjguwh.cloudfront.net/logo-red.svg) (0.6.1)
22

33
PhearJS renders webpages. It runs a server which supervises a set number of PhantomJS workers that do the actual parsing and evaluation.
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
extends ./status.jade
1+
extends ./status.pug
22

33
block content
44
.mui-col-md-10
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
extends ./status.jade
1+
extends ./status.pug
22

33
block content
44
.mui-col-md-5
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
extends ./status.jade
1+
extends ./status.pug
22

33
block content
44
each worker, i in stats.workers

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "phearjs",
3-
"version": "0.6.0",
3+
"version": "0.6.1",
44
"homepage": "http://phear.io",
55
"description": "Render any dynamic Javascript webpage to JSON with PhantomJS.",
66
"keywords": [
@@ -25,7 +25,7 @@
2525
"basic-auth": "latest",
2626
"dot-object": "latest",
2727
"express": "latest",
28-
"jade": "latest",
28+
"pug": "latest",
2929
"memcached": "latest",
3030
"querystring": "latest",
3131
"request": "latest",

phear.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
serve = function(port) {
3030
var app;
3131
app = express();
32-
app.set('view engine', 'jade');
32+
app.set('view engine', 'pug');
3333
app.set('views', './lib/views');
3434
app.use(express["static"]('assets'));
3535
app.get('/', function(req, res) {
@@ -65,7 +65,7 @@
6565
}
6666
get_worker_states = req.params.sub === "workers";
6767
return stats.get(get_worker_states, function() {
68-
return res.render(req.params.sub + ".jade", {
68+
return res.render(req.params.sub + ".pug", {
6969
stats: stats,
7070
sub: req.params.sub
7171
});

src/phear.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spawn = (n) ->
3636
# Express server running on http://localhost:port to handle fetch requests
3737
serve = (port) ->
3838
app = express()
39-
app.set('view engine', 'jade')
39+
app.set('view engine', 'pug')
4040
app.set('views', './lib/views')
4141
app.use(express.static('assets'))
4242

@@ -75,7 +75,7 @@ serve = (port) ->
7575

7676
# Fetch the stats and when we have 'em, show.
7777
stats.get get_worker_states, ->
78-
res.render("#{req.params.sub}.jade", stats: stats, sub: req.params.sub)
78+
res.render("#{req.params.sub}.pug", stats: stats, sub: req.params.sub)
7979

8080
app.listen(port)
8181

src/views/config.pug

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
extends ./status.pug
2+
3+
block content
4+
.mui-col-md-10
5+
table.mui-table
6+
thead
7+
tr
8+
th(colspan=2) Config
9+
tbody
10+
tr
11+
td File
12+
td #{ stats.general.config_file }
13+
each value, key in stats.config
14+
tr
15+
td #{ key }
16+
td #{ value }

0 commit comments

Comments
 (0)