Skip to content

Commit 061c3c0

Browse files
committed
separate courseCode into clientCode and serverCode
1 parent 2f962e8 commit 061c3c0

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

backend/server.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ config.serverType = 'http';
1717
config.serverPort = '3000';
1818
config.questionsDir = "questions";
1919
config.testsDir = "tests";
20-
config.courseCodeDir = "../../backend/code";
20+
config.clientCodeDir = "../../backend/clientCode";
21+
config.serverCodeDir = "../../backend/serverCode";
2122
config.frontendDir = "../frontend";
2223
config.secretKey = "THIS_IS_THE_SECRET_KEY"; // override in config.json
2324
config.skipUIDs = {};
@@ -46,7 +47,8 @@ requirejs.config({
4647
nodeRequire: require,
4748
baseUrl: config.frontendDir + '/require',
4849
paths: {
49-
courseCode: config.courseCodeDir,
50+
clientCode: config.clientCodeDir,
51+
serverCode: config.serverCodeDir,
5052
},
5153
});
5254

@@ -464,7 +466,7 @@ app.use(function(req, res, next) {
464466
next();
465467
return;
466468
}
467-
if (/^\/courseCode/.test(req.path)) {
469+
if (/^\/clientCode/.test(req.path)) {
468470
req.authUID = "nouser";
469471
next();
470472
return;
@@ -637,13 +639,13 @@ app.get("/questions/:qid/:filename", function(req, res) {
637639
sendQuestionFile(req, res, req.params.filename);
638640
});
639641

640-
app.get("/courseCode/:filename", function(req, res) {
641-
var fullFilePath = path.join(config.courseCodeDir, req.params.filename);
642+
app.get("/clientCode/:filename", function(req, res) {
643+
var fullFilePath = path.join(config.clientCodeDir, req.params.filename);
642644
fs.stat(fullFilePath, function(err, stats) {
643645
if (err) {
644-
return sendError(res, 404, 'No such file "/courseCode/' + req.params.filename + '"', err);
646+
return sendError(res, 404, 'No such file "/clientCode/' + req.params.filename + '"', err);
645647
}
646-
res.sendfile(req.params.filename, {root: config.courseCodeDir});
648+
res.sendfile(req.params.filename, {root: config.clientCodeDir});
647649
});
648650
});
649651

frontend/require/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var PRAIRIELEARN_DEFAULT_API_SERVER = "http://localhost:3000";
33
requirejs.config({
44
baseUrl: 'require',
55
paths: {
6-
courseCode: (document.PLConfig.apiServer || PRAIRIELEARN_DEFAULT_API_SERVER) + "/courseCode",
6+
clientCode: (document.PLConfig.apiServer || PRAIRIELEARN_DEFAULT_API_SERVER) + "/clientCode",
77
},
88
map: {
99
'*': {

make_tex_images.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
for line in config_file:
1313
for pattern in [
1414
'"questionsDir" *: *\"([^"]*)\"',
15-
'"courseCodeDir" *: *\"([^"]*)\"',
15+
'"clientCodeDir" *: *\"([^"]*)\"',
1616
]:
1717
match = re.search(pattern, line)
1818
if match:

0 commit comments

Comments
 (0)