Compare commits

..

145 Commits

Author SHA1 Message Date
d9f967811f Finesse log in form css 2021-12-07 12:39:29 +00:00
6fb8b62e5b Finessed remaining block question counter 2021-12-07 12:27:06 +00:00
79073f3d92 Correcting an error 2021-12-07 07:24:39 +00:00
b9a83a436e Finesse cookie dismiss button 2021-12-07 07:22:11 +00:00
706ba8409e Finesse cookie consent display 2021-12-07 07:09:28 +00:00
103093c886 removed fake link 2021-12-07 07:04:58 +00:00
89e8267a29 Fixed subject-verb disagreement 2021-12-07 07:00:44 +00:00
c85fa69713 Merge branch 'master' of https://git.vsnt.uk/viveksantayana/ska-referee-test 2021-12-07 06:55:50 +00:00
9bdff0d729 Technical issues help email 2021-12-07 06:46:34 +00:00
f867022207 Remove personal data from document 2021-12-07 06:42:46 +00:00
b151de39df Removed email address 2021-12-07 06:40:57 +00:00
80391229a3 Merge branch 'master' of ssh://git.vsnt.uk:2222/viveksantayana/ska-referee-test
Sync
2021-12-07 06:38:54 +00:00
23ddf6601b Started drafting documentation 2021-12-07 06:38:43 +00:00
a5f8cba71b Better precision in expiring quizzes 2021-12-07 00:08:01 +00:00
58f40e221f Better precision in expiring quizzes 2021-12-07 00:08:01 +00:00
973bafcdb2 Updated test expiry 2021-12-06 23:37:16 +00:00
220a378c63 Updated test expiry 2021-12-06 23:37:16 +00:00
d3f116e1ca Corrected bug in exam display 2021-12-06 23:24:57 +00:00
e2a0bc7b4e Corrected bug in exam display 2021-12-06 23:24:57 +00:00
0f1f79e237 I am bad at debugging. 2021-12-06 23:19:13 +00:00
ed6360e7a3 I am bad at debugging. 2021-12-06 23:19:13 +00:00
045f3aec0a Close Quiz function 2021-12-06 23:16:33 +00:00
6d931bdf6c Close Quiz function 2021-12-06 23:16:33 +00:00
8749c6e590 Remove redundant file 2021-12-06 22:54:40 +00:00
bac083411c Remove redundant file 2021-12-06 22:54:40 +00:00
920287b7ae Merge branch 'master' of ssh://git.vsnt.uk:2222/viveksantayana/ska-referee-test 2021-12-06 22:54:02 +00:00
e9a5e72959 Merge branch 'master' of ssh://git.vsnt.uk:2222/viveksantayana/ska-referee-test 2021-12-06 22:54:02 +00:00
00fb8e13fe This fixes it, hopefully 2021-12-06 22:47:54 +00:00
c462b76cb7 This fixes it, hopefully 2021-12-06 22:47:54 +00:00
57e5a21ffa And again 2021-12-06 22:26:48 +00:00
e935524552 And again 2021-12-06 22:26:48 +00:00
8d2a84a071 Trying to fix it again 2021-12-06 22:24:34 +00:00
f61c12afd1 Trying to fix it again 2021-12-06 22:24:34 +00:00
1b2209d97c I am really bad at fixing bugs 2021-12-06 22:20:27 +00:00
9e4e874401 I am really bad at fixing bugs 2021-12-06 22:20:27 +00:00
a2e05d39e6 More Bug Fixes 2021-12-06 22:17:52 +00:00
7150e679c8 More Bug Fixes 2021-12-06 22:17:52 +00:00
cdd35117bf Bugfix: lack of submission time in detailed result 2021-12-06 22:11:16 +00:00
19521c3f23 Bugfix: lack of submission time in detailed result 2021-12-06 22:11:16 +00:00
fa43ab1879 OG Meta and navbar bug fix 2021-12-06 21:58:51 +00:00
9a5f073170 OG Meta and navbar bug fix 2021-12-06 21:58:51 +00:00
d2cd8316da Merge branch 'master' of https://git.vsnt.uk/viveksantayana/ska-referee-test 2021-12-06 21:53:00 +00:00
de969e0028 Merge branch 'master' of https://git.vsnt.uk/viveksantayana/ska-referee-test 2021-12-06 21:53:00 +00:00
2472323103 OG and Cookie settings 2021-12-06 21:51:29 +00:00
5fad0cda1e OG and Cookie settings 2021-12-06 21:51:29 +00:00
54653e82f2 Bugfixes: case sensitivity, percent sign rendering
Temporary work-around: disabled client navbar home link to prevent exit
2021-12-06 21:47:02 +00:00
cb39592bd3 Bugfixes: case sensitivity, percent sign rendering
Temporary work-around: disabled client navbar home link to prevent exit
2021-12-06 21:47:02 +00:00
cda7ac480f Proxy Fix 2021-12-06 20:10:27 +00:00
724ffbfdf4 Proxy Fix 2021-12-06 20:10:27 +00:00
Vivek Santayana
727779f054 Merge branch 'master' of https://git.vsnt.uk/viveksantayana/ska-referee-test
Fix config
2021-12-06 19:22:06 +00:00
Vivek Santayana
1edd25d3ea Merge branch 'master' of https://git.vsnt.uk/viveksantayana/ska-referee-test
Fix config
2021-12-06 19:22:06 +00:00
529ac35bdb Updated config 2021-12-06 19:21:45 +00:00
81b3e3a142 Updated config 2021-12-06 19:21:45 +00:00
Vivek Santayana
c8ccd002fa Merge branch 'master' of https://git.vsnt.uk/viveksantayana/ska-referee-test
Pull icons
2021-12-06 18:59:05 +00:00
Vivek Santayana
fc765c0177 Merge branch 'master' of https://git.vsnt.uk/viveksantayana/ska-referee-test
Pull icons
2021-12-06 18:59:05 +00:00
720de1f2de Favicons and OG Meta 2021-12-06 18:58:42 +00:00
7d90b6c7a2 Favicons and OG Meta 2021-12-06 18:58:42 +00:00
Vivek Santayana
14bc50165b Merge branch 'master' of https://git.vsnt.uk/viveksantayana/ska-referee-test
Download fonts and remove private files
2021-12-06 18:06:47 +00:00
Vivek Santayana
bcc9e9c609 Merge branch 'master' of https://git.vsnt.uk/viveksantayana/ska-referee-test
Download fonts and remove private files
2021-12-06 18:06:47 +00:00
13b7249f2a Uploading Fonts 2021-12-06 18:06:11 +00:00
73c00ac333 Uploading Fonts 2021-12-06 18:06:11 +00:00
Vivek Santayana
a7e3a5fe47 Merge branch 'master' of https://git.vsnt.uk/viveksantayana/ska-referee-test 2021-12-06 18:02:59 +00:00
Vivek Santayana
36334ef186 Merge branch 'master' of https://git.vsnt.uk/viveksantayana/ska-referee-test 2021-12-06 18:02:59 +00:00
9b34fb8f73 Correct error 2021-12-06 16:56:54 +00:00
1a290e3bd6 Correct error 2021-12-06 16:56:54 +00:00
3d03fb79a7 Added correct answer view 2021-12-06 13:44:40 +00:00
6db6baab50 Added correct answer view 2021-12-06 13:44:40 +00:00
41a7129959 Added individual result correct/incorrect flag 2021-12-06 13:42:26 +00:00
349dd030d6 Added individual result correct/incorrect flag 2021-12-06 13:42:26 +00:00
8cb4435517 Added Certbot and Nginx to Docker stack 2021-12-06 13:39:06 +00:00
ce31c3e691 Added Certbot and Nginx to Docker stack 2021-12-06 13:39:06 +00:00
1a20f1ec67 Nginx Server 2021-12-06 13:29:20 +00:00
f242413911 Nginx Server 2021-12-06 13:29:20 +00:00
db59e6c85c Dockerised. Restructured to remove circular import
Moved most of app definitions out of guard function to use wsgi
Updated configuration files and referencing of .env values.
Local version needs dotenv or exporting of env variables.
Dockerised version works fine without load_dotenv.
Ready to test now!
2021-12-05 03:49:31 +00:00
79c23471ee Dockerised. Restructured to remove circular import
Moved most of app definitions out of guard function to use wsgi
Updated configuration files and referencing of .env values.
Local version needs dotenv or exporting of env variables.
Dockerised version works fine without load_dotenv.
Ready to test now!
2021-12-05 03:49:31 +00:00
8d76ecb78a dockerise 2021-12-05 00:17:54 +00:00
c4f088f29c dockerise 2021-12-05 00:17:54 +00:00
0318ddbf21 Deleted redundant variable assignment 2021-12-04 21:29:15 +00:00
31d7e978f4 Deleted redundant variable assignment 2021-12-04 21:29:15 +00:00
486aeb86a2 Updated footer, added question counters. 2021-12-04 21:25:43 +00:00
77267f944b Updated footer, added question counters. 2021-12-04 21:25:43 +00:00
e313df57d6 Finished making dashboards 2021-12-04 20:47:43 +00:00
85efd755d8 Finished making dashboards 2021-12-04 20:47:43 +00:00
ecaa4fa95f Added question progress bar 2021-12-04 18:50:09 +00:00
fdb5cc1cf9 Added question progress bar 2021-12-04 18:50:09 +00:00
6331dda37b Added custom 404 display and login redirect 2021-12-04 17:40:01 +00:00
727fc2d8c0 Added custom 404 display and login redirect 2021-12-04 17:40:01 +00:00
8b2daf400a Completed client side time adjustment handling
Corrected error display bug
Removed redundant auth and models in quiz client app
2021-12-04 17:14:28 +00:00
93bf9e94fb Completed client side time adjustment handling
Corrected error display bug
Removed redundant auth and models in quiz client app
2021-12-04 17:14:28 +00:00
f97b2c7cbb Added server and admin-side time limit adjustments 2021-12-04 15:41:47 +00:00
cca01a6c2f Added server and admin-side time limit adjustments 2021-12-04 15:41:47 +00:00
56b3e6a2f5 Refactored form model for custom validators 2021-12-04 15:41:24 +00:00
4b603b70a0 Refactored form model for custom validators 2021-12-04 15:41:24 +00:00
121dd32bfb Typo correction 2021-12-04 12:48:01 +00:00
d890a45f2b Typo correction 2021-12-04 12:48:01 +00:00
9fac4ebd82 Added results CRUD and result detailed view 2021-12-04 12:20:03 +00:00
237aabf4ba Added results CRUD and result detailed view 2021-12-04 12:20:03 +00:00
4d734dbbe8 Streamlined post form handlers for admin console 2021-12-01 08:26:08 +00:00
e69f60d813 Streamlined post form handlers for admin console 2021-12-01 08:26:08 +00:00
a0fc1653e7 Added footer text to quiz site. 2021-12-01 01:00:53 +00:00
cf82a85070 Added footer text to quiz site. 2021-12-01 01:00:53 +00:00
4da20115d2 Added result page. 2021-12-01 00:48:47 +00:00
7e65416f80 Added result page. 2021-12-01 00:48:47 +00:00
d1cf44fd18 Finessing of client. 2021-12-01 00:48:38 +00:00
61ac4c1cb0 Finessing of client. 2021-12-01 00:48:38 +00:00
19054a9c67 Finessing display on index and instruction pages 2021-12-01 00:48:05 +00:00
e326729ddb Finessing display on index and instruction pages 2021-12-01 00:48:05 +00:00
fb19b12e7f Set timer to be hidden by default
Swapped default behaviour of timer around.
2021-12-01 00:47:19 +00:00
8a2d81ec23 Set timer to be hidden by default
Swapped default behaviour of timer around.
2021-12-01 00:47:19 +00:00
51f40311e0 Added text to index and instruction pages. 2021-12-01 00:46:41 +00:00
779b06b4bf Added text to index and instruction pages. 2021-12-01 00:46:41 +00:00
f49b2f7df1 Added automated email notification of results. 2021-12-01 00:46:21 +00:00
a4a3b6de1b Added automated email notification of results. 2021-12-01 00:46:21 +00:00
636c1fdadb Corrected missing assignment of variable 2021-12-01 00:45:56 +00:00
e7ca3ac0d7 Corrected missing assignment of variable 2021-12-01 00:45:56 +00:00
6495904cf1 Corrected doubled import 2021-12-01 00:45:20 +00:00
594354e459 Corrected doubled import 2021-12-01 00:45:20 +00:00
6f57a4b24c Exam Code Time Controls 2021-11-30 18:16:52 +00:00
2e5c87f0b1 Exam Code Time Controls 2021-11-30 18:16:52 +00:00
1f4848cc83 Finished client result API.
Need to work on adjustment user codes and server email notifications.
2021-11-30 18:06:24 +00:00
71b39d467d Finished client result API.
Need to work on adjustment user codes and server email notifications.
2021-11-30 18:06:24 +00:00
dc0e3bf11c Built client interface 2021-11-30 03:11:28 +00:00
2bd07bf598 Built client interface 2021-11-30 03:11:28 +00:00
9e9ceab81f Added CSRF protection to all ajax requests 2021-11-29 09:13:21 +00:00
7c325e7c9e Added CSRF protection to all ajax requests 2021-11-29 09:13:21 +00:00
6285014938 Added question generating API 2021-11-28 18:17:50 +00:00
3cedfcaeaf Added question generating API 2021-11-28 18:17:50 +00:00
fdc68079dc Added functionality for default datasets.
Incorporated dataset selector into test creation.
2021-11-28 17:28:14 +00:00
3797adfc95 Added functionality for default datasets.
Incorporated dataset selector into test creation.
2021-11-28 17:28:14 +00:00
53cc25b4ce Finished data upload
Refactored to move security package inside common
Moved data folder to process root.
2021-11-28 02:30:46 +00:00
c7252d0f7b Finished data upload
Refactored to move security package inside common
Moved data folder to process root.
2021-11-28 02:30:46 +00:00
0fff71b1fb Refactor to have all models in the models package. 2021-11-25 23:21:48 +00:00
408aa965fd Refactor to have all models in the models package. 2021-11-25 23:21:48 +00:00
52019e61c1 Quiz registration form 2021-11-25 23:12:20 +00:00
c745e3c27c Quiz registration form 2021-11-25 23:12:20 +00:00
9b1d8fca71 Finished delete and data table fiew for tests 2021-11-25 20:12:50 +00:00
2d0bb883bd Finished delete and data table fiew for tests 2021-11-25 20:12:50 +00:00
d6d809a60e Working version of test tables 2021-11-25 10:34:01 +00:00
c0d79d1bc7 Working version of test tables 2021-11-25 10:34:01 +00:00
610b6a5766 Building new test form
Added CRUD for tests
2021-11-24 17:17:56 +00:00
a862a0f03a Building new test form
Added CRUD for tests
2021-11-24 17:17:56 +00:00
f2943e4bc1 Deleted user views registration 2021-11-23 14:53:58 +00:00
9f198ed133 Deleted user views registration 2021-11-23 14:53:58 +00:00
43b5973dbe Finished most of admin console
Basic CRUD operations for managing registered admin users
Encrypted personal information
Still missing sections on managing tests and results
Also missing dashboards/index/category landing pages
2021-11-23 13:00:03 +00:00
0002c15e94 Finished most of admin console
Basic CRUD operations for managing registered admin users
Encrypted personal information
Still missing sections on managing tests and results
Also missing dashboards/index/category landing pages
2021-11-23 13:00:03 +00:00

