Commit Graph

1006 Commits

Author SHA1 Message Date
Ramon Wenger 7c9d425a5e Clean up code 2020-03-12 18:06:05 +01:00
Ramon Wenger a00206499b Close sidebar on click outside of it 2020-03-11 17:54:47 +01:00
Ramon Wenger c1341a8ac9 Fix iOS bug 2020-03-11 16:02:57 +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 9c7e4c92ca Add margin bottom to infogram blocks 2020-03-11 11:13:15 +01:00
Ramon Wenger 7837bc930e Fix some minor issues 2020-03-10 23:08:18 +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 63a1a24847 Fix Beta Login 2020-03-09 16:41:17 +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 985ccd0e62 Refactor simple list styling, also some other style polishing 2020-03-08 11:51:56 +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 4a3d08203d Enable adding previous members to school classes 2020-03-05 16:18:30 +01:00
Ramon Wenger b82b82369c Add mutation to remove member from class 2020-03-05 15:14:26 +01:00
Ramon Wenger a99a073460 Distinguish between active and inactive users in class list 2020-03-04 16:57:15 +01:00
Ramon Wenger ad8409f783 Fix a visual bug with the sidebar 2020-03-04 16:56:34 +01:00
Ramon Wenger b3457502d9 Change class list to display only currently selected class 2020-03-02 18:38:36 +01:00
Ramon Wenger 0ac0f3d610 Fix cypress test 2020-02-27 16:59:00 +01:00
Ramon Wenger 58d5e47158 Remove superfluous links from mobile navigation 2020-02-27 16:11:02 +01:00
Ramon Wenger 82aa0f5bd4 Fix clip path in avatar 2020-02-27 16:06:11 +01:00
Christian Cueni 1d7ca9f612 Fix more tests 🤪 2020-02-27 16:03:22 +01:00
Ramon Wenger ba1f518816 Update mobile navigation styling 2020-02-27 15:44:32 +01:00
Christian Cueni d91e0fbb37 Update registration tests 2020-02-27 15:05:45 +01:00
Ramon Wenger 9d45d5d360 Close sidebar when clicking on class list link 2020-02-27 14:24:28 +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 f08c6bf807 Remove change password spec 2020-02-27 14:00:57 +01:00
Christian Cueni ca90f32e03 Fix cypress tests 2020-02-27 13:37:32 +01:00
Christian Cueni 59f650891c Remove change password test 2020-02-27 11:37:24 +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 162615ce5c Remove password change form 2020-02-26 18:36:31 +01:00
Ramon Wenger 5054f21bc9 Update wording 2020-02-26 16:01:26 +01:00
Ramon Wenger 1c71c24ea0 Change redirect for new student, also add new test 2020-02-26 12:48:30 +01:00
Ramon Wenger e869cc8829 Add mixin for `me` query 2020-02-26 12:48:07 +01:00
Ramon Wenger dccbf2ae1a Fix cypress test 2020-02-26 12:47:33 +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
Christian Cueni 3d63a7933d Rename local login url 2020-02-25 16:22:27 +01:00
Ramon Wenger ee78a3229f Refactor mixins 2020-02-25 15:46:11 +01:00
Ramon Wenger 4f7a2cdc2f Move class selection to sidebar, refactor it in the process 2020-02-25 15:46:11 +01:00
Christian Cueni b572523a33 Add proxy for registration call 2020-02-25 14:42:42 +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
Ramon Wenger ca97a15398 Merge branch 'hotfix/postgres-pipelines' into feature/multiple-classes-for-everyone 2020-02-24 16:11:25 +01:00
Christian Cueni a481989348 Add footer 2020-02-24 15:17:11 +01:00
Christian Cueni a28c462a1e Merge branch 'hotfix/postgres-pipelines' into feature/licensing 2020-02-24 11:32:18 +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 c93d2f6843 Remove hep id as default 2020-02-18 16:57:36 +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 f3bd38e819 Redirect users without license to coupon page 2020-02-18 13:48:45 +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
Ramon Wenger 878937257e Rename top navigation to content navigation 2020-02-18 10:22:56 +01:00
Christian Cueni 677d8dbf44 Fix login & tests 2020-02-18 10:05:07 +01:00
Ramon Wenger c0cbffecbc Add sidebar to the blank layout 2020-02-18 09:21:32 +01:00
Ramon Wenger 99ef303c4d Move logout link to sidebar 2020-02-18 09:21:15 +01:00
Ramon Wenger e96211803b Clean up code 2020-02-18 09:20:47 +01:00
Ramon Wenger ef4f8aefd3 Add user data to profile widget 2020-02-17 16:50:07 +01:00
Ramon Wenger 5b67ecfb8c Add profile edit link to sidebar 2020-02-17 16:20:53 +01:00
Ramon Wenger 2f00a98838 Add new default user avatar 2020-02-17 16:16:33 +01:00
Ramon Wenger bdd3705bff Update styling, clean up code 2020-02-17 16:16:13 +01:00
Ramon Wenger 879db2000b Toggle the new sidebar 2020-02-17 16:14:48 +01:00
Ramon Wenger 08b816f3fd Add sidebar 2020-02-17 16:13:48 +01:00
Christian Cueni 36c43bf4e1 Detect 402 in frontend, allow me query 2020-02-17 16:08:47 +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 97469ce419 Mock the backend for the cypress test 2020-02-12 21:01:26 +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 919c0aec18 Add loading message for spellcheck 2020-02-12 10:37:34 +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 12f3b2d9a7 Simplify the logic of visible content blocks for students 2020-02-10 09:27:43 +01:00
Ramon Wenger 542c7c6d84 Merged in feature/taskbase-spellcheck (pull request #45)
Feature/taskbase spellcheck

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2020-02-06 14:16:40 +00:00
Ramon Wenger d11d494fae Clean up code 2020-02-06 15:06:50 +01:00
Ramon Wenger 2e4ac4d265 Add empty property to instrument activity 2020-02-05 14:00:25 +01:00
Ramon Wenger 66842ac1d8 Add instruments to the my activity page 2020-02-05 11:35:04 +01:00
Ramon Wenger c4cacac1c7 Update schema, fix cypress test 2020-02-04 22:05:12 +01:00
Ramon Wenger e8ada8f372 Add styling for spell check and teacher feedback 2020-02-03 15:11:01 +01:00
Ramon Wenger 6948c6724f Reset corrections on input and on turn in 2020-02-03 15:06:43 +01:00
Ramon Wenger ec1d68dd51 Add sentence offset to spell check results
Without that property, the offset always just starts at the current
sentence, not the whole user input
2020-02-03 15:04:52 +01:00
Christian Cueni 113b1d8d9a Reset cache on logout, refactor logout 2020-01-22 08:43:01 +01:00
Ramon Wenger c9222adf60 Update cypress tests to mock the server 2020-01-20 17:14:20 +01:00
Ramon Wenger 2b9d14222d Fix order of corrections 2020-01-20 13:03:01 +01:00
Ramon Wenger bc9bf8cdec Remove modules from manual cache definition 2020-01-20 13:03:01 +01:00
Ramon Wenger 374186ed27 Re-add styling for highlights 2020-01-20 13:02:27 +01:00
Ramon Wenger cdb2570203 Add schema file, also add instructions to readme 2020-01-20 13:02:27 +01:00
Ramon Wenger cfde20c67c Add spell check component 2020-01-20 13:01:47 +01:00
Ramon Wenger ff7a6b93b3 Add first implementation of a test with mocked GraphQL calls 2020-01-20 13:01:47 +01:00
Ramon Wenger 9ee3dc48b5 Add login via GraphQL to cypress commands 2020-01-20 13:01:00 +01:00
Ramon Wenger 7f71977523 Add initial frontend implementation for spell checks 2020-01-20 13:01:00 +01:00
Ramon Wenger a195492ece Temporarily disable problematic test 2020-01-20 11:06:51 +01:00
Ramon Wenger 6c8628f56f Prevent apollo client from throwing errors on 302 response 2020-01-20 10:38:29 +01:00
Ramon Wenger 013b020f68 Upgrade cypress version 2020-01-16 17:48:25 +01:00
Ramon Wenger 68c5375bab Add test to check solution display in surveys 2020-01-16 16:36:27 +01:00
Ramon Wenger 6b8b520bc5 Add test to check solution display in surveys 2020-01-16 16:07:00 +01:00
Ramon Wenger 00b2b02113 Use slug to identify module when toggling solutions 2020-01-16 15:49:50 +01:00
Ramon Wenger ea95efc23f Make test fail when it should fail 2020-01-16 15:49:14 +01:00
Ramon Wenger 8c908fddd2 Use slug to identify modules for the bookmark mutation 2020-01-16 15:03:50 +01:00
Ramon Wenger e92412cf21 Clean up code 2020-01-16 14:10:16 +01:00
Ramon Wenger d4d2e9934e Add note to instruments 2020-01-16 10:45:36 +01:00
Ramon Wenger 5200d2165d Use slug to identify instruments on client 2020-01-16 10:44:37 +01:00
Ramon Wenger 35cdd5ff5f Remove superfluous query file 2020-01-13 19:48:46 +01:00
Ramon Wenger 2b40f81764 Add bookmark actions to instrument, implement instrument bookmark 2020-01-08 15:00:40 +01:00
Ramon Wenger 8765de9603 Add instrument query by id 2020-01-08 14:58:07 +01:00
Ramon Wenger 01ab01a9e9 Add instruments to local cache 2020-01-08 14:56:07 +01:00
Ramon Wenger 27b068e9ef Add news item 2019-12-24 22:23:58 +01:00
Ramon Wenger a75ae4f3fc Add top border to my activities 2019-12-19 14:19:42 +01:00
Ramon Wenger 32ae0b0641 Add filter for my activity 2019-12-19 14:19:20 +01:00
Ramon Wenger 74c74c1eca Add missing block type in my activities 2019-12-19 11:38:15 +01:00
Ramon Wenger 7237b86ac0 Refactor code 2019-12-19 11:38:07 +01:00
Ramon Wenger a76b27bf0b Fix margin on link block in my activities 2019-12-19 11:37:31 +01:00
Ramon Wenger de5882f644 Add anchor for notes 2019-12-19 11:36:29 +01:00
Ramon Wenger 64db0487ca Refresh my activities periodically 2019-12-19 11:35:47 +01:00
Ramon Wenger ddf3bde076 Add clickable link to my activities 2019-12-19 11:34:20 +01:00
Ramon Wenger 9fb8e13c1c Enable scrolling to the content blocks in a module 2019-12-18 16:28:24 +01:00
Ramon Wenger 65a09fb9c7 Use the GQL cache for local state 2019-12-18 16:23:33 +01:00
Ramon Wenger 54a6a2a702 Update package versions 2019-12-18 16:16:32 +01:00
Ramon Wenger a713048b86 Add styling for module activity entries 2019-12-18 13:18:42 +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
Ramon Wenger 388c1f63d7 Merged in feature/bookmarks-for-modules-and-chapters (pull request #42)
Feature/bookmarks for modules and chapters
2019-12-10 14:09:13 +00:00
Ramon Wenger dab5d907f3 Update mobile navigation styling 2019-12-10 14:11:14 +01:00
Ramon Wenger 84bcfdc7cf Add comments 2019-12-09 15:44:50 +01:00
Ramon Wenger d400b2f61c Add todo 2019-12-09 15:29:07 +01:00
Ramon Wenger c2ead4c78d Add cypress test 2019-12-09 15:18:47 +01:00