Commit Graph

433 Commits

Author SHA1 Message Date
Ramon Wenger c1ac3e779f Add instructions to client 2020-04-10 21:28:39 +02:00
Ramon Wenger 2f6b66112c Add additional editor plugins for instrument WYSIWYG editor 2020-04-06 13:31:40 +02:00
Ramon Wenger e26c4b7093 Hide solutions on completed survey 2020-03-25 15:48:25 +01:00
Ramon Wenger 32e3c6067b Move modal to plugin 2020-03-25 12:58:53 +01:00
Ramon Wenger 4173fe70ab Add confirmation modal when deactivating users in school class 2020-03-24 16:16:13 +01:00
Ramon Wenger 4bd2c9c065 Add page to display the class code 2020-03-20 22:49:51 +01:00
Ramon Wenger 950fe9c60e Add "create class" view 2020-03-20 10:14:55 +01:00
Christian Cueni 0e52ab6f49 Clean up code 2020-03-17 14:20:06 +01:00
Christian Cueni 9617a1ee88 Revert "Use GraphQL for email available"
This reverts commit 24cccbf053.
2020-03-17 13:29:40 +01:00
Christian Cueni 24cccbf053 Use GraphQL for email available 2020-03-16 16:50:19 +01:00
Ramon Wenger 611a066c65 Add button to change the school class name 2020-03-14 11:27:16 +01:00
Ramon Wenger 8d5e9845e4 Fix cypress test 2020-03-11 13:44:40 +01:00
Ramon Wenger 3368d03ede Merge branch 'hotfix/news-entry' into develop 2020-03-11 11:47:51 +01:00
Ramon Wenger 24b66bbf9e Add new news entry 2020-03-11 11:47:02 +01:00
Ramon Wenger e6f852fdc4 Clean up code 2020-03-10 15:35:55 +01:00
Ramon Wenger 394469d773 Add new cypress test and fix old ones 2020-03-10 10:16:30 +01:00
Christian Cueni 5d614dd7e5 Fix minor issues 2020-03-09 16:22:56 +01:00
Christian Cueni e5b0fe539f Rename LocalLogin -> BetaLogin 2020-03-09 15:47:50 +01:00
Ramon Wenger 442bab19bc Add unit test for old classes query 2020-03-09 15:34:09 +01:00
Christian Cueni 59d5376f60 Handle native GraphQLErrors 2020-03-09 14:53:00 +01:00
Ramon Wenger 229c6b4d8b Add old classes view 2020-03-08 11:57:42 +01:00
Ramon Wenger f4270b8243 Remove actions in class list for students 2020-03-05 16:41:07 +01:00
Ramon Wenger 9dab0856e8 Remove and add members in client 2020-03-05 16:20:57 +01:00
Ramon Wenger a99a073460 Distinguish between active and inactive users in class list 2020-03-04 16:57:15 +01:00
Ramon Wenger b3457502d9 Change class list to display only currently selected class 2020-03-02 18:38:36 +01:00
Ramon Wenger fffbc47fde Change profile layout 2020-02-27 14:21:56 +01:00
Ramon Wenger c8449e7fe9 Fix some IE 10 issues 2020-02-27 14:01:13 +01:00
Christian Cueni d95e8ca492 Merge branch 'develop' into feature/licensing
# Conflicts:
#	Pipfile.lock
#	client/cypress/fixtures/schema.json
#	client/src/graphql/client.js
#	client/src/graphql/resolvers.js
#	client/src/graphql/typedefs.js
#	client/src/main.js
#	client/src/router/index.js
#	server/users/models.py
2020-02-27 10:29:24 +01:00
Christian Cueni 8f9750ebe8 Style beta login pages 2020-02-27 09:10:25 +01:00
Ramon Wenger 5054f21bc9 Update wording 2020-02-26 16:01:26 +01:00
Ramon Wenger 0ffe77b745 Add more data properties 2020-02-26 12:47:20 +01:00
Christian Cueni 5e77ee0cee Fix helloEmail, make linter happy 2020-02-26 12:44:41 +01:00
Ramon Wenger ee78a3229f Refactor mixins 2020-02-25 15:46:11 +01:00
Ramon Wenger a7413c6ce0 Merged in feature/multiple-classes-for-everyone (pull request #46)
Feature/multiple classes for everyone

Approved-by: Christian Cueni
2020-02-25 08:42:21 +00:00
Ramon Wenger 2e1d7b46bc Add error message and add styling 2020-02-24 18:32:55 +01:00
Ramon Wenger a59733b2f1 Add redirect after joining class 2020-02-24 16:23:55 +01:00
Christian Cueni f8fab82851 Finish coupon flow 2020-02-24 11:30:37 +01:00
Christian Cueni 1152f1fd95 Add forgot password page, add cancel button to login 2020-02-20 11:24:10 +01:00
Christian Cueni e9713c736b Redirect to hello, add redirect query param 2020-02-18 16:32:12 +01:00
Christian Cueni e067717d50 Fix local login 2020-02-18 16:01:20 +01:00
Christian Cueni 3c72c9559e Split token and local login 2020-02-18 14:36:49 +01:00
Christian Cueni 42d16caafc Allow coupon calls 2020-02-18 14:10:04 +01:00
Christian Cueni 26a342c5a5 Fix license verification flow 2020-02-18 13:32:17 +01:00
Ramon Wenger fb65e23f3d Update news links on start page 2020-02-18 10:24:17 +01:00
Christian Cueni 677d8dbf44 Fix login & tests 2020-02-18 10:05:07 +01:00
Christian Cueni c9c42e2296 Check user license in Api, save 2020-02-17 15:08:06 +01:00
Ramon Wenger d22a77e513 Update styling on join class page 2020-02-13 15:51:50 +01:00
Christian Cueni d5276d5adc Update and test front end email verification 2020-02-13 12:42:17 +01:00
Christian Cueni 909f7337ac Fix email verification for stage 2020-02-13 11:28:23 +01:00
Christian Cueni 82c1135f0e Add coupon call in frontend, add tests, fix api 2020-02-13 10:03:00 +01:00
Ramon Wenger 76fa510053 Update local school class cache after joining a class 2020-02-12 20:28:46 +01:00
Christian Cueni f5ddff12e3 Add email verification tests 2020-02-12 15:49:56 +01:00
Christian Cueni 6509b31ab5 Add registration tests 2020-02-12 13:37:36 +01:00
Ramon Wenger a4a5e37268 Add code to school class, add form and mutation to join class 2020-02-12 10:17:31 +01:00
Christian Cueni dd272757bf Add login tests 2020-02-11 16:47:21 +01:00
Christian Cueni 0922c5d198 Fix local signup, style header 2020-02-11 14:44:57 +01:00
Christian Cueni b36ba5f9a1 Add email verifcation page 2020-02-11 14:44:14 +01:00
Christian Cueni a0eeec4e18 Add extra fields to registration, remove unused fields 2020-02-11 14:44:14 +01:00
Christian Cueni 587d661ca8 Add hello page, add local mutation 2020-02-11 14:42:58 +01:00
Christian Cueni 1d50287dbf Add basic registration flow 2020-02-11 14:41:55 +01:00
Ramon Wenger 6688cedd7c Add initial cypress test for students to join classes 2020-02-10 15:42:22 +01:00
Ramon Wenger 66842ac1d8 Add instruments to the my activity page 2020-02-05 11:35:04 +01:00
Christian Cueni 113b1d8d9a Reset cache on logout, refactor logout 2020-01-22 08:43:01 +01:00
Ramon Wenger 5200d2165d Use slug to identify instruments on client 2020-01-16 10:44:37 +01:00
Ramon Wenger 2b40f81764 Add bookmark actions to instrument, implement instrument bookmark 2020-01-08 15:00:40 +01:00
Ramon Wenger 27b068e9ef Add news item 2019-12-24 22:23:58 +01:00
Ramon Wenger 32ae0b0641 Add filter for my activity 2019-12-19 14:19:20 +01:00
Ramon Wenger 64db0487ca Refresh my activities periodically 2019-12-19 11:35:47 +01:00
Ramon Wenger 9fb8e13c1c Enable scrolling to the content blocks in a module 2019-12-18 16:28:24 +01:00
Ramon Wenger b132e320af Fix scrolling to assignments 2019-12-18 13:18:17 +01:00
Ramon Wenger cb13aa1ea5 Update my activity in client 2019-12-18 13:17:08 +01:00
Ramon Wenger eba199dc60 Add more emojis! 2019-12-11 11:04:23 +01:00
Christian Cueni 92d03dbe50 Merged in feature/feedback (pull request #41)
Feature/feedback
2019-12-09 10:04:27 +00:00
Ramon Wenger 89e3925590 Change submissionfeedback to submission_feedback or submissionFeedback,
respectively
2019-12-09 10:30:49 +01:00
Christian Cueni 84a69b24f1 Incoorperate feedback 2019-12-02 17:12:19 +01:00
Ramon Wenger 2913796a1b Add Thinglink block to frontend views 2019-11-26 09:31:39 +01:00
Christian Cueni 7641e5dcaa Add logout button 2019-11-21 12:35:42 +01:00
Christian Cueni 735eae25e3 Handle submissions with no feedback 2019-11-19 15:32:13 +01:00
Christian Cueni 3e606073e2 Refactor emojis 2019-11-19 12:59:18 +01:00
Christian Cueni 066f5259ce Refactor submission form 2019-11-19 10:25:24 +01:00
Christian Cueni d0b8ca7ac7 Style final an non-final feedbacks 2019-11-18 16:35:06 +01:00
Christian Cueni 714cb713b1 Style submission page 2019-11-18 15:31:42 +01:00
Christian Cueni 6bdce35f7f Style submissions page 2019-11-18 15:15:25 +01:00
Christian Cueni 662071d066 Handle form updates 2019-11-18 13:46:27 +01:00
Christian Cueni a2af5759bb Add emojis 2019-11-18 11:12:09 +01:00
Christian Cueni 6b739034de Refactor feedback form and final submission 2019-11-14 14:36:20 +01:00
Christian Cueni d3a81e17d8 Add Feedback container component 2019-11-14 11:11:58 +01:00
Christian Cueni ad07ada2f2 Add feedback to submission view, style view 2019-11-13 19:25:24 +01:00
Christian Cueni 4965eb5fa1 Add login link to registration 2019-11-12 10:49:09 +01:00
Christian Cueni e2f5c0b3f0 Fix copy, fix styles on server 2019-11-11 18:19:35 +01:00
Christian Cueni 193c1d39b5 Style no class page, change admin display 2019-11-11 18:19:35 +01:00
Christian Cueni 06dbf20094 Add no-class page & guard 2019-11-11 18:19:34 +01:00
Christian Cueni b20917d29a Validate license on login 2019-11-11 18:19:34 +01:00
Christian Cueni bceb01c5f4 Add and update tests, add dummy data 2019-11-11 18:19:34 +01:00
Christian Cueni 148b2cae3d Init password reset after registration 2019-11-11 18:19:34 +01:00
Christian Cueni 836cd63cfd Style inputs, make registration page public 2019-11-11 18:19:34 +01:00
Christian Cueni f3ae0fec7e Display server errors 2019-11-11 18:19:34 +01:00
Christian Cueni 436a9b891f Add registration component 2019-11-11 18:19:34 +01:00
Christian Cueni 81d89dae9a Change css names, refactor login guard 2019-10-23 08:33:37 +02:00
Christian Cueni c396c34be2 Hide registration, redirect to correct page after reset, style reset 2019-10-08 10:14:57 +02:00
Christian Cueni 80b1d38b93 Style public pages, add links to login page 2019-10-08 09:30:00 +02:00
Christian Cueni a1954e00c5 Update integration tests 2019-10-08 09:30:00 +02:00
Christian Cueni 57224d228a Style default layout, style login 2019-10-08 09:30:00 +02:00
Christian Cueni 9783bd802a Redirect user to visited page after login 2019-10-08 09:30:00 +02:00
Christian Cueni 062269f030 Add loggedIn guard, add basic login component 2019-10-08 09:30:00 +02:00
Ramon Wenger 2c665399b6 Add survey save button text 2019-09-17 17:51:02 +02:00
Ramon Wenger 64bf100a19 Save user answers in surveys on page change 2019-09-17 10:12:28 +02:00
Ramon Wenger e940066db8 Display solutions for teachers always 2019-09-16 14:02:28 +02:00
Ramon Wenger 23936ec6ae Fix bug where surveys don't retain answers without reloading 2019-09-12 09:08:16 +02:00
Ramon Wenger 4ae9c5813f Merged in feature/survey-with-correct-answer (pull request #34)
Feature/survey with correct answer

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2019-09-11 11:02:37 +00:00
Ramon Wenger 0a4269aaad Change news link to use SSL 2019-09-09 14:09:27 +02:00
Ramon Wenger e10b577ac1 Add solution visibility check to survey 2019-09-09 14:04:47 +02:00
Ramon Wenger 371c5cd276 Refactor code to be clearer 2019-09-09 11:07:45 +02:00
Ramon Wenger 8993f3f72b Add new news entry, re-enable news footer 2019-09-06 15:53:09 +02:00
Ramon Wenger aeab246aee Add solutions to survey 2019-09-05 15:22:01 +02:00
Ramon Wenger 65663491b0 Add rudimentary answer display to survey page 2019-09-04 15:18:37 +02:00
Christian Cueni 29a0ec5aef Hide news 2019-08-14 13:31:21 +02:00
Christian Cueni 2fa006d790 Rename block, update frontend 2019-08-14 11:52:44 +02:00
Christian Cueni 8c42daca7f Update copy, fix widget height 2019-08-13 11:25:38 +02:00
Ramon Wenger 99c39b1b69 Update and normalize meta title style 2019-07-31 15:31:27 +02:00
Ramon Wenger 4eea9c3a2c Normalize line height for headings 2019-07-31 14:03:39 +02:00
Ramon Wenger c577cc6c1a Update survey styling for 'completed' page 2019-07-31 10:59:30 +02:00
Christian Cueni deabbf328f Use UserMetaWidget 2019-07-25 11:43:51 +02:00
Christian Cueni 638bea0cd0 Use cache to propagate changes, add tests, style popover 2019-07-25 11:43:51 +02:00
Ramon Wenger 18b6079d26 Merged in feature/content-actions (pull request #29)
Feature/content actions

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2019-07-25 08:15:02 +00:00
Ramon Wenger fa72d8f5b8 Add button to reopen survey 2019-07-24 15:22:53 +02:00
Ramon Wenger a4cf7a0d62 Add toggle for module editing 2019-07-23 16:04:23 +02:00
Ramon Wenger 062d799c4c Set locale on survey 2019-07-23 11:14:02 +02:00
Ramon Wenger eda5653477 Always display survey title from JSON, never from model 2019-07-22 11:36:08 +02:00
Ramon Wenger a9b10fdf88 Add radiobutton styling to survey 2019-07-18 14:55:46 +02:00
Christian Cueni cc55dbdf69 Fix subtitle and genially blocks in instruments 2019-07-17 15:11:43 +02:00
Ramon Wenger dae832b98d Add navigation to and from instrument overview 2019-07-17 11:20:01 +02:00
Ramon Wenger cd6ff31cef Add instrument query to instrument overview 2019-07-17 09:54:34 +02:00
Ramon Wenger 2a4cf56825 Refactor some more occurences of basic knowledge to instrument 2019-07-17 09:54:34 +02:00
Ramon Wenger 98a8acac4f Refactor subnavigation and implement module subnavigation 2019-07-16 16:15:20 +02:00
Ramon Wenger 33a4f9e2c1 Merged in feature/new-assignment-design (pull request #21)
Feature/new assignment design

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2019-07-15 08:35:44 +00:00
Ramon Wenger c5fea80ab4 Add single button file upload 2019-07-11 16:19:06 +02:00
Christian Cueni 707909761e Change default set for rich text, add blocks 2019-07-11 10:49:54 +02:00
Christian Cueni 695a9a8ccb Change grayscale, add border 2019-07-11 10:41:55 +02:00
Ramon Wenger ca17ed42f7 Add property check to answer 2019-07-08 16:03:55 +02:00
Ramon Wenger a09bf2786d Save correct answer with answer given by user 2019-07-08 15:10:33 +02:00
Ramon Wenger 9dca627465 Merged in feature/surveyjs (pull request #17)
Feature/surveyjs
2019-07-04 11:31:12 +00:00
Ramon Wenger e296d500aa Clean up code 2019-07-04 10:24:12 +02:00
Ramon Wenger b498dc4efa Add cypress test for surveys 2019-07-01 13:08:42 +02:00
Ramon Wenger fbe39e2784 Add style guide 2019-06-27 17:56:49 +02:00
Ramon Wenger f9642ff49e Get survey from server and display it dynamically 2019-06-27 17:55:07 +02:00
Ramon Wenger 43da8adfa4 Change default topic 2019-06-24 16:07:42 +02:00
Ramon Wenger bad289ac3a Rename basic knowledge to instrument in frontend 2019-06-24 15:54:38 +02:00
Ramon Wenger 2494245b12 Add survey.js demo implementation to frontend 2019-06-20 14:51:09 +02:00
Ramon Wenger 590fd180c3 Move project and room actions to own component
Also adds those actions to the detail pages of both entity types. Also refactors some code.
2019-05-22 17:47:31 +02:00