View File

@ -1,78 +0,0 @@
version: '3.9'
services:
ref_test_server:
container_name: ref_test_server
image: nginx:1.21.4-alpine
volumes:
- ./certbot:/etc/letsencrypt:ro
- ./nginx:/etc/nginx
- ./src/html:/usr/share/nginx/html/
- ./ref-test/admin/static:/usr/share/nginx/html/admin/static
- ./ref-test/quiz/static:/usr/share/nginx/html/quiz/static
ports:
- 80:80
- 443:443
restart: unless-stopped
networks:
- frontend
depends_on:
- ref_test_app
ref_test_app:
container_name: ref_test_app
build: ./ref-test
volumes:
- ./ref-test:/ref-test
env_file:
- ./.env
ports:
- 5000
restart: unless-stopped
networks:
- frontend
- backend
depends_on:
- ref_test_db
- ref_test_postfix
ref_test_db:
container_name: ref_test_db
image: mongo:5.0.4-focal
restart: unless-stopped
volumes:
- ./database/data:/data
- ./database/initdb.d/:/docker-entrypoint-initdb.d/
env_file:
- ./.env
ports:
- 27017
networks:
- backend
ref_test_postfix:
container_name: ref_test_postfix
image: catatnight/postfix:latest
restart: unless-stopped
env_file:
- ./.env
ports:
- 25
networks:
- backend
ref_test_certbot:
container_name: ref_test_certbot
image: certbot/certbot:v1.21.0
volumes:
- ./certbot:/etc/letsencrypt
- ./src/html:/var/www/html
depends_on:
- ref_test_server
# command: certonly --webroot --webroot-path=/var/www/html --email vsdomainmanager@gmail.com --agree-tos --no-eff-email -d reftest.vsnt.uk
networks:
frontend:
external: false
backend:
external: false