Commit Graph

543 Commits

Author SHA1 Message Date
Ramon Wenger 19bcbaf168 Add team mutations and pages 2021-03-25 16:31:11 +01:00
Ramon Wenger d334370f3b Refactor some code, generalize some components 2021-03-25 16:29:12 +01:00
Ramon Wenger 45db4e3258 Remove unused query import 2021-03-25 00:16:45 +01:00
Ramon Wenger ea3a404ae7 Add new pages for joining and creating teams 2021-03-24 23:38:49 +01:00
Ramon Wenger 19b721388b Add my teams page 2021-03-24 18:51:29 +01:00
Ramon Wenger 728ac73821 Temporarily disable failing test 2021-03-24 09:56:14 +01:00
Ramon Wenger 8c9c27b9c4 Temporarily remove cache update of last module mutation 2021-03-24 09:46:35 +01:00
Ramon Wenger a3291de999 Merge branch 'hotfix/survey-progress-style' into develop 2021-03-18 14:22:47 +01:00
Ramon Wenger bfc2ccdf8e Fix surve progress bar styling
To prevent it from causing a linebreak
2021-03-18 14:21:57 +01:00
Ramon Wenger 81e5704fbe Add back-to-module link 2021-03-17 18:07:58 +01:00
Ramon Wenger bcff36b49f Add correct component for solution toggle 2021-03-15 23:07:40 +01:00
Ramon Wenger e4ffecfcac Remove unused imports 2021-03-15 13:09:48 +01:00
Ramon Wenger e4839df4db Fix cypress test 2021-03-14 21:49:28 +01:00
Ramon Wenger 244229e534 Use correct paths for refactored components 2021-03-12 14:27:24 +01:00
Ramon Wenger adf662533d Add more navigation buttons 2021-03-12 11:19:56 +01:00
Ramon Wenger 2e424198f0 Add settings button 2021-03-12 11:19:56 +01:00
Ramon Wenger 9490ffd443 Add module visibility sync mutation 2021-03-12 11:19:56 +01:00
Ramon Wenger 14022fa9eb Remove unused code 2021-03-12 11:19:56 +01:00
Ramon Wenger b3268a6299 Add settings pages 2021-03-12 11:19:56 +01:00
Ramon Wenger 271b517fdc Merge branch 'hotfix/deleted-survey-answers' into develop 2021-03-03 21:54:37 +01:00
Ramon Wenger ff5b2d28f6 Prevent answers being deleted when opening a completed survey 2021-03-03 21:53:40 +01:00
Ramon Wenger e82bd3fbfb Update build options 2021-03-03 11:46:21 +01:00
Ramon Wenger 16baba9423 Refactor some code 2021-02-18 18:15:19 +01:00
Ramon Wenger 1eec4e989b Merge branch 'hotfix/portfolio-width' into develop 2021-02-04 11:11:56 +01:00
Ramon Wenger b13ca43736 Fix portfolio width bug (again) 2021-02-04 11:11:27 +01:00
Ramon Wenger 763b643186 Merge branch 'feature/whitelabel' into develop 2021-02-03 14:31:02 +01:00
Ramon Wenger b5a5a9b921 Fix project entry width bug 2021-01-28 16:42:54 +01:00
Ramon Wenger 651cc1d67d Get page title from env variable 2021-01-25 17:48:20 +01:00
Ramon Wenger 1f973aa15f Disable portfolio based on env variable 2021-01-20 17:30:40 +01:00
Ramon Wenger 761ae312e2 Fix handling of visible solutions on survey page 2021-01-19 17:03:28 +01:00
Ramon Wenger 8f2e2ccb7d Remove unused query 2020-11-19 17:09:22 +01:00
Ramon Wenger c9735207c2 Fix student submission feedback bug on turning in 2020-11-19 13:51:34 +01:00
Ramon Wenger 532f788cc9 Fix cache miss 2020-11-17 16:23:43 +01:00
Ramon Wenger 5586f28250 Fix style issue on submissions page 2020-11-17 16:13:37 +01:00
Ramon Wenger ecec97a411 Fix vanishing text bug on submission feedback 2020-11-17 14:03:10 +01:00
Ramon Wenger 80382d6bb5 Add logout button to license activation page 2020-11-11 13:24:12 +01:00
Ramon Wenger 47b5d2e037 Fix student submission feedback bug 2020-11-05 09:59:53 +01:00
Ramon Wenger 0a9c1680de Update styling of survey answers 2020-10-20 10:27:34 +02:00
Ramon Wenger 7fb61d9f05 Update spacing of various text elements 2020-10-07 15:54:40 +02:00
Ramon Wenger e94573cd09 Format matrix solutions in a more readable way 2020-10-07 11:22:15 +02:00
Ramon Wenger efd1c7e8f7 Force correct order and newlines for matrix solutions 2020-10-05 15:07:16 +02:00
Ramon Wenger 76b14e3cc8 Add intro to instruments 2020-09-29 13:56:17 +02:00
Christian Cueni 5057e54e4d Merged in hotfix/typos (pull request #75)
Hotfix/typos
2020-09-28 16:56:40 +00:00
Ramon Wenger ab989d15a7 Add more spacing on start page 2020-09-28 14:54:35 +02:00
Christian Cueni 33bd20d44b Fix typos 2020-09-28 14:18:21 +02:00
Ramon Wenger bb50fc75a0 Add button with loading spinner component 2020-08-04 11:31:32 +02:00
Ramon Wenger 6360f1950a Add loading button component 2020-08-04 10:33:49 +02:00
Ramon Wenger b0b46e12b0 Add 404 page with styling 2020-08-04 10:33:28 +02:00
Ramon Wenger 16c587ea59 Clean up semicolons 2020-08-03 14:35:25 +02:00
Ramon Wenger 5332e60dba Change some wording, fix typos 2020-07-22 11:36:10 +02:00
Ramon Wenger f8458b8139 Add onboarding cypress test, fix join class procedure 2020-07-10 16:46:10 +02:00
Ramon Wenger c50aa19f94 Add new schema, fix cypress tests 2020-07-10 10:12:27 +02:00
Ramon Wenger f588abee43 Add onboarding visited flag to user 2020-07-07 22:31:25 +02:00
Ramon Wenger 5778f98448 Replace illustrations 2020-07-07 16:27:18 +02:00
Ramon Wenger e6fe2397b7 Add onboarding sub-pages 2020-07-07 15:49:01 +02:00
Ramon Wenger 62338a5ddb Add onboarding page with first layout implementation 2020-07-07 09:42:29 +02:00
Ramon Wenger 44e7e4c322 Clean up code 2020-07-02 12:32:44 +02:00
Ramon Wenger 10cc8ca3ba Add new test scenario and fix it 2020-07-02 11:12:00 +02:00
Ramon Wenger 240fcf0795 Display text when no modules have been visited by the user 2020-07-01 11:33:15 +02:00
Ramon Wenger f4f9b7c1a1 Refactor and update news teasers on start page 2020-06-30 18:05:45 +02:00
Ramon Wenger 841b75e0db Add cypress test for new start page 2020-06-29 16:54:52 +02:00
Ramon Wenger 943ac76859 Archive old start page 2020-06-29 16:39:44 +02:00
Ramon Wenger feb6a87888 Show recent modules on start page 2020-06-25 15:19:42 +02:00
Ramon Wenger 991efbe613 Remove 'forgot password' link 2020-06-22 10:47:26 +02:00
Ramon Wenger da5bd1e439 Merged in feature/save-last-topic (pull request #67)
Save last topic and go there on topic navigation

Approved-by: Christian Cueni
2020-06-18 14:08:18 +00:00
Ramon Wenger b5fbc562b5 Clean up code 2020-06-18 11:54:02 +02:00
Christian Cueni d6e8db5f99 Make linter happy 2020-06-17 14:38:49 +02:00
Christian Cueni e07e0a199a Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop 2020-06-17 14:22:31 +02:00
Christian Cueni 1b4a0da2e1 Merged in feature/news (pull request #65)
Feature/news

Approved-by: Ramon Wenger
2020-06-17 11:53:45 +00:00
Ramon Wenger 0080cf283e Fix linting errors 2020-06-16 16:40:19 +02:00
Ramon Wenger c6bdae3fd3 Save last topic and go there on topic navigation 2020-06-16 16:29:41 +02:00
Christian Cueni b64bd5b614 Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop 2020-06-16 13:51:31 +02:00
Christian Cueni 49cd6e590f Remove trailing comma 2020-06-16 13:18:24 +02:00
Christian Cueni 1d60a76760 Use correct property 2020-06-04 13:22:17 +02:00
Christian Cueni 17d3978c46 Fix registration tests 2020-06-04 13:21:30 +02:00
Christian Cueni 3f8c604a0c Remove migrations, rename html properties 2020-06-04 13:20:30 +02:00
Christian Cueni a4ac9d57cb Update tests 2020-06-04 13:19:17 +02:00
Christian Cueni 20a6290eb9 Update copy 2020-06-04 13:19:17 +02:00
Christian Cueni d9fd4dac35 Enforce terms in proxy 2020-06-04 13:19:17 +02:00
Christian Cueni 012ff7c604 Add confirmation field 2020-06-04 13:19:17 +02:00
Ramon Wenger 9fedebd42c Update topic page 2020-06-04 13:02:19 +02:00
Ramon Wenger b5d9d6a998 Refactor handling of mobile view 2020-06-02 16:46:58 +02:00
Ramon Wenger 6d43226ebb Merge branch 'hotfix/lockdown-news' into develop 2020-05-27 18:09:45 +02:00
Ramon Wenger 8dfc862efb Add new news entry, remove old one 2020-05-27 18:07:53 +02:00
Ramon Wenger 7f118a9161 Fix eslint issues 2020-05-27 16:24:37 +02:00
Christian Cueni 12c5bf8d90 Format date, style source 2020-05-27 11:51:43 +02:00
Christian Cueni 8ce5401311 Add basic grid 2020-05-25 15:36:55 +02:00
Ramon Wenger 07059f63f4 Add missing ID 2020-05-25 14:45:23 +02:00
Ramon Wenger 38e99e4747 Add and fix some more rules 2020-05-25 14:19:12 +02:00
Ramon Wenger d6772bb3db Update linter rules and fix them 2020-05-25 14:19:12 +02:00
Christian Cueni 6933e10a7f Add news page, add field 2020-05-20 15:42:50 +02:00
Christian Cueni ce299e0f0e Merged in feature/licensing (pull request #50)
Feature/licensing
2020-05-12 11:37:17 +00:00
Christian Cueni d159876472 Rename input variable 2020-05-12 11:20:43 +02:00
Christian Cueni 47129e81a6 Clean up code 2020-05-12 10:59:22 +02:00
Christian Cueni 685fa3ff34 Use built-in graphql errors 2020-05-12 09:56:48 +02:00
Ramon Wenger bf3e2db7a9 Prevent overwrite bug in student submission feedback form 2020-05-07 17:23:50 +02:00
Ramon Wenger 6d5e66c469 Remove unused code 2020-05-07 12:25:41 +02:00
Ramon Wenger e60d88dcf0 Replace old instrument overview with new one 2020-05-06 16:52:22 +02:00
Christian Cueni a0733d1caf Remove unused page, fix password error display 2020-05-06 09:04:31 +02:00
Christian Cueni b222fc86e4 Style pages, remove no-class page 2020-05-06 08:37:30 +02:00
Christian Cueni 5be7428b70 Style links 2020-05-04 15:22:35 +02:00
Christian Cueni 6b76c27c55 Merge branch 'develop' into feature/licensing
# Conflicts:
#	client/config/dev.env.js
#	client/config/prod.env.js
#	client/cypress/fixtures/schema.json
#	client/cypress/integration/beta-login.spec.js
#	client/package-lock.json
#	client/src/graphql/client.js
#	client/src/layouts/PublicLayout.vue
#	client/src/main.js
#	client/src/styles/main.scss
#	server/core/settings.py
#	server/registration/mutations_public.py
#	server/users/factories.py
#	server/users/models.py
#	server/users/schema.py
2020-04-30 15:22:55 +02:00
Christian Cueni fd619ab47b Fix login error messages 2020-04-30 14:17:56 +02:00
Christian Cueni 0aa1625837 Update links, add group_id in customer 2020-04-30 12:16:24 +02:00
Christian Cueni 55f120f1ff Update links to shop 2020-04-30 10:54:00 +02:00
Christian Cueni ebc8d070f6 Remove error field from query 2020-04-30 09:12:36 +02:00
Christian Cueni d46cc7a177 Use remove error field, fix tests 2020-04-30 08:49:54 +02:00
Ramon Wenger a799160501 Update icon 2020-04-14 15:53:59 +02:00
Ramon Wenger 1e5c66fb64 Clean up code 2020-04-14 12:18:25 +02:00
Ramon Wenger 10078cde5f Parse answers from survey matrix 2020-04-14 10:43:27 +02:00
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