Introduction
Introduction Statistics Contact Development Disclaimer Help
tidy up and moving from jade to pug. - seedlinux - Torrent indexing tool openso…
Log
Files
Refs
README
---
commit c0a7141683eb188aa0b082f51bde05a300efd72a
parent ae7071ce130a7c4060c471515a90e9deb2d886c4
Author: Jay Scott <[email protected]>
Date: Sun, 25 Jun 2017 19:07:35 +0100
tidy up and moving from jade to pug.
Diffstat:
M .gitignore | 38 ++++-------------------------…
M app.js | 9 +++++----
M package-lock.json | 319 +++++++++++++++++++++++++++--…
M package.json | 7 +++----
M routes/index.js | 11 ++++++++++-
D routes/torrents.js | 9 ---------
A views/error.pug | 6 ++++++
D views/error.twig | 7 -------
A views/index.pug | 17 +++++++++++++++++
D views/index.twig | 6 ------
A views/layout.pug | 15 +++++++++++++++
D views/layout.twig | 53 ------------------------------
12 files changed, 344 insertions(+), 153 deletions(-)
---
diff --git a/.gitignore b/.gitignore
@@ -1,15 +1,11 @@
# Logs
logs
*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
# Runtime data
pids
*.pid
*.seed
-*.pid.lock
# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
@@ -17,42 +13,18 @@ lib-cov
# Coverage directory used by tools like istanbul
coverage
-# nyc test coverage
-.nyc_output
-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task…
.grunt
-# Bower dependency directory (https://bower.io/)
-bower_components
-
# node-waf configuration
.lock-wscript
# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# Typescript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
+# Dependency directory
+# https://docs.npmjs.com/cli/shrinkwrap#caveats
+node_modules
-# dotenv environment variables file
-.env
+# Debug log from npm
+npm-debug.log
diff --git a/app.js b/app.js
@@ -5,19 +5,21 @@ var logger = require('morgan');
var cookieParser = require('cookie-parser');
var bodyParser = require('body-parser');
-var index = require('./routes/index');
-var torrents = require('./routes/torrents');
// MongoDB
var mongo = require('mongodb');
var monk = require('monk');
var db = monk('localhost:27017/seedlinux');
+var index = require('./routes/index');
+
var app = express();
+app.locals.inspect = require('util').inspect;
+
// view engine setup
app.set('views', path.join(__dirname, 'views'));
-app.set('view engine', 'twig');
+app.set('view engine', 'pug');
// uncomment after placing your favicon in /public
//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
@@ -34,7 +36,6 @@ app.use(function(req,res,next){
});
app.use('/', index);
-app.use('/torrents', torrents);
// catch 404 and forward to error handler
app.use(function(req, res, next) {
diff --git a/package-lock.json b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "seedlinux",
- "version": "0.0.1",
+ "version": "0.0.0",
"lockfileVersion": 1,
"dependencies": {
"accepts": {
@@ -8,15 +8,42 @@
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
"integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo="
},
+ "acorn": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+ "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
+ },
+ "acorn-globals": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.…
+ "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=",
+ "dependencies": {
+ "acorn": {
+ "version": "4.0.13",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+ "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
+ }
+ }
+ },
+ "align-text": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tg…
+ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc="
+ },
+ "amdefine": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
+ },
"array-flatten": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.…
"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
},
- "balanced-match": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-…
- "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+ "asap": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz",
+ "integrity": "sha1-UidltQw1EEkOUtfc/ghe+bqWlY8="
},
"basic-auth": {
"version": "1.1.0",
@@ -35,11 +62,6 @@
}
}
},
- "brace-expansion": {
- "version": "1.1.8",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansio…
- "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI="
- },
"bson": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz",
@@ -55,10 +77,40 @@
"resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
"integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk="
},
- "concat-map": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tg…
- "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+ "camelcase": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+ "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
+ },
+ "center-align": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.…
+ "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60="
+ },
+ "character-parser": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/character-parser/-/character-par…
+ "integrity": "sha1-x84o821LzZdE5f/CxfzeHHMmH8A="
+ },
+ "clean-css": {
+ "version": "3.4.27",
+ "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.27.tgz…
+ "integrity": "sha1-re91sxwWD/pdcvTeZ5ZuJmDBolU="
+ },
+ "cliui": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+ "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE="
+ },
+ "commander": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+ "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ="
+ },
+ "constantinople": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-…
+ "integrity": "sha1-dWnKqKo/jVk11i4fqW+fcCzYHHk="
},
"content-disposition": {
"version": "0.5.2",
@@ -95,6 +147,11 @@
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw="
},
+ "decamelize": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tg…
+ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+ },
"depd": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
@@ -105,6 +162,11 @@
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
},
+ "doctypes": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz",
+ "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk="
+ },
"ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -154,11 +216,6 @@
}
}
},
- "foreachasync": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.…
- "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY="
- },
"forwarded": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz",
@@ -169,6 +226,21 @@
"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz",
"integrity": "sha1-9HTKXmqSRtb9jglTz6m5yAWvp44="
},
+ "function-bind": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.…
+ "integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E="
+ },
+ "graceful-readlink": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-rea…
+ "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
+ },
+ "has": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+ "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg="
+ },
"http-errors": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.…
@@ -189,15 +261,55 @@
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz",
"integrity": "sha1-HgOlL9rYOou7KyXL9JmLTP/NPew="
},
+ "is-buffer": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
+ "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw="
+ },
+ "is-expression": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-2.…
+ "integrity": "sha1-kb6dR968/vB3l36XIr5tz7RGXvA="
+ },
+ "is-promise": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tg…
+ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+ },
+ "is-regex": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE="
+ },
"isarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
},
- "locutus": {
- "version": "2.0.9",
- "resolved": "https://registry.npmjs.org/locutus/-/locutus-2.0.9.tgz",
- "integrity": "sha1-4mWvHoX9GRc+dDhjc4iFYHg6Avw="
+ "js-stringify": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.…
+ "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds="
+ },
+ "jstransformer": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.…
+ "integrity": "sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM="
+ },
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ="
+ },
+ "lazy-cache": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tg…
+ "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
+ },
+ "longest": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+ "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc="
},
"media-typer": {
"version": "0.3.0",
@@ -229,11 +341,6 @@
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.t…
"integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0="
},
- "minimatch": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
- "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yD…
- },
"mongodb": {
"version": "2.2.29",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.29.tgz",
@@ -314,6 +421,11 @@
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz",
"integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY="
},
+ "path-parse": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tg…
+ "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
+ },
"path-to-regexp": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-…
@@ -324,11 +436,88 @@
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-n…
"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
},
+ "promise": {
+ "version": "7.3.1",
+ "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+ "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqT…
+ },
"proxy-addr": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tg…
"integrity": "sha1-J+VF9pYKRKYn2bREZ+NcG2tM4vM="
},
+ "pug": {
+ "version": "2.0.0-rc.2",
+ "resolved": "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.2.tgz",
+ "integrity": "sha1-B4RVJ3kKssa+Z9z16x8xgECB8Eo="
+ },
+ "pug-attrs": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.2.tgz",
+ "integrity": "sha1-i+KyIlVo/6ddG4Zpgr/59BEa/8s="
+ },
+ "pug-code-gen": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-1.1.…
+ "integrity": "sha1-HPcnRO8qA56uajNAyqoRBYcSWOg="
+ },
+ "pug-error": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz",
+ "integrity": "sha1-U659nSm7A89WRJOgJhCfVMR/XyY="
+ },
+ "pug-filters": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.3.…
+ "integrity": "sha1-1ZdnoiDeeX3XVUifZoNM+aqDqlQ="
+ },
+ "pug-lexer": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-3.1.0.tgz",
+ "integrity": "sha1-/QhzdtSmdbT1n4/vQiiDQ06VgaI=",
+ "dependencies": {
+ "acorn": {
+ "version": "4.0.13",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+ "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
+ },
+ "is-expression": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-expression/-/is-expressio…
+ "integrity": "sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8="
+ }
+ }
+ },
+ "pug-linker": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.1.tg…
+ "integrity": "sha1-uj+P8hPKjzowSFm0T+0Tynud+hk="
+ },
+ "pug-load": {
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.7.tgz",
+ "integrity": "sha1-Ux0MbhFUYBDphGMNA99AY2fS3nc="
+ },
+ "pug-parser": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-3.0.0.tg…
+ "integrity": "sha1-N8YZ3YAPZCGHzk1s4aFkzddUh6M="
+ },
+ "pug-runtime": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.3.…
+ "integrity": "sha1-mBYmB7D86eJU1CfzOYelrucWi9o="
+ },
+ "pug-strip-comments": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-c…
+ "integrity": "sha1-0xOvoBvMN0mA4TmeI+vy65vchRM="
+ },
+ "pug-walk": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.3.tgz",
+ "integrity": "sha1-181bI9s8qHxjbIaglz+c2OAwQ2w="
+ },
"qs": {
"version": "6.4.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
@@ -349,16 +538,31 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-strea…
"integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE="
},
+ "repeat-string": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.…
+ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+ },
"require_optional": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/require_optional/-/require_optio…
"integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUk…
},
+ "resolve": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
+ "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU="
+ },
"resolve-from": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.…
"integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
},
+ "right-align": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.…
+ "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8="
+ },
"safe-buffer": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.…
@@ -396,6 +600,11 @@
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-…
"integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
},
+ "source-map": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tg…
+ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s="
+ },
"statuses": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -413,16 +622,34 @@
}
}
},
- "twig": {
- "version": "0.10.3",
- "resolved": "https://registry.npmjs.org/twig/-/twig-0.10.3.tgz",
- "integrity": "sha1-Z2BOCOGSDr8vr4CpAeJWGJyKPGc="
+ "token-stream": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-0.0.…
+ "integrity": "sha1-zu78cXp2xDFvEm0LnbqlXX598Bo="
},
"type-is": {
"version": "1.6.15",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
"integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA="
},
+ "uglify-js": {
+ "version": "2.8.29",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz…
+ "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+ "dependencies": {
+ "source-map": {
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.…
+ "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+ }
+ }
+ },
+ "uglify-to-browserify": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to…
+ "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+ "optional": true
+ },
"unpipe": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -443,10 +670,30 @@
"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz",
"integrity": "sha1-Z1Neu2lMHVIldFeYRmUyP1h+jTc="
},
- "walk": {
- "version": "2.3.9",
- "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz",
- "integrity": "sha1-MbTbZnjyrgHDnqn7hyWpAx5Vins="
+ "void-elements": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.…
+ "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w="
+ },
+ "window-size": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.…
+ "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0="
+ },
+ "with": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/with/-/with-5.1.1.tgz",
+ "integrity": "sha1-+k2qktrzLE6pTtRTyB8EaGtXXf4="
+ },
+ "wordwrap": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+ "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
+ },
+ "yargs": {
+ "version": "3.10.0",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+ "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E="
}
}
}
diff --git a/package.json b/package.json
@@ -1,10 +1,9 @@
{
"name": "seedlinux",
"version": "0.0.1",
- "description": "Linux torrent information",
"private": true,
"scripts": {
- "start": "node ./bin/www"
+ "start": "DEBUG=seedlinux:* node ./bin/www"
},
"dependencies": {
"body-parser": "~1.17.1",
@@ -14,7 +13,7 @@
"mongodb": "^2.2.29",
"monk": "^6.0.1",
"morgan": "~1.8.1",
- "serve-favicon": "~2.4.2",
- "twig": "~0.10.3"
+ "pug": "~2.0.0-beta11",
+ "serve-favicon": "~2.4.2"
}
}
diff --git a/routes/index.js b/routes/index.js
@@ -3,7 +3,16 @@ var router = express.Router();
/* GET home page. */
router.get('/', function(req, res, next) {
- res.render('index', { title: 'Express' });
+
+ var db = req.db;
+ var collection = db.get('torrents');
+
+ collection.find({},{},function(e,docs){
+ console.log(docs);
+ res.render('index', {
+ "torrentlist" : docs
+ });
+ });
});
module.exports = router;
diff --git a/routes/torrents.js b/routes/torrents.js
@@ -1,9 +0,0 @@
-var express = require('express');
-var router = express.Router();
-
-/* GET torrents listing. */
-router.get('/', function(req, res, next) {
- res.send('List of all torrents');
-});
-
-module.exports = router;
diff --git a/views/error.pug b/views/error.pug
@@ -0,0 +1,6 @@
+extends layout
+
+block content
+ h1= message
+ h2= error.status
+ pre #{error.stack}
diff --git a/views/error.twig b/views/error.twig
@@ -1,7 +0,0 @@
-{% extends 'layout.twig' %}
-
-{% block body %}
- <h1>{{message}}</h1>
- <h2>{{error.status}}</h2>
- <pre>{{error.stack}}</pre>
-{% endblock %}
diff --git a/views/index.pug b/views/index.pug
@@ -0,0 +1,17 @@
+extends layout
+
+block content
+ .section
+ table(class='table')
+ thead
+ th Name
+ th Seeders
+ th Leachers
+ th Description
+ tbody
+ each i in torrentlist
+ tr
+ td= i.torrent.name
+ td= i.torrent.seeders
+ td= i.torrent.leechers
+ td= i.torrent.info
diff --git a/views/index.twig b/views/index.twig
@@ -1,6 +0,0 @@
-{% extends 'layout.twig' %}
-
-{% block body %}
- <h1>{{title}}</h1>
- <p>Welcome to {{title}}</p>
-{% endblock %}
diff --git a/views/layout.pug b/views/layout.pug
@@ -0,0 +1,15 @@
+doctype html
+html
+ head
+ meta(charset='utf-8')
+ meta(http-equiv="X-UA-Compatible", content="IE=edge")
+ meta(name='viewport', content='width=device-width, initial-scale=1.0')
+ title= title
+ link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/bulma/…
+ link(rel='stylesheet', href='/stylesheets/style.css')
+ body
+ .container
+ .logo
+ a(href='/')
+ img(src='/images/logo.png')
+ block content
diff --git a/views/layout.twig b/views/layout.twig
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <title>{{ title }}</title>
- <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/aj…
- <link rel='stylesheet' href='/stylesheets/style.css' />
-</head>
-
-<body>
- <div class="container">
-
- <div class="logo">
- <a href="/">
- <img src="/images/logo.png">
- </a>
- </div>
-
- <div class="section">
- <table class="table">
- <thead>
- <tr>
- <th><abbr title="Position">Pos</abbr></th>
- <th>Name</th>
- <th><abbr title="Seeders">S</abbr></th>
- <th><abbr title="Leachers">L</abbr></th>
- <th>Description</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <th>1</th>
- <td>Ubuntu 17.04 <strong>(C)</strong></td>
- <td>190</td>
- <td>23</td>
- <td>Qualification for the yada yda ydayydaydaydya</td>
- </tr>
- <tr>
- <th>2</th>
- <td>Void Linux 22062017</td>
- <td>38</td>
- <td>20</td>
- <td>Qualification for the yada yda ydayydaydaydya</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-</body>
-</html>
You are viewing proxied material from jay.scot. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.