Skip to content

Commit 922aa05

Browse files
hauselinhauselin
committedJul 17, 2020
clean up routes
1 parent aead486 commit 922aa05

File tree

13 files changed

+84
-139
lines changed

13 files changed

+84
-139
lines changed
 

‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ tasks: behavioral tasks
1313
## unique study ids and routes
1414

1515
- studies
16-
- studyA
16+
- studies/studyA
1717
- surveys
18-
- bigfiveaspect
19-
- gritshort
18+
- surveys/bigfiveaspect
19+
- surveys/gritshort
2020
- tasks
21-
- bigfiveaspect
22-
- gritshort
21+
- tasks/bigfiveaspect
22+
- tasks/gritshort
2323

2424

‎app.js

+9-12
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ var express = require("express"),
66
path = require('path'),
77
DataLibrary = require('./models/datalibrary')
88

9-
var taskRoutes = require('./routes/tasks'),
10-
studiesRoutes = require('./routes/studies'),
11-
surveysRoutes = require('./routes/surveys'),
9+
var showRoutes = require('./routes/show'),
1210
indexRoutes = require('./routes/index'),
1311
datalibraryRoutes = require('./routes/datalibrary'),
1412
vizRoutes = require('./routes/viz'),
@@ -27,20 +25,19 @@ mongoose.connect('mongodb://localhost/datalibrary',
2725
);
2826

2927
// // TELL EXPRESS TO USE THE FOLLOWING LIBRARIES/FILES/ROUTES DEFINED IN ROUTES FOLDER
30-
app.use(taskRoutes);
31-
app.use(studiesRoutes);
32-
app.use(surveysRoutes);
28+
app.use('/tasks', express.static(__dirname + "/tasks"));
29+
app.use('/surveys', express.static(__dirname + "/surveys"));
30+
app.use('/studies', express.static(__dirname + "/studies"));
31+
app.use('/jsPsych', express.static(__dirname + "/jsPsych"));
32+
app.use('/libraries', express.static(__dirname + "/libraries"));
33+
app.use('/public', express.static(__dirname + "/public"));
34+
35+
app.use(showRoutes);
3336
app.use(indexRoutes); // TODO Maham: work on index routes
3437
app.use(datalibraryRoutes);
3538
app.use(vizRoutes);
3639
// app.use(downloadsRoutes); // TODO Maham: work on download routes
3740

38-
app.use('/jsPsych', express.static(__dirname + "/jsPsych"));
39-
app.use('/libraries', express.static(__dirname + "/libraries"));
40-
app.use('/tasks', express.static(__dirname + "/tasks"));
41-
app.use('/surveys', express.static(__dirname + "/surveys"));
42-
app.use('/studies', express.static(__dirname + "/studies"));
43-
app.use('/public', express.static(__dirname + "/public"));
4441

4542
// require('./routes')(app, path)
4643

‎middleware/delay_disccount.js ‎middleware/delaydisccount.js

File renamed without changes.

‎routes/show.js

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// SHOW ROUTES (STUDIES, SURVEYS, TASKS)
2+
var express = require("express");
3+
var router = express.Router()
4+
5+
// TODO Maham: I think this single rotue is enough for all tasks/studies/surveys?
6+
router.get('/:type/:uniquestudyid', function (req, res) {
7+
const root = '../lab_exp/' + req.params.type + '/' + req.params.uniquestudyid;
8+
res.sendFile('task.html', { root: root })
9+
});
10+
11+
module.exports = router;

‎routes/studies.js

-9
This file was deleted.

‎routes/surveys.js

-13
This file was deleted.

‎routes/tasks.js

-24
This file was deleted.

‎routes/viz.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
var express = require("express");
22
var router = express.Router();
33

