Selaa lähdekoodia

fix some code

Dotos 9 vuotta sitten
vanhempi
sitoutus
63cb145b6f
7 muutettua tiedostoa jossa 73 lisäystä ja 53 poistoa
  1. 1 0
      .gitignore
  2. 19 18
      app.js
  3. 34 34
      package.json
  4. 18 0
      public/libs/v1.js
  5. 0 0
      views/error.pug
  6. 0 0
      views/index.pug
  7. 1 1
      views/layout.pug

+ 1 - 0
.gitignore

@@ -1,3 +1,4 @@
+.sass
 .DS_Store
 node_modules/
 npm-debug.log

+ 19 - 18
app.js

@@ -9,6 +9,7 @@ var routes = require('./routes/index');
 var users = require('./routes/users');
 //HOME PAGE
 var home = require('./routes/home');
+var index = require('./routes/index');
 //version 1.0
 var v1 = require('./routes/v1');
 
@@ -16,7 +17,7 @@ var app = express();
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
-app.set('view engine', 'jade');
+app.set('view engine', 'pug');
 
 // uncomment after placing your favicon in /public
 //app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
@@ -28,14 +29,14 @@ app.use(express.static(path.join(__dirname, 'public')));
 
 
 app.use('/', home);
-
-app.use('/v1',v1);
+app.use('/user', index);
+app.use('/v1', v1);
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
-  var err = new Error('Not Found');
-  err.status = 404;
-  next(err);
+    var err = new Error('Not Found');
+    err.status = 404;
+    next(err);
 });
 
 // error handlers
@@ -43,24 +44,24 @@ app.use(function(req, res, next) {
 // development error handler
 // will print stacktrace
 if (app.get('env') === 'development') {
-  app.use(function(err, req, res, next) {
-    res.status(err.status || 500);
-    res.render('error', {
-      message: err.message,
-      error: err
+    app.use(function(err, req, res, next) {
+        res.status(err.status || 500);
+        res.render('error', {
+            message: err.message,
+            error: err
+        });
     });
-  });
 }
 
 // production error handler
 // no stacktraces leaked to user
 app.use(function(err, req, res, next) {
-  res.status(err.status || 500);
-  res.render('error', {
-    message: err.message,
-    error: {}
-  });
+    res.status(err.status || 500);
+    res.render('error', {
+        message: err.message,
+        error: {}
+    });
 });
 
 
-module.exports = app;
+module.exports = app;

+ 34 - 34
package.json

@@ -1,35 +1,35 @@
 {
-  "name": "API",
-  "version": "1.0.0",
-  "private": true,
-  "scripts": {
-    "start": "node ./bin/www",
-    "dev": "hotnode ./bin/www"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/xCss/api.git"
-  },
-  "keywords": [
-    "api"
-  ],
-  "author": "xCss",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/xCss/api/issues"
-  },
-  "readme": "./readme.md",
-  "homepage": "https://github.com/xCss/api#readme",
-  "dependencies": {
-    "body-parser": "~1.15.1",
-    "cookie-parser": "~1.4.3",
-    "debug": "~2.2.0",
-    "express": "~4.13.4",
-    "express-generator": "^4.13.4",
-    "hotnode": "0.0.8",
-    "jade": "~1.11.0",
-    "morgan": "~1.7.0",
-    "request": "^2.74.0",
-    "serve-favicon": "~2.3.0"
-  }
-}
+    "name": "JsonProxy",
+    "version": "1.0.0",
+    "private": true,
+    "scripts": {
+        "start": "node ./bin/www",
+        "dev": "hotnode ./bin/www"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/xCss/JsonProxy.git"
+    },
+    "keywords": [
+        "JsonProxy"
+    ],
+    "author": "xCss",
+    "license": "ISC",
+    "bugs": {
+        "url": "https://github.com/xCss/JsonProxy/issues"
+    },
+    "readme": "./readme.md",
+    "homepage": "https://github.com/xCss/JsonProxy#readme",
+    "dependencies": {
+        "body-parser": "~1.15.1",
+        "cookie-parser": "~1.4.3",
+        "debug": "~2.2.0",
+        "express": "~4.13.4",
+        "express-generator": "^4.13.4",
+        "hotnode": "0.0.8",
+        "morgan": "~1.7.0",
+        "pug": "^2.0.0-beta6",
+        "request": "^2.74.0",
+        "serve-favicon": "~2.3.0"
+    }
+}

+ 18 - 0
public/libs/v1.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _typeof =
+    typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ?
+    function(obj) { return typeof obj; } : 
+    function(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
+
+(function(root, f) {
+    if ((typeof exports === "undefined" ? "undefined" : _typeof(exports)) === 'object' && typeof module !== 'undefined') {
+        module.exports = f;
+    } else if (typeof define === 'function' && defind.amd) {
+        define([], f);
+    } else {
+        root.BIRD = f();
+    }
+})(window || global || self || this, function() {
+
+});

+ 0 - 0
views/error.jade → views/error.pug


+ 0 - 0
views/index.jade → views/index.pug


+ 1 - 1
views/layout.jade → views/layout.pug

@@ -2,6 +2,6 @@ doctype html
 html
   head
     title= title
-    link(rel='stylesheet', href='/stylesheets/style.css')
+    link(rel='stylesheet', href='/css/style.css')
   body
     block content