From 73bbd5b495dff5c2af346f08f0162652e79ce094 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 7 Apr 2014 10:55:07 +0100 Subject: [PATCH] moved info and home controller into static page feature --- .../StaticPages}/HomeController.coffee | 9 +++++---- .../StaticPages}/InfoController.coffee | 0 services/web/app/coffee/managers/SecurityManager.coffee | 2 +- services/web/app/coffee/router.coffee | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) rename services/web/app/coffee/{controllers => Features/StaticPages}/HomeController.coffee (81%) rename services/web/app/coffee/{controllers => Features/StaticPages}/InfoController.coffee (100%) diff --git a/services/web/app/coffee/controllers/HomeController.coffee b/services/web/app/coffee/Features/StaticPages/HomeController.coffee similarity index 81% rename from services/web/app/coffee/controllers/HomeController.coffee rename to services/web/app/coffee/Features/StaticPages/HomeController.coffee index 566b5bcebc..3a284c2f3a 100755 --- a/services/web/app/coffee/controllers/HomeController.coffee +++ b/services/web/app/coffee/Features/StaticPages/HomeController.coffee @@ -1,11 +1,12 @@ logger = require('logger-sharelatex') _ = require('underscore') -User = require('./UserController') -Quotes = require('../models/Quote').Quote +User = require('../../controllers/UserController') +Quotes = require('../../models/Quote').Quote Path = require "path" fs = require "fs" -homepageExists = fs.existsSync Path.resolve(__dirname + "/../../views/external/home.jade") + +homepageExists = fs.existsSync Path.resolve(__dirname + "/../../../views/external/home.jade") module.exports = HomeController = index : (req,res)-> @@ -23,7 +24,7 @@ module.exports = HomeController = externalPage: (page, title) -> return (req, res, next = (error) ->) -> - path = Path.resolve(__dirname + "/../../views/external/#{page}.jade") + path = Path.resolve(__dirname + "/../../../views/external/#{page}.jade") fs.exists path, (exists) -> # No error in this callback - old method in Node.js! if exists res.render "external/#{page}.jade", diff --git a/services/web/app/coffee/controllers/InfoController.coffee b/services/web/app/coffee/Features/StaticPages/InfoController.coffee similarity index 100% rename from services/web/app/coffee/controllers/InfoController.coffee rename to services/web/app/coffee/Features/StaticPages/InfoController.coffee diff --git a/services/web/app/coffee/managers/SecurityManager.coffee b/services/web/app/coffee/managers/SecurityManager.coffee index 1f757fd9c2..0052011122 100644 --- a/services/web/app/coffee/managers/SecurityManager.coffee +++ b/services/web/app/coffee/managers/SecurityManager.coffee @@ -4,7 +4,7 @@ Assert = require 'assert' Settings = require 'settings-sharelatex' User = require('../models/User').User Project = require('../models/Project').Project -HomeController = require("../controllers/HomeController") +HomeController = require("../Features/StaticPages/HomeController") AuthenticationController = require("../Features/Authentication/AuthenticationController") _ = require('underscore') metrics = require('../infrastructure/Metrics') diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index 90d1cf3379..022c724142 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -1,9 +1,9 @@ UserController = require('./controllers/UserController') AdminController = require('./controllers/AdminController') -HomeController = require('./controllers/HomeController') +HomeController = require('./Features/StaticPages/HomeController') ProjectController = require("./controllers/ProjectController") ProjectApiController = require("./Features/Project/ProjectApiController") -InfoController = require('./controllers/InfoController') +InfoController = require('./Features/StaticPages/InfoController') SpellingController = require('./Features/Spelling/SpellingController') SecurityManager = require('./managers/SecurityManager') AuthorizationManager = require('./Features/Security/AuthorizationManager')