4-
router.get("/:uniquestudyid/viz", function (req, res) {
5-
// TODO Maham: specify root?
6-
res.render('viz/' + req.params.uniquestudyid + ".ejs"); // render {uniquestudyid}.ejs in views directory
4+
router.get("/:type/:uniquestudyid/viz", function (req, res) {
5+
const file = 'viz/' + req.params.uniquestudyid + '.ejs';
6+
res.render(file); // render {uniquestudyid}.ejs in views directory
77
});
88

99
module.exports = router;

‎tasks/delaydiscount/consent.html

+34-49
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,14 @@
66
<title>Informed consent</title>
77
<meta name="viewport" content="width=device-width, initial-scale=1.0">
88
<meta name="description" content="A corporate Bootstrap theme by Medium Rare">
9-
<link href="../public/assets/css/loaders/loader-typing.css" rel="stylesheet" type="text/css" media="all" />
10-
<link href="../public/assets/css/theme.css" rel="stylesheet" type="text/css" media="all" />
11-
<link rel="preload" as="font" href="../public/assets/fonts/Inter-UI-upright.var.woff2" type="font/woff2" crossorigin="anonymous">
12-
<link rel="preload" as="font" href="../public/assets/fonts/Inter-UI.var.woff2" type="font/woff2" crossorigin="anonymous">
9+
<link href="../../public/assets/css/loaders/loader-typing.css" rel="stylesheet" type="text/css" media="all" />
10+
<link href="../../public/assets/css/theme.css" rel="stylesheet" type="text/css" media="all" />
11+
<link rel="preload" as="font" href="../../public/assets/fonts/Inter-UI-upright.var.woff2" type="font/woff2" crossorigin="anonymous">
12+
<link rel="preload" as="font" href="../../public/assets/fonts/Inter-UI.var.woff2" type="font/woff2" crossorigin="anonymous">
1313
</head>
1414

1515
<body>
16-
<section align="left" style="width: 64em;" class="pt-3">
17-
<div class="container">
18-
<div class="row">
19-
<div class="col">
20-
<nav aria-label="breadcrumb">
21-
<ol class="breadcrumb">
22-
<li class="breadcrumb-item">
23-
<a href="../public/index.html">Home</a>
24-
</li>
25-
<li class="breadcrumb-item active" aria-current="page">Delay Discounting</li>
26-
</ol>
27-
</nav>
28-
</div>
29-
</div>
30-
</div>
31-
</section>
16+
<section align="left" style="width: 64em;" class="pt-3"></section>
3217

3318
<section class="pt-0">
3419
<div class="container">
@@ -38,19 +23,19 @@
3823
<div class="col">
3924
<div class="row justify-content-center">
4025
<div class="col-xl-7 col-lg-8">
41-
<h1 class="my-2">Informed Consent</h1>
26+
<h1 class="my-2">Informed consent</h1>
4227
<hr>
4328
<article class="article">
4429
<div id="consent">
45-
<p>
46-
<zero-md src="../tasks/delaydiscount/consent.md"></zero-md>
30+
<p style="text-align:left">
31+
<zero-md src="../../tasks/delaydiscount/consent.md"></zero-md>
4732
</p>
4833
</div>
4934
</article>
5035
<hr>
51-
<a href="/" class="btn btn-outline-primary">Disagree and return home</a>
52-
<a class="btn btn-primary" style="color: white" id="agree_button">Agree and continue</a>
53-
<a href="../tasks/delaydiscount/consent" class="btn btn-outline-primary">Download consent</a>
36+
<a href="/" class="btn btn-outline-primary">Disagree</a>
37+
<a class="btn btn-primary" style="color: white" id="agree_button">Agree</a>
38+
<a href="../../tasks/delaydiscount/consent" class="btn btn-outline-primary">Download</a>
5439
</div>
5540
</div>
5641
</div>
@@ -59,50 +44,50 @@ <h1 class="my-2">Informed Consent</h1>
5944
</section>
6045

6146
<!-- Required vendor scripts (Do not remove) -->
62-
<script type="text/javascript" src="../public/assets/js/jquery.min.js"></script>
63-
<script type="text/javascript" src="../public/assets/js/popper.min.js"></script>
64-
<script type="text/javascript" src="../public/assets/js/bootstrap.js"></script>
47+
<script type="text/javascript" src="../../public/assets/js/jquery.min.js"></script>
48+
<script type="text/javascript" src="../../public/assets/js/popper.min.js"></script>
49+
<script type="text/javascript" src="../../public/assets/js/bootstrap.js"></script>
6550

6651
<!-- Optional Vendor Scripts (Remove the plugin script here and comment initializer script out of index.js if site does not use that feature) -->
6752

6853
<!-- AOS (Animate On Scroll - animates elements into view while scrolling down) -->
69-
<script type="text/javascript" src="../public/assets/js/aos.js"></script>
54+
<script type="text/javascript" src="../../public/assets/js/aos.js"></script>
7055
<!-- Clipboard (copies content from browser into OS clipboard) -->
71-
<script type="text/javascript" src="../public/assets/js/clipboard.js"></script>
56+
<script type="text/javascript" src="../../public/assets/js/clipboard.js"></script>
7257
<!-- Fancybox (handles image and video lightbox and galleries) -->
73-
<script type="text/javascript" src="../public/assets/js/jquery.fancybox.min.js"></script>
58+
<script type="text/javascript" src="../../public/assets/js/jquery.fancybox.min.js"></script>
7459
<!-- Flatpickr (calendar/date/time picker UI) -->
75-
<script type="text/javascript" src="../public/assets/js/flatpickr.min.js"></script>
60+
<script type="text/javascript" src="../../public/assets/js/flatpickr.min.js"></script>
7661
<!-- Flickity (handles touch enabled carousels and sliders) -->
77-
<script type="text/javascript" src="../public/assets/js/flickity.pkgd.min.js"></script>
62+
<script type="text/javascript" src="../../public/assets/js/flickity.pkgd.min.js"></script>
7863
<!-- Ion rangeSlider (flexible and pretty range slider elements) -->
79-
<script type="text/javascript" src="../public/assets/js/ion.rangeSlider.min.js"></script>
64+
<script type="text/javascript" src="../../public/assets/js/ion.rangeSlider.min.js"></script>
8065
<!-- Isotope (masonry layouts and filtering) -->
81-
<script type="text/javascript" src="../public/assets/js/isotope.pkgd.min.js"></script>
66+
<script type="text/javascript" src="../../public/assets/js/isotope.pkgd.min.js"></script>
8267
<!-- jarallax (parallax effect and video backgrounds) -->
83-
<script type="text/javascript" src="../public/assets/js/jarallax.min.js"></script>
84-
<script type="text/javascript" src="../public/assets/js/jarallax-video.min.js"></script>
85-
<script type="text/javascript" src="../public/assets/js/jarallax-element.min.js"></script>
68+
<script type="text/javascript" src="../../public/assets/js/jarallax.min.js"></script>
69+
<script type="text/javascript" src="../../public/assets/js/jarallax-video.min.js"></script>
70+
<script type="text/javascript" src="../../public/assets/js/jarallax-element.min.js"></script>
8671
<!-- jQuery Countdown (displays countdown text to a specified date) -->
87-
<script type="text/javascript" src="../public/assets/js/jquery.countdown.min.js"></script>
72+
<script type="text/javascript" src="../../public/assets/js/jquery.countdown.min.js"></script>
8873
<!-- jQuery smartWizard facilitates steppable wizard content -->
89-
<script type="text/javascript" src="../public/assets/js/jquery.smartWizard.min.js"></script>
74+
<script type="text/javascript" src="../../public/assets/js/jquery.smartWizard.min.js"></script>
9075
<!-- Plyr (unified player for Video, Audio, Vimeo and Youtube) -->
91-
<script type="text/javascript" src="../public/assets/js/plyr.polyfilled.min.js"></script>
76+
<script type="text/javascript" src="../../public/assets/js/plyr.polyfilled.min.js"></script>
9277
<!-- Prism (displays formatted code boxes) -->
93-
<script type="text/javascript" src="../public/assets/js/prism.js"></script>
78+
<script type="text/javascript" src="../../public/assets/js/prism.js"></script>
9479
<!-- ScrollMonitor (manages events for elements scrolling in and out of view) -->
95-
<script type="text/javascript" src="../public/assets/js/scrollMonitor.js"></script>
80+
<script type="text/javascript" src="../../public/assets/js/scrollMonitor.js"></script>
9681
<!-- Smooth scroll (animation to links in-page)-->
97-
<script type="text/javascript" src="../public/assets/js/smooth-scroll.polyfills.min.js"></script>
82+
<script type="text/javascript" src="../../public/assets/js/smooth-scroll.polyfills.min.js"></script>
9883
<!-- SVGInjector (replaces img tags with SVG code to allow easy inclusion of SVGs with the benefit of inheriting colors and styles)-->
99-
<script type="text/javascript" src="../public/assets/js/svg-injector.umd.production.js"></script>
84+
<script type="text/javascript" src="../../public/assets/js/svg-injector.umd.production.js"></script>
10085
<!-- TwitterFetcher (displays a feed of tweets from a specified account)-->
101-
<script type="text/javascript" src="../public/assets/js/twitterFetcher_min.js"></script>
86+
<script type="text/javascript" src="../../public/assets/js/twitterFetcher_min.js"></script>
10287
<!-- Typed text (animated typing effect)-->
103-
<script type="text/javascript" src="../public/assets/js/typed.min.js"></script>
88+
<script type="text/javascript" src="../../public/assets/js/typed.min.js"></script>
10489
<!-- Required theme scripts (Do not remove) -->
105-
<script type="text/javascript" src="../public/assets/js/theme.js"></script>
90+
<script type="text/javascript" src="../../public/assets/js/theme.js"></script>
10691
<!-- Removes page load animation when window is finished loading -->
10792
<script type="text/javascript">
10893
window.addEventListener("load", function () { document.querySelector('body').classList.add('loaded'); });

‎tasks/delaydiscount/consent.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,12 @@ Platea aenean congue justo montes venenatis l
88

99
## One more section
1010

11-
Vulputate ac nam diam curabitur ut netus taci
11+
Montes facilisi habitant vehicula hac conubia nisl ipsum ante arcu, convallis leo dapibus tempor sagittis fames ultricies purus imperdiet, himenaeos facilisis condimentum varius porttitor dui eget pretium. Iaculis potenti placerat leo donec aliquet dictumst finibus natoque id cubilia dictum ac convallis, at ultricies dignissim augue consectetur integer ex conubia sit risus vestibulum est sapien, orci elementum pharetra blandit feugiat mi mollis dolor pretium justo fames nostra. Interdum sapien taciti purus velit dapibus potenti eleifend praesent, himenaeos aenean blandit magna habitant odio rhoncus vehicula, per dictum orci torquent tortor morbi neque. Libero gravida suspendisse pulvinar euismod praesent, scelerisque sapien dolor tempor litora, felis neque odio lectus. Facilisis quam vehicula nisl hac semper cursus platea aliquet dictum donec, malesuada maximus rutrum conubia sodales justo pharetra pretium cubilia ullamcorper torquent, bibendum praesent urna rhoncus quis fusce tellus magnis phasellus. Condimentum commodo ex euismod inceptos eget lorem donec potenti eros congue torquent ullamcorper libero dictum, egestas aliquet nisl fusce penatibus auctor justo proin risus facilisis mollis volutpat ante.
12+
13+
Velit facilisi maximus enim sodales magnis parturient justo curae efficitur, semper accumsan proin dignissim hac ac tempus nascetur, ullamcorper auctor mus diam dictumst ipsum neque sagittis. Ultrices facilisis dui cursus suspendisse rhoncus, massa gravida fames mauris feugiat inceptos, donec aliquet blandit tristique. Lacus mi ligula habitant arcu leo, volutpat platea feugiat mauris phasellus, viverra posuere finibus aliquam. Potenti morbi accumsan augue conubia penatibus cursus dapibus mollis egestas at laoreet, velit litora curabitur dolor porta duis justo donec odio eros, dis ipsum luctus sagittis nibh turpis pulvinar enim facilisis nisl. Libero integer dictum augue morbi tellus commodo pharetra, parturient diam natoque hendrerit taciti sem quis, nullam eros non metus proin fermentum. Pulvinar sodales sagittis lectus ex aenean mauris, fringilla amet semper tincidunt et, consectetur morbi eu nibh commodo. Arcu taciti vehicula netus imperdiet eget, gravida aptent vivamus dolor montes, non fames platea sociosqu.
14+
15+
Massa elit lacinia et etiam convallis sodales lectus, turpis sollicitudin magnis libero mus eget proin, aptent efficitur duis dictum justo quis. Volutpat scelerisque ullamcorper diam bibendum class auctor torquent est augue potenti, orci semper cras non cubilia quis vel ridiculus quisque risus rhoncus, vulputate ac dignissim facilisi habitant sapien rutrum sed suscipit. Consectetur at praesent metus purus dictumst nam neque potenti mus, nec eleifend dis sodales quisque ullamcorper et justo nunc, nulla volutpat turpis vulputate risus sollicitudin quam elit. Quisque magna proin molestie ex sollicitudin faucibus fermentum metus, blandit ligula dignissim eleifend tellus odio aliquet cubilia, euismod ut pellentesque neque gravida sagittis maximus.
16+
17+
Volutpat neque velit etiam nostra cras ultrices penatibus quam netus, diam aenean phasellus hac vehicula habitant consectetur urna, et posuere blandit sem ligula fringilla eu ullamcorper. Fames nulla fermentum ac litora nunc cursus nostra suscipit condimentum cubilia, donec ligula imperdiet ex rutrum mattis at diam arcu accumsan dictum, aptent id metus auctor ullamcorper orci per magnis bibendum. Inceptos vulputate dui sollicitudin sodales vel, praesent elit felis bibendum tristique aenean, gravida ultrices nibh torquent. Vitae metus pharetra a odio eros magnis vel vestibulum inceptos, scelerisque tortor efficitur dictumst mus lorem nam blandit litora egestas, nullam orci class sollicitudin erat fermentum id curabitur. Himenaeos accumsan magnis vivamus vestibulum, eleifend turpis dis nam aliquet, magna erat sed. Accumsan phasellus adipiscing arcu molestie urna etiam non risus leo natoque, facilisi mauris at porta nibh ac ipsum eget efficitur lorem luctus, torquent conubia magna congue aliquet sociosqu lacus ultricies ridiculus. Vestibulum natoque erat convallis bibendum netus non tincidunt, varius hendrerit dis venenatis posuere iaculis nec, massa euismod fusce praesent ex blandit. Vel magna lorem habitasse fermentum iaculis ultricies lacus class, viverra enim sodales consectetur cursus sagittis vulputate phasellus, nisl leo ex primis ad facilisis finibus.
18+
19+
Cubilia porttitor habitasse quam vulputate hac aptent fames vestibulum class luctus, nascetur nisi sem efficitur tincidunt nulla tristique urna faucibus. Aliquet lacinia volutpat nascetur per eleifend cursus dui vitae, tempus semper enim luctus elit malesuada mollis, inceptos natoque orci est integer quisque tincidunt. Senectus dictumst velit finibus sollicitudin mattis etiam dolor inceptos bibendum, rutrum lorem sapien integer morbi sit conubia auctor, nunc dis elit enim gravida tempor potenti suscipit. Suscipit amet ligula sociosqu potenti blandit elementum egestas at interdum ullamcorper ultricies, feugiat laoreet diam hac ultrices nunc fames nascetur fusce tempor sit volutpat, quisque phasellus rhoncus nostra congue praesent lectus urna curabitur aptent. Condimentum fames facilisi commodo sit tempus maecenas convallis dui erat enim senectus feugiat luctus phasellus justo elit nostra, proin rhoncus turpis sollicitudin vel praesent accumsan laoreet cursus nunc netus libero dolor nascetur habitant suspendisse.

‎tasks/delaydiscount/task.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const taskinfo = {
33
uniquestudyid: 'delaydiscount', // unique task id: must be IDENTICAL to directory name
44
desc: 'delay discounting task staircase with 6 delays', // brief description of task
55
condition: null, // experiment/task condition
6-
redirect_url: "delaydiscount/viz" // set to false if no redirection required
6+
redirect_url: "/tasks/delaydiscount/viz" // set to false if no redirection required
77
};
88

99
var info_ = create_info_(taskinfo); // initialize subject id and task parameters
@@ -52,7 +52,7 @@ jsPsych.data.addProperties({
5252

5353
// create experiment timeline
5454
var timeline = [];
55-
const html_path = "../tasks/delaydiscount/consent.html";
55+
const html_path = "../../tasks/delaydiscount/consent.html";
5656
timeline = create_consent(timeline, html_path);
5757

5858
var instructions = {

0 commit comments

Comments
 (0)
Please sign in to comment.