Skip to content

Commit d1c40e1

Browse files
author
joeltaylor
committed
Add relative paths and use /server
1 parent 915b74e commit d1c40e1

Some content is hidden

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

58 files changed

+36
-33
lines changed

‎bin/www

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
* Module dependencies.
55
*/
66

7-
var app = require('../app');
7+
var path = require('path');
8+
var app = require(path.join(__dirname, '..', 'server', 'app'));
89
var debug = require('debug')('JavaScript.com:server');
910
var http = require('http');
1011

‎gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var watch = require('gulp-watch');
2828
var _ = require('lodash');
2929
var run = require('run-sequence');
3030
var Chance = require('chance');
31-
var db = require('./services/db');
31+
var db = require('./server/services/db');
3232

3333
// -------------------------------------
3434
// Variables

‎app.js renamed to ‎server/app.js

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
var express = require('express');
2-
var path = require('path');
32
var favicon = require('serve-favicon');
43
var logger = require('morgan');
4+
// Global, it's used everywhere
5+
path = require('path');
56

67
// Set baseURL depending on enviornment
78

@@ -14,21 +15,21 @@ if (env === 'production') {
1415
baseURL = "http://localhost:3000/";
1516
}
1617

17-
var routes = require('./routes/index');
18-
19-
var about = require('./routes/about');
20-
var admin = require('./routes/admin');
21-
var assets = require('./routes/assets');
22-
var courses = require('./routes/courses');
23-
var feed = require('./routes/feed');
24-
var feedback = require('./routes/feedback');
25-
var guidelines = require('./routes/guidelines');
26-
var learn = require('./routes/learn');
27-
var news = require('./routes/news');
28-
var notFound = require('./routes/notFound');
29-
var resources = require('./routes/resources');
30-
var styleguide = require('./routes/styleguide');
31-
var users = require('./routes/users');
18+
var routes = require(path.join(__dirname, 'routes','index'));
19+
20+
var about = require(path.join(__dirname, 'routes', 'about'));
21+
var admin = require(path.join(__dirname, 'routes', 'admin'));
22+
var assets = require(path.join(__dirname, 'routes', 'assets'));
23+
var courses = require(path.join(__dirname, 'routes', 'courses'));
24+
var feed = require(path.join(__dirname, 'routes', 'feed'));
25+
var feedback = require(path.join(__dirname, 'routes', 'feedback'));
26+
var guidelines = require(path.join(__dirname, 'routes', 'guidelines'));
27+
var learn = require(path.join(__dirname, 'routes', 'learn'));
28+
var news = require(path.join(__dirname, 'routes', 'news'));
29+
var notFound = require(path.join(__dirname, 'routes', 'notFound'));
30+
var resources = require(path.join(__dirname, 'routes', 'resources'));
31+
var styleguide = require(path.join(__dirname, 'routes', 'styleguide'));
32+
var users = require(path.join(__dirname, 'routes', 'users'));
3233

3334
var app = express();
3435

@@ -55,7 +56,7 @@ app.set('view engine', 'jade');
5556
// uncomment after placing your favicon in /public
5657
//app.use(favicon(__dirname + '/public/favicon.ico'));
5758
app.use(logger('dev'));
58-
app.use(express.static(path.join(__dirname, 'public')));
59+
app.use(express.static(path.join(__dirname, '..', 'public')));
5960

6061
// Flash messages
6162
app.use(require('flash')());

‎db/schema.sql renamed to ‎server/db/schema.sql

File renamed without changes.

‎routes/about.js renamed to ‎server/routes/about.js

File renamed without changes.

‎routes/admin.js renamed to ‎server/routes/admin.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ var router = express.Router();
33
var csrf = require('csurf');
44
var bodyParser = require('body-parser');
55
var cookieParser = require('cookie-parser')();
6-
var Articles = require('../services/articles');
7-
var Users = require('../services/users');
8-
var Comments = require('../services/comments');
9-
var Akismetor = require('../services/akismetor');
10-
var Mailer = require('../services/mailer');
6+
7+
var Articles = require(path.join(__dirname, '..', 'services', 'articles'));
8+
var Users = require(path.join(__dirname, '..', 'services', 'users'));
9+
var Comments = require(path.join(__dirname, '..', 'services', 'comments'));
10+
var Akismetor = require(path.join(__dirname, '..', 'services', 'akismetor'));
11+
var Mailer = require(path.join(__dirname, '..', 'services', 'mailer'));
1112

1213
var csrfProtection = csrf();
1314
var parsePost = bodyParser.urlencoded({ extended: false });

‎routes/assets.js renamed to ‎server/routes/assets.js

File renamed without changes.

‎routes/courses.js renamed to ‎server/routes/courses.js

File renamed without changes.

‎routes/feed.js renamed to ‎server/routes/feed.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var express = require('express');
22
var router = express.Router();
33
var path = require('path');
44

5-
var Articles = require('./../services/articles');
5+
var Articles = require(path.join(__dirname, '..', 'services', 'articles'));
66

77

