Changeset 452 for Dev/trunk/src/server

Timestamp:

06/08/13 23:40:39 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Completed separation of client and server.

Location:

Dev/trunk/src

Files:

• . (modified) (1 prop)
• server (moved) (moved from Dev/trunk/src/qed-server) (1 prop)
• server/config/couchdb/config/check.js (copied) (copied from Dev/trunk/src/qed-server/config/couchdb/config/check.js)
• server/package.json (copied) (copied from Dev/trunk/src/qed-server/package.json) (1 diff)
• server/server.js (copied) (copied from Dev/trunk/src/qed-server/server.js) (2 diffs)

Dev/trunk/src/server/package.json

@@ -7 +7 @@
     "express": "~3.2.3",
     "underscore": "~1.4.4"
-  },
-  "dojoBuild": "qed-server.profile.js"
+  }
 }

Dev/trunk/src/server/server.js

@@ -6 +6 @@
 var _ = require("underscore");
 
-function staticFile(request, response) {
-    response.sendfile(__dirname+request.path);
+function clientPath(relativePath) {
+    return path.resolve('../client/'+relativePath);
 }
 
-var __dirname = path.resolve('..');
-
 var httpsOptions = {
-    key: fs.readFileSync(__dirname+'/qed-server.key'),
-    cert: fs.readFileSync(__dirname+'/qed-server.pem')
+    key: fs.readFileSync(path.resolve('../qed-server.key')),
+    cert: fs.readFileSync(path.resolve('../qed-server.pem'))
 };
 
@@ -22 +20 @@
 app.use(express.favicon());
 app.get('/', function(request, response){
-    response.sendfile(__dirname+'/index.html');
+    response.sendfile(clientPath('index.html'));
 });
-app.get('/*.html', staticFile);
-_.foreach(['/dojo', '/dijit', '/dojox', '/qed', '/qed-client'], function(dir){
-    app.use(dir, express['static'](__dirname+dir));
+app.get('/*.html', function(request, response) {
+    response.sendfile(clientPath(request.path));
+});
+_.each(['/dojo', '/dijit', '/dojox', '/qed', '/qed-client'], function(dir){
+    app.use(dir, express.static(clientPath(dir)));
 });
 app.use('/data/couch', proxy('http://localhost:5984/qed'));