From b54df0ddd0c6a0372327c5aa3668e5a6458fcd64 Mon Sep 17 00:00:00 2001 From: st782s Date: Thu, 4 May 2017 07:48:42 -0400 Subject: [PORTAL-7] Rebase This rebasing includes common libraries and common overlays projects abstraction of components Change-Id: I9a24a338665c7cd058978e8636bc412d9e2fdce8 Signed-off-by: st782s --- ecomp-portal-FE/server/.jshintrc | 14 -- ecomp-portal-FE/server/.jshintrc-spec | 11 -- ecomp-portal-FE/server/app.js | 19 --- ecomp-portal-FE/server/components/errors/index.js | 20 --- ecomp-portal-FE/server/config/environment/index.js | 25 ---- ecomp-portal-FE/server/config/express.js | 40 ------ ecomp-portal-FE/server/routes.js | 17 --- ecomp-portal-FE/server/views/404.html | 157 --------------------- 8 files changed, 303 deletions(-) delete mode 100644 ecomp-portal-FE/server/.jshintrc delete mode 100644 ecomp-portal-FE/server/.jshintrc-spec delete mode 100644 ecomp-portal-FE/server/app.js delete mode 100644 ecomp-portal-FE/server/components/errors/index.js delete mode 100644 ecomp-portal-FE/server/config/environment/index.js delete mode 100644 ecomp-portal-FE/server/config/express.js delete mode 100644 ecomp-portal-FE/server/routes.js delete mode 100644 ecomp-portal-FE/server/views/404.html (limited to 'ecomp-portal-FE/server') diff --git a/ecomp-portal-FE/server/.jshintrc b/ecomp-portal-FE/server/.jshintrc deleted file mode 100644 index 66d1af7c..00000000 --- a/ecomp-portal-FE/server/.jshintrc +++ /dev/null @@ -1,14 +0,0 @@ -{ - "node": true, - "esnext": true, - "bitwise": true, - "eqeqeq": true, - "immed": true, - "latedef": "nofunc", - "newcap": true, - "noarg": true, - "undef": true, - "smarttabs": true, - "asi": true, - "debug": true -} diff --git a/ecomp-portal-FE/server/.jshintrc-spec b/ecomp-portal-FE/server/.jshintrc-spec deleted file mode 100644 index b6b55cbf..00000000 --- a/ecomp-portal-FE/server/.jshintrc-spec +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": ".jshintrc", - "globals": { - "describe": true, - "it": true, - "before": true, - "beforeEach": true, - "after": true, - "afterEach": true - } -} diff --git a/ecomp-portal-FE/server/app.js b/ecomp-portal-FE/server/app.js deleted file mode 100644 index e6e3383f..00000000 --- a/ecomp-portal-FE/server/app.js +++ /dev/null @@ -1,19 +0,0 @@ -'use strict'; -//let serverCommon = require('ssp_server_common'); -let express = require('express'); -let config = require('./config/environment'); - -//let logger = serverCommon.getLogger(config); -// Setup server -let app = express(); -let server = require('http').createServer(app); -require('./config/express')(app); -require('./routes')(app); - -// Start server -server.listen(config.port, config.ip, ()=> { - console.log('Express server listening on %d port, in %s mode', config.port, config.ip); -}); - -// Expose app -module.exports = app; diff --git a/ecomp-portal-FE/server/components/errors/index.js b/ecomp-portal-FE/server/components/errors/index.js deleted file mode 100644 index 4c5a57c9..00000000 --- a/ecomp-portal-FE/server/components/errors/index.js +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Error responses - */ - -'use strict'; - -module.exports[404] = function pageNotFound(req, res) { - var viewFilePath = '404'; - var statusCode = 404; - var result = { - status: statusCode - }; - - res.status(result.status); - res.render(viewFilePath, function (err) { - if (err) { return res.json(result, result.status); } - - res.render(viewFilePath); - }); -}; diff --git a/ecomp-portal-FE/server/config/environment/index.js b/ecomp-portal-FE/server/config/environment/index.js deleted file mode 100644 index 6bf620cb..00000000 --- a/ecomp-portal-FE/server/config/environment/index.js +++ /dev/null @@ -1,25 +0,0 @@ -'use strict'; - -var path = require('path'); - -// All configurations will extend these options -// ============================================ -var all = { - env: process.env.NODE_ENV, - - // Root path of server - root: path.normalize(__dirname + '/../../..'), - - // Server port - port: process.env.PORT || 9000, - - // Server IP - ip: process.env.IP || '0.0.0.0', - - //Base tag url - baseUrl: '/ecompportal' -}; - -// Export the config object based on the NODE_ENV -// ============================================== -module.exports = all; diff --git a/ecomp-portal-FE/server/config/express.js b/ecomp-portal-FE/server/config/express.js deleted file mode 100644 index 15600503..00000000 --- a/ecomp-portal-FE/server/config/express.js +++ /dev/null @@ -1,40 +0,0 @@ -'use strict'; - -let express = require('express'); -let favicon = require('serve-favicon'); -let morgan = require('morgan'); -let compression = require('compression'); -let bodyParser = require('body-parser'); -let methodOverride = require('method-override'); -let cookieParser = require('cookie-parser'); -let errorHandler = require('errorhandler'); -let path = require('path'); -let config = require('./environment'); - - -module.exports = (app) => { - var env = app.get('env'); - - app.set('views', config.root + '/server/views'); - app.engine('html', require('ejs').renderFile); - app.set('view engine', 'html'); - app.use(compression()); - app.use(bodyParser.urlencoded({extended: false})); - app.use(bodyParser.json()); - app.use(methodOverride()); - app.use(cookieParser()); - - //if (process.env.NODE_TREE_STRUCTURE === 'unminified') { - app.use(require('connect-livereload')()); - app.use(config.baseUrl, express.static(path.join(config.root, '.tmp'))); - app.use(config.baseUrl, express.static(path.join(config.root, 'client'))); - app.set('appPath', path.join(config.root, 'client')); - app.use(morgan('dev')); - app.use(errorHandler()); // Error handler - has to be last - //} else { - // app.use(favicon(path.join(config.root, 'public', 'favicon.ico'))); - // app.use(express.static(path.join(config.root, 'public'))); - // app.set('appPath', path.join(config.root, 'public')); - // app.use(morgan('dev')); - //} -}; diff --git a/ecomp-portal-FE/server/routes.js b/ecomp-portal-FE/server/routes.js deleted file mode 100644 index b74027e8..00000000 --- a/ecomp-portal-FE/server/routes.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict'; -let path = require('path'); -let config = require('./config/environment'); - -module.exports = app => { - // All undefined asset or api routes should return a 404 - app.route('/:url(api|auth|components|app|bower_components|assets)/*') - .get(function(req, res){ - res.status(404).send(); - }); - - // All other routes should redirect to the index.html - app.route(config.baseUrl + '/*') - .get(function (req, res) { - res.sendFile(path.resolve('client/index.html')); - }); -}; diff --git a/ecomp-portal-FE/server/views/404.html b/ecomp-portal-FE/server/views/404.html deleted file mode 100644 index ec98e3c2..00000000 --- a/ecomp-portal-FE/server/views/404.html +++ /dev/null @@ -1,157 +0,0 @@ - - - - - Page Not Found :( - - - -
-

Not found :(

-

Sorry, but the page you were trying to view does not exist.

-

It looks like this was the result of either:

-
    -
  • a mistyped address
    • -
  • an out-of-date link
    • -
- - -
- - -- cgit 1.2.3-korg