88
router.get('/rss', function(req, res, next) {

‎routes/feedback.js renamed to ‎server/routes/feedback.js

File renamed without changes.

‎routes/guidelines.js renamed to ‎server/routes/guidelines.js

File renamed without changes.

‎routes/index.js renamed to ‎server/routes/index.js

File renamed without changes.

‎routes/learn.js renamed to ‎server/routes/learn.js

File renamed without changes.

‎routes/news.js renamed to ‎server/routes/news.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ var router = express.Router();
33
var csrf = require('csurf');
44
var bodyParser = require('body-parser');
55
var cookieParser = require('cookie-parser')();
6-
var Articles = require('../services/articles');
7-
var Users = require('../services/users');
8-
var Comments = require('../services/comments');
9-
var Akismetor = require('../services/akismetor');
6+
var Articles = require(path.join(__dirname, '..', 'services', 'articles'));
7+
var Users = require(path.join(__dirname, '..', 'services', 'users'));
8+
var Comments = require(path.join(__dirname, '..', 'services', 'comments'));
9+
var Akismetor = require(path.join(__dirname, '..', 'services', 'akismetor'));
1010
var moment = require('moment');
1111
var pluralize = require('pluralize');
1212
var expressValidator = require('express-validator');

‎routes/notFound.js renamed to ‎server/routes/notFound.js

File renamed without changes.

‎routes/resources.js renamed to ‎server/routes/resources.js

File renamed without changes.

‎routes/styleguide.js renamed to ‎server/routes/styleguide.js

File renamed without changes.

‎routes/users.js renamed to ‎server/routes/users.js

File renamed without changes.

‎services/akismetor.js renamed to ‎server/services/akismetor.js

File renamed without changes.

‎services/articles.js renamed to ‎server/services/articles.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var db = require('./db');
1+
var db = require(path.join(__dirname, 'db'));
22
var slugGenerator = require('./slug-generator');
33

44
/* Articles fall into two seperate categories, Flow and News. Flow stories are user

‎services/comments.js renamed to ‎server/services/comments.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var db = require('./db');
2-
var Akismetor = require('../services/akismetor');
1+
var db = require(path.join(__dirname, 'db'));
2+
var Akismetor = require(path.join(__dirname, '..', 'services', 'akismetor'));
33

44
var Comments = {
55
// Returns all comments by article with user information.

‎services/course.js renamed to ‎server/services/course.js

File renamed without changes.

‎services/db.js renamed to ‎server/services/db.js

File renamed without changes.

‎services/github-api.js renamed to ‎server/services/github-api.js

File renamed without changes.

‎services/mailer.js renamed to ‎server/services/mailer.js

File renamed without changes.

‎services/slug-generator.js renamed to ‎server/services/slug-generator.js

File renamed without changes.

‎services/users.js renamed to ‎server/services/users.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var db = require('./db');
1+
var db = require(path.join(__dirname, 'db'));
22
var GithubApi = require('./github-api');
33

44
var Users = {

‎views/404.jade renamed to ‎server/views/404.jade

File renamed without changes.

‎views/about/index.jade renamed to ‎server/views/about/index.jade

File renamed without changes.

‎views/admin/index.jade renamed to ‎server/views/admin/index.jade

File renamed without changes.

‎views/assets/index.jade renamed to ‎server/views/assets/index.jade

File renamed without changes.

‎views/error.jade renamed to ‎server/views/error.jade

File renamed without changes.

‎views/feed/rss.jade renamed to ‎server/views/feed/rss.jade

File renamed without changes.

‎views/feedback/index.jade renamed to ‎server/views/feedback/index.jade

File renamed without changes.

‎views/feedback/success.jade renamed to ‎server/views/feedback/success.jade

File renamed without changes.

‎views/guidelines/index.jade renamed to ‎server/views/guidelines/index.jade

File renamed without changes.

‎views/index.jade renamed to ‎server/views/index.jade

File renamed without changes.

‎views/layouts/_head.jade renamed to ‎server/views/layouts/_head.jade

File renamed without changes.

‎views/layouts/layout-bleed.jade renamed to ‎server/views/layouts/layout-bleed.jade

File renamed without changes.

‎views/layouts/layout-course.jade renamed to ‎server/views/layouts/layout-course.jade

File renamed without changes.

‎views/layouts/layout.jade renamed to ‎server/views/layouts/layout.jade

File renamed without changes.

‎views/learn/index.jade renamed to ‎server/views/learn/index.jade

File renamed without changes.

‎views/news/_data_separator.jade renamed to ‎server/views/news/_data_separator.jade

File renamed without changes.

‎views/news/index.jade renamed to ‎server/views/news/index.jade

File renamed without changes.

‎views/news/new.jade renamed to ‎server/views/news/new.jade

File renamed without changes.

‎views/news/pending.jade renamed to ‎server/views/news/pending.jade

File renamed without changes.

‎views/news/show.jade renamed to ‎server/views/news/show.jade

File renamed without changes.

‎views/news/sign_in.jade renamed to ‎server/views/news/sign_in.jade

File renamed without changes.

‎views/partials/_flash.jade renamed to ‎server/views/partials/_flash.jade

File renamed without changes.

‎views/partials/_footer.jade renamed to ‎server/views/partials/_footer.jade

File renamed without changes.

‎views/partials/_header.jade renamed to ‎server/views/partials/_header.jade

File renamed without changes.

‎views/partials/_hero_console.jade renamed to ‎server/views/partials/_hero_console.jade

File renamed without changes.

‎views/partials/_hero_img.jade renamed to ‎server/views/partials/_hero_img.jade

File renamed without changes.

‎views/partials/_icon.jade renamed to ‎server/views/partials/_icon.jade

File renamed without changes.

‎views/partials/_newsletter_form.jade renamed to ‎server/views/partials/_newsletter_form.jade

File renamed without changes.

‎views/resources/_resource.jade renamed to ‎server/views/resources/_resource.jade

File renamed without changes.

‎views/resources/index.jade renamed to ‎server/views/resources/index.jade

File renamed without changes.

‎views/styleguide/index.jade renamed to ‎server/views/styleguide/index.jade

File renamed without changes.

0 commit comments

Comments
 